Merge branch 'feature/fixes' into 'master'

feature/fixes See merge request upm-inesdata/inesdata-local-env!16
oeg-upm · Jul 30, 2024 · 1f198e6 · 1f198e6
2 parents e106cb4 + d398898
commit 1f198e6
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -294,7 +294,7 @@ services:
     volumes:
       - hvdata:/data
     healthcheck:
-      test: [ "CMD", "wget", "--spider", "http://localhost:8201/v1/sys/health?standbyok=true" ]
+      test: [ "CMD", "wget", "--spider", "http://0.0.0.0:8201/v1/sys/health?standbyok=true" ]
       interval: 2s
       timeout: 3s
       retries: 30

diff --git a/resources/operations/InesData_Connector_Management_API.postman_collection.json b/resources/operations/InesData_Connector_Management_API.postman_collection.json
@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "5d6de9ba-2e64-4f93-ac27-4ae4648ac327",
+		"_postman_id": "e8264589-9ea7-4a3e-beb8-9e24139d4834",
 		"name": "INESData Connector Management API",
 		"description": "# ⛓️ INESData Connector Management API\n\nPrincipales métodos para la gestión de entidades en el conector de INESData",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
@@ -1242,7 +1242,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n  \"@context\": {\r\n    \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\r\n  },\r\n  \"@id\": \"inesdata-vocabulary\",\r\n  \"name\": \"Vocabulary for Inesdata\",\r\n  \"category\": \"default\",\r\n  \"jsonSchema\": \"{ \\\"title\\\": \\\"vocabulary\\\", \\\"type\\\": \\\"object\\\", \\\"properties\\\": { \\\"title\\\": { \\\"type\\\": \\\"string\\\", \\\"title\\\": \\\"Title\\\" }, \\\"keyword\\\": { \\\"type\\\": \\\"array\\\", \\\"title\\\": \\\"Keywords\\\", \\\"items\\\": { \\\"type\\\": \\\"string\\\" } } }, \\\"required\\\": [ \\\"title\\\"] }\"\r\n}",
+					"raw": "{\r\n  \"@context\": {\r\n    \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\r\n  },\r\n  \"@id\": \"inesdata-vocabulary\",\r\n  \"name\": \"Vocabulary for Inesdata\",\r\n  \"category\": \"default\",\r\n  \"connectorId\": \"connector-c1\",\r\n  \"jsonSchema\": \"{ \\\"title\\\": \\\"vocabulary\\\", \\\"type\\\": \\\"object\\\", \\\"properties\\\": { \\\"title\\\": { \\\"type\\\": \\\"string\\\", \\\"title\\\": \\\"Title\\\" }, \\\"keyword\\\": { \\\"type\\\": \\\"array\\\", \\\"title\\\": \\\"Keywords\\\", \\\"items\\\": { \\\"type\\\": \\\"string\\\" } } }, \\\"required\\\": [ \\\"title\\\"] }\"\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"

