iotagent-node-lib 2.23.0 → 2.25.0

package/test/unit/examples/deviceProvisioningRequests/provisionNewDeviceEmpty.json

@@ -0,0 +1,43 @@
+{
+  "devices": [
+    {
+      "device_id": "",
+      "protocol": "GENERIC_PROTO",
+      "entity_name": "TheFirstLight",
+      "entity_type": "TheLightType",
+      "timezone": "America/Santiago",
+      "endpoint": "http://fakedEndpoint:1234",
+      "transport": "MQTT",
+      "attributes": [
+        {
+          "name": "attr_name",
+          "type": "string"
+        }
+      ],
+      "lazy": [
+        {
+          "name": "luminance",
+          "type": "lumens"
+        }
+      ],
+      "static_attributes": [
+        {
+          "name": "hardcodedAttr",
+          "type": "hardcodedType",
+          "value": "hardcodedValue"
+        }
+      ],
+      "commands": [
+        {
+          "name": "commandAttr",
+          "type": "commandType"
+        }
+      ],
+      "internal_attributes": [
+        {
+          "customField": "customValue"
+        }
+      ]
+    }
+  ]
+}

package/test/unit/examples/mongoCollections/configurations.json

@@ -2,7 +2,7 @@
   {
     "apikey" : "7e5721f478220be21f41f4700e50be2",
     "token" : "e50b7781d5e2d39d577e7c15e4a21f470ed39d5777e7c15e2e2d39d5777e7c1e2",
-    "cbroker" : "http://10.0.0.2:1026",
+    "cbHost" : "http://10.0.0.2:1026",
     "entity_type" : "device",
     "resource" : "/iot/d",
     "service" : "smart_gondor",
@@ -10,7 +10,7 @@
   },
   {
     "apikey" : "gdb13gq3f8q4beuk263besr8eh9ri",
-    "cbroker" : "http://10.0.0.2:1026",
+    "cbHost" : "http://10.0.0.2:1026",
     "entity_type" : "device",
     "resource" : "/iot/d",
     "service" : "dumb_mordor",
@@ -25,7 +25,7 @@
   },
   {
     "apikey" : "hs4h2ke7oerfdvrexbyh54w2",
-    "cbroker" : "http://10.0.0.2:1026",
+    "cbHost" : "http://10.0.0.2:1026",
     "entity_type" : "device",
     "resource" : "/iot/d",
     "service" : "demo",

package/test/unit/expressions/jexlExpression-test.js

@@ -234,6 +234,26 @@ describe('Jexl expression interpreter', function () {
         });
     });
 
+    describe('When an concatarr function is used with an array', function () {
+        it('should work on the expression value', function (done) {
+            expressionParser.parse('array|concatarr(array)', scope, function (error, result) {
+                should.not.exist(error);
+                result.should.deepEqual([1, 2, 1, 2]);
+                done();
+            });
+        });
+    });
+
+    describe('When an joinarrtostr function is used with an array', function () {
+        it('should work on the expression value', function (done) {
+            expressionParser.parse('array|joinarrtostr("_")', scope, function (error, result) {
+                should.not.exist(error);
+                result.should.equal('1_2');
+                done();
+            });
+        });
+    });
+
     describe('When a function is applied to an array', function () {
         it('should work on the expression value', function (done) {
             expressionParser.parse('array[1]+1', scope, function (error, result) {
@@ -313,14 +333,15 @@ describe('Jexl expression interpreter', function () {
 
     describe('When a JSON parse transformation is applied', function () {
         it('should work on the expression value', function (done) {
-            expressionParser.parse('"{\\"name\\":\\"John\\",\\"surname\\":\\"Doe\\"}"|jsonparse', scope, function (
-                error,
-                result
-            ) {
-                should.not.exist(error);
-                result.should.eql(scope.object);
-                done();
-            });
+            expressionParser.parse(
+                '"{\\"name\\":\\"John\\",\\"surname\\":\\"Doe\\"}"|jsonparse',
+                scope,
+                function (error, result) {
+                    should.not.exist(error);
+                    result.should.eql(scope.object);
+                    done();
+                }
+            );
         });
     });
 

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,4 +197,53 @@ 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) {
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .post('/v2/entities?options=upsert')
+                .times(10)
+                .reply(204);
+
+            const devices = [];
+
+            for (let i = 0; i < 10; i++) {
+                devices.push({
+                    id: 'id' + i,
+                    name: 'name' + i,
+                    type: 'Light' + i,
+                    internalId: 'internal' + i,
+                    service: 'smartgondor',
+                    subservice: 'gardens',
+                    active: [
+                        {
+                            id: 'attrId',
+                            type: 'attrType' + i,
+                            value: i
+                        }
+                    ]
+                });
+            }
+
+            async.map(devices, iotAgentLib.register, function (error, results) {
+                done();
+            });
+        });
+
+        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) {
+                should.not.exist(error);
+                should.exist(device);
+                should.exist(device.name);
+                should.exist(device.type);
+                device.name.should.equal('name5');
+                device.type.should.equal('Light5');
+                Object.keys(device).length.should.equal(11);
+                done();
+            });
+        });
+    });
 });

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

@@ -448,4 +448,28 @@ 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);
+                should.exist(body.count);
+                body.count.should.equal(1);
+                should.exist(body.services);
+                should.exist(body.services.length);
+                body.services.length.should.equal(1);
+                should.exist(body.services[0].entity_type);
+                body.services[0].entity_type.should.equal('Light');
+                done();
+            });
+        });
+    });
 });

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,4 +510,59 @@ describe('NGSI-v2 - MongoDB Device Registry', 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')
+                .times(10)
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .reply(204);
+
+            const devices = [];
+
+            for (let i = 0; i < 10; i++) {
+                devices.push({
+                    id: 'id' + i,
+                    type: 'Light' + i,
+                    internalId: 'internal' + i,
+                    service: 'smartgondor',
+                    subservice: 'gardens',
+                    active: [
+                        {
+                            id: 'attrId',
+                            type: 'attrType' + i,
+                            value: i
+                        }
+                    ]
+                });
+            }
+            iotAgentLib.activate(iotAgentConfig, function (error) {
+                async.map(devices, iotAgentLib.register, function (error, results) {
+                    done();
+                });
+            });
+        });
+        afterEach(function (done) {
+            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();
+                }
+            );
+        });
+    });
 });

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/examples/subscriptionRequests/bidirectionalNotificationWithDatasetId.json

@@ -0,0 +1,21 @@
+{
+    "data": [
+        {
+            "id": "TheFirstLight",
+            "location": [
+              {
+                    "type": "GeoProperty",
+                    "value": "12.4, -9.6",
+                    "datasetId": "urn:ngsi-ld:Property:do-this"
+              },
+              {
+                    "type": "GeoProperty",
+                    "value": "6, 10",
+                    "datasetId": "urn:ngsi-ld:Property:then-do-this"
+              }
+            ],
+            "type": "TheLightType"
+        }
+    ],
+    "subscriptionId": "51c0ac9ed714fb3b37d7d5a8"
+}

package/test/unit/ngsi-ld/examples/subscriptionRequests/bidirectionalNotificationWithMetadata.json

@@ -0,0 +1,17 @@
+{
+    "data": [
+        {
+            "id": "TheFirstLight",
+            "location": {
+                "type": "GeoProperty",
+                "value": "12.4, -9.6",
+                "qos": {
+                  "type": "Property",
+                  "value": 1
+                }
+            },
+            "type": "TheLightType"
+        }
+    ],
+    "subscriptionId": "51c0ac9ed714fb3b37d7d5a8"
+}

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();
+                }
+            );
         });
     });
 });