iotagent-node-lib 3.2.0 → 3.4.0

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

@@ -146,11 +146,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin1.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -177,11 +176,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin2.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -208,11 +206,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin3.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -240,11 +237,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin3.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -272,11 +268,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin4.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -304,11 +299,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin5.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -336,11 +330,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin6.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -368,11 +361,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin7.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -400,11 +392,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin8.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -432,11 +423,10 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin9.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 

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

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

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

@@ -111,8 +111,7 @@ describe('NGSI-v2 - Custom plugin', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch('/v2/entities/light1/attrs')
-                .query({ type: 'Light' })
+                .post('/v2/entities?options=upsert')
                 .reply(204);
         });
 

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

@@ -508,7 +508,6 @@ const iotAgentConfig = {
         },
         GPS1: {
             commands: [],
-            expressionLanguage: 'jexl',
             type: 'GPS',
             lazy: [],
             active: [
@@ -601,7 +600,7 @@ const iotAgentConfig = {
 
 describe('NGSI-v2 - Multi-entity plugin', function () {
     beforeEach(function (done) {
-        logger.setLevel('FATAL');
+        logger.setLevel('DEBUG');
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
@@ -1672,9 +1671,8 @@ describe('NGSI-v2 - Multi-entity plugin is executed for a command update for a r
         contextBrokerMock = nock('http://192.168.1.1:1026')
             .matchHeader('fiware-service', 'smartgondor')
             .matchHeader('fiware-servicepath', 'gardens')
-            .patch(
-                //'/v2/op/update',
-                '/v2/entities/sensorCommand/attrs?type=SensorCommand',
+            .post(
+                '/v2/entities?options=upsert',
                 utils.readExampleFile(
                     './test/unit/ngsiv2/examples/contextRequests/updateContextMultientityTimestampPlugin4.json'
                 )

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

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

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

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

package/test/unit/ngsiv2/provisioning/device-provisioning-api_test.js

@@ -100,15 +100,6 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                     )
                 )
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
-
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createProvisionedDevice.json')
-                )
-                .reply(204);
         });
 
         const options = {
@@ -214,7 +205,7 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
             });
         });
 
-        it('should create the initial entity in the Context Broker', function (done) {
+        it('should not 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) {
@@ -248,15 +239,6 @@ describe('NGSI-v2 - 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-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createTimeinstantDevice.json')
-                )
-                .reply(204);
-
             done();
         });
 
@@ -292,15 +274,6 @@ describe('NGSI-v2 - 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-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createTimeinstantDevice.json')
-                )
-                .reply(204);
-
             done();
         });
 
@@ -336,18 +309,8 @@ describe('NGSI-v2 - 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-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createExplicitAttrsDevice.json')
-                )
-                .reply(204);
-
             done();
         });
-
         it('should send the appropriate requests to the Context Broker', function (done) {
             request(options, function (error, response, body) {
                 contextBrokerMock.done();
@@ -394,17 +357,6 @@ describe('NGSI-v2 - 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-servicepath', '/gardens')
-                    .post(
-                        '/v2/entities?options=upsert',
-                        utils.readExampleFile(
-                            './test/unit/ngsiv2/examples/contextRequests/createMinimumProvisionedDevice.json'
-                        )
-                    )
-                    .reply(204);
-
                 done();
             });
 
@@ -552,12 +504,12 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 done();
             });
 
