iotagent-node-lib 3.1.0 → 3.3.0

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

@@ -95,15 +95,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                     )
                 )
                 .reply(201, null, { Location: '/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8' });
-
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createBidirectionalDevice.json')
-                )
-                .reply(204);
         });
 
         it('should subscribe to the modification of the combined attribute with all the variables', function (done) {
@@ -137,15 +128,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                 )
                 .reply(201, null, { Location: '/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8' });
 
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createBidirectionalDevice.json')
-                )
-                .reply(204);
-
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
@@ -189,15 +171,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                     )
                 )
                 .reply(201, null, { Location: '/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8' });
-
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createBidirectionalDevice.json')
-                )
-                .reply(204);
         });
 
         afterEach(function () {
@@ -246,11 +219,11 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                 let longitudeFound = false;
 
                 for (let i = 0; i < values.length; i++) {
-                    if (values[i].name === 'latitude' && values[i].type === 'string' && values[i].value === '-9.6') {
+                    if (values[i].name === 'latitude' && values[i].type === 'Number' && values[i].value === -9.6) {
                         latitudeFound = true;
                     }
 
-                    if (values[i].name === 'longitude' && values[i].type === 'string' && values[i].value === '12.4') {
+                    if (values[i].name === 'longitude' && values[i].type === 'Number' && values[i].value === 12.4) {
                         longitudeFound = true;
                     }
                 }
@@ -296,15 +269,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                     )
                 )
                 .reply(201, null, { Location: '/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8' });
-
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createBidirectionalDevice.json')
-                )
-                .reply(204);
         });
 
         afterEach(function () {
@@ -357,11 +321,11 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                 let longitudeFound = false;
 
                 for (let i = 0; i < values.length; i++) {
-                    if (values[i].name === 'latitude' && values[i].type === 'string' && values[i].value === '-9.6') {
+                    if (values[i].name === 'latitude' && values[i].type === 'Number' && values[i].value === -9.6) {
                         latitudeFound = true;
                     }
 
-                    if (values[i].name === 'longitude' && values[i].type === 'string' && values[i].value === '12.4') {
+                    if (values[i].name === 'longitude' && values[i].type === 'Number' && values[i].value === 12.4) {
                         longitudeFound = true;
                     }
                 }
@@ -415,15 +379,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                     )
                 )
                 .reply(201, null, { Location: '/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8' });
-
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createBidirectionalDevice.json')
-                )
-                .reply(204);
         });
         it('should subscribe to the modification of the combined attribute with all the variables', function (done) {
             request(provisionGroup, function (error, response, body) {
@@ -480,15 +435,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                     )
                 )
                 .reply(201, null, { Location: '/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8' });
-
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createBidirectionalDevice.json')
-                )
-                .reply(204);
         });
 
         afterEach(function () {
@@ -503,11 +449,11 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                 let longitudeFound = false;
 
                 for (let i = 0; i < values.length; i++) {
-                    if (values[i].name === 'latitude' && values[i].type === 'string' && values[i].value === '-9.6') {
+                    if (values[i].name === 'latitude' && values[i].type === 'Number' && values[i].value === -9.6) {
                         latitudeFound = true;
                     }
 
-                    if (values[i].name === 'longitude' && values[i].type === 'string' && values[i].value === '12.4') {
+                    if (values[i].name === 'longitude' && values[i].type === 'Number' && values[i].value === 12.4) {
                         longitudeFound = true;
                     }
                 }
@@ -577,15 +523,6 @@ describe('NGSI-v2 - Bidirectional data plugin and CB is defined using environmen
                     )
                 )
                 .reply(201, null, { Location: '/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8' });
-
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createBidirectionalDevice.json')
-                )
-                .reply(204);
         });
 
         it('should subscribe to the modification of the combined attribute with all the variables', function (done) {

package/test/unit/ngsiv2/plugins/compress-timestamp-plugin_test.js

@@ -153,13 +153,12 @@ describe('NGSI-v2 - Timestamp compression plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextCompressTimestamp1.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -198,13 +197,12 @@ describe('NGSI-v2 - Timestamp compression plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextCompressTimestamp2.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 

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

@@ -0,0 +1,150 @@
+/*
+ * Copyright 2015 Telefonica Investigación y Desarrollo, S.A.U
+ *
+ * This file is part of fiware-iotagent-lib
+ *
+ * fiware-iotagent-lib is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * fiware-iotagent-lib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with fiware-iotagent-lib.
+ * If not, see http://www.gnu.org/licenses/.
+ *
+ * For those usages not covered by the GNU Affero General Public License
+ * please contact with::daniel.moranjimenez@telefonica.com
+ *
+ * Modified by: Daniel Calvo - ATOS Research & Innovation
+ */
+
+const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
+const should = require('should');
+const logger = require('logops');
+const nock = require('nock');
+let contextBrokerMock;
+const iotAgentConfig = {
+    contextBroker: {
+        host: '192.168.1.1',
+        port: '1026',
+        ngsiVersion: 'v2'
+    },
+    server: {
+        port: 4041
+    },
+    types: {
+        Light: {
+            commands: [],
+            type: 'Light',
+            lazy: [
+                {
+                    name: 'temperature',
+                    type: 'centigrades'
+                }
+            ],
+            active: [
+                {
+                    name: 'pressure',
+                    type: 'Hgmm'
+                }
+            ]
+        }
+    },
+    service: 'smartgondor',
+    subservice: 'gardens',
+    providerUrl: 'http://smartgondor.com'
+};
+
+describe('NGSI-v2 - Custom plugin', function () {
+    let updateInvoked = false;
+    let queryInvoked = false;
+
+    function updatePlugin(entity, typeInformation, callback) {
+        updateInvoked = true;
+        return callback(null, entity, typeInformation);
+    }
+    function queryPlugin(entity, typeInformation, callback) {
+        queryInvoked = true;
+        return callback(null, entity, typeInformation);
+    }
+    beforeEach(function (done) {
+        logger.setLevel('FATAL');
+
+        iotAgentLib.activate(iotAgentConfig, function () {
+            iotAgentLib.clearAll(function () {
+                iotAgentLib.addUpdateMiddleware(updatePlugin);
+                iotAgentLib.addQueryMiddleware(queryPlugin);
+                done();
+            });
+        });
+    });
+
+    afterEach(function (done) {
+        iotAgentLib.clearAll(function () {
+            iotAgentLib.deactivate(done);
+            updateInvoked = false;
+            queryInvoked = false;
+        });
+    });
+    describe('When an update occurs', function () {
+        const values = [
+            {
+                name: 'state',
+                type: 'Boolean',
+                value: 'true'
+            },
+            {
+                name: 'dimming',
+                type: 'Number',
+                value: 23
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .post('/v2/entities?options=upsert')
+                .reply(204);
+        });
+
+        it('should invoke the plugin', function (done) {
+            iotAgentLib.update('light1', 'Light', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                updateInvoked.should.equal(true);
+                done();
+            });
+        });
+    });
+    describe('When an query occurs', function () {
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .get('/v2/entities/light1/attrs')
+                .query({ type: 'Light', attrs: 'state,dimming' })
+                .reply(200, { state: 'good', dimming: '23' });
+        });
+
+        it('should invoke the plugin', function (done) {
+            const attributes = ['state', 'dimming'];
+            iotAgentLib.query('light1', 'Light', '', attributes, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                should.not.exist(error);
+                queryInvoked.should.equal(true);
+                done();
+            });
+        });
+    });
+});

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

