From a4011e8cb493e9ab316abaa4c6f9bdd02c2261cc Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Wed, 10 Jul 2024 13:19:25 +0200 Subject: [PATCH] Switching to user-context --- NGSI-LD Registrations.postman_collection.json | 36 +++-- README.md | 8 +- data-models/ngsi-context.jsonld | 147 +----------------- data-models/user-context.jsonld | 143 +++++++++++++++++ docker-compose/common.yml | 6 +- services | 2 +- 6 files changed, 176 insertions(+), 166 deletions(-) create mode 100644 data-models/user-context.jsonld diff --git a/NGSI-LD Registrations.postman_collection.json b/NGSI-LD Registrations.postman_collection.json index f9b7208..23ecb8c 100644 --- 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": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" } ], "url": { @@ -68,7 +68,7 @@ }, { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\"" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\"" }, { "key": "NGSILD-Tenant", @@ -134,7 +134,7 @@ }, { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json", + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json", "type": "text" } ], @@ -181,7 +181,7 @@ }, { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\"" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\"" }, { "key": "NGSILD-Tenant", @@ -232,7 +232,7 @@ "header": [ { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" } ], "body": { @@ -268,7 +268,7 @@ "header": [ { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" } ], "url": { @@ -309,7 +309,7 @@ }, { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" } ], "url": { @@ -346,7 +346,7 @@ }, { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" }, { "key": "NGSILD-Tenant", @@ -388,7 +388,7 @@ "header": [ { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" }, { "key": "NGSILD-Tenant", @@ -432,7 +432,7 @@ }, { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\"" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json\"" }, { "key": "NGSILD-Tenant", @@ -485,7 +485,7 @@ "header": [ { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" }, { "key": "NGSILD-Tenant", @@ -525,7 +525,7 @@ "header": [ { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" }, { "key": "NGSILD-Tenant", @@ -562,7 +562,7 @@ "header": [ { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" }, { "key": "NGSILD-Tenant", @@ -593,7 +593,7 @@ "header": [ { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" }, { "key": "NGSILD-Tenant", @@ -624,7 +624,7 @@ "header": [ { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" }, { "key": "NGSILD-Tenant", @@ -655,7 +655,7 @@ "header": [ { "key": "Link", - "value": "<{{ngsi-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" + "value": "<{{user-context.jsonld}}>; rel=\"http://www.w3.org/ns/json-ld#context\"; type=\"application/ld+json" }, { "key": "NGSILD-Tenant", @@ -705,6 +705,10 @@ "key": "ngsi-context.jsonld", "value": "http://context/ngsi-context.jsonld" }, + { + "key": "user-context.jsonld", + "value": "http://context/user-context.jsonld" + }, { "key": "orion", "value": "localhost:1026" diff --git a/README.md b/README.md index 47bb95b..4644109 100644 --- a/README.md +++ b/README.md @@ -254,7 +254,7 @@ set up on port 1027. The farmer's data can be read as shown: ```console curl -L 'http://localhost:1027/ngsi-ld/v1/entities/?type=Animal&limit=100&options=concise' \ -H 'Content-Type: application/json' \ --H 'Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json' +-H 'Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json' ``` #### Response: @@ -291,7 +291,7 @@ the payloads offered by the two subscriptions will be discussed below. ```console curl -L 'http://localhost:1027/ngsi-ld/v1/entities/?type=Animal&limit=100&options=concise' \ -H 'Content-Type: application/json' \ --H 'Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json' +-H 'Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json' ``` #### Response: @@ -310,7 +310,7 @@ A redirection registration informs a context broker that all data for a given `t ```console curl -L 'http://localhost:1026/ngsi-ld/v1/csourceRegistrations/' \ --H 'Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json' \ +-H 'Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json' \ -H 'Content-Type: application/json' \ -d '{ "type": "ContextSourceRegistration", @@ -343,7 +343,7 @@ animals from the farmer subsystem: ```console curl -L 'http://localhost:1026/ngsi-ld/v1/entities/?type=Animal&limit=100&options=concise' \ -H 'Content-Type: application/json' \ --H 'Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json' +-H 'Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json' ``` #### Response: diff --git a/data-models/ngsi-context.jsonld b/data-models/ngsi-context.jsonld index 4b61537..952032a 100644 --- a/data-models/ngsi-context.jsonld +++ b/data-models/ngsi-context.jsonld @@ -1,143 +1,6 @@ { - "@context": { - "type": "@type", - "id": "@id", - "ngsi-ld": "https://uri.etsi.org/ngsi-ld/", - "fiware": "https://uri.fiware.org/ns/dataModels#", - "schema": "https://schema.org/", - "tutorial": "https://ngsi-ld-tutorials.readthedocs.io/en/latest/datamodels.html#", - "Building": "https://uri.fiware.org/ns/dataModels#Building", - "Device": "fiware:Device", - "Animal": "fiware:Animal", - "Female": "schema:Female", - "FillingLevelSensor": "tutorial:FillingLevelSensor", - "Herbicide": "tutorial:Product", - "HVAC": "https://w3id.org/saref#HVAC", - "Male": "schema:Male", - "PartField": "tutorial:PartField", - "Person": "fiware:Person", - "SoilSensor": "tutorial:SoilSensor", - "TemperatureSensor": "tutorial:TemperatureSensor", - "Task": "fiware:Activity", - "Tractor": "tutorial:Tractor", - "Water": "tutorial:Water", - "actuator": "https://w3id.org/saref#actuator", - "additionalName": "schema:additionalName", - "address": "schema:address", - "addressCountry": "schema:addressCountry", - "addressLocality": "schema:addressLocality", - "addressRegion": "schema:addressRegion", - "airPollution": "https://w3id.org/saref#airPollution", - "atmosphericPressure": "https://w3id.org/saref#atmosphericPressure", - "barn": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dbarn", - "batteryLevel": "fiware:batteryLevel", - "category": "fiware:category", - "configuration": "fiware:configuration", - "conservatory": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dconservatory", - "containedInPlace": "fiware:containedInPlace", - "controlledAsset": "fiware:controlledAsset", - "controlledProperty": "fiware:controlledProperty", - "cowshed": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dcowshed", - "dataProvider": "fiware:dataProvider", - "dateCreated": "fiware:dateCreated", - "dateFirstUsed": "fiware:dateFirstUsed", - "dateInstalled": "fiware:dateInstalled", - "dateLastCalibration": "fiware:dateLastCalibration", - "dateLastValueReported": "fiware:dateLastValueReported", - "dateManufactured": "fiware:dateManufactured", - "dateModified": "fiware:dateModified", - "depth": "https://w3id.org/saref#depth", - "description": "ngsi-ld:description", - "deviceState": "fiware:deviceState", - "digester": "https://wiki.openstreetmap.org/wiki/Tag:building%3Ddigester", - "eatingActivity": "https://w3id.org/saref#eatingActivity", - "email": "schema:email", - "endgun": "https://w3id.org/saref#endgun", - "familyName": "schema:familyName", - "farm": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm", - "farm_auxiliary": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm_auxiliary", - "faxNumber": "schema:faxNumber", - "filling": "https://w3id.org/saref#fillingLevel", - "firmwareVersion": "fiware:firmwareVersion", - "floorsAboveGround": "fiware:floorsAboveGround", - "floorsBelowGround": "fiware:floorsBelowGround", - "gender": "schema:gender", - "givenName": "schema:givenName", - "greenhouse": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dgreenhouse", - "hangar": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dhangar", - "hardwareVersion": "fiware:hardwareVersion", - "honorificPrefix": "schema:honorificPrefix", - "honorificSuffix": "schema:honorificSuffix", - "humidity": "https://w3id.org/saref#humidity", - "hut": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dhut", - "implement": "https://w3id.org/saref#implement", - "ipAddress": "fiware:ipAddress", - "irrSection": "https://w3id.org/saref#irrSection", - "irrSystem": "https://w3id.org/saref#irrSystem", - "isicV4": "schema:isicV4", - "jobTitle": "schema:jobTitle", - "location": "https://w3id.org/saref#location", - "macAddress": "fiware:macAddress", - "mcc": "fiware:mcc", - "meter": "https://w3id.org/saref#meter", - "milking": "https://w3id.org/saref#milking", - "mnc": "fiware:mnc", - "motion": "https://w3id.org/saref#motion", - "movementActivity": "https://w3id.org/saref#movementActivity", - "multimedia": "https://w3id.org/saref#multimedia", - "name": "schema:name", - "network": "https://w3id.org/saref#network", - "observedAt": "ngsi-ld:observedAt", - "occupancy": "https://w3id.org/saref#occupancy", - "occupier": "fiware:occupier", - "openingHours": "fiware:openingHours", - "osVersion": "fiware:osVersion", - "owner": "fiware:owner", - "postalCode": "schema:postalCode", - "precipitation": "https://w3id.org/saref#precipitation", - "pressure": "https://w3id.org/saref#pressure", - "providedBy": "fiware:providedBy", - "provider": "fiware:provider", - "refDeviceModel": "fiware:refDeviceModel", - "refMap": "fiware:refMap", - "rssi": "fiware:rssi", - "sensor": "https://w3id.org/saref#sensor", - "serialNumber": "fiware:serialNumber", - "service": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dservice", - "shed": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dshed", - "softwareVersion": "fiware:softwareVersion", - "soilMoisture": "https://w3id.org/saref#soilMoisture", - "solarRadiation": "https://w3id.org/saref#solarRadiation", - "source": "fiware:source", - "stable": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dstable", - "streetAddress": "schema:streetAddress", - "sty": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dsty", - "supportedProtocol": "fiware:supportedProtocol", - "taxID": "schema:taxID", - "telephone": "schema:telephone", - "temperature": "https://w3id.org/saref#temperature", - "transformer_tower": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dtransformer_tower", - "unitCode": "ngsi-ld:unitCode", - "value": "fiware:value", - "vatID": "schema:vatID", - "waterConsumption": "https://w3id.org/saref#waterConsumption", - "water_tower": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dwater_tower", - "weatherConditions": "https://w3id.org/saref#weatherConditions", - "weight": "https://w3id.org/saref#weight", - "windDirection": "https://w3id.org/saref#windDirection", - "windSpeed": "https://w3id.org/saref#windSpeed", - "status": "https://saref.etsi.org/core/status", - "state": "https://saref.etsi.org/core/hasState", - "heartRate": "https://purl.bioontology.org/ontology/MESH/D006339", - "product": "fiware:refObject", - "worker": "fiware:refAgent", - "field": "fiware:refTarget", - - "on": "https://w3id.org/saref#on", - "off": "https://w3id.org/saref#off", - "verified": "fiware:verified", - "species": "fiware:species", - "sex": "fiware:sex", - "legalID": "fiware:legalID" - } -} + "@context": [ + "http://context/user-context.jsonld", + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld" + ] +} \ No newline at end of file diff --git a/data-models/user-context.jsonld b/data-models/user-context.jsonld new file mode 100644 index 0000000..4b61537 --- /dev/null +++ b/data-models/user-context.jsonld @@ -0,0 +1,143 @@ +{ + "@context": { + "type": "@type", + "id": "@id", + "ngsi-ld": "https://uri.etsi.org/ngsi-ld/", + "fiware": "https://uri.fiware.org/ns/dataModels#", + "schema": "https://schema.org/", + "tutorial": "https://ngsi-ld-tutorials.readthedocs.io/en/latest/datamodels.html#", + "Building": "https://uri.fiware.org/ns/dataModels#Building", + "Device": "fiware:Device", + "Animal": "fiware:Animal", + "Female": "schema:Female", + "FillingLevelSensor": "tutorial:FillingLevelSensor", + "Herbicide": "tutorial:Product", + "HVAC": "https://w3id.org/saref#HVAC", + "Male": "schema:Male", + "PartField": "tutorial:PartField", + "Person": "fiware:Person", + "SoilSensor": "tutorial:SoilSensor", + "TemperatureSensor": "tutorial:TemperatureSensor", + "Task": "fiware:Activity", + "Tractor": "tutorial:Tractor", + "Water": "tutorial:Water", + "actuator": "https://w3id.org/saref#actuator", + "additionalName": "schema:additionalName", + "address": "schema:address", + "addressCountry": "schema:addressCountry", + "addressLocality": "schema:addressLocality", + "addressRegion": "schema:addressRegion", + "airPollution": "https://w3id.org/saref#airPollution", + "atmosphericPressure": "https://w3id.org/saref#atmosphericPressure", + "barn": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dbarn", + "batteryLevel": "fiware:batteryLevel", + "category": "fiware:category", + "configuration": "fiware:configuration", + "conservatory": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dconservatory", + "containedInPlace": "fiware:containedInPlace", + "controlledAsset": "fiware:controlledAsset", + "controlledProperty": "fiware:controlledProperty", + "cowshed": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dcowshed", + "dataProvider": "fiware:dataProvider", + "dateCreated": "fiware:dateCreated", + "dateFirstUsed": "fiware:dateFirstUsed", + "dateInstalled": "fiware:dateInstalled", + "dateLastCalibration": "fiware:dateLastCalibration", + "dateLastValueReported": "fiware:dateLastValueReported", + "dateManufactured": "fiware:dateManufactured", + "dateModified": "fiware:dateModified", + "depth": "https://w3id.org/saref#depth", + "description": "ngsi-ld:description", + "deviceState": "fiware:deviceState", + "digester": "https://wiki.openstreetmap.org/wiki/Tag:building%3Ddigester", + "eatingActivity": "https://w3id.org/saref#eatingActivity", + "email": "schema:email", + "endgun": "https://w3id.org/saref#endgun", + "familyName": "schema:familyName", + "farm": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm", + "farm_auxiliary": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm_auxiliary", + "faxNumber": "schema:faxNumber", + "filling": "https://w3id.org/saref#fillingLevel", + "firmwareVersion": "fiware:firmwareVersion", + "floorsAboveGround": "fiware:floorsAboveGround", + "floorsBelowGround": "fiware:floorsBelowGround", + "gender": "schema:gender", + "givenName": "schema:givenName", + "greenhouse": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dgreenhouse", + "hangar": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dhangar", + "hardwareVersion": "fiware:hardwareVersion", + "honorificPrefix": "schema:honorificPrefix", + "honorificSuffix": "schema:honorificSuffix", + "humidity": "https://w3id.org/saref#humidity", + "hut": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dhut", + "implement": "https://w3id.org/saref#implement", + "ipAddress": "fiware:ipAddress", + "irrSection": "https://w3id.org/saref#irrSection", + "irrSystem": "https://w3id.org/saref#irrSystem", + "isicV4": "schema:isicV4", + "jobTitle": "schema:jobTitle", + "location": "https://w3id.org/saref#location", + "macAddress": "fiware:macAddress", + "mcc": "fiware:mcc", + "meter": "https://w3id.org/saref#meter", + "milking": "https://w3id.org/saref#milking", + "mnc": "fiware:mnc", + "motion": "https://w3id.org/saref#motion", + "movementActivity": "https://w3id.org/saref#movementActivity", + "multimedia": "https://w3id.org/saref#multimedia", + "name": "schema:name", + "network": "https://w3id.org/saref#network", + "observedAt": "ngsi-ld:observedAt", + "occupancy": "https://w3id.org/saref#occupancy", + "occupier": "fiware:occupier", + "openingHours": "fiware:openingHours", + "osVersion": "fiware:osVersion", + "owner": "fiware:owner", + "postalCode": "schema:postalCode", + "precipitation": "https://w3id.org/saref#precipitation", + "pressure": "https://w3id.org/saref#pressure", + "providedBy": "fiware:providedBy", + "provider": "fiware:provider", + "refDeviceModel": "fiware:refDeviceModel", + "refMap": "fiware:refMap", + "rssi": "fiware:rssi", + "sensor": "https://w3id.org/saref#sensor", + "serialNumber": "fiware:serialNumber", + "service": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dservice", + "shed": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dshed", + "softwareVersion": "fiware:softwareVersion", + "soilMoisture": "https://w3id.org/saref#soilMoisture", + "solarRadiation": "https://w3id.org/saref#solarRadiation", + "source": "fiware:source", + "stable": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dstable", + "streetAddress": "schema:streetAddress", + "sty": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dsty", + "supportedProtocol": "fiware:supportedProtocol", + "taxID": "schema:taxID", + "telephone": "schema:telephone", + "temperature": "https://w3id.org/saref#temperature", + "transformer_tower": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dtransformer_tower", + "unitCode": "ngsi-ld:unitCode", + "value": "fiware:value", + "vatID": "schema:vatID", + "waterConsumption": "https://w3id.org/saref#waterConsumption", + "water_tower": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dwater_tower", + "weatherConditions": "https://w3id.org/saref#weatherConditions", + "weight": "https://w3id.org/saref#weight", + "windDirection": "https://w3id.org/saref#windDirection", + "windSpeed": "https://w3id.org/saref#windSpeed", + "status": "https://saref.etsi.org/core/status", + "state": "https://saref.etsi.org/core/hasState", + "heartRate": "https://purl.bioontology.org/ontology/MESH/D006339", + "product": "fiware:refObject", + "worker": "fiware:refAgent", + "field": "fiware:refTarget", + + "on": "https://w3id.org/saref#on", + "off": "https://w3id.org/saref#off", + "verified": "fiware:verified", + "species": "fiware:species", + "sex": "fiware:sex", + "legalID": "fiware:legalID" + } +} diff --git a/docker-compose/common.yml b/docker-compose/common.yml index 5be5926..6842dac 100644 --- a/docker-compose/common.yml +++ b/docker-compose/common.yml @@ -34,7 +34,7 @@ services: target: /usr/local/apache2/conf/mime.types read_only: true healthcheck: - test: (wget --server-response --spider --quiet http://ld-context/ngsi-context.jsonld 2>&1 | awk 'NR==1{print $$2}'| grep -q -e "200") || exit 1 + test: (wget --server-response --spider --quiet http://context/user-context.jsonld 2>&1 | awk 'NR==1{print $$2}'| grep -q -e "200") || exit 1 # Databases mongo-db: @@ -86,7 +86,7 @@ services: - TWITTER_CONSUMER_KEY= - TWITTER_CONSUMER_SECRET= - MONGO_URL=mongodb://mongo-db:27017 - - IOTA_JSON_LD_CONTEXT=http://context/ngsi-context.jsonld + - IOTA_JSON_LD_CONTEXT=http://context/user-context.jsonld # IoT-Agent is configured for the UltraLight Protocol @@ -118,7 +118,7 @@ services: - IOTA_HTTP_PORT=${IOTA_SOUTH_PORT} # The port used for device traffic over HTTP - IOTA_PROVIDER_URL=http://iot-agent:${IOTA_NORTH_PORT} - IOTA_CB_NGSI_VERSION=ld # use NGSI-LD when sending updates for active attributes - - IOTA_JSON_LD_CONTEXT=http://context/ngsi-context.jsonld + - IOTA_JSON_LD_CONTEXT=http://context/user-context.jsonld - IOTA_FALLBACK_TENANT=openiot - IOTA_MULTI_CORE=true healthcheck: diff --git a/services b/services index ac83c12..9fc3a68 100755 --- a/services +++ b/services @@ -11,7 +11,7 @@ SCORPIO="http://scorpio:9090/" ORION="http://orion:1026/version" ORION2="http://orion2:1026/version" STELLIO="http://localhost:8080/actuator/health" -CONTEXT="http://context/ngsi-context.jsonld" +CONTEXT="http://context/user-context.jsonld" CORE_CONTEXT="https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" dockerCmd="docker compose"