iotagent-node-lib 2.24.0 → 2.25.0

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

@@ -134,7 +134,7 @@ const groupCreation = {
                 apikey: '801230BJKL23Y9090DSFL123HJK09H324HV8732',
                 entity_type: 'TheLightType',
                 trust: '8970A9078A803H3BL98PINEQRW8342HBAMS',
-                cbHost: 'http://unexistentHost:1026',
+                cbHost: 'http://192.168.1.1:1026',
                 commands: [],
                 lazy: [],
                 attributes: [
@@ -181,7 +181,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
 
     describe('When an existing device tries to be retrieved with retrieveOrCreate()', function () {
         beforeEach(function (done) {
-            contextBrokerMock = nock('http://unexistentHost:1026')
+            contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
                 .post('/v2/registrations')
@@ -193,12 +193,12 @@ describe('NGSI-v2 - Device Service: utils', function () {
                 .post('/v2/entities?options=upsert')
                 .reply(204);
 
-            async.series([request.bind(request, groupCreation), request.bind(request, deviceCreation)], function (
-                error,
-                results
-            ) {
-                done();
-            });
+            async.series(
+                [request.bind(request, groupCreation), request.bind(request, deviceCreation)],
+                function (error, results) {
+                    done();
+                }
+            );
         });
 
         it('should return the existing device', function (done) {
@@ -214,7 +214,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
 
     describe('When an unexisting device tries to be retrieved for an existing APIKey', function () {
         beforeEach(function (done) {
-            contextBrokerMock = nock('http://unexistentHost:1026')
+            contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
                 .post('/v2/registrations')
@@ -232,32 +232,34 @@ describe('NGSI-v2 - Device Service: utils', function () {
         });
 
         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);
+            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();
-            });
+                    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('UNEXISTENT_DEV_AND_GROUP', 'H2332Y909DSF3H346yh20JK092', function (
-                error,
-                device
-            ) {
-                should.exist(error);
-                error.name.should.equal('DEVICE_GROUP_NOT_FOUND');
-                should.not.exist(device);
-                done();
-            });
+            iotAgentLib.retrieveDevice(
+                'UNEXISTENT_DEV_AND_GROUP',
+                'H2332Y909DSF3H346yh20JK092',
+                function (error, device) {
+                    should.exist(error);
+                    error.name.should.equal('DEVICE_GROUP_NOT_FOUND');
+                    should.not.exist(device);
+                    done();
+                }
+            );
         });
     });
 });

package/test/unit/memoryRegistry/deviceRegistryMemory_test.js

@@ -96,16 +96,19 @@ describe('NGSI-v2 - In memory device registry', function () {
             iotAgentLib.clearRegistry(done);
         });
         it('should return the appropriate device', function (done) {
-            iotAgentLib.getDevicesByAttribute('internalId', 'internal3', 'smartgondor', 'gardens', function (
-                error,
-                devices
-            ) {
-                should.not.exist(error);
-                should.exist(devices);
-                devices.length.should.equal(1);
-                devices[0].id.should.equal('id3');
-                done();
-            });
+            iotAgentLib.getDevicesByAttribute(
+                'internalId',
+                'internal3',
+                'smartgondor',
+                'gardens',
+                function (error, devices) {
+                    should.not.exist(error);
+                    should.exist(devices);
+                    devices.length.should.equal(1);
+                    devices[0].id.should.equal('id3');
+                    done();
+                }
+            );
         });
     });
 
@@ -194,9 +197,9 @@ describe('NGSI-v2 - In memory device registry', function () {
             });
         });
     });
