iotagent-node-lib 4.4.0 → 4.6.0

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin4.json

@@ -1,19 +1,14 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WeatherStation:ws5",
-        "type": "WeatherStation"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "16"
-            }
-        },
-        "type": "Higrometer"
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2000",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "16"
+      }
     }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin5.json

@@ -1,31 +1,26 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WeatherStation:ws6",
-        "type": "WeatherStation"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "type": "Higrometer",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "16"
-            }
-        }
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2002",
-        "type": "Higrometer",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "17"
-            }
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2002",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "17"
+      }
     }
+  },
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2000",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "16"
+      }
+    }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin6.json

@@ -1,16 +1,11 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Sensor:Sensor",
-        "type": "Sensor"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WM:SO1",
-        "type": "WM",
-        "vol": {
-            "type": "Property",
-            "value": 38
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:WM:SO1",
+    "type": "WM",
+    "vol": {
+      "type": "Property",
+      "value": 38
     }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin7.json

@@ -1,9 +1,4 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Sensor:Sensor",
-        "type": "Sensor"
-    },
     {
         "@context": "http://context.json-ld",
         "id": "urn:ngsi-ld:WM:SO1",

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin8.json

@@ -1,32 +1,27 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WeatherStation:ws7",
-        "type": "WeatherStation"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "type": "Higrometer",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "16"
-            }
-        }
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2002",
-        "type": "Higrometer",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "17"
-            },
-            "unitCode": "Hgmm"
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2002",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "17"
+      },
+      "unitCode": "Hgmm"
     }
+  },
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2000",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "16"
+      }
+    }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityTimestampPlugin2.json

@@ -1,20 +1,15 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WeatherStation:ws4",
-        "type": "WeatherStation"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "type": "Higrometer",
-        "humidity": {
-            "type": "Property",
-            "value": {
-                "@type": "Percentage",
-                "@value": "12"
-            },
-            "observedAt": "2023-03-21T16:54:11.464Z"
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2000",
+    "type": "Higrometer",
+    "humidity": {
+      "type": "Property",
+      "value": {
+        "@type": "Percentage",
+        "@value": "12"
+      },
+      "observedAt": "2024-06-25T16:04:13.914Z"
     }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextStaticLinkedAttributes.json

@@ -1,14 +1,8 @@
 [
   {
     "@context": "http://context.json-ld",
-    "luminosity": {
-      "type": "Property",
-      "value": 87,
-      "providedBy": {
-        "type": "Relationship",
-        "object": "urn:ngsi-ld:Lamp:lamp1"
-      }
-    },
+    "id": "urn:ngsi-ld:Lamp:lamp1",
+    "type": "Lamp",
     "controlledAsset": {
       "type": "Relationship",
       "object": "urn:ngsi-ld:Building:001"
@@ -21,8 +15,15 @@
         "value": "bell"
       }
     },
-    "id": "urn:ngsi-ld:Lamp:lamp1",
-    "type": "Lamp"
+    "luminosity": {
+      "type": "Property",
+      "value": 87,
+      "unitCode": "CAL",
+      "providedBy": {
+        "type": "Relationship",
+        "object": "urn:ngsi-ld:Lamp:lamp1"
+      }
+    }
   },
   {
     "@context": "http://context.json-ld",
@@ -31,6 +32,7 @@
     "luminosity": {
       "type": "Property",
       "value": 87,
+      "unitCode": "CAL",
       "providedBy": {
         "type": "Relationship",
         "object": "urn:ngsi-ld:Lamp:lamp1"

package/test/unit/ngsi-ld/expressions/jexlBasedTransformations-test.js

@@ -306,40 +306,6 @@ describe('NGSI-LD: JEXL', function () {
         });
     });
 
-    describe('When an update comes for expressions with syntax errors', function () {
-        // Case: Update for an attribute with bad expression
-        const values = [
-            {
-                name: 'p',
-                type: 'centigrades',
-                value: '52'
-            }
-        ];
-
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin30.json'
-                    )
-                )
-                .reply(204);
-        });
-
-        it('should ignore the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'LightError', '', values, function (error) {
-                should.not.exist(error);
-                contextBrokerMock.done();
-                done();
-            });
-        });
-    });
-
     describe('When there are expression attributes that are just calculated (not sent by the device)', function () {
         // Case: Expression which results is sent as a new attribute
         const values = [
@@ -557,41 +523,6 @@ describe('NGSI-LD: JEXL', function () {
         });
     });
 
-    describe('When an update comes for attributes without expressions and NULL type', function () {
-        // Case: Update for a Null attribute without expression
-
-        const values = [
-            {
-                name: 'a',
-                type: 'None',
-                value: null
-            }
-        ];
-
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin5.json'
-                    )
-                )
-                .reply(204);
-        });
-
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'Light', '', values, function (error) {
-                should.not.exist(error);
-                contextBrokerMock.done();
-                done();
-            });
-        });
-    });
-
     describe('When an update comes for attributes without expressions and Boolean type', function () {
         // Case: Update for a Boolean attribute without expression
 
@@ -696,39 +627,6 @@ describe('NGSI-LD: JEXL', function () {
         });
     });
 
