iotagent-node-lib 2.15.1 → 2.19.0

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

@@ -25,10 +25,10 @@
 
 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;
 let keystoneMock;
 const iotAgentConfig = {
@@ -51,7 +51,7 @@ const iotAgentConfig = {
     },
     types: {
         Light: {
-            service: 'smartGondor',
+            service: 'smartgondor',
             subservice: 'electricity',
             trust: 'BBBB987654321',
             type: 'Light',
@@ -81,13 +81,13 @@ const iotAgentConfig = {
             active: []
         }
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M'
 };
 
-describe('NGSI-v1 - Secured access to the Context Broker with Keystone', function () {
+describe('NGSI-v2 - Secured access to the Context Broker with Keystone', function () {
     const values = [
         {
             name: 'state',
@@ -124,15 +124,12 @@ describe('NGSI-v1 - Secured access to the Context Broker with Keystone', functio
                 });
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                .post(
-                    '/v1/updateContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/updateContext1.json')
-                )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/updateContext1Success.json'));
-
+                .patch('/v2/entities/light1/attrs')
+                .query({ type: 'Light' })
+                .reply(204);
             iotAgentLib.activate(iotAgentConfig, done);
         });
 
@@ -165,14 +162,12 @@ describe('NGSI-v1 - Secured access to the Context Broker with Keystone', functio
                 });
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                .post(
-                    '/v1/updateContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/updateContext1.json')
-                )
-                .reply(403, utils.readExampleFile('./test/unit/examples/contextResponses/updateContext1Success.json'));
+                .patch('/v2/entities/light1/attrs')
+                .query({ type: 'Light' })
+                .reply(403, { name: 'ACCESS_FORBIDDEN' });
 
             iotAgentLib.activate(iotAgentConfig, done);
         });
@@ -200,14 +195,11 @@ describe('NGSI-v1 - Secured access to the Context Broker with Keystone', functio
                 );
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                .post(
-                    '/v1/updateContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/updateContext1.json')
-                )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/updateContext1Success.json'));
+                .patch('/v2/entities/light1/attrs')
+                .query({ type: 'Light' });
 
             iotAgentLib.activate(iotAgentConfig, done);
         });
@@ -237,14 +229,12 @@ describe('NGSI-v1 - Secured access to the Context Broker with Keystone', functio
                 });
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                .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')
+                .query({ attrs: 'state,dimming', type: 'Light' })
+                .reply(200, { state: 'good', dimming: '23' });
 
             iotAgentLib.activate(iotAgentConfig, done);
         });
@@ -267,7 +257,7 @@ describe('NGSI-v1 - Secured access to the Context Broker with Keystone', functio
                     './test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice3.json'
                 ),
                 headers: {
-                    'fiware-service': 'smartGondor',
+                    'fiware-service': 'smartgondor',
                     'fiware-servicepath': 'electricity'
                 }
             };
