iotagent-node-lib 2.25.0 → 2.26.0

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent1.json

@@ -1,18 +1,28 @@
 {
-    "@context": "http://context.json-ld",
-    "endpoint": "http://smartgondor.com",
-    "information": [
+  "type": "ContextSourceRegistration",
+  "information": [
+    {
+      "entities": [
         {
-            "entities": [
-                {
-                    "id": "urn:ngsi-ld:Light:light1",
-                    "type": "Light"
-                }
-            ],
-            "properties": [
-                "temperature"
-            ]
+          "type": "Light",
+          "id": "urn:ngsi-ld:Light:light1"
         }
-    ],
-    "type": "ContextSourceRegistration"
+      ],
+      "propertyNames": [
+        "temperature"
+      ]
+    }
+  ],
+  "mode": "exclusive",
+  "operations": [
+    "retrieveOps"
+  ],
+  "endpoint": "http://smartgondor.com",
+  "contextSourceInfo": [
+    {
+      "key": "jsonldContext",
+      "value": "http://context.json-ld"
+    }
+  ],
+  "@context": "http://context.json-ld"
 }

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent2.json

@@ -1,18 +1,28 @@
 {
-  "type": "ContextSourceRegistration",
-  "information": [
-    {
-      "entities": [
+    "type": "ContextSourceRegistration",
+    "information": [
         {
-          "type": "Motion",
-          "id": "urn:ngsi-ld:Motion:motion1"
+            "entities": [
+                {
+                    "type": "Motion",
+                    "id": "urn:ngsi-ld:Motion:motion1"
+                }
+            ],
+            "propertyNames": [
+                "moving"
+            ]
         }
-      ],
-      "properties": [
-        "moving"
-      ]
-    }
-  ],
-  "endpoint": "http://smartgondor.com",
-  "@context": "http://context.json-ld"
-}
+    ],
+    "mode": "exclusive",
+    "operations": [
+        "retrieveOps"
+    ],
+    "endpoint": "http://smartgondor.com",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
+    "@context": "http://context.json-ld"
+}

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent4.json

@@ -4,15 +4,25 @@
     {
       "entities": [
         {
-          "type": "RobotPre",
-          "id": "urn:ngsi-ld:RobotPre:TestRobotPre"
+          "type": "Light",
+          "id": "urn:ngsi-ld:Light:light1"
         }
       ],
-      "properties": [
-        "moving"
+      "propertyNames": [
+        "temperature"
       ]
     }
   ],
+  "mode": "exclusive",
+  "operations": [
+    "retrieveOps"
+  ],
   "endpoint": "http://smartgondor.com",
+  "contextSourceInfo": [
+    {
+      "key": "jsonldContext",
+      "value": "http://context.json-ld"
+    }
+  ],
   "@context": "http://context.json-ld"
-}
+}

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgentCommands.json

@@ -1,6 +1,12 @@
 {
     "@context": "http://context.json-ld",
     "endpoint": "http://smartgondor.com",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
     "information": [
         {
             "entities": [
@@ -9,11 +15,13 @@
                     "type": "Robot"
                 }
             ],
-            "properties": [
+            "propertyNames": [
                 "position",
                 "orientation"
             ]
         }
     ],
+    "mode": "exclusive",
+    "operations" :["updateOps"],
     "type": "ContextSourceRegistration"
 }

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgentCommandsAndLazy.json

@@ -0,0 +1,32 @@
+{
+  "type": "ContextSourceRegistration",
+  "information": [
+    {
+      "entities": [
+        {
+          "type": "Robot",
+          "id": "urn:ngsi-ld:Robot:r2d2"
+        }
+      ],
+      "propertyNames": [
+        "batteryLevel",
+        "position",
+        "orientation"
+      ]
+    }
+  ],
+  "mode": "exclusive",
+  "operations": [
+    "retrieveOps",
+    "updateOps",
+    "mergeEntity"
+  ],
+  "endpoint": "http://smartgondor.com",
+  "contextSourceInfo": [
+    {
+      "key": "jsonldContext",
+      "value": "http://context.json-ld"
+    }
+  ],
+  "@context": "http://context.json-ld"
+}

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDevice.json