-    describe('When there are expressions including other attributes and they are not updated', function () {
-        const values = [
-            {
-                name: 'x',
-                type: 'Number',
-                value: 0.44
-            }
-        ];
-
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin12a.json'
-                    )
-                )
-                .reply(204);
-        });
-
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'Light', '', values, function (error) {
-                should.not.exist(error);
-                contextBrokerMock.done();
-                done();
-            });
-        });
-    });
-
     describe('When there are expressions including other attributes and they are updated', function () {
         const values = [
             {

package/test/unit/ngsi-ld/plugins/multientity-plugin_test.js

@@ -696,17 +696,16 @@ describe('NGSI-LD - Multi-entity plugin is executed before timestamp process plu
                         './test/unit/ngsi-ld/examples' +
                             '/contextRequests/updateContextMultientityTimestampPlugin2.json'
                     );
-
                     // Note that TimeInstant fields are not included in the json used by this mock as they are dynamic
                     // fields. The following code just checks that TimeInstant fields are present.
-                    if (!body[1].humidity.observedAt) {
+                    if (!body[0].humidity.observedAt) {
                         return false;
                     }
 
-                    const timeInstantAtt = body[1].humidity.observedAt;
+                    const timeInstantAtt = body[0].humidity.observedAt;
                     if (moment(timeInstantAtt, 'YYYY-MM-DDTHH:mm:ss.SSSZ').isValid) {
-                        delete body[1].humidity.observedAt;
-                        delete expectedBody[1].humidity.observedAt;
+                        delete body[0].humidity.observedAt;
+                        delete expectedBody[0].humidity.observedAt;
                         return JSON.stringify(body) === JSON.stringify(expectedBody);
                     }
                     return false;

package/test/unit/ngsi-ld/provisioning/device-update-registration_test.js

@@ -186,14 +186,14 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
         });
 
         it('should register as ContextProvider of its lazy attributes', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
+            iotAgentLib.updateRegister(deviceUpdated, device1, false, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
             });
         });
         it('should store the new values in the registry', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, false, function (error, data) {
+            iotAgentLib.updateRegister(deviceUpdated, device1, false, function (error, data) {
                 iotAgentLib.getDevice(deviceUpdated.id, null, 'smartgondor', 'gardens', function (error, deviceResult) {
                     should.not.exist(error);
                     should.exist(deviceResult);
@@ -236,7 +236,7 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
         //     });
         // });
         it('should store the new values in the registry', function (done) {
-            iotAgentLib.updateRegister(deviceCommandUpdated, false, function (error, data) {
+            iotAgentLib.updateRegister(deviceCommandUpdated, device1, false, function (error, data) {
                 iotAgentLib.getDevice(
                     deviceCommandUpdated.id,
                     null,
@@ -257,7 +257,7 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
 
     describe('When a update action is executed in a non registered device', function () {
         it('should return a DEVICE_NOT_FOUND error', function (done) {
-            iotAgentLib.updateRegister(unknownDevice, false, function (error) {
+            iotAgentLib.updateRegister(unknownDevice, device1, false, function (error) {
                 should.exist(error);
                 error.name.should.equal('DEVICE_NOT_FOUND');
                 done();
@@ -273,7 +273,7 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
         });
 
         it('should return a REGISTRATION_ERROR error in the update action', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
+            iotAgentLib.updateRegister(deviceUpdated, device1, false, function (error) {
                 should.exist(error);
                 //error.name.should.equal('UNREGISTRATION_ERROR');
                 done();

package/test/unit/ngsi-ld/provisioning/listProvisionedDevices-test.js

@@ -184,11 +184,9 @@ describe('NGSI-LD - Device provisioning API: List provisioned devices', function
                 should.exist(body.devices[2].attributes[0].entity_name);
                 should.exist(body.devices[2].attributes[0].entity_type);
                 should.exist(body.devices[2].attributes[1].expression);
-                should.exist(body.devices[2].attributes[2].reverse);
                 body.devices[2].attributes[0].entity_name.should.equal('Higro2000');
                 body.devices[2].attributes[0].entity_type.should.equal('Higrometer');
                 body.devices[2].attributes[1].expression.should.equal('${@humidity * 20}');
-                body.devices[2].attributes[2].reverse.length.should.equal(2);
                 done();
             });
         });
@@ -245,11 +243,9 @@ describe('NGSI-LD - Device provisioning API: List provisioned devices', function
                 should.exist(body.attributes[0].entity_name);
                 should.exist(body.attributes[0].entity_type);
                 should.exist(body.attributes[1].expression);
-                should.exist(body.attributes[2].reverse);
                 body.attributes[0].entity_name.should.equal('Higro2000');
                 body.attributes[0].entity_type.should.equal('Higrometer');
                 body.attributes[1].expression.should.equal('${@humidity * 20}');
-                body.attributes[2].reverse.length.should.equal(2);
                 done();
             });
         });

package/test/unit/ngsiv2/general/deviceService-test.js

@@ -156,6 +156,34 @@ const groupCreation = {
         'fiware-servicepath': '/testingPath'
     }
 };
+const configGroupCreation = {
+    url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/groups',
+    method: 'POST',
+    json: {
+        groups: [
+            {
+                resource: '',
+                apikey: '801230BJKL23Y9090DSFL123HJK09H324HV8732',
+                entity_type: 'TheLightType',
+                trust: '8970A9078A803H3BL98PINEQRW8342HBAMS',
+                cbHost: 'http://192.168.1.1:1026',
+                commands: [],
+                lazy: [],
+                attributes: [
+                    {
+                        name: 'status',
+                        type: 'Boolean'
+                    }
+                ],
+                static_attributes: []
+            }
+        ]
+    },
+    headers: {
+        'fiware-service': 'testservice',
+        'fiware-servicepath': '/testingPath'
+    }
+};
 const deviceCreation = {
     url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
     method: 'POST',
@@ -182,7 +210,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
         nock.cleanAll();
         async.series([iotAgentLib.clearAll, iotAgentLib.deactivate], done);
     });
-
+    // #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
     describe('When an existing device tries to be retrieved with retrieveOrCreate()', function () {
         beforeEach(function (done) {
             // This mock does not check the payload since the aim of the test is not to verify
@@ -212,7 +240,39 @@ describe('NGSI-v2 - Device Service: utils', function () {
             });
         });
     });
+    describe('When an existing device tries to be retrieved with retrieveOrCreate()', function () {
+        beforeEach(function (done) {
+            // This mock does not check the payload since the aim of the test is not to verify
+            // device provisioning functionality. Appropriate verification is done in tests under
+            // provisioning folder
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'testservice')
+                .matchHeader('fiware-servicepath', '/testingPath')
+                .post('/v2/entities?options=upsert')
+                .reply(204);
+
+            async.series(
+                [
+                    utils.request.bind(utils.request, configGroupCreation),
+                    utils.request.bind(utils.request, deviceCreation)
+                ],
+                function (error, results) {
+                    done();
+                }
+            );
+        });
+
+        it('should return the existing device', function (done) {
+            iotAgentLib.retrieveDevice('Light1', '801230BJKL23Y9090DSFL123HJK09H324HV8732', function (error, device) {
+                should.not.exist(error);
+                should.exist(device);
 
+                device.id.should.equal('Light1');
+                done();
+            });
+        });
+    });
+    // #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
     describe('When an unexisting device tries to be retrieved for an existing APIKey', function () {
         beforeEach(function (done) {
             // This mock does not check the payload since the aim of the test is not to verify
@@ -246,6 +306,39 @@ describe('NGSI-v2 - Device Service: utils', function () {
         });
     });
 
+    describe('When an unexisting device tries to be retrieved for an existing APIKey', function () {
+        beforeEach(function (done) {
+            // This mock does not check the payload since the aim of the test is not to verify
+            // device provisioning functionality. Appropriate verification is done in tests under
+            // provisioning folder
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'testservice')
+                .matchHeader('fiware-servicepath', '/testingPath')
+                .post('/v2/entities?options=upsert')
+                .reply(204);
+
+            async.series([utils.request.bind(utils.request, configGroupCreation)], function (error, results) {
+                done();
+            });
+        });
+
+        it('should register the device and return it', function (done) {
+            iotAgentLib.retrieveDevice(
+                'UNEXISTENT_DEV',
+                '801230BJKL23Y9090DSFL123HJK09H324HV8732',
+                function (error, device) {
+                    should.not.exist(error);
+                    should.exist(device);
+
+                    device.id.should.equal('UNEXISTENT_DEV');
+                    should.exist(device.protocol);
+                    device.protocol.should.equal('MQTT_UL');
+                    done();
+                }
+            );
+        });
+    });
+
     describe('When an unexisting device tries to be retrieved for an unexisting APIKey', function () {
         it('should raise an error', function (done) {
             iotAgentLib.retrieveDevice(