Update Stellio

FIWARE · Jan 16, 2025 · efec333 · efec333
1 parent 7c214b1
commit efec333
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/NGSI-LD Registrations.postman_collection.json b/NGSI-LD Registrations.postman_collection.json
@@ -22,7 +22,7 @@
 					},
 					{
 						"key": "Link",
-						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json"
+						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\""
 					}
 				],
 				"url": {
@@ -72,11 +72,11 @@
 					},
 					{
 						"key": "NGSILD-Tenant",
-						"value": "openiot"
+						"value": "farmer"
 					}
 				],
 				"url": {
-					"raw": "http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:cow001",
+					"raw": "http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Animal:cow001",
 					"protocol": "http",
 					"host": [
 						"localhost"
@@ -86,7 +86,7 @@
 						"ngsi-ld",
 						"v1",
 						"entities",
-						"urn:ngsi-ld:Device:cow001"
+						"urn:ngsi-ld:Animal:cow001"
 					],
 					"query": [
 						{
@@ -135,7 +135,7 @@
 					},
 					{
 						"key": "Link",
-						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json",
+						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\"",
 						"type": "text"
 					}
 				],
@@ -231,7 +231,7 @@
 				"header": [
 					{
 						"key": "Link",
-						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json"
+						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\""
 					}
 				],
 				"body": {
@@ -376,7 +376,7 @@
 				"header": [
 					{
 						"key": "Link",
-						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json"
+						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\""
 					},
 					{
 						"key": "NGSILD-Tenant",
@@ -473,12 +473,11 @@
 				"header": [
 					{
 						"key": "Link",
-						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json"
+						"value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\""
 					},
 					{
 						"key": "NGSILD-Tenant",
-						"value": "farmer",
-						"disabled": true
+						"value": "farmer"
 					}
 				],
 				"body": {
@@ -819,7 +818,7 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n  \"type\": \"ContextSourceRegistration\",\n  \"information\": [\n    {\n      \"entities\": [\n        {\n          \"type\": \"AgriPacel\"\n        }\n      ],\n      \"propertyNames\": [\"temperature\"]\n    }\n  ],\n  \"mode\": \"auxiliary\",\n  \"operations\": [\n    \"retrieveOps\"\n  ],\n  \"endpoint\": \"http://weather\"\n}\n",
+					"raw": "{\n  \"type\": \"ContextSourceRegistration\",\n  \"information\": [\n    {\n      \"entities\": [\n        {\n          \"type\": \"AgriParcel\"\n        }\n      ],\n      \"propertyNames\": [\"temperature\"]\n    }\n  ],\n  \"mode\": \"auxiliary\",\n  \"operations\": [\n    \"retrieveOps\"\n  ],\n  \"endpoint\": \"http://weather\"\n}\n",
 					"options": {
 						"raw": {
 							"language": "json"

diff --git a/README.ja.md b/README.ja.md
@@ -599,8 +599,8 @@ curl -iX GET 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Building:sto
         "value": "Bösebrücke Einkauf"
     },
     "category": {
-        "type": "Property",
-        "value": "commercial"
+        "type": "VocabProperty",
+        "vocab": "commercial"
     },
     "location": {
         "type": "GeoProperty",

diff --git a/docker-compose/stellio.yml b/docker-compose/stellio.yml
@@ -91,6 +91,18 @@ services:
       - APPLICATION_TENANTS_1_NAME=openiot
       - APPLICATION_TENANTS_1_ISSUER=https://sso.stellio.io/auth/realms/openiot
       - APPLICATION_TENANTS_1_DBSCHEMA=openiot
+      - APPLICATION_TENANTS_2_NAME=farmer
+      - APPLICATION_TENANTS_2_ISSUER=https://sso.stellio.io/auth/realms/farmer
+      - APPLICATION_TENANTS_2_DBSCHEMA=farmer
+      - APPLICATION_TENANTS_3_NAME=vet
+      - APPLICATION_TENANTS_3_ISSUER=https://sso.stellio.io/auth/realms/vet
+      - APPLICATION_TENANTS_3_DBSCHEMA=vet
+      - APPLICATION_TENANTS_4_NAME=contractor
+      - APPLICATION_TENANTS_4_ISSUER=https://sso.stellio.io/auth/realms/contractor
+      - APPLICATION_TENANTS_4_DBSCHEMA=contractor
+      - APPLICATION_TENANTS_5_NAME=weather
+      - APPLICATION_TENANTS_5_ISSUER=https://sso.stellio.io/auth/realms/weather
+      - APPLICATION_TENANTS_5_DBSCHEMA=weather
       - APPLICATION_PAGINATION_LIMIT-DEFAULT=30
       - APPLICATION_PAGINATION_LIMIT-MAX=1000
     ports:

diff --git a/services b/services
@@ -185,7 +185,7 @@ case "${command}" in
 		export $(cat .env | grep "#" -v)
 		stoppingContainers
 		waitForCoreContext
-		echo -e "Starting containers:  \033[1;34mStellio\033[0m, \033[1mKafka\033[0m, \033[1mZookeeper\033[0m, \033[1mNeo4j\033[0m, \033[1mPostgreSQL/TimescaleDB\033[0m, and a linked data \033[1mContext\033[0m."
+		echo -e "Starting containers:  \033[1;34mStellio\033[0m, \033[1mKafka\033[0m \033[1mPostgreSQL/TimescaleDB\033[0m, and a linked data \033[1mContext\033[0m."
 		echo -e "- \033[1;34mStellio\033[0m is the context broker"
 		echo -e "- Data models \033[1m@context\033[0m (Smart Farm) is supplied externally"
 		echo ""