@@ -1,6 +1,12 @@
 {
     "@context": "http://context.json-ld",
     "endpoint": "http://smartgondor.com",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
     "information": [
         {
             "entities": [
@@ -9,11 +15,16 @@
                     "type": "TheLightType"
                 }
             ],
-            "properties": [
+            "propertyNames": [
                 "luminance",
                 "commandAttr"
             ]
         }
     ],
+    "mode": "exclusive",
+    "operations": [
+        "retrieveOps",
+        "updateOps"
+    ],
     "type": "ContextSourceRegistration"
 }

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDevice2.json

@@ -1,6 +1,12 @@
 {
     "@context": "http://context.json-ld",
     "endpoint": "http://smartgondor.com",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
     "information": [
         {
             "entities": [
@@ -9,10 +15,12 @@
                     "type": "TheLightType"
                 }
             ],
-            "properties": [
+            "propertyNames": [
                 "luminance"
             ]
         }
     ],
+    "mode": "exclusive",
+    "operations" :["retrieveOps"],
     "type": "ContextSourceRegistration"
 }

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup.json

@@ -1,6 +1,12 @@
 {
     "@context": "http://context.json-ld",
     "endpoint": "http://smartgondor.com",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
     "information": [
         {
             "entities": [
@@ -9,7 +15,7 @@
                     "type": "TheLightType"
                 }
             ],
-            "properties": [
+            "propertyNames": [
                 "luminance",
                 "luminescence",
                 "commandAttr",
@@ -17,5 +23,10 @@
             ]
         }
     ],
+    "mode": "exclusive",
+    "operations": [
+        "retrieveOps",
+        "updateOps"
+    ],
     "type": "ContextSourceRegistration"
 }

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup2.json

@@ -1,6 +1,12 @@
 {
     "@context": "http://context.json-ld",
     "endpoint": "http://smartgondor.com",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
     "information": [
         {
             "entities": [
@@ -9,7 +15,7 @@
                     "type": "SensorMachine"
                 }
             ],
-            "properties": [
+            "propertyNames": [
                 "luminance",
                 "luminescence",
                 "commandAttr",
@@ -17,5 +23,10 @@
             ]
         }
     ],
+    "mode": "exclusive",
+    "operations" : [
+        "retrieveOps",
+        "updateOps"
+    ],
     "type": "ContextSourceRegistration"
 }

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup3.json

@@ -1,6 +1,12 @@
 {
     "@context": "http://context.json-ld",
     "endpoint": "http://smartgondor.com",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
     "information": [
         {
             "entities": [
@@ -9,10 +15,12 @@
                     "type": "Light"
                 }
             ],
-            "properties": [
+            "propertyNames": [
                 "temperature"
             ]
         }
     ],
+    "mode": "exclusive",
+    "operations" :["retrieveOps"],
     "type": "ContextSourceRegistration"
 }

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/updateCommands1.json

@@ -1,5 +1,11 @@
 {
     "type":"ContextSourceRegistration",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
     "information":[
         {
             "entities":[
@@ -8,11 +14,13 @@
                     "id":"urn:ngsi-ld:Light:light1"
                 }
             ],
-            "properties":[
+            "propertyNames":[
                 "move"
             ]
         }
     ],
+    "mode": "exclusive",
+    "operations":["updateOps"],
     "endpoint":"http://smartgondor.com",
     "@context": "http://context.json-ld"
-}
+}

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/updateIoTAgent1.json

@@ -1,6 +1,12 @@
 {
     "@context": "http://context.json-ld",
     "endpoint": "http://smartgondor.com",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
     "information": [
         {
             "entities": [
@@ -9,10 +15,14 @@
                     "type": "Light"
                 }
             ],
-            "properties": [
+            "propertyNames": [
                 "pressure"
             ]
         }
     ],
+    "mode": "exclusive",
+    "operations": [
+        "retrieveOps"
+    ],
     "type": "ContextSourceRegistration"
 }

package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/updateIoTAgent2.json

@@ -1,6 +1,12 @@
 {
     "@context": "http://context.json-ld",
     "endpoint": "http://smartgondor.com",
+    "contextSourceInfo":[
+      {
+        "key": "jsonldContext",
+        "value": "http://context.json-ld"
+      }
+    ],
     "information": [
         {
             "entities": [
@@ -9,11 +15,16 @@
                     "type": "TheLightType"
                 }
             ],
-            "properties": [
+            "propertyNames": [
                 "luminance",
                 "commandAttr"
             ]
         }
     ],
+    "mode": "exclusive",
+    "operations" : [
+        "retrieveOps",
+        "updateOps"
+    ],
     "type": "ContextSourceRegistration"
 }