@@ -288,46 +278,20 @@ describe('NGSI-v1 - Secured access to the Context Broker with Keystone', functio
                 contextBrokerMock = nock('http://192.168.1.1:1026');
 
                 contextBrokerMock
-                    .matchHeader('fiware-service', 'smartGondor')
+                    .matchHeader('fiware-service', 'smartgondor')
                     .matchHeader('fiware-servicepath', 'electricity')
                     .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                    .post(
-                        '/v1/updateContext',
-                        utils.readExampleFile('./test/unit/examples/contextRequests/updateContext5.json')
-                    )
-                    .reply(
-                        200,
-                        utils.readExampleFile('./test/unit/examples/contextResponses/updateContext1Success.json')
-                    );
+                    .post('/v2/entities?options=upsert')
+                    .reply(204);
 
                 contextBrokerMock
-                    .post(
-                        '/NGSI9/registerContext',
-                        utils.readExampleFile(
-                            './test/unit/examples/contextAvailabilityRequests/registerNewDevice1.json'
-                        )
-                    )
-                    .reply(
-                        200,
-                        utils.readExampleFile(
-                            './test/unit/examples/contextAvailabilityResponses/registerNewDevice1Success.json'
-                        )
-                    );
+                    .post('/v2/registrations')
+                    .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
                 contextBrokerMock
-                    .post(
-                        '/v1/subscribeContext',
-                        utils.readExampleFile(
-                            './test/unit/examples/subscriptionRequests/simpleSubscriptionRequest1.json'
-                        )
-                    )
+                    .post('/v2/subscriptions')
                     .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                    .reply(
-                        200,
-                        utils.readExampleFile(
-                            './test/unit/examples/subscriptionResponses/simpleSubscriptionSuccess.json'
-                        )
-                    );
+                    .reply(201, null, { Location: '/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8' });
 
                 iotAgentLib.clearAll(function () {
                     request(optionsProvision, function (error, result, body) {
@@ -338,7 +302,7 @@ describe('NGSI-v1 - Secured access to the Context Broker with Keystone', functio
         });
 
         it('subscribe requests use auth header', function (done) {
-            iotAgentLib.getDevice('Light1', 'smartGondor', 'electricity', function (error, device) {
+            iotAgentLib.getDevice('Light1', 'smartgondor', 'electricity', function (error, device) {
                 iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
                     should.not.exist(error);
 
@@ -359,18 +323,7 @@ describe('NGSI-v1 - Secured access to the Context Broker with Keystone', functio
                     'X-Subject-Token': '12345679ABCDEF'
                 });
 
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .post(
-                    '/v1/unsubscribeContext',
-                    utils.readExampleFile('./test/unit/examples/subscriptionRequests/simpleSubscriptionRemove.json')
-                )
-                .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                .reply(
-                    200,
-                    utils.readExampleFile('./test/unit/examples/subscriptionResponses/simpleSubscriptionSuccess.json')
-                );
-
-            iotAgentLib.getDevice('Light1', 'smartGondor', 'electricity', function (error, device) {
+            iotAgentLib.getDevice('Light1', 'smartgondor', 'electricity', function (error, device) {
                 iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
                     iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
                         contextBrokerMock.done();

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

@@ -25,9 +25,9 @@
 
 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 logger = require('logops');
 const async = require('async');
 const iotAgentConfig = {
@@ -119,9 +119,9 @@ const iotAgentConfig = {
         protocol: 'MQTT_UL',
         description: 'MQTT Ultralight 2.0 IoT Agent (Node.js version)'
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M'
 };
 const groupCreation = {
@@ -148,7 +148,7 @@ const groupCreation = {
         ]
     },
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     }
 };
@@ -157,7 +157,7 @@ const deviceCreation = {
     method: 'POST',
     json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionNewDevice.json'),
     headers: {
-        'fiware-service': 'TestService',
+        'fiware-service': 'testservice',
         'fiware-servicepath': '/testingPath'
     }
 };
@@ -165,10 +165,10 @@ let contextBrokerMock;
 let iotamMock;
 
 /* jshint camelcase: false */
-describe('NGSI-v1 - Device Service: utils', function () {
+describe('NGSI-v2 - Device Service: utils', function () {
     beforeEach(function (done) {
         nock.cleanAll();
-        logger.setLevel('FATAL');
+        logger.setLevel('ERROR');
         iotamMock = nock('http://localhost:8082').post('/protocols').reply(200, {});
 
         iotAgentLib.activate(iotAgentConfig, done);
@@ -182,24 +182,16 @@ describe('NGSI-v1 - Device Service: utils', function () {
     describe('When an existing device tries to be retrieved with retrieveOrCreate()', function () {
         beforeEach(function (done) {
             contextBrokerMock = nock('http://unexistentHost:1026')
-                .matchHeader('fiware-service', 'TestService')
+                .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post('/NGSI9/registerContext')
-                .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('/v1/updateContext')
-                .reply(
-                    200,
-                    utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
-                );
+                .post('/v2/entities?options=upsert')
+                .reply(204);
 
             async.series([request.bind(request, groupCreation), request.bind(request, deviceCreation)], function (
                 error,
@@ -223,24 +215,16 @@ describe('NGSI-v1 - 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')
-                .matchHeader('fiware-service', 'TestService')
+                .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post('/NGSI9/registerContext')
-                .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('/v1/updateContext')
-                .reply(
-                    200,
-                    utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
-                );
+                .post('/v2/entities?options=upsert')
+                .reply(204);
 
             async.series([request.bind(request, groupCreation)], function (error, results) {
                 done();

package/test/unit/general/loglevel-api_test.js

@@ -26,7 +26,8 @@
 const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
 const should = require('should');
 const logger = require('logops');
-const request = require('request');
+const utils = require('../../tools/utils');
+const request = utils.request;
 const iotAgentConfig = {
     contextBroker: {
         host: '192.168.1.1',
@@ -60,9 +61,9 @@ const iotAgentConfig = {
             ]
         }
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M'
 };
 
@@ -129,10 +130,8 @@ describe('Log level API', function () {
 
         it('should return the current log level', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
-
-                should.exist(parsedBody.level);
-                parsedBody.level.should.equal('FATAL');
+                should.exist(body.level);
+                body.level.should.equal('FATAL');
 
                 done();
             });
@@ -158,9 +157,7 @@ describe('Log level API', function () {
                 response.statusCode.should.equal(400);
                 should.exist(body);
 
-                const parsedBody = JSON.parse(body);
-
-                parsedBody.error.should.equal('invalid log level');
+                body.error.should.equal('invalid log level');
 
                 done();
             });
@@ -183,9 +180,7 @@ describe('Log level API', function () {
                 response.statusCode.should.equal(400);
                 should.exist(body);
 
-                const parsedBody = JSON.parse(body);
-
-                parsedBody.error.should.equal('log level missing');
+                body.error.should.equal('log level missing');
 
                 done();
             });

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

@@ -27,6 +27,7 @@ const migration = require('../../../lib/command/migration');
 const mongo = require('mongodb').MongoClient;
 const mongoUtils = require('../mongodb/mongoDBUtils');
 const utils = require('../../tools/utils');
+const request = utils.request;
 const logger = require('logops');
 const async = require('async');
 const apply = async.apply;

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

@@ -28,6 +28,7 @@ const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
 const should = require('should');
 const nock = require('nock');
 const utils = require('../../tools/utils');
+const request = utils.request;
 const config = require('../../../lib/commonConfig');
 const _ = require('underscore');
 const iotAgentConfig = {
@@ -57,14 +58,14 @@ const iotAgentConfig = {
             ]
         }
     },
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M'
 };
 const iotAgentConfigNoUrl = _.clone(iotAgentConfig);
 const iotAgentConfigNoTypes = _.clone(iotAgentConfig);
 let iotamMock;
 
-describe('NGSI-v1 - Startup tests', function () {
+describe('Startup tests', function () {
     describe('When the IoT Agent is started without a "providerUrl" config parameter', function () {
         beforeEach(function () {
             delete iotAgentConfigNoUrl.providerUrl;

package/test/unit/general/statistics-persistence_test.js

@@ -49,9 +49,9 @@ const iotAgentConfig = {
         db: 'iotagent'
     },
     types: {},
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M'
 };
 let iotAgentDb;

package/test/unit/general/statistics-service_test.js

@@ -38,9 +38,9 @@ const iotAgentConfig = {
         interval: 100
     },
     types: {},
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M'
 };
 let oldConfig;

package/test/unit/lazyAndCommands/commandRegistry_test.js

@@ -46,9 +46,9 @@ const iotAgentConfig = {
         port: '27017',
         db: 'iotagent'
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M',
     pollingExpiration: 800,
     pollingDaemonFrequency: 20
@@ -75,15 +75,15 @@ function testRegistry(registryType) {
 
         describe('When a new command is created in the command registry', function () {
             it('should not cause any error', function (done) {
-                iotAgentLib.addCommand('smartGondor', 'gardens', 'devId', commandTemplate, function (error) {
+                iotAgentLib.addCommand('smartgondor', 'gardens', 'devId', commandTemplate, function (error) {
                     should.not.exist(error);
                     done();
                 });
             });
 
             it('should appear in the listings', function (done) {
-                iotAgentLib.addCommand('smartGondor', 'gardens', 'devId', commandTemplate, function (error) {
-                    iotAgentLib.commandQueue('smartGondor', 'gardens', 'devId', function (error, commandList) {
+                iotAgentLib.addCommand('smartgondor', 'gardens', 'devId', commandTemplate, function (error) {
+                    iotAgentLib.commandQueue('smartgondor', 'gardens', 'devId', function (error, commandList) {
                         commandList.count.should.equal(1);
                         commandList.commands[0].name.should.equal('commandName');
                         commandList.commands[0].type.should.equal('commandType');
@@ -96,9 +96,9 @@ function testRegistry(registryType) {
 
         describe('When a new command has expired from the registry', function () {
             it('should not appear in the listings', function (done) {
-                iotAgentLib.addCommand('smartGondor', 'gardens', 'devId', commandTemplate, function (error) {
+                iotAgentLib.addCommand('smartgondor', 'gardens', 'devId', commandTemplate, function (error) {
                     setTimeout(function () {
-                        iotAgentLib.commandQueue('smartGondor', 'gardens', 'devId', function (error, commandList) {
+                        iotAgentLib.commandQueue('smartgondor', 'gardens', 'devId', function (error, commandList) {
                             commandList.count.should.equal(0);
                             done();
                         });
@@ -115,19 +115,19 @@ function testRegistry(registryType) {
             };
 
             beforeEach(function (done) {
-                iotAgentLib.addCommand('smartGondor', 'gardens', 'devId', commandTemplate, done);
+                iotAgentLib.addCommand('smartgondor', 'gardens', 'devId', commandTemplate, done);
             });
 
             it('should not give any error', function (done) {
-                iotAgentLib.addCommand('smartGondor', 'gardens', 'devId', updatedCommand, function (error) {
+                iotAgentLib.addCommand('smartgondor', 'gardens', 'devId', updatedCommand, function (error) {
                     should.not.exist(error);
                     done();
                 });
             });
 
             it('should override the old value, and change the expiration time', function (done) {
-                iotAgentLib.addCommand('smartGondor', 'gardens', 'devId', updatedCommand, function (error) {
-                    iotAgentLib.commandQueue('smartGondor', 'gardens', 'devId', function (error, list) {
+                iotAgentLib.addCommand('smartgondor', 'gardens', 'devId', updatedCommand, function (error) {
+                    iotAgentLib.commandQueue('smartgondor', 'gardens', 'devId', function (error, list) {
                         list.count.should.equal(1);
                         list.commands[0].value.should.equal('newValueForTheCommand');
                         done();
@@ -149,7 +149,7 @@ function testRegistry(registryType) {
                         };
 
                         commands.push(
-                            async.apply(iotAgentLib.addCommand, 'smartGondor', 'gardens', 'devId' + i, newCommand)
+                            async.apply(iotAgentLib.addCommand, 'smartgondor', 'gardens', 'devId' + i, newCommand)
                         );
                     }
                 }
@@ -160,7 +160,7 @@ function testRegistry(registryType) {
             });
 
             it('should not return any command for other devices', function (done) {
-                iotAgentLib.commandQueue('smartGondor', 'gardens', 'devId1', function (error, commandList) {
+                iotAgentLib.commandQueue('smartgondor', 'gardens', 'devId1', function (error, commandList) {
                     commandList.count.should.equal(5);
 
                     for (let i = 0; i < 5; i++) {
@@ -172,14 +172,14 @@ function testRegistry(registryType) {
             });
 
             it('should return all the fields for each command', function (done) {
-                iotAgentLib.commandQueue('smartGondor', 'gardens', 'devId1', function (error, commandList) {
+                iotAgentLib.commandQueue('smartgondor', 'gardens', 'devId1', function (error, commandList) {
                     commandList.count.should.equal(5);
 
                     for (let i = 0; i < 5; i++) {
                         commandList.commands[i].name.should.equal('commandName' + i);
                         commandList.commands[i].type.should.equal('commandType' + i);
                         commandList.commands[i].value.should.equal('commandValue' + i);
-                        commandList.commands[i].service.should.equal('smartGondor');
+                        commandList.commands[i].service.should.equal('smartgondor');
                         commandList.commands[i].subservice.should.equal('gardens');
 
                         should.exist(commandList.commands[i].creationDate);
@@ -201,7 +201,7 @@ function testRegistry(registryType) {
                         value: commandTemplate.value + j
                     };
 
-                    commands.push(async.apply(iotAgentLib.addCommand, 'smartGondor', 'gardens', 'devId', newCommand));
+                    commands.push(async.apply(iotAgentLib.addCommand, 'smartgondor', 'gardens', 'devId', newCommand));
                 }
 
                 async.series(commands, function (error) {
@@ -210,8 +210,8 @@ function testRegistry(registryType) {
             });
 
             it('should not appear in the listings', function (done) {
-                iotAgentLib.removeCommand('smartGondor', 'gardens', 'devId', 'commandName2', function (error) {
-                    iotAgentLib.commandQueue('smartGondor', 'gardens', 'devId', function (error, commandList) {
+                iotAgentLib.removeCommand('smartgondor', 'gardens', 'devId', 'commandName2', function (error) {
+                    iotAgentLib.commandQueue('smartgondor', 'gardens', 'devId', function (error, commandList) {
                         commandList.commands.length.should.equal(4);
 
                         for (let i = 0; i < commandList.commands.length; i++) {