iotagent-node-lib 2.15.1 → 2.19.0

package/test/unit/ngsiv2/provisioning/listProvisionedDevices-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 nock = require('nock');
 const async = require('async');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     logLevel: 'FATAL',
@@ -44,9 +45,9 @@ const iotAgentConfig = {
         baseRoot: '/'
     },
     types: {},
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com'
+    providerUrl: 'http://smartgondor.com'
 };
 
 describe('NGSI-v2 - Device provisioning API: List provisioned devices', function () {
@@ -60,7 +61,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
             method: 'POST',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionNewDevice.json')
@@ -70,7 +71,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
             method: 'POST',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionAnotherDevice.json')
@@ -80,7 +81,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
             method: 'POST',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionFullDevice.json')
@@ -136,7 +137,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'GET'
@@ -144,12 +145,11 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should return all the provisioned devices', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
-                should.exist(parsedBody.devices);
+                should.exist(body.devices);
                 response.statusCode.should.equal(200);
-                parsedBody.devices.length.should.equal(3);
-                parsedBody.count.should.equal(3);
+                body.devices.length.should.equal(3);
+                body.count.should.equal(3);
                 done();
             });
         });
@@ -158,22 +158,20 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             /* jshint camelcase:false */
 
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
-
-                should.exist(parsedBody.devices[0].attributes);
-                parsedBody.devices[0].attributes.length.should.equal(1);
+                should.exist(body.devices[0].attributes);
+                body.devices[0].attributes.length.should.equal(1);
 
-                should.exist(parsedBody.devices[0].device_id);
-                parsedBody.devices[0].device_id.should.equal('Light1');
+                should.exist(body.devices[0].device_id);
+                body.devices[0].device_id.should.equal('Light1');
 
-                should.exist(parsedBody.devices[0].entity_name);
-                parsedBody.devices[0].entity_name.should.equal('TheFirstLight');
+                should.exist(body.devices[0].entity_name);
+                body.devices[0].entity_name.should.equal('TheFirstLight');
 
-                should.exist(parsedBody.devices[0].protocol);
-                parsedBody.devices[0].protocol.should.equal('GENERIC_PROTO');
+                should.exist(body.devices[0].protocol);
+                body.devices[0].protocol.should.equal('GENERIC_PROTO');
 
-                should.exist(parsedBody.devices[0].static_attributes);
-                parsedBody.devices[0].static_attributes.length.should.equal(1);
+                should.exist(body.devices[0].static_attributes);
+                body.devices[0].static_attributes.length.should.equal(1);
 
                 done();
             });
@@ -181,16 +179,14 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should return all the plugin attributes', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
-
-                should.exist(parsedBody.devices[2].attributes[0].entity_name);
-                should.exist(parsedBody.devices[2].attributes[0].entity_type);
-                should.exist(parsedBody.devices[2].attributes[1].expression);
-                should.exist(parsedBody.devices[2].attributes[2].reverse);
-                parsedBody.devices[2].attributes[0].entity_name.should.equal('Higro2000');
-                parsedBody.devices[2].attributes[0].entity_type.should.equal('Higrometer');
-                parsedBody.devices[2].attributes[1].expression.should.equal('${@humidity * 20}');
-                parsedBody.devices[2].attributes[2].reverse.length.should.equal(2);
+                should.exist(body.devices[2].attributes[0].entity_name);
+                should.exist(body.devices[2].attributes[0].entity_type);
+                should.exist(body.devices[2].attributes[1].expression);
+                should.exist(body.devices[2].attributes[2].reverse);
+                body.devices[2].attributes[0].entity_name.should.equal('Higro2000');
+                body.devices[2].attributes[0].entity_type.should.equal('Higrometer');
+                body.devices[2].attributes[1].expression.should.equal('${@humidity * 20}');
+                body.devices[2].attributes[2].reverse.length.should.equal(2);
                 done();
             });
         });
