iotagent-node-lib 2.15.1 → 2.19.0

package/test/unit/ngsi-ld/provisioning/device-provisioning-api_test.js

@@ -27,9 +27,10 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const nock = require('nock');
-const request = require('request');
+
 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-LD - Device provisioning API: Provision devices', function () {
@@ -55,7 +56,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/csourceRegistrations/',
                     utils.readExampleFile(
@@ -68,7 +69,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .reply(204);
 
@@ -86,7 +87,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function () {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/csourceRegistrations/',
                     utils.readExampleFile(
@@ -96,7 +97,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile('./test/unit/ngsi-ld/examples/contextRequests/createProvisionedDevice.json')
@@ -109,7 +110,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionNewDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -119,7 +120,7 @@ describe('NGSI-LD - 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();
                 });
@@ -143,7 +144,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         it('should store the device with the provided entity id, name and type', function (done) {
             request(options, function (error, response, body) {
                 response.statusCode.should.equal(201);
-                iotAgentLib.listDevices('smartGondor', '/gardens', function (error, results) {
+                iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                     results.devices[0].id.should.equal('Light1');
                     results.devices[0].name.should.equal('TheFirstLight');
                     results.devices[0].type.should.equal('TheLightType');
@@ -154,7 +155,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         it('should store the device with the per device information', function (done) {
             request(options, function (error, response, body) {
                 response.statusCode.should.equal(201);
-                iotAgentLib.listDevices('smartGondor', '/gardens', function (error, results) {
+                iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                     should.exist(results.devices[0].timezone);
                     results.devices[0].timezone.should.equal('America/Santiago');
                     should.exist(results.devices[0].endpoint);
@@ -185,7 +186,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             /* jshint camelcase:false */
             request(options, function (error, response, body) {
                 response.statusCode.should.equal(201);
-                iotAgentLib.listDevices('smartGondor', '/gardens', function (error, results) {
+                iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                     results.devices[0].lazy[0].object_id.should.equal('luminance');
                     results.devices[0].commands[0].object_id.should.equal('commandAttr');
                     results.devices[0].active[0].object_id.should.equal('attr_name');
@@ -197,9 +198,9 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         it('should store service and subservice info from the headers along with the device data', function (done) {
             request(options, function (error, response, body) {
                 response.statusCode.should.equal(201);
-                iotAgentLib.listDevices('smartGondor', '/gardens', function (error, results) {
+                iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                     should.exist(results.devices[0].service);
-                    results.devices[0].service.should.equal('smartGondor');
+                    results.devices[0].service.should.equal('smartgondor');
                     should.exist(results.devices[0].subservice);
                     results.devices[0].subservice.should.equal('/gardens');
                     done();
@@ -210,7 +211,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         it('should create the initial entity in the Context Broker', function (done) {
             request(options, function (error, response, body) {
                 response.statusCode.should.equal(201);
-                iotAgentLib.listDevices('smartGondor', '/gardens', function (error, results) {
+                iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                     contextBrokerMock.done();
                     done();
                 });
@@ -223,7 +224,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionTimeInstant.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -242,7 +243,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile('./test/unit/ngsi-ld/examples/contextRequests/createTimeinstantDevice.json')
@@ -266,7 +267,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionTimeInstant2.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -285,7 +286,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile('./test/unit/ngsi-ld/examples/contextRequests/createTimeinstantDevice.json')
@@ -309,7 +310,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionAutoprovision.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -328,7 +329,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile('./test/unit/ngsi-ld/examples/contextRequests/createAutoprovisionDevice.json')
@@ -351,7 +352,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -370,7 +371,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile(
@@ -396,7 +397,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -404,7 +405,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile(
@@ -428,7 +429,7 @@ describe('NGSI-LD - 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();
                 });
@@ -438,7 +439,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         it('should store the device with the provided entity id, name and type', function (done) {
             request(options, function (error, response, body) {
                 response.statusCode.should.equal(201);
-                iotAgentLib.listDevices('smartGondor', '/gardens', function (error, results) {
+                iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                     results.devices[0].id.should.equal('MicroLight1');
                     results.devices[0].name.should.equal('FirstMicroLight');
                     results.devices[0].type.should.equal('MicroLights');
@@ -454,7 +455,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionGeopointDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -462,7 +463,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile(
@@ -488,7 +489,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionDatetimeDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -496,7 +497,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile(
@@ -522,7 +523,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -573,7 +574,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         it('should show the new device in each list', function (done) {
             request(options1, function (error, response, body) {
                 request(options2, function (error, response, body) {
-                    iotAgentLib.listDevices('smartGondor', '/gardens', function (error, results) {
+                    iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                         results.devices.length.should.equal(1);
                         results.devices[0].id.should.equal('MicroLight1');
 
@@ -594,7 +595,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -602,7 +603,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile(
@@ -634,7 +635,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -642,7 +643,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile(
@@ -671,7 +672,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -679,7 +680,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         beforeEach(function (done) {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/',
                     utils.readExampleFile(
@@ -708,7 +709,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -717,7 +718,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/')
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
@@ -725,7 +726,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .replyWithError({ message: 'Description of the error', code: 'STRING_CODE' });
 
@@ -748,7 +749,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -757,7 +758,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/')
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
@@ -765,7 +766,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .replyWithError({ message: 'Description of the error', code: 123456789 });
 
@@ -787,7 +788,7 @@ describe('NGSI-LD - Device provisioning API: Provision 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(
@@ -811,14 +812,14 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionNewDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
 
         beforeEach(function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/')
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
@@ -826,7 +827,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .reply(204);
 
@@ -852,7 +853,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
                 './test/unit/examples/deviceProvisioningRequests/provisionNewDeviceMalformed1.json'
             ),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -873,7 +874,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/newBaseRoot/iot/devices',
             method: 'POST',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionNewDevice.json')
@@ -895,7 +896,7 @@ describe('NGSI-LD - 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();
                 });
@@ -925,7 +926,7 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices/Light84',
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             },
             method: 'DELETE'

package/test/unit/ngsi-ld/provisioning/device-registration_test.js

@@ -27,6 +27,7 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
@@ -57,7 +58,7 @@ const iotAgentConfig = {
                     type: 'Hgmm'
                 }
             ],
-            service: 'smartGondor',
+            service: 'smartgondor',
             subservice: 'gardens'
         },
         Termometer: {
@@ -69,24 +70,24 @@ const iotAgentConfig = {
                 }
             ],
             active: [],
-            service: 'smartGondor',
+            service: 'smartgondor',
             subservice: 'gardens'
         }
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com'
+    providerUrl: 'http://smartgondor.com'
 };
 const device1 = {
     id: 'light1',
     type: 'Light',
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens'
 };
 const device2 = {
     id: 'term2',
     type: 'Termometer',
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens'
 };
 
@@ -112,7 +113,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .reply(204);
 
@@ -120,7 +121,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
                 './test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/', nockBody)
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
@@ -146,7 +147,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
                 './test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/', nockBody)
                 .reply(404);
 
@@ -172,7 +173,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
                 './test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/', nockBody)
                 .reply(500);
 
@@ -201,7 +202,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
                 './test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/', nockBody)
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
@@ -209,7 +210,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .reply(204);
 
@@ -220,7 +221,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
 
         it("should return all the device's information", function (done) {
             iotAgentLib.register(device1, function (error) {
-                iotAgentLib.getDevice('light1', 'smartGondor', 'gardens', function (error, data) {
+                iotAgentLib.getDevice('light1', 'smartgondor', 'gardens', function (error, data) {
                     should.not.exist(error);
                     should.exist(data);
                     data.type.should.equal('Light');
@@ -239,7 +240,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
                 './test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/', nockBody)
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
@@ -250,7 +251,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
 
         it('should return a ENTITY_NOT_FOUND error', function (done) {
             iotAgentLib.register(device1, function (error) {
-                iotAgentLib.getDevice('lightUnexistent', 'smartGondor', 'gardens', function (error, data) {
+                iotAgentLib.getDevice('lightUnexistent', 'smartgondor', 'gardens', function (error, data) {
                     should.exist(error);
                     should.not.exist(data);
                     error.code.should.equal(404);
@@ -283,7 +284,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
             contextBrokerMock.post('/ngsi-ld/v1/entityOperations/upsert/').reply(204);
 
             contextBrokerMock
-                .delete('/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d')
+                .delete('/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d', '')
                 .reply(204, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
             iotAgentLib.activate(iotAgentConfig, function (error) {
@@ -299,7 +300,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
         });
 
         it('should update the devices information in Context Broker', function (done) {
-            iotAgentLib.unregister(device1.id, 'smartGondor', 'gardens', function (error) {
+            iotAgentLib.unregister(device1.id, 'smartgondor', 'gardens', function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -328,7 +329,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
             // provisioning folder
             contextBrokerMock.post('/ngsi-ld/v1/entityOperations/upsert/').reply(204);
 
-            contextBrokerMock.delete('/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d').reply(500);
+            contextBrokerMock.delete('/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d', '').reply(500);
 
             iotAgentLib.activate(iotAgentConfig, function (error) {
                 async.series(
@@ -344,7 +345,7 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
 
         it('should not remove the device from the internal registry');
         it('should return a UNREGISTRATION_ERROR error to the caller', function (done) {
-            iotAgentLib.unregister(device1.id, 'smartGondor', 'gardens', function (error) {
+            iotAgentLib.unregister(device1.id, 'smartgondor', 'gardens', function (error) {
                 should.exist(error);
                 should.exist(error.name);
                 error.name.should.equal('UNREGISTRATION_ERROR');