diff --git a/resources/operations/InesData_Search.postman_collection.json b/resources/operations/InesData_Search.postman_collection.json
@@ -161,7 +161,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n  \"@context\": {\r\n    \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\r\n  },\r\n  \"@id\": \"machine-learning-vocabulary\",\r\n  \"name\": \"Vocabulary for machine learning\",\r\n  \"category\": \"machineLearning\",\r\n  \"jsonSchema\": \"{ \\\"title\\\":\\\"machine learning vocabulary\\\", \\\"type\\\":\\\"object\\\", \\\"properties\\\":{ \\\"title\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"Title\\\" }, \\\"keyword\\\":{ \\\"type\\\":\\\"array\\\", \\\"title\\\":\\\"Keywords\\\", \\\"items\\\":{ \\\"type\\\":\\\"string\\\" } }, \\\"trainedOn\\\":{ \\\"type\\\":\\\"array\\\", \\\"title\\\":\\\"Trained on\\\", \\\"items\\\":{ \\\"type\\\":\\\"object\\\", \\\"title\\\":\\\"Training dataset\\\", \\\"properties\\\":{ \\\"identifier\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"id\\\" }, \\\"name\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"Name\\\" }, \\\"description\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"Description\\\" }, \\\"url\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"URL\\\" } }, \\\"required\\\":[ \\\"name\\\" ] } } }, \\\"required\\\":[ \\\"title\\\" ] }\"\r\n}",
+					"raw": "{\r\n  \"@context\": {\r\n    \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\r\n  },\r\n  \"@id\": \"machine-learning-vocabulary\",\r\n  \"name\": \"Vocabulary for machine learning\",\r\n  \"category\": \"machineLearning\",\r\n  \"connectorId\": \"connector-c1\",\r\n  \"jsonSchema\": \"{ \\\"title\\\":\\\"machine learning vocabulary\\\", \\\"type\\\":\\\"object\\\", \\\"properties\\\":{ \\\"title\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"Title\\\" }, \\\"keyword\\\":{ \\\"type\\\":\\\"array\\\", \\\"title\\\":\\\"Keywords\\\", \\\"items\\\":{ \\\"type\\\":\\\"string\\\" } }, \\\"trainedOn\\\":{ \\\"type\\\":\\\"array\\\", \\\"title\\\":\\\"Trained on\\\", \\\"items\\\":{ \\\"type\\\":\\\"object\\\", \\\"title\\\":\\\"Training dataset\\\", \\\"properties\\\":{ \\\"identifier\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"id\\\" }, \\\"name\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"Name\\\" }, \\\"description\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"Description\\\" }, \\\"url\\\":{ \\\"type\\\":\\\"string\\\", \\\"title\\\":\\\"URL\\\" } }, \\\"required\\\":[ \\\"name\\\" ] } } }, \\\"required\\\":[ \\\"title\\\" ] }\"\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -212,7 +212,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n  \"@context\": {\r\n    \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\r\n  },\r\n  \"@id\": \"inesdata-vocabulary\",\r\n  \"name\": \"Vocabulary for Inesdata\",\r\n  \"category\": \"default\",\r\n  \"jsonSchema\": \"{ \\\"title\\\": \\\"vocabulary\\\", \\\"type\\\": \\\"object\\\", \\\"properties\\\": { \\\"title\\\": { \\\"type\\\": \\\"string\\\", \\\"title\\\": \\\"Title\\\" }, \\\"keyword\\\": { \\\"type\\\": \\\"array\\\", \\\"title\\\": \\\"Keywords\\\", \\\"items\\\": { \\\"type\\\": \\\"string\\\" } } }, \\\"required\\\": [ \\\"title\\\"] }\"\r\n}",
+					"raw": "{\r\n  \"@context\": {\r\n    \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\r\n  },\r\n  \"@id\": \"inesdata-vocabulary\",\r\n  \"name\": \"Vocabulary for Inesdata\",\r\n  \"category\": \"default\",\r\n  \"connectorId\": \"connector-c2\",\r\n  \"jsonSchema\": \"{ \\\"title\\\": \\\"vocabulary\\\", \\\"type\\\": \\\"object\\\", \\\"properties\\\": { \\\"title\\\": { \\\"type\\\": \\\"string\\\", \\\"title\\\": \\\"Title\\\" }, \\\"keyword\\\": { \\\"type\\\": \\\"array\\\", \\\"title\\\": \\\"Keywords\\\", \\\"items\\\": { \\\"type\\\": \\\"string\\\" } } }, \\\"required\\\": [ \\\"title\\\"] }\"\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -306,7 +306,7 @@
 					"bearer": [
 						{
 							"key": "token",
-							"value": "{{c1-jwt}}",
+							"value": "{{c2-jwt}}",
 							"type": "string"
 						}
 					]
@@ -358,7 +358,7 @@
 					"bearer": [
 						{
 							"key": "token",
-							"value": "{{c1-jwt}}",
+							"value": "{{c2-jwt}}",
 							"type": "string"
 						}
 					]
@@ -462,7 +462,7 @@
 					"bearer": [
 						{
 							"key": "token",
-							"value": "{{c1-jwt}}",
+							"value": "{{c2-jwt}}",
 							"type": "string"
 						}
 					]
@@ -494,6 +494,110 @@
 			},
 			"response": []
 		},
+		{
+			"name": "Create Contract Definition - Conn1",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript",
+						"packages": {}
+					}
+				}
+			],
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{c1-jwt}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n  \"@context\": {\r\n    \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\r\n  },\r\n  \"@id\": \"inesdata-contract\",\r\n  \"accessPolicyId\": \"in-2024-policy\",\r\n  \"contractPolicyId\": \"in-2024-policy\",\r\n  \"assetsSelector\": []\r\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "{{baseUrl}}:19193/management/v3/contractdefinitions",
+					"host": [
+						"{{baseUrl}}"
+					],
+					"port": "19193",
+					"path": [
+						"management",
+						"v3",
+						"contractdefinitions"
+					]
+				},
+				"description": "Creación de una defición de contrato que aplica la política vacía a todos los assets del conector connector-c1."
+			},
+			"response": []
+		},
+		{
+			"name": "Create Contract Definition - Conn2",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript",
+						"packages": {}
+					}
+				}
+			],
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{c2-jwt}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n  \"@context\": {\r\n    \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\r\n  },\r\n  \"@id\": \"inesdata-contract\",\r\n  \"accessPolicyId\": \"in-2024-policy\",\r\n  \"contractPolicyId\": \"in-2024-policy\",\r\n  \"assetsSelector\": []\r\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "{{baseUrl}}:29193/management/v3/contractdefinitions",
+					"host": [
+						"{{baseUrl}}"
+					],
+					"port": "29193",
+					"path": [
+						"management",
+						"v3",
+						"contractdefinitions"
+					]
+				},
+				"description": "Creación de una defición de contrato que aplica la política vacía a todos los assets del conector connector-c1."
+			},
+			"response": []
+		},
 		{
 			"name": "Get Paginated Federated Catalog",
 			"event": [