@@ -199,7 +195,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices/Light1',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'GET'
@@ -210,9 +206,8 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
                 should.not.exist(error);
                 response.statusCode.should.equal(200);
 
-                const parsedBody = JSON.parse(body);
-                parsedBody.entity_name.should.equal('TheFirstLight');
-                parsedBody.device_id.should.equal('Light1');
+                body.entity_name.should.equal('TheFirstLight');
+                body.device_id.should.equal('Light1');
                 done();
             });
         });
@@ -221,11 +216,10 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             request(options, function (error, response, body) {
                 should.not.exist(error);
 
-                const parsedBody = JSON.parse(body);
-                should.exist(parsedBody.attributes[0].object_id);
-                parsedBody.attributes[0].object_id.should.equal('attr_name');
-                parsedBody.attributes[0].name.should.equal('attr_name');
-                parsedBody.attributes[0].type.should.equal('string');
+                should.exist(body.attributes[0].object_id);
+                body.attributes[0].object_id.should.equal('attr_name');
+                body.attributes[0].name.should.equal('attr_name');
+                body.attributes[0].type.should.equal('string');
                 done();
             });
         });
@@ -234,7 +228,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices/LightFull',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'GET'
@@ -244,15 +238,14 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             request(options, function (error, response, body) {
                 should.not.exist(error);
 
-                const parsedBody = JSON.parse(body);
-                should.exist(parsedBody.attributes[0].entity_name);
-                should.exist(parsedBody.attributes[0].entity_type);
-                should.exist(parsedBody.attributes[1].expression);
-                should.exist(parsedBody.attributes[2].reverse);
-                parsedBody.attributes[0].entity_name.should.equal('Higro2000');
-                parsedBody.attributes[0].entity_type.should.equal('Higrometer');
-                parsedBody.attributes[1].expression.should.equal('${@humidity * 20}');
-                parsedBody.attributes[2].reverse.length.should.equal(2);
+                should.exist(body.attributes[0].entity_name);
+                should.exist(body.attributes[0].entity_type);
+                should.exist(body.attributes[1].expression);
+                should.exist(body.attributes[2].reverse);
+                body.attributes[0].entity_name.should.equal('Higro2000');
+                body.attributes[0].entity_type.should.equal('Higrometer');
+                body.attributes[1].expression.should.equal('${@humidity * 20}');
+                body.attributes[2].reverse.length.should.equal(2);
                 done();
             });
         });
@@ -261,7 +254,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices/Light84',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'GET'
@@ -280,7 +273,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices?limit=3',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'GET'
@@ -293,7 +286,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
                 url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
                 method: 'POST',
                 headers: {
-                    'fiware-service': 'smartGondor',
+                    'fiware-service': 'smartgondor',
                     'fiware-servicepath': '/gardens'
                 },
                 json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionNewDevice.json')
@@ -309,7 +302,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post('/v2/registrations')
                 .times(10)
@@ -329,18 +322,16 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should return just 3 devices', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
-                parsedBody.devices.length.should.equal(3);
+                body.devices.length.should.equal(3);
                 done();
             });
         });
 
         it('should return a count with the complete number of devices', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
-                parsedBody.count.should.equal(10);
+                body.count.should.equal(10);
                 done();
             });
         });
@@ -350,7 +341,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices?offset=3',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'GET'
@@ -361,7 +352,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
                 url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
                 method: 'POST',
                 headers: {
-                    'fiware-service': 'smartGondor',
+                    'fiware-service': 'smartgondor',
                     'fiware-servicepath': '/gardens'
                 },
                 json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionNewDevice.json')
@@ -379,7 +370,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post('/v2/registrations')
                 .times(10)
@@ -394,11 +385,10 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should skip the first 3 devices', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
 
