iotagent-node-lib 3.2.0 → 3.4.0

package/test/unit/ngsiv2/ngsiService/active-devices-test.js

@@ -60,6 +60,23 @@ const iotAgentConfig = {
                 }
             ]
         },
+        LightNoTimestamp: {
+            commands: [],
+            type: 'Light',
+            lazy: [
+                {
+                    name: 'temperature',
+                    type: 'centigrades'
+                }
+            ],
+            timestamp: false,
+            active: [
+                {
+                    name: 'pressure',
+                    type: 'Hgmm'
+                }
+            ]
+        },
         BrokenLight: {
             commands: [],
             lazy: [
@@ -175,11 +192,10 @@ describe('NGSI-v2 - Active attributes test', 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/updateContext.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -192,22 +208,53 @@ describe('NGSI-v2 - Active attributes test', function () {
                 done();
             });
         });
+    });
+
+    describe('When the IoT Agent receives new information and the timestamp flag is on', function () {
+        let modifiedValues;
 
-        it('should ignore if wrong type or id are target atributes in the context broker', function (done) {
-            const wrongvalues = [
+        beforeEach(function (done) {
+            const time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
+
+            modifiedValues = [
                 {
-                    name: 'type',
-                    type: 'string',
-                    value: 'wrongtype'
+                    name: 'state',
+                    type: 'boolean',
+                    value: true
                 },
                 {
-                    name: 'id',
-                    type: 'string',
-                    value: 'wrongid'
+                    name: 'dimming',
+                    type: 'number',
+                    value: 87
                 }
             ];
 
-            iotAgentLib.update('light1', 'Light', '', wrongvalues.concat(values), function (error) {
+            timekeeper.freeze(time);
+
+            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/updateContextTimestamp.json')
+                )
+                .reply(204);
+
+            iotAgentConfig.timestamp = true;
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
+
+        afterEach(function (done) {
+            delete iotAgentConfig.timestamp;
+            timekeeper.reset();
+
+            done();
+        });
+
+        it('should add the timestamp to the entity and all the attributes', function (done) {
+            iotAgentLib.update('light1', 'Light', '', modifiedValues, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -215,12 +262,10 @@ describe('NGSI-v2 - Active attributes test', function () {
         });
     });
 
-    describe('When the IoT Agent receives new information and the timestamp flag is on', function () {
+    describe('When the IoT Agent receives new information and the timestamp flag is false', function () {
         let modifiedValues;
 
         beforeEach(function (done) {
-            const time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
-
             modifiedValues = [
                 {
                     name: 'state',
@@ -234,6 +279,57 @@ describe('NGSI-v2 - Active attributes test', function () {
                 }
             ];
 
+            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/updateContextTimestampFalse.json'
+                    )
+                )
+                .reply(204);
+
+            iotAgentConfig.timestamp = false;
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
+
+        afterEach(function (done) {
+            delete iotAgentConfig.timestamp;
+
+            done();
+        });
+
+        it('should not add the timestamp to the entity and the attributes', function (done) {
+            iotAgentLib.update('lightNoTimestamp1', 'LightNoTimestamp', '', modifiedValues, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
+    describe('When the IoT Agent receives new information and the timestamp flag is false but the measure contains timeInstant', function () {
+        let modifiedValues;
+
+        beforeEach(function (done) {
+            const time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
+
+            modifiedValues = [
+                {
+                    name: 'state',
+                    type: 'boolean',
+                    value: true
+                },
+                {
+                    name: 'TimeInstant',
+                    type: 'DateTime',
+                    value: '2015-12-14T08:06:01.468Z'
+                }
+            ];
+
             timekeeper.freeze(time);
 
             nock.cleanAll();
@@ -241,14 +337,15 @@ describe('NGSI-v2 - Active attributes test', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextTimestamp.json')
+                .post(
+                    '/v2/entities?options=upsert',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextTimestampFalseTimeInstant.json'
+                    )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
-            iotAgentConfig.timestamp = true;
+            iotAgentConfig.timestamp = false;
             iotAgentLib.activate(iotAgentConfig, done);
         });
 
@@ -259,8 +356,8 @@ describe('NGSI-v2 - Active attributes test', function () {
             done();
         });
 
-        it('should add the timestamp to the entity and all the attributes', function (done) {
-            iotAgentLib.update('light1', 'Light', '', modifiedValues, function (error) {
+        it('should add the timestamp attribute to the entity but not as attribute metadata', function (done) {
+            iotAgentLib.update('lightNoTimestamp1', 'LightNoTimestamp', '', modifiedValues, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -332,13 +429,12 @@ describe('NGSI-v2 - Active attributes test', 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/updateContextTimestampOverrideWithoutMilis.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentConfig.timestamp = true;
@@ -361,7 +457,7 @@ describe('NGSI-v2 - Active attributes test', function () {
         });
     });
 
-    describe('When the IoT Agent receives new information, the timestamp flag is onand timezone is defined', function () {
+    describe('When the IoT Agent receives new information, the timestamp flag is on and timezone is defined', function () {
         let modifiedValues;
 
         beforeEach(function (done) {
@@ -387,13 +483,12 @@ describe('NGSI-v2 - Active attributes test', 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/updateContextTimestampTimezone.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentConfig.timestamp = true;
@@ -444,13 +539,12 @@ describe('NGSI-v2 - Active attributes test', 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/updateContextTimestampOverride.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentConfig.timestamp = true;
@@ -499,13 +593,12 @@ describe('NGSI-v2 - Active attributes test', 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/updateContextTimestampOverride.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentConfig.timestamp = true;
@@ -554,11 +647,10 @@ describe('NGSI-v2 - Active attributes test', 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/updateContext.json')
                 )
-                .query({ type: 'Light' })
                 .reply(
                     413,
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextResponses/updateContext1Failed.json')
@@ -587,11 +679,10 @@ describe('NGSI-v2 - Active attributes test', 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/updateContext.json')
                 )
-                .query({ type: 'Light' })
                 .reply(
                     400,
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextResponses/updateContext2Failed.json')
@@ -617,11 +708,10 @@ describe('NGSI-v2 - Active attributes test', 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/updateContext.json')
                 )
-                .query({ type: 'Light' })
                 .reply(
                     500,
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextResponses/updateContext2Failed.json')
@@ -650,11 +740,10 @@ describe('NGSI-v2 - Active attributes test', function () {
             contextBrokerMock = nock('http://192.168.1.1:3024')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/humSensor/attrs',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext.json')
+                .post(
+                    '/v2/entities?options=upsert',
+                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext5.json')
                 )
-                .query({ type: 'Humidity' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -684,13 +773,12 @@ describe('NGSI-v2 - Active attributes test', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/motion1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextStaticAttributes.json'
                     )
                 )
-                .query({ type: 'Motion' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -720,13 +808,12 @@ describe('NGSI-v2 - Active attributes test', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/lamp1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextStaticAttributesMetadata.json'
                     )
                 )
-                .query({ type: 'Lamp' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -740,7 +827,7 @@ describe('NGSI-v2 - Active attributes test', function () {
         });
     });
 
-    describe('When the IoT Agent receives new information from a device and the appendMode flag is on', function () {
+    describe('When the IoT Agent receives new information from a device', function () {
         beforeEach(function (done) {
             nock.cleanAll();
 
@@ -748,19 +835,15 @@ describe('NGSI-v2 - Active attributes test', function () {
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post(
-                    '/v2/entities/light1/attrs',
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
-            iotAgentConfig.appendMode = true;
             iotAgentLib.activate(iotAgentConfig, done);
         });
 
         afterEach(function (done) {
-            iotAgentConfig.appendMode = false;
-
             done();
         });
 
@@ -782,16 +865,14 @@ describe('NGSI-v2 - Active attributes test', function () {
             contextBrokerMock = nock('http://cbhost:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext.json')
+                .post(
+                    '/v2/entities?options=upsert',
+                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext6.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
         });
-
         it('should change the value of the corresponding attribute in the context broker', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);

package/test/unit/ngsiv2/ngsiService/autocast-test.js

@@ -107,11 +107,10 @@ describe('NGSI-v2 - JSON native types autocast test', 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/updateContextAutocast1.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -141,11 +140,10 @@ describe('NGSI-v2 - JSON native types autocast test', 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/updateContextAutocast2.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -175,11 +173,10 @@ describe('NGSI-v2 - JSON native types autocast test', 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/updateContextAutocast3.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -209,11 +206,10 @@ describe('NGSI-v2 - JSON native types autocast test', 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/updateContextAutocast4.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -243,11 +239,10 @@ describe('NGSI-v2 - JSON native types autocast test', 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/updateContextAutocast5.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -277,11 +272,10 @@ describe('NGSI-v2 - JSON native types autocast test', 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/updateContextAutocast6.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -311,11 +305,10 @@ describe('NGSI-v2 - JSON native types autocast test', 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/updateContextAutocast7.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);

package/test/unit/ngsiv2/ngsiService/staticAttributes-test.js

@@ -112,20 +112,18 @@ describe('NGSI-v2 - Static attributes test', 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')
                 .times(4)
                 .reply(204)
-                .patch('/v2/entities/light1/attrs', function (body) {
+                .post('/v2/entities?options=upsert', function (body) {
                     let metadatas = 0;
                     for (const i in body) {
                         if (body[i].metadata) {
                             metadatas += Object.keys(body[i].metadata).length;
                         }
                     }
-                    return metadatas === Object.keys(body).length - 1;
+                    return metadatas === Object.keys(body).length - 1 - 2;
                 })
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);

package/test/unit/ngsiv2/ngsiService/subscriptions-test.js

@@ -64,16 +64,7 @@ describe('NGSI-v2 - Subscription tests', function () {
         nock.cleanAll();
 
         iotAgentLib.activate(iotAgentConfig, function () {
-            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);
+            contextBrokerMock = nock('http://192.168.1.1:1026');
 
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
@@ -104,7 +95,7 @@ describe('NGSI-v2 - Subscription tests', function () {
 
     describe('When a client invokes the subscribe() function for device', function () {
         it('should send the appropriate request to the Context Broker', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     should.not.exist(error);
 
@@ -115,9 +106,9 @@ describe('NGSI-v2 - Subscription tests', function () {
             });
         });
         it('should store the subscription ID in the Device Registry', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
-                    iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+                    iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                         should.not.exist(error);
                         should.exist(device);
                         should.exist(device.subscriptions);
@@ -141,10 +132,10 @@ describe('NGSI-v2 - Subscription tests', function () {
             done();
         });
         it('should delete the subscription from the CB', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
-                        iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+                        iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                             contextBrokerMock.done();
                             done();
                         });
@@ -153,10 +144,10 @@ describe('NGSI-v2 - Subscription tests', function () {
             });
         });
         it('should remove the id from the subscriptions array', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
-                        iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+                        iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                             should.not.exist(error);
                             should.exist(device);
                             should.exist(device.subscriptions);
@@ -180,9 +171,9 @@ describe('NGSI-v2 - Subscription tests', function () {
         });
 
         it('should delete the subscription from the CB', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
-                    iotAgentLib.unregister(device.id, 'smartgondor', '/gardens', function (error) {
+                    iotAgentLib.unregister(device.id, null, 'smartgondor', '/gardens', function (error) {
                         contextBrokerMock.done();
                         done();
                     });
@@ -192,7 +183,7 @@ describe('NGSI-v2 - Subscription tests', function () {
     });
     describe('When a new notification comes to the IoTAgent', function () {
         beforeEach(function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     done();
                 });