iotagent-node-lib 2.15.1 → 2.19.0

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

@@ -56,9 +56,9 @@ const iotAgentConfig = {
             ]
         }
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com'
+    providerUrl: 'http://smartgondor.com'
 };
 
 describe('NGSI-v2 - Timestamp processing plugin', function () {
@@ -96,9 +96,9 @@ describe('NGSI-v2 - Timestamp processing plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextProcessTimestamp.json'

package/test/unit/{plugins → ngsiv2/plugins}/translation-inPlugins_test.js

@@ -23,8 +23,9 @@
 
 /* eslint-disable no-unused-vars */
 
-const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
-const utils = require('../../tools/utils');
+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');
@@ -32,7 +33,8 @@ let contextBrokerMock;
 const iotAgentConfig = {
     contextBroker: {
         host: '192.168.1.1',
-        port: '1026'
+        port: '1026',
+        nsgiVersion: 'v2'
     },
     server: {
         port: 4041
@@ -111,13 +113,13 @@ const iotAgentConfig = {
             ]
         }
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M'
 };
 
-describe('Data Mapping Plugins: translation', function () {
+describe('NGSI-v2 - Data Mapping Plugins: translation', function () {
     beforeEach(function (done) {
         logger.setLevel('FATAL');
 
@@ -137,13 +139,13 @@ describe('Data Mapping Plugins: translation', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/updateContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/updateContextMiddleware1.json')
+                .patch(
+                    '/v2/entities/light1/attrs?type=Light',
+                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextMiddleware1.json')
                 )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/updateContext1Success.json'));
+                .reply(204);
         });
 
         it('should execute the translation middlewares', function (done) {
@@ -163,7 +165,7 @@ describe('Data Mapping Plugins: translation', function () {
             let executed = false;
 
             function testMiddleware(entity, typeInformation, callback) {
-                entity.contextElements[0].attributes[1].value = entity.contextElements[0].attributes[1].value + '%';
+                entity.dimming.value = entity.dimming.value + '%';
                 executed = true;
                 callback(null, entity, typeInformation);
             }
@@ -192,7 +194,7 @@ describe('Data Mapping Plugins: translation', function () {
             ];
 
             function testMiddleware(entity, typeInformation, callback) {
-                entity.contextElements[0].attributes[1].value = entity.contextElements[0].attributes[1].value + '%';
+                entity.dimming.value = entity.dimming.value + '%';
                 callback(null, entity, typeInformation);
             }
 
@@ -213,21 +215,21 @@ describe('Data Mapping Plugins: translation', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/queryContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/queryContext1.json')
-                )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/queryContext1Success.json'));
+                .get('/v2/entities/light1/attrs?attrs=state,dimming&type=Light')
+
+                .reply(
+                    200,
+                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextMiddleware2.json')
+                );
         });
 
         it('should call the middleware', function (done) {
             let called = false;
 
             function testMiddleware(entity, typeInformation, callback) {
-                entity.contextResponses[0].contextElement.attributes[1].value =
-                    entity.contextResponses[0].contextElement.attributes[1].value + '%';
+                entity.dimming.value = entity.dimming.value + '%';
 
                 called = true;
 
@@ -244,9 +246,7 @@ describe('Data Mapping Plugins: translation', function () {
         });
         it('should call the middleware', function (done) {
             function testMiddleware(entity, typeInformation, callback) {
-                entity.contextResponses[0].contextElement.attributes[1].value =
-                    entity.contextResponses[0].contextElement.attributes[1].value + '%';
-
+                entity.dimming.value = entity.dimming.value + '%';
                 callback(null, entity, typeInformation);
             }
 
@@ -254,7 +254,7 @@ describe('Data Mapping Plugins: translation', function () {
 
             iotAgentLib.query('light1', 'Light', '', attributes, function (error, result) {
                 should.not.exist(error);
-                result.contextResponses[0].contextElement.attributes[1].value.should.equal('23%');
+                result.dimming.value.should.equal('23%');
                 done();
             });
         });

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

@@ -23,13 +23,14 @@
 
 /* eslint-disable no-unused-vars */
 
-const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
+const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const _ = require('underscore');
 const async = require('async');
 const nock = require('nock');
-const utils = require('../../tools/utils');
-const groupRegistryMemory = require('../../../lib/services/groups/groupRegistryMemory');
-const request = require('request');
+const utils = require('../../../tools/utils');
+const request = utils.request;
+const groupRegistryMemory = require('../../../../lib/services/groups/groupRegistryMemory');
+
 const should = require('should');
 const iotAgentConfig = {
     logLevel: 'FATAL',
@@ -43,9 +44,9 @@ const iotAgentConfig = {
         baseRoot: '/'
     },
     types: {},
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M'
 };
 const optionsCreation = {
@@ -88,7 +89,7 @@ const optionsCreation = {
         ]
     },
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     }
 };
@@ -97,7 +98,7 @@ const optionsDeviceCreation = {
     method: 'POST',
     json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionNewDevice.json'),
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     }
 };
@@ -106,7 +107,7 @@ const optionsDelete = {
     method: 'DELETE',
     json: {},
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     },
     qs: {
@@ -119,7 +120,7 @@ const optionsDeleteDevice = {
     method: 'DELETE',
     json: {},
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     },
     qs: {
@@ -161,7 +162,7 @@ const optionsUpdate = {
         ]
     },
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     },
     qs: {
@@ -174,7 +175,7 @@ const optionsList = {
     method: 'GET',
     json: {},
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/*'
     }
 };
@@ -183,12 +184,12 @@ const optionsGet = {
     method: 'GET',
     json: {},
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     }
 };
 
-describe('Device Group Configuration API', function () {
+describe('NGSI-v2 - Device Group Configuration API', function () {
     beforeEach(function (done) {
         iotAgentLib.activate(iotAgentConfig, function () {
             groupRegistryMemory.clear(done);
@@ -247,7 +248,7 @@ describe('Device Group Configuration API', function () {
             request(optionsCreation, function (error, response, body) {
                 request(optionsList, function (error, response, body) {
                     body.count.should.equal(1);
-                    body.services[0].service.should.equal('TestService');
+                    body.services[0].service.should.equal('testservice');
                     body.services[0].subservice.should.equal('/testingPath');
                     done();
                 });
@@ -288,7 +289,7 @@ describe('Device Group Configuration API', function () {
                 ]
             },
             headers: {
-                'fiware-service': 'TestService',
+                'fiware-service': 'testservice',
                 'fiware-servicepath': '/testingPath'
             }
         };
@@ -328,7 +329,7 @@ describe('Device Group Configuration API', function () {
         });
 
         afterEach(function () {
-            optionsCreation.headers['fiware-service'] = 'TestService';
+            optionsCreation.headers['fiware-service'] = 'testservice';
         });
 
         it('should fail with a 400 MISSING_HEADERS Error', function (done) {
@@ -410,60 +411,28 @@ describe('Device Group Configuration API', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'TestService')
+                .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post(
-                    '/v1/updateContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/createProvisionedDevice.json')
-                )
-                .reply(
-                    200,
-                    utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
-                );
+                .post('/v2/entities?options=upsert')
+                .reply(204);
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'TestService')
+                .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post(
-                    '/NGSI9/registerContext',
-                    utils.readExampleFile(
-                        './test/unit/examples/contextAvailabilityRequests/registerProvisionedDevice.json'
-                    )
-                )
-                .reply(
-                    200,
-                    utils.readExampleFile(
-                        './test/unit/examples/contextAvailabilityResponses/registerProvisionedDeviceSuccess.json'
-                    )
-                );
+                .post('/v2/registrations')
+                .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'TestService')
+                .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post(
-                    '/NGSI9/registerContext',
-                    utils.readExampleFile(
-                        './test/unit/examples/contextAvailabilityRequests/unregisterProvisionedDevice.json'
-                    )
-                )
-                .reply(
-                    200,
-                    utils.readExampleFile(
-                        './test/unit/examples/contextAvailabilityResponses/unregisterDevice1Success.json'
-                    )
-                );
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
+                .reply(204);
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'TestService')
+                .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post(
-                    '/v1/updateContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/createProvisionedDevice.json')
-                )
-                .reply(
-                    200,
-                    utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
-                );
+                .post('/v2/entities?options=upsert')
+                .reply(204);
 
             async.series(
                 [
@@ -479,7 +448,7 @@ describe('Device Group Configuration API', function () {
             const options = {
                 url: 'http://localhost:4041/iot/devices/Light1',
                 headers: {
-                    'fiware-service': 'TestService',
+                    'fiware-service': 'testservice',
                     'fiware-servicepath': '/testingPath'
                 },
                 method: 'GET'
@@ -530,7 +499,7 @@ describe('Device Group Configuration API', function () {
         });
 
         afterEach(function (done) {
-            optionsDeleteDifferentService.headers['fiware-service'] = 'TestService';
+            optionsDeleteDifferentService.headers['fiware-service'] = 'testservice';
             done();
         });
 
@@ -711,7 +680,7 @@ describe('Device Group Configuration API', function () {
                 should.exist(callback);
                 newConfiguration.cbHost.should.equal('http://anotherUnexistentHost:1026');
                 newConfiguration.trust.should.equal('8970A9078A803H3BL98PINEQRW8342HBAMS');
-                newConfiguration.service.should.equal('TestService');
+                newConfiguration.service.should.equal('testservice');
                 newConfiguration.subservice.should.equal('/testingPath');
                 newConfiguration.resource.should.equal('/deviceTest');
                 newConfiguration.apikey.should.equal('801230BJKL23Y9090DSFL123HJK09H324HV8732');
@@ -733,7 +702,7 @@ describe('Device Group Configuration API', function () {
         });
 
         afterEach(function () {
-            optionsUpdate.headers['fiware-service'] = 'TestService';
+            optionsUpdate.headers['fiware-service'] = 'testservice';
         });
 
         it('should return a 200 OK', function (done) {
@@ -821,7 +790,7 @@ describe('Device Group Configuration API', function () {
                 ]
             },
             headers: {
-                'fiware-service': 'TestService',
+                'fiware-service': 'testservice',
                 'fiware-servicepath': '/testingPath'
             }
         };
@@ -832,7 +801,7 @@ describe('Device Group Configuration API', function () {
                 explicitAttrs: false
             },
             headers: {
-                'fiware-service': 'TestService',
+                'fiware-service': 'testservice',
                 'fiware-servicepath': '/testingPath'
             },
             qs: {
@@ -914,7 +883,7 @@ describe('Device Group Configuration API', function () {
         });
         it('should return all the configured device groups from the database', function (done) {
             request(optionsGet, function (error, response, body) {
-                body.services[0].service.should.equal('TestService');
+                body.services[0].service.should.equal('testservice');
                 done();
             });
         });
@@ -934,14 +903,14 @@ describe('Device Group Configuration API', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://unexistentHost:1026')
-                .matchHeader('fiware-service', 'TestService')
+                .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post(
-                    '/v1/updateContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/updateContext3WithStatic.json')
+                .patch(
+                    '/v2/entities/machine1/attrs',
+                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext3WithStatic.json')
                 )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/updateContext1Success.json'));
-
+                .query({ type: 'SensorMachine' })
+                .reply(204, {});
             async.series([async.apply(request, optionsCreation)], done);
         });
 
@@ -975,7 +944,7 @@ describe('Device Group Configuration API', function () {
             },
             json: {},
             headers: {
-                'fiware-service': 'TestService',
+                'fiware-service': 'testservice',
                 'fiware-servicepath': '/*'
             }
         };

package/test/unit/{provisioning/device-group-utils_test.js → ngsiv2/provisioning/device-group-utils-test.js}

@@ -23,18 +23,19 @@
 
 /* eslint-disable no-unused-vars */
 
-const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
-const utils = require('../../tools/utils');
+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 groupRegistryMemory = require('../../../../lib/services/groups/groupRegistryMemory');
+
 const groupCreation = {
     url: 'http://localhost:4041/iot/services',
     method: 'POST',
     json: utils.readExampleFile('./test/unit/examples/groupProvisioningRequests/provisionFullGroup.json'),
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     }
 };
@@ -43,7 +44,7 @@ const alternateGroupCreation = {
     method: 'POST',
     json: utils.readExampleFile('./test/unit/examples/groupProvisioningRequests/provisionFullGroupAlternate.json'),
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     }
 };
@@ -68,13 +69,13 @@ const iotAgentConfig = {
             ],
             active: [],
             apikey: '1234567890asdfghjkl',
-            service: 'TestService',
+            service: 'testservice',
             subservice: '/testingPath'
         }
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M',
     defaultKey: 'default1234'
 };
@@ -98,7 +99,7 @@ describe('Device Group utils', function () {
             );
         });
         it('should return the API Key of the group', function (done) {
-            iotAgentLib.getEffectiveApiKey('TestService', '/testingPath', 'AnotherMachine', function (error, apiKey) {
+            iotAgentLib.getEffectiveApiKey('testservice', '/testingPath', 'AnotherMachine', function (error, apiKey) {
                 should.not.exist(error);
                 apiKey.should.equal('754KL23Y9090DSFL123HSFL12380KL23Y2');
                 done();
@@ -118,7 +119,7 @@ describe('Device Group utils', function () {
             iotAgentConfig.singleConfigurationMode = false;
         });
         it('should return the API Key of the related subservice', function (done) {
-            iotAgentLib.getEffectiveApiKey('TestService', '/testingPath', null, function (error, apiKey) {
+            iotAgentLib.getEffectiveApiKey('testservice', '/testingPath', null, function (error, apiKey) {
                 should.not.exist(error);
                 apiKey.should.equal('801230BJKL23Y9090DSFL123HJK09H324HV8732');
                 done();
@@ -131,7 +132,7 @@ describe('Device Group utils', function () {
         });
 
         it('should return the API Key of the related type', function (done) {
-            iotAgentLib.getEffectiveApiKey('TestService', '/testingPath', 'Termometer', function (error, apiKey) {
+            iotAgentLib.getEffectiveApiKey('testservice', '/testingPath', 'Termometer', function (error, apiKey) {
                 should.not.exist(error);
                 apiKey.should.equal('1234567890asdfghjkl');
                 done();
@@ -144,7 +145,7 @@ describe('Device Group utils', function () {
         });
 
         it('should return the default API Key', function (done) {
-            iotAgentLib.getEffectiveApiKey('TestService', '/testingPath', 'WeatherMachine', function (error, apiKey) {
+            iotAgentLib.getEffectiveApiKey('testservice', '/testingPath', 'WeatherMachine', function (error, apiKey) {
                 should.not.exist(error);
                 apiKey.should.equal('default1234');
                 done();
@@ -162,7 +163,7 @@ describe('Device Group utils', function () {
         });
 
         it('should raise an error', function (done) {
-            iotAgentLib.getEffectiveApiKey('TestService', '/testingPath', 'WeatherMachine', function (error, apiKey) {
+            iotAgentLib.getEffectiveApiKey('testservice', '/testingPath', 'WeatherMachine', function (error, apiKey) {
                 should.exist(error);
                 error.name.should.equal('GROUP_NOT_FOUND');
                 done();