@@ -102,7 +102,7 @@ const iotAgentConfig = {
                     object_id: 'h',
                     name: 'humidity',
                     type: 'Percentage',
-                    entity_name: 'Station Number ${@sn * 10}'
+                    entity_name: '"Station Number "+sn*10'
                 }
             ]
         },
@@ -115,13 +115,13 @@ const iotAgentConfig = {
                     object_id: 'p',
                     name: 'pressure',
                     type: 'Hgmm',
-                    entity_name: 'Station Number ${@sn * 10}'
+                    entity_name: '"Station Number "+sn*10'
                 },
                 {
                     object_id: 'h',
                     name: 'humidity',
                     type: 'Percentage',
-                    entity_name: 'Station Number ${@sn * 10}'
+                    entity_name: '"Station Number "+sn*10'
                 }
             ]
         },
@@ -197,21 +197,21 @@ const iotAgentConfig = {
                 {
                     object_id: 'v1',
                     name: 'vol',
-                    expression: '${@v1*100}',
+                    expression: 'v1*100',
                     type: 'Number',
                     entity_name: 'WeatherStation1'
                 },
                 {
                     object_id: 'v2',
                     name: 'vol',
-                    expression: '${@v2*100}',
+                    expression: 'v2*100',
                     type: 'Number',
                     entity_name: 'WeatherStation2'
                 },
                 {
                     object_id: 'v',
                     name: 'vol',
-                    expression: '${@v*100}',
+                    expression: 'v*100',
                     type: 'Number'
                 }
             ]