-            it('should store the device with static attributes provided in configuration', function (done) {
+            it('should not store the device with static attributes provided in configuration', function (done) {
                 request(groupCreation, function (error, response, body) {
                     request(options, function (error, response, body) {
                         iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                             should.exist(results.devices[0].staticAttributes);
-                            results.devices[0].staticAttributes[0].name.should.equal('bootstrapServer');
+                            results.devices[0].staticAttributes.length.should.equal(0);
                             done();
                         });
                     });
@@ -692,12 +644,12 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 done();
             });
 
-            it('should store the device with static attributes provided in configuration as well as device', function (done) {
+            it('should store the device with static attributes provided in device but no in configuration', function (done) {
                 request(groupCreation, function (error, response, body) {
                     request(options, function (error, response, body) {
                         iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                             should.exist(results.devices[0].staticAttributes);
-                            results.devices[0].staticAttributes.length.should.equal(2);
+                            results.devices[0].staticAttributes.length.should.equal(1);
                             done();
                         });
                     });
@@ -727,7 +679,6 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                         /*jshint camelcase: false */
                         entity_type: 'MicroLights',
                         entityNameExp: "id + '__' + suffix_st",
-                        expressionLanguage: 'jexl',
                         cbHost: 'http://192.168.1.1:1026',
                         static_attributes: [
                             {
@@ -861,31 +812,19 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
 
         beforeEach(function (done) {
             iotAgentLib.deactivate(function () {
-                iotAgentConfig.appendMode = false;
                 iotAgentLib.activate(iotAgentConfig, done);
             });
         });
 
-        afterEach(function () {
-            iotAgentConfig.appendMode = false;
-        });
+        afterEach(function () {});
 
         beforeEach(function (done) {
             nock.cleanAll();
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createAutoprovisionDevice.json')
-                )
-                .reply(204);
             done();
         });
 
-        it('should send the appropriate requests to the Context Broker', function (done) {
+        it('should should not appropriate requests to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -915,36 +854,11 @@ describe('NGSI-v2 - 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-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert', function (body) {
-                    const expectedBody = utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/createTimeInstantMinimumDevice.json'
-                    );
-                    if (!body.TimeInstant.value) {
-                        return false;
-                    } else if (moment(body.TimeInstant.value, 'YYYY-MM-DDTHH:mm:ss.SSSZ').isValid()) {
-                        const timeInstantDiff = moment().diff(body.TimeInstant.value, 'milliseconds');
-                        if (timeInstantDiff < 500) {
-                            delete body.TimeInstant;
-
-                            return JSON.stringify(body) === JSON.stringify(expectedBody);
-                        }
-
-                        return false;
-                    } else {
-                        return false;
-                    }
-                })
-                .reply(204);
-
             done();
         });
 
-        it('should send the appropriate requests to the Context Broker', function (done) {
+        it('should not send any requests to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -963,23 +877,11 @@ describe('NGSI-v2 - 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-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/createMinimumProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
             done();
         });
 
-        it('should send the appropriate requests to the Context Broker', function (done) {
+        it('should not send any requests to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -1022,23 +924,10 @@ describe('NGSI-v2 - 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-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/createGeopointProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
             done();
         });
-
-        it('should send the appropriate initial values to the Context Broker', function (done) {
+        it('should not send any initial values to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -1057,23 +946,10 @@ describe('NGSI-v2 - 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-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/createDatetimeProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
             done();
         });
-
-        it('should send the appropriate initial values to the Context Broker', function (done) {
+        it('should not send any initial values to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -1170,23 +1046,13 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post('/v2/registrations')
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
-
-            // 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-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .replyWithError({ message: 'Description of the error', code: 'STRING_CODE' });
-
             done();
         });
 
         it('should return a valid return code', function (done) {
             request(options, function (error, response, body) {
                 should.not.exist(error);
-                response.statusCode.should.equal(500);
+                response.statusCode.should.equal(201);
 
                 done();
             });
@@ -1213,22 +1079,13 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 .post('/v2/registrations')
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-            // 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-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .replyWithError({ message: 'Description of the error', code: 123456789 });
-
             done();
         });
 
         it('should return a valid return code (three character number)', function (done) {
             request(options, function (error, response, body) {
                 should.not.exist(error);
-                response.statusCode.should.equal(500);
+                response.statusCode.should.equal(201);
 
                 done();
             });

package/test/unit/ngsiv2/provisioning/device-registration_test.js

@@ -82,13 +82,15 @@ const device1 = {
     id: 'light1',
     type: 'Light',
     service: 'smartgondor',
-    subservice: 'gardens'
+    subservice: 'gardens',
+    apikey: null
 };
 const device2 = {
     id: 'term2',
     type: 'Termometer',
     service: 'smartgondor',
-    subservice: 'gardens'
+    subservice: 'gardens',
+    apikey: null
 };
 
 describe('NGSI-v2 - IoT Agent Device Registration', function () {
@@ -112,11 +114,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             // 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 = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerMock = nock('http://192.168.1.1:1026');
 
             const nockBody = utils.readExampleFile(
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent1.json'
@@ -227,7 +225,7 @@ describe('NGSI-v2 - 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', null, 'smartgondor', 'gardens', function (error, data) {
                     should.not.exist(error);
                     should.exist(data);
                     data.type.should.equal('Light');
@@ -258,7 +256,7 @@ describe('NGSI-v2 - 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', null, 'smartgondor', 'gardens', function (error, data) {
                     should.exist(error);
                     should.not.exist(data);
                     error.code.should.equal(404);
@@ -279,7 +277,6 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             // 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.post('/v2/entities?options=upsert').reply(204);
 
             contextBrokerMock
                 .post('/v2/registrations')
@@ -288,7 +285,6 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             // 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.post('/v2/entities?options=upsert').reply(204);
 
             contextBrokerMock
                 .delete('/v2/registrations/6319a7f5254b05844116584d', '')
@@ -307,7 +303,7 @@ describe('NGSI-v2 - 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, null, 'smartgondor', 'gardens', function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -352,7 +348,7 @@ describe('NGSI-v2 - 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, null, 'smartgondor', 'gardens', function (error) {
                 should.exist(error);
                 should.exist(error.name);
                 error.name.should.equal('UNREGISTRATION_ERROR');