iotagent-node-lib 2.18.0 → 2.19.0

package/test/unit/ngsiv2/lazyAndCommands/lazy-devices-test.js

@@ -27,16 +27,18 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const async = require('async');
 const apply = async.apply;
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
 const mongoUtils = require('../../mongodb/mongoDBUtils');
-const request = require('request');
+
 const timekeeper = require('timekeeper');
 let contextBrokerMock;
 const iotAgentConfig = {
+    logLevel: 'FATAL',
     contextBroker: {
         host: '192.168.1.1',
         port: '1026',
@@ -235,12 +237,11 @@ describe('NGSI-v2 - IoT Agent Lazy Devices', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/v2/op/query',
             method: 'POST',
-            json: true,
             headers: {
                 'fiware-service': 'smartgondor',
                 'fiware-servicepath': 'gardens'
             },
-            body: {
+            json: {
                 entities: [
                     {
                         id: 'Light:light1'
@@ -307,12 +308,12 @@ describe('NGSI-v2 - IoT Agent Lazy Devices', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/v2/op/query',
             method: 'POST',
-            json: true,
+
             headers: {
                 'fiware-service': 'smartgondor',
                 'fiware-servicepath': 'gardens'
             },
-            body: {
+            json: {
                 entities: [
                     {
                         id: 'Light:light1'
@@ -370,12 +371,12 @@ describe('NGSI-v2 - IoT Agent Lazy Devices', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/v2/op/query',
             method: 'POST',
-            json: true,
+
             headers: {
                 'fiware-service': 'smartgondor',
                 'fiware-servicepath': 'gardens'
             },
-            body: {
+            json: {
                 entities: [
                     {
                         id: 'Light:light1'
@@ -441,12 +442,11 @@ describe('NGSI-v2 - IoT Agent Lazy Devices', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/v2/op/query',
             method: 'POST',
-            json: true,
             headers: {
                 'fiware-service': 'smartgondor',
                 'fiware-servicepath': 'gardens'
             },
-            body: {
+            json: {
                 entities: [
                     {
                         id: 'Motion:motion1'
@@ -580,12 +580,11 @@ describe('NGSI-v2 - IoT Agent Lazy Devices', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/v2/op/query',
             method: 'POST',
-            json: true,
             headers: {
                 'fiware-service': 'smartgondor',
                 'fiware-servicepath': 'gardens'
             },
-            body: {
+            json: {
                 entities: [
                     {
                         idPattern: '.*'
@@ -663,12 +662,11 @@ describe('NGSI-v2 - IoT Agent Lazy Devices', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/v2/op/query',
             method: 'POST',
-            json: true,
             headers: {
                 'fiware-service': 'smartgondor',
                 'fiware-servicepath': 'gardens'
             },
-            body: {
+            json: {
                 entities: [
                     {
                         idPattern: '.*',
@@ -747,12 +745,11 @@ describe('NGSI-v2 - IoT Agent Lazy Devices', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/v2/op/query',
             method: 'POST',
-            json: true,
             headers: {
                 'fiware-service': 'smartgondor',
                 'fiware-servicepath': 'gardens'
             },
-            body: {
+            json: {
                 entities: [
                     {
                         id: 'Light:light1',
@@ -1084,9 +1081,8 @@ describe('NGSI-v2 - IoT Agent Lazy Devices', function () {
             });
 
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
-                parsedBody.error.should.equal('UNSUPPORTED_CONTENT_TYPE');
-                parsedBody.description.should.equal('Unsupported content type in the context request: text/plain');
+                body.error.should.equal('UNSUPPORTED_CONTENT_TYPE');
+                body.description.should.equal('Unsupported content type in the context request: text/plain');
                 done();
             });
         });

package/test/unit/ngsiv2/lazyAndCommands/polling-commands-test.js

@@ -27,14 +27,16 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
 const mongoUtils = require('../../mongodb/mongoDBUtils');
-const request = require('request');
+
 let contextBrokerMock;
 let statusAttributeMock;
 const iotAgentConfig = {
+    logLevel: 'FATAL',
     contextBroker: {
         host: '192.168.1.1',
         port: '1026',

package/test/unit/ngsiv2/ngsiService/active-devices-test.js

@@ -27,6 +27,7 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const timekeeper = require('timekeeper');
 const should = require('should');
 const logger = require('logops');

package/test/unit/ngsiv2/ngsiService/queryDeviceInformationInCb-test.js

@@ -187,7 +187,6 @@ describe('NGSI-v2 - Query device information in the Context Broker', function ()
 
         it('should return a ENTITY_GENERIC_ERROR', function (done) {
             iotAgentLib.query('light3', 'Light', '', attributes, function (error) {
-                console.error(error);
                 should.exist(error);
                 should.exist(error.name);
                 should.exist(error.code);

package/test/unit/ngsiv2/ngsiService/subscriptions-test.js

@@ -27,8 +27,9 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
-const request = require('request');
+
 const nock = require('nock');
 let contextBrokerMock;
 const iotAgentConfig = {
@@ -133,7 +134,7 @@ describe('NGSI-v2 - Subscription tests', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8')
+                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8', '')
                 .reply(204);
 
             done();
@@ -171,7 +172,7 @@ describe('NGSI-v2 - Subscription tests', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8')
+                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8', '')
                 .reply(204);
 
             done();

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

@@ -27,10 +27,11 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     contextBroker: {
@@ -147,7 +148,7 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8')
+                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8', '')
                 .reply(204);
         });
 

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

@@ -27,6 +27,7 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
@@ -242,6 +243,46 @@ const iotAgentConfig = {
                 }
             ]
         },
+        WeatherStation9Jexl: {
+            commands: [],
+            type: 'WeatherStation',
+            expressionLanguage: 'jexl',
+            lazy: [],
+            static: [
+                {
+                    name: 'st1',
+                    type: 'Number',
+                    value: 1
+                },
+                {
+                    name: 'st2',
+                    type: 'Number',
+                    value: 2
+                }
+            ],
+            active: [
+                {
+                    object_id: 'v1',
+                    name: 'vol',
+                    expression: 'st1 * 100',
+                    type: 'Number',
+                    entity_name: 'WeatherStation1'
+                },
+                {
+                    object_id: 'v2',
+                    name: 'vol',
+                    expression: 'st2 * 100',
+                    type: 'Number',
+                    entity_name: 'WeatherStation2'
+                },
+                {
+                    object_id: 'v',
+                    name: 'vol',
+                    expression: 'v * 100',
+                    type: 'Number'
+                }
+            ]
+        },
         Sensor001: {
             commands: [],
             type: 'Sensor',
@@ -422,6 +463,58 @@ const iotAgentConfig = {
                     type: 'Number'
                 }
             ]
+        },
+        GPS: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            active: [
+                {
+                    name: 'explicit',
+                    type: 'number',
+                    entity_name: 'SO5',
+                    object_id: 'x'
+                },
+                {
+                    name: 'explicit',
+                    type: 'number',
+                    entity_name: 'SO6',
+                    object_id: 'y'
+                }
+            ],
+            explicitAttrs: true
+        },
+        GPS2: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            active: [
+                {
+                    name: 'foo',
+                    type: 'text',
+                    object_id: 'f'
+                },
+                {
+                    name: 'attr1',
+                    type: 'number',
+                    entity_name: 'SO5',
+                    object_id: 'x'
+                },
+                {
+                    name: 'attr2',
+                    type: 'number',
+                    entity_name: 'SO6',
+                    object_id: 'y'
+                }
+            ],
+            static: [
+                {
+                    name: 'bar',
+                    type: 'text',
+                    value: 'b'
+                }
+            ],
+            explicitAttrs: '[ "attr1", "attr2" ]'
         }
     },
     service: 'smartgondor',
@@ -899,6 +992,39 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
         });
     });
 
+    describe('When an update comes for a multientity defined with an expression (multi values / multiple entities / same attribute) - JEXL with static', function () {
+        const values = [
+            {
+                name: 'v',
+                type: 'Number',
+                value: 0
+            }
+        ];
+
+        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/updateContextMultientityPlugin10.json'
+                    )
+                )
+                .reply(204);
+        });
+
+        it('should send the update value to the resulting value of the expression', function (done) {
+            iotAgentLib.update('ws9', 'WeatherStation9Jexl', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
     beforeEach(function () {
         nock.cleanAll();
 
@@ -995,6 +1121,90 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
         });
     });
 
+    describe('When an update comes for a multientity measurement explicitAttrs for one entity', function () {
+        const values = [
+            {
+                name: 'x',
+                type: 'Number',
+                value: 52
+            },
+            {
+                name: 'y',
+                type: 'Number',
+                value: 13
+            },
+            {
+                name: 'z',
+                type: 'Number',
+                value: 12
+            }
+        ];
+
+        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/updateContextMultientityPlugin15.json'
+                    )
+                )
+                .reply(204);
+        });
+
+        it('should remove hidden attrs from the value', function (done) {
+            iotAgentLib.update('gps1', 'GPS', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
+    describe('When an update comes for a multientity measurement explicitAttrs as jexl for one entity', function () {
+        const values = [
+            {
+                name: 'x',
+                type: 'Number',
+                value: 52
+            },
+            {
+                name: 'y',
+                type: 'Number',
+                value: 13
+            },
+            {
+                name: 'z',
+                type: 'Number',
+                value: 12
+            }
+        ];
+
+        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/updateContextMultientityPlugin16.json'
+                    )
+                )
+                .reply(204);
+        });
+
+        it('should remove hidden attrs from the value', function (done) {
+            iotAgentLib.update('gps1', 'GPS2', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
     describe(
         'When an update comes for a multientity measurement and there are attributes with' +
             ' the same name but different alias and mapped to different CB entities',

package/test/unit/ngsiv2/plugins/translation-inPlugins_test.js

@@ -25,6 +25,7 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
@@ -246,7 +247,6 @@ describe('NGSI-v2 - Data Mapping Plugins: translation', function () {
         it('should call the middleware', function (done) {
             function testMiddleware(entity, typeInformation, callback) {
                 entity.dimming.value = entity.dimming.value + '%';
-
                 callback(null, entity, typeInformation);
             }
 

package/test/unit/ngsiv2/provisioning/device-group-api-test.js

@@ -28,8 +28,9 @@ const _ = require('underscore');
 const async = require('async');
 const nock = require('nock');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const groupRegistryMemory = require('../../../../lib/services/groups/groupRegistryMemory');
-const request = require('request');
+
 const should = require('should');
 const iotAgentConfig = {
     logLevel: 'FATAL',
@@ -424,7 +425,7 @@ describe('NGSI-v2 - Device Group Configuration API', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204);
 
             contextBrokerMock

package/test/unit/ngsiv2/provisioning/device-group-utils-test.js

@@ -25,10 +25,11 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const async = require('async');
 const groupRegistryMemory = require('../../../../lib/services/groups/groupRegistryMemory');
-const request = require('request');
+
 const groupCreation = {
     url: 'http://localhost:4041/iot/services',
     method: 'POST',

package/test/unit/ngsiv2/provisioning/device-provisioning-api_test.js

@@ -27,9 +27,10 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const nock = require('nock');
-const request = require('request');
+
 const moment = require('moment');
 let contextBrokerMock;
 const iotAgentConfig = {

package/test/unit/ngsiv2/provisioning/device-registration_test.js

@@ -27,6 +27,7 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
@@ -289,7 +290,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
 
             contextBrokerMock
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
             iotAgentLib.activate(iotAgentConfig, function (error) {
@@ -334,7 +335,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             // provisioning folder
             contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
 
-            contextBrokerMock.delete('/v2/registrations/6319a7f5254b05844116584d').reply(500);
+            contextBrokerMock.delete('/v2/registrations/6319a7f5254b05844116584d', '').reply(500);
 
             iotAgentLib.activate(iotAgentConfig, function (error) {
                 async.series(

package/test/unit/ngsiv2/provisioning/device-update-registration_test.js

@@ -27,6 +27,7 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
@@ -188,7 +189,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204);
 
             contextBrokerMock
@@ -243,7 +244,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204);
 
             contextBrokerMock
@@ -296,7 +297,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
             // FIXME: When https://github.com/telefonicaid/fiware-orion/issues/3007 is merged into master branch,
             // this function should use the new API. This is just a temporary solution which implies deleting the
             // registration and creating a new one.
-            contextBrokerMock.delete('/v2/registrations/6319a7f5254b05844116584d').reply(500, {});
+            contextBrokerMock.delete('/v2/registrations/6319a7f5254b05844116584d', '').reply(500, {});
 
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')