@@ -244,7 +244,6 @@ const iotAgentConfig = {
         WeatherStation8Jexl: {
             commands: [],
             type: 'WeatherStation',
-            expressionLanguage: 'jexl',
             lazy: [],
             active: [
                 {
@@ -272,7 +271,6 @@ const iotAgentConfig = {
         WeatherStation9Jexl: {
             commands: [],
             type: 'WeatherStation',
-            expressionLanguage: 'jexl',
             lazy: [],
             static: [
                 {
@@ -364,7 +362,6 @@ const iotAgentConfig = {
         WrongStation: {
             commands: [],
             type: 'WrongStation',
-            expressionLanguage: 'jexl',
             lazy: [],
             active: [
                 {
@@ -456,7 +453,6 @@ const iotAgentConfig = {
         SharedIds3: {
             commands: [],
             type: 'ShareStation',
-            expressionLanguage: 'jexl',
             lazy: [],
             active: [
                 {
@@ -510,6 +506,41 @@ const iotAgentConfig = {
             ],
             explicitAttrs: true
         },
+        GPS1: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            active: [
+                {
+                    name: 'explicit',
+                    type: 'number',
+                    object_id: 'z'
+                },
+                {
+                    name: 'expectedAtt',
+                    type: 'number',
+                    expression: 'z+1'
+                },
+                {
+                    name: 'nonexpectedAtt',
+                    type: 'number',
+                    expression: 'w+1'
+                },
+                {
+                    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',
@@ -559,8 +590,7 @@ const iotAgentConfig = {
                     name: 'pressure',
                     type: 'Number'
                 }
-            ],
-            expressionLanguage: 'jexl'
+            ]
         }
     },
     service: 'smartgondor',
@@ -570,7 +600,7 @@ const iotAgentConfig = {
 
 describe('NGSI-v2 - Multi-entity plugin', function () {
     beforeEach(function (done) {
-        logger.setLevel('FATAL');
+        logger.setLevel('DEBUG');
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
@@ -1244,6 +1274,48 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
         });
     });
 
+    describe('When an update comes for a multientity measurement explicitAttrs for several entities', 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/updateContextMultientityPlugin25.json'
+                    )
+                )
+                .reply(204);
+        });
+
+        it('should remove hidden attrs from the value', function (done) {
+            iotAgentLib.update('gps1', 'GPS1', '', 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 = [
             {
@@ -1599,9 +1671,8 @@ describe('NGSI-v2 - Multi-entity plugin is executed for a command update for a r
         contextBrokerMock = nock('http://192.168.1.1:1026')
             .matchHeader('fiware-service', 'smartgondor')
             .matchHeader('fiware-servicepath', 'gardens')
-            .patch(
-                //'/v2/op/update',
-                '/v2/entities/sensorCommand/attrs?type=SensorCommand',
+            .post(
+                '/v2/entities?options=upsert',
                 utils.readExampleFile(
                     './test/unit/ngsiv2/examples/contextRequests/updateContextMultientityTimestampPlugin4.json'
                 )

package/test/unit/ngsiv2/plugins/timestamp-processing-plugin_test.js

@@ -98,14 +98,13 @@ describe('NGSI-v2 - Timestamp processing plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     // this tests breaks jexlBasedTransformation-test with uses updateContextExpressionPlugin32 which do not includes Timestamp in metadata attributes
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextProcessTimestamp.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 

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

@@ -906,11 +906,10 @@ describe('NGSI-v2 - Device Group Configuration API', function () {
             contextBrokerMock = nock('http://unexistentHost:1026')
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .patch(
-                    '/v2/entities/machine1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext3WithStatic.json')
                 )
-                .query({ type: 'SensorMachine' })
                 .reply(204, {});
             async.series([async.apply(request, optionsCreation)], done);
         });