Changes for avoiding CES and creating assets

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"
 
 
 

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'

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 = {

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))