diff --git a/API_OASEES/app/main.py b/API_OASEES/app/main.py index 692d61fdb982583c2c5b76ca3c102aa692ee4c56..95ed86e9455dbba74a74271def37619a941f56d5 100644 --- a/API_OASEES/app/main.py +++ b/API_OASEES/app/main.py @@ -126,11 +126,11 @@ async def createAndPublishDataProduct(body:DataProductResourcesModel, dataResouc print("Output create and publish data product with resources") print (output) #output="CES" - outputEDC = load_asset_edc(body, dataResouceAPI_URL) - print (outputEDC) - if "CES" in output and outputEDC: - return output - + if output is not False or output is not None: + outputEDC = load_asset_edc(body, dataResouceAPI_URL) + print (outputEDC) + return outputEDC + else: return "An error has happened during the publication of the data product" diff --git a/API_OASEES/app/utils/connector_utils.py b/API_OASEES/app/utils/connector_utils.py index 09530a3c6f532a1c6e0317da4603050e316ebd01..f04089ffbbb2ac1cc1814f8ff08463b6f926235c 100644 --- a/API_OASEES/app/utils/connector_utils.py +++ b/API_OASEES/app/utils/connector_utils.py @@ -22,6 +22,7 @@ def load_asset_edc(body:DataProductResourcesModel, dataResouceAPi_URL:str): dataResouceAPi_URL, header_authorization) if not create_asset_response.ok: + raise HTTPException(status_code=400, detail=json.loads(create_asset_response.text)) # Create policy @@ -42,4 +43,4 @@ def load_asset_edc(body:DataProductResourcesModel, dataResouceAPi_URL:str): print (f'Asset {body.dataProductName} created') - return True + return f'Asset {body.dataProductName} created' diff --git a/API_OASEES/app/utils/create_contract_definition.py b/API_OASEES/app/utils/create_contract_definition.py index 869383992c7ee73255fb98ef0f448fbd832a493a..2da2f22125a46dfc44e19916e29c238260b98e45 100644 --- a/API_OASEES/app/utils/create_contract_definition.py +++ b/API_OASEES/app/utils/create_contract_definition.py @@ -10,7 +10,7 @@ def invoke_create_contract_definition(contract_id, policy_id, asset_id,header_au provider_host = os.getenv("PROVIDER_HOST", "ekodata2.tri.lan") provider_management_port = os.getenv("PROVIDER_MANAGEMENT_PORT", "9193") - url = f"http://{provider_host}:{provider_management_port}/management/v2/contractdefinitions" + url = f"http://{provider_host}:{provider_management_port}/management/v3/contractdefinitions" payload = json.dumps(generate_contract_metadata(contract_id, policy_id, asset_id)) """headers = { @@ -31,7 +31,7 @@ def invoke_create_contract_definition_equal(contract_id, policy_id, asset_id): provider_host = os.getenv("PROVIDER_HOST", "ekodata2.tri.lan") provider_management_port = os.getenv("PROVIDER_MANAGEMENT_PORT", "9193") - url = f"http://{provider_host}:{provider_management_port}/management/v2/contractdefinitions" + url = f"http://{provider_host}:{provider_management_port}/management/v3/contractdefinitions" payload = json.dumps(generate_contract_metadata_equal(contract_id, policy_id, asset_id)) headers = { diff --git a/API_OASEES/app/utils/create_policy.py b/API_OASEES/app/utils/create_policy.py index 029c4215f6b00711dcdeb43a6d01a0223359d61d..4144728b596e3fb6bcb4aff37721e0e8ef4054bc 100644 --- a/API_OASEES/app/utils/create_policy.py +++ b/API_OASEES/app/utils/create_policy.py @@ -6,7 +6,7 @@ def checkPolicyId(policy_id,header_authorization): provider_host = os.getenv("PROVIDER_HOST") provider_management_port = os.getenv("PROVIDER_MANAGEMENT_PORT") - url = f"http://{provider_host}:{provider_management_port}/management/v2/policydefinitions/request" + url = f"http://{provider_host}:{provider_management_port}/management/v3/policydefinitions/request" """headers = { @@ -33,7 +33,7 @@ def invoke_create_policy(policy_id,header_authorization): provider_host = os.getenv("PROVIDER_HOST", "ekodata2.tri.lan") provider_management_port = os.getenv("PROVIDER_MANAGEMENT_PORT", "9193") - url = f"http://{provider_host}:{provider_management_port}/management/v2/policydefinitions" + url = f"http://{provider_host}:{provider_management_port}/management/v3/policydefinitions" payload = json.dumps(generate_policy_metadata_without_restrictions(policy_id)) """headers = { @@ -53,7 +53,7 @@ def invoke_create_policy_time(policy_id, policy_time_interval, policy_time_inter provider_host = os.getenv("PROVIDER_HOST", "ekodata2.tri.lan") provider_management_port = os.getenv("PROVIDER_MANAGEMENT_PORT", "9193") - url = f"http://{provider_host}:{provider_management_port}/management/v2/policydefinitions" + url = f"http://{provider_host}:{provider_management_port}/management/v3/policydefinitions" payload = json.dumps(generate_policy_metadata_time(policy_id, policy_time_interval, policy_time_interval_start_date, policy_time_interval_end_date)) diff --git a/API_OASEES/datamite-1.0-py2.py3-none-any.whl b/API_OASEES/datamite-1.0-py2.py3-none-any.whl index b943f85a9f06fc30c6815cbd47bdad8ea5ff232c..1ff6167df4d0c91f9fea351f991e041865f20e6c 100644 Binary files a/API_OASEES/datamite-1.0-py2.py3-none-any.whl and b/API_OASEES/datamite-1.0-py2.py3-none-any.whl differ diff --git a/API_OASEES/local_wheels/datamite-1.8-py2.py3-none-any.whl b/API_OASEES/local_wheels/datamite-1.8-py2.py3-none-any.whl deleted file mode 100644 index 7e8916d563ed7ca5a5d025651116c4d64c162dcd..0000000000000000000000000000000000000000 Binary files a/API_OASEES/local_wheels/datamite-1.8-py2.py3-none-any.whl and /dev/null differ