-  
-    describe('When a the registry is queried for device in a particular name and type', function (){
-	    beforeEach(function (done) {
+
+    describe('When a the registry is queried for device in a particular name and type', function () {
+        beforeEach(function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .post('/v2/entities?options=upsert')
                 .times(10)
@@ -204,21 +207,21 @@ describe('NGSI-v2 - In memory device registry', function () {
 
             const devices = [];
 
-            for (let i = 0; i < 10; i++) 
-            {
-                devices.push(
-                {
+            for (let i = 0; i < 10; i++) {
+                devices.push({
                     id: 'id' + i,
-                    name : 'name' + i,
+                    name: 'name' + i,
                     type: 'Light' + i,
                     internalId: 'internal' + i,
                     service: 'smartgondor',
                     subservice: 'gardens',
-                    active: [ {
+                    active: [
+                        {
                             id: 'attrId',
                             type: 'attrType' + i,
                             value: i
-                        }]
+                        }
+                    ]
                 });
             }
 
@@ -230,10 +233,8 @@ describe('NGSI-v2 - In memory device registry', function () {
         afterEach(function (done) {
             iotAgentLib.clearRegistry(done);
         });
-        it('should return the name and type of device', function (done)
-        {
-            iotAgentLib.getDeviceByNameAndType('name5', 'Light5','smartgondor', 'gardens' ,function(error, device)
-            {
+        it('should return the name and type of device', function (done) {
+            iotAgentLib.getDeviceByNameAndType('name5', 'Light5', 'smartgondor', 'gardens', function (error, device) {
                 should.not.exist(error);
                 should.exist(device);
                 should.exist(device.name);

package/test/unit/mongodb/mongodb-group-registry-test.js

@@ -448,16 +448,16 @@ describe('MongoDB Group Registry test', function () {
             });
         });
     });
-    
+
     describe('When the device info request with name and type', function () {
         beforeEach(function (done) {
             async.series([async.apply(request, optionsCreation)], done);
         });
-        
+
         afterEach(function (done) {
             iotAgentLib.clearRegistry(done);
         });
-        
+
         it('should return the name and type of device', function (done) {
             request(optionsGet, function (error, response, body) {
                 should.exist(body);

package/test/unit/mongodb/mongodb-registry-test.js

@@ -440,16 +440,19 @@ describe('NGSI-v2 - MongoDB Device Registry', function () {
             iotAgentLib.clearRegistry(done);
         });
         it('should return the appropriate device', function (done) {
-            iotAgentLib.getDevicesByAttribute('internalId', 'internal3', 'smartgondor', 'gardens', function (
-                error,
-                devices
-            ) {
-                should.not.exist(error);
-                should.exist(devices);
-                devices.length.should.equal(1);
-                devices[0].id.should.equal('id3');
-                done();
-            });
+            iotAgentLib.getDevicesByAttribute(
+                'internalId',
+                'internal3',
+                'smartgondor',
+                'gardens',
+                function (error, devices) {
+                    should.not.exist(error);
+                    should.exist(devices);
+                    devices.length.should.equal(1);
+                    devices[0].id.should.equal('id3');
+                    done();
+                }
+            );
         });
     });
 
@@ -507,8 +510,8 @@ describe('NGSI-v2 - MongoDB Device Registry', function () {
             });
         });
     });
-    
-     describe('When the device is queried with the name and type', function () {
+
+    describe('When the device is queried with the name and type', function () {
         beforeEach(function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .post('/v2/entities?options=upsert')
@@ -545,15 +548,21 @@ describe('NGSI-v2 - MongoDB Device Registry', function () {
             iotAgentLib.clearRegistry(done);
         });
         it('should return the device with name and type', function (done) {
-            iotAgentLib.getDeviceByNameAndType('Light4:id4', 'Light4', 'smartgondor', 'gardens', function ( error, device ) {
-                should.not.exist(error);
-                should.exist(device);
-                should.exist(device.name);
-                should.exist(device.type);
-                device.name.should.equal('Light4:id4');
-                device.type.should.equal('Light4');
-                done();
-            });
+            iotAgentLib.getDeviceByNameAndType(
+                'Light4:id4',
+                'Light4',
+                'smartgondor',
+                'gardens',
+                function (error, device) {
+                    should.not.exist(error);
+                    should.exist(device);
+                    should.exist(device.name);
+                    should.exist(device.type);
+                    device.name.should.equal('Light4:id4');
+                    device.type.should.equal('Light4');
+                    done();
+                }
+            );
         });
     });
 });

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

@@ -0,0 +1,11 @@
+[
+  {
+      "@context": "http://context.json-ld",
+      "pressure": {
+          "type": "Property",
+          "value": 52
+      },
+      "id": "urn:ngsi-ld:Light:light1",
+      "type": "Light"
+  }
+]

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

@@ -321,11 +321,25 @@ describe('NGSI-LD: JEXL', function () {
             }
         ];
 
-        it('should apply the expression before sending the values', function (done) {
+        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.exist(error);
-                error.name.should.equal('INVALID_EXPRESSION');
-                error.code.should.equal(400);
+                should.not.exist(error);
+                contextBrokerMock.done();
                 done();
             });
         });

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

@@ -137,7 +137,7 @@ const groupCreation = {
                 apikey: '801230BJKL23Y9090DSFL123HJK09H324HV8732',
                 entity_type: 'TheLightType',
                 trust: '8970A9078A803H3BL98PINEQRW8342HBAMS',
-                cbHost: 'http://unexistentHost:1026',
+                cbHost: 'http://192.168.1.1:1026',
                 commands: [],
                 lazy: [],
                 attributes: [
@@ -187,17 +187,17 @@ describe('NGSI-LD - Device Service: utils', function () {
             // 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://unexistenthost:1026')
+            contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'testservice')
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .reply(204);
 
-            async.series([request.bind(request, groupCreation), request.bind(request, deviceCreation)], function (
-                error,
-                results
-            ) {
-                done();
-            });
+            async.series(
+                [request.bind(request, groupCreation), request.bind(request, deviceCreation)],
+                function (error, results) {
+                    done();
+                }
+            );
         });
 
         it('should return the existing device', function (done) {
@@ -216,7 +216,7 @@ describe('NGSI-LD - Device Service: utils', function () {
             // 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://unexistenthost:1026')
+            contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'testservice')
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .reply(204);
@@ -227,32 +227,34 @@ describe('NGSI-LD - Device Service: utils', function () {
         });
 
         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);
+            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();
-            });
+                    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('UNEXISTENT_DEV_AND_GROUP', 'H2332Y909DSF3H346yh20JK092', function (
-                error,
-                device
-            ) {
-                should.exist(error);
-                error.name.should.equal('DEVICE_GROUP_NOT_FOUND');
-                should.not.exist(device);
-                done();
-            });
+            iotAgentLib.retrieveDevice(
+                'UNEXISTENT_DEV_AND_GROUP',
+                'H2332Y909DSF3H346yh20JK092',
+                function (error, device) {
+                    should.exist(error);
+                    error.name.should.equal('DEVICE_GROUP_NOT_FOUND');
+                    should.not.exist(device);
+                    done();
+                }
+            );
         });
     });
 });

package/test/unit/ngsi-mixed/provisioning/ngsi-versioning-test.js

@@ -65,7 +65,6 @@ const optionsCreationDefault = {
         services: [
             {
                 apikey: 'default-test',
-                cbroker: 'http://orion:1026',
                 entity_type: 'Device',
                 resource: '/iot/default',
                 attributes: [
@@ -90,7 +89,6 @@ const optionsCreationV2 = {
         services: [
             {
                 apikey: 'v2-test',
-                cbroker: 'http://orion:1026',
                 ngsiVersion: 'v2',
                 entity_type: 'Device',
                 resource: '/iot/v2',
@@ -117,7 +115,6 @@ const optionsCreationLD = {
         services: [
             {
                 apikey: 'ld-test',
-                cbroker: 'http://orion:1026',
                 entity_type: 'Device',
                 ngsiVersion: 'ld',
                 resource: '/iot/ld',

package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityJexlExpressionPlugin1.json

@@ -0,0 +1,22 @@
+{
+  "actionType":"update",
+  "entities":[
+    {
+    "id":"lightPseudo:id",
+    "type":"Light",
+    "pressure":{
+      "type":"Number",
+      "value":60
+      }
+    },
+    {
+      "id":"Ligth:mymulti",
+      "type":"myType",
+      "pressure":{
+          "type":"Number",
+          "value":90
+        }
+
+    }
+  ]
+}

package/test/unit/ngsiv2/expressions/jexlBasedTransformations-test.js

@@ -437,16 +437,31 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         const values = [
             {
                 name: 'p',
-                type: 'centigrades',
-                value: '52'
+                type: 'Number',
+                value: 1040
             }
         ];
 
-        it('should apply the expression before sending the values', function (done) {
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .patch(
+                    '/v2/entities/light1/attrs',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin30.json'
+                    )
+                )
+                .query({ type: 'Light' })
+                .reply(204);
+        });
+
+        it('should ignore the expression and send the values', function (done) {
             iotAgentLib.update('light1', 'LightError', '', values, function (error) {
-                should.exist(error);
-                error.name.should.equal('INVALID_EXPRESSION');
-                error.code.should.equal(400);
+                should.not.exist(error);
+                contextBrokerMock.done();
                 done();
             });
         });

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

@@ -137,7 +137,7 @@ const groupCreation = {
                 apikey: '801230BJKL23Y9090DSFL123HJK09H324HV8732',
                 entity_type: 'TheLightType',
                 trust: '8970A9078A803H3BL98PINEQRW8342HBAMS',
-                cbHost: 'http://unexistentHost:1026',
+                cbHost: 'http://192.168.1.1:1026',
                 commands: [],
                 lazy: [],
                 attributes: [
@@ -187,7 +187,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
             // 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://unexistenthost:1026')
+            contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
                 .post('/v2/entities?options=upsert')
@@ -217,7 +217,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
             // 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://unexistenthost:1026')
+            contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
                 .post('/v2/entities?options=upsert')
@@ -229,32 +229,34 @@ describe('NGSI-v2 - Device Service: utils', function () {
         });
 
         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);
+            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();
-            });
+                    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('UNEXISTENT_DEV_AND_GROUP', 'H2332Y909DSF3H346yh20JK092', function (
-                error,
-                device
-            ) {
-                should.exist(error);
-                error.name.should.equal('DEVICE_GROUP_NOT_FOUND');
-                should.not.exist(device);
-                done();
-            });
+            iotAgentLib.retrieveDevice(
+                'UNEXISTENT_DEV_AND_GROUP',
+                'H2332Y909DSF3H346yh20JK092',
+                function (error, device) {
+                    should.exist(error);
+                    error.name.should.equal('DEVICE_GROUP_NOT_FOUND');
+                    should.not.exist(device);
+                    done();
+                }
+            );
         });
     });
 });

package/test/unit/ngsiv2/plugins/multientity-plugin_test.js

@@ -540,6 +540,26 @@ const iotAgentConfig = {
                 }
             ],
             explicitAttrs: '[ "attr1", "attr2" ]'
+        },
+        LightMultiDefault: {
+            commands: [],
+            type: 'Light',
+            lazy: [],
+            active: [
+                {
+                    object_id: 'p',
+                    name: 'pressure',
+                    type: 'Number',
+                    entity_type: 'myType',
+                    entity_name: 'Ligth:mymulti'
+                },
+                {
+                    object_id: 'q',
+                    name: 'pressure',
+                    type: 'Number'
+                }
+            ],
+            expressionLanguage: 'jexl'
         }
     },
     service: 'smartgondor',
@@ -1356,6 +1376,44 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
             });
         }
     );
+
+    describe('When pseudo-multientity device is provisioned (entity_type and default entity_id)', function () {
+        // Case: Expression which results is sent as a new attribute
+        const values = [
+            {
+                name: 'p',
+                type: 'Number',
+                value: 90
+            },
+            {
+                name: 'q',
+                type: 'Number',
+                value: 60
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .post(
+                    '/v2/op/update',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextMultientityJexlExpressionPlugin1.json'
+                    )
+                )
+                .reply(204);
+        });
+
+        it('should work without invalid expression error', function (done) {
+            iotAgentLib.update('lightPseudo:id', 'LightMultiDefault', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
 });
 
 describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plugin', function () {