package/test/unit/ngsi-ld/general/startup-test.js

@@ -66,7 +66,7 @@ describe('NGSI-LD - Startup tests', function () {
         beforeEach(function () {
             process.env.IOTA_CB_HOST = 'cbhost';
             process.env.IOTA_CB_PORT = '1111';
-            process.env.IOTA_CB_NGSI_VERSION = 'v2';
+            process.env.IOTA_CB_NGSI_VERSION = 'ld';
             process.env.IOTA_NORTH_HOST = 'localhost';
             process.env.IOTA_NORTH_PORT = '2222';
             process.env.IOTA_PROVIDER_URL = 'provider:3333';
@@ -83,6 +83,11 @@ describe('NGSI-LD - Startup tests', function () {
             process.env.IOTA_MONGO_DB = 'themongodb';
             process.env.IOTA_MONGO_REPLICASET = 'customReplica';
             process.env.IOTA_DEFAULT_RESOURCE = '/iot/custom';
+            process.env.IOTA_JSON_LD_CONTEXT = 'http://context.jsonld';
+            process.env.IOTA_FALLBACK_TENANT = 'openiot';
+            process.env.IOTA_FALLBACK_PATH = 'smartgondor';
+            process.env.IOTA_LD_SUPPORT_NULL = 'false';
+            process.env.IOTA_LD_SUPPORT_DATASET_ID = 'false';
 
             nock.cleanAll();
 
@@ -114,6 +119,11 @@ describe('NGSI-LD - Startup tests', function () {
             delete process.env.IOTA_MONGO_DB;
             delete process.env.IOTA_MONGO_REPLICASET;
             delete process.env.IOTA_DEFAULT_RESOURCE;
+            delete process.env.IOTA_JSON_LD_CONTEXT;
+            delete process.env.IOTA_FALLBACK_TENANT;
+            delete process.env.IOTA_FALLBACK_PATH;
+            delete process.env.IOTA_LD_SUPPORT_NULL;
+            delete process.env.IOTA_LD_SUPPORT_DATASET_ID;
         });
 
         afterEach(function (done) {
@@ -123,7 +133,12 @@ describe('NGSI-LD - Startup tests', function () {
         it('should load the correct configuration parameters', function (done) {
             iotAgentLib.activate(iotAgentConfig, function (error) {
                 config.getConfig().contextBroker.url.should.equal('http://cbhost:1111');
-                config.getConfig().contextBroker.ngsiVersion.should.equal('v2');
+                config.getConfig().contextBroker.ngsiVersion.should.equal('ld');
+                config.getConfig().contextBroker.jsonLdContext.should.equal('http://context.jsonld');
+                config.getConfig().contextBroker.fallbackTenant.should.equal( 'openiot');
+                config.getConfig().contextBroker.fallbackPath.should.equal('smartgondor');
+                config.getConfig().server.ldSupport.null.should.equal(false);
+                config.getConfig().server.ldSupport.datasetId.should.equal(false);
                 config.getConfig().server.host.should.equal('localhost');
                 config.getConfig().server.port.should.equal('2222');
                 config.getConfig().providerUrl.should.equal('provider:3333');

package/test/unit/ngsi-ld/lazyAndCommands/command-test.js

@@ -184,7 +184,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -287,7 +286,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -368,7 +366,7 @@ describe('NGSI-LD - Command functionalities', function () {
     describe('When a sequential command with datasetId updates via PATCH  /attrs/attr-name arrives to the IoT Agent', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2/attrs',
-            method: 'PUT',
+            method: 'PATCH',
             json: {
                 position: [
                     {
@@ -390,7 +388,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -496,7 +493,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -594,7 +590,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -691,7 +686,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -794,7 +788,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -902,7 +895,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -1006,7 +998,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -1104,7 +1095,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -1246,7 +1236,6 @@ describe('NGSI-LD - Command functionalities', function () {
         };
 
         beforeEach(function (done) {
-            logger.setLevel('ERROR');
             iotAgentLib.register(device3, function (error) {
                 done();
             });