-                for (let i = 0; i < parsedBody.devices.length; i++) {
-                    ['Light1_0', 'Light1_1', 'Light1_2'].indexOf(parsedBody.devices[i].id).should.equal(-1);
+                for (let i = 0; i < body.devices.length; i++) {
+                    ['Light1_0', 'Light1_1', 'Light1_2'].indexOf(body.devices[i].id).should.equal(-1);
                 }
 
                 done();
@@ -410,7 +400,7 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'GET'
@@ -440,10 +430,9 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should return just the ones in the selected service', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
                 response.statusCode.should.equal(200);
-                parsedBody.devices.length.should.equal(3);
+                body.devices.length.should.equal(3);
                 done();
             });
         });

package/test/unit/ngsiv2/provisioning/provisionDeviceMultientity-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');
+
 let contextBrokerMock;
 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'
 };
 
 describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
@@ -68,7 +69,7 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post(
                     '/v2/registrations',
@@ -79,7 +80,7 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post(
                     '/v2/entities?options=upsert',
@@ -97,7 +98,7 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 './test/unit/examples/deviceProvisioningRequests/provisionNewDeviceMultientity.json'
             ),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -107,7 +108,7 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 should.not.exist(error);
                 response.statusCode.should.equal(201);
 
-                iotAgentLib.listDevices('smartGondor', '/gardens', function (error, results) {
+                iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                     results.devices.length.should.equal(1);
                     done();
                 });

package/test/unit/ngsiv2/provisioning/removeProvisionedDevice-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 nock = require('nock');
 const async = require('async');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     logLevel: 'FATAL',
@@ -44,9 +45,9 @@ const iotAgentConfig = {
         baseRoot: '/'
     },
     types: {},
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com'
+    providerUrl: 'http://smartgondor.com'
 };
 
 describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', function () {
@@ -54,7 +55,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
         url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
         method: 'POST',
         headers: {
-            'fiware-service': 'smartGondor',
+            'fiware-service': 'smartgondor',
             'fiware-servicepath': '/gardens'
         },
         json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionNewDevice.json')
@@ -63,7 +64,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
         url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
         method: 'POST',
         headers: {
-            'fiware-service': 'smartGondor',
+            'fiware-service': 'smartgondor',
             'fiware-servicepath': '/gardens'
         },
         json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionAnotherDevice.json')
@@ -72,7 +73,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
         url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
         method: 'POST',
         headers: {
-            'fiware-service': 'smartGondor',
+            'fiware-service': 'smartgondor',
             'fiware-servicepath': '/gardens'
         },
         json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionDeviceActiveAtts.json')
@@ -84,7 +85,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerProvisionedDevice.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post('/v2/registrations', nockBody)
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
@@ -93,7 +94,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post('/v2/entities?options=upsert')
                 .reply(204);
@@ -102,7 +103,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerProvisionedDevice2.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post('/v2/registrations', nockBody2)
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
@@ -111,22 +112,22 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post('/v2/entities?options=upsert')
                 .reply(204);
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204);
 
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post('/v2/entities?options=upsert')
                 .reply(204);
@@ -153,7 +154,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices/Light1',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'DELETE'
@@ -172,15 +173,14 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
                 const options = {
                     url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
                     headers: {
-                        'fiware-service': 'smartGondor',
+                        'fiware-service': 'smartgondor',
                         'fiware-servicepath': '/gardens'
                     },
                     method: 'GET'
                 };
 
                 request(options, function (error, response, body) {
-                    const parsedBody = JSON.parse(body);
-                    parsedBody.devices.length.should.equal(2);
+                    body.devices.length.should.equal(2);
                     done();
                 });
             });
@@ -191,7 +191,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
                 const options = {
                     url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices/Light1',
                     headers: {
-                        'fiware-service': 'smartGondor',
+                        'fiware-service': 'smartgondor',
                         'fiware-servicepath': '/gardens'
                     },
                     method: 'GET'
@@ -224,7 +224,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices/Light3',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'DELETE'