iotagent-node-lib 2.15.1 → 2.19.0

package/test/unit/ngsiv2/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');
@@ -56,7 +57,7 @@ const iotAgentConfig = {
                     type: 'Hgmm'
                 }
             ],
-            service: 'smartGondor',
+            service: 'smartgondor',
             subservice: 'gardens'
         },
         Termometer: {
@@ -68,24 +69,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'
 };
 
@@ -111,7 +112,7 @@ describe('NGSI-v2 - 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')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post('/v2/entities?options=upsert')
                 .reply(204);
@@ -120,7 +121,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post('/v2/registrations', nockBody)
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
@@ -147,7 +148,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post('/v2/registrations', nockBody)
                 .reply(404);
@@ -174,7 +175,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post('/v2/registrations', nockBody)
                 .reply(500);
@@ -204,7 +205,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post('/v2/registrations', nockBody)
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
@@ -213,7 +214,7 @@ describe('NGSI-v2 - 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')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post('/v2/entities?options=upsert')
                 .reply(204);
@@ -225,7 +226,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', 'smartgondor', 'gardens', function (error, data) {
                     should.not.exist(error);
                     should.exist(data);
                     data.type.should.equal('Light');
@@ -244,7 +245,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post('/v2/registrations', nockBody)
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
@@ -256,7 +257,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', 'smartgondor', 'gardens', function (error, data) {
                     should.exist(error);
                     should.not.exist(data);
                     error.code.should.equal(404);
@@ -289,7 +290,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
 
             contextBrokerMock
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
             iotAgentLib.activate(iotAgentConfig, function (error) {
@@ -305,7 +306,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, 'smartgondor', 'gardens', function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -334,7 +335,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             // provisioning folder
             contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
 
-            contextBrokerMock.delete('/v2/registrations/6319a7f5254b05844116584d').reply(500);
+            contextBrokerMock.delete('/v2/registrations/6319a7f5254b05844116584d', '').reply(500);
 
             iotAgentLib.activate(iotAgentConfig, function (error) {
                 async.series(
@@ -350,7 +351,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, 'smartgondor', 'gardens', function (error) {
                 should.exist(error);
                 should.exist(error.name);
                 error.name.should.equal('UNREGISTRATION_ERROR');

package/test/unit/ngsiv2/provisioning/device-update-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');
@@ -55,7 +56,7 @@ const iotAgentConfig = {
                     type: 'Hgmm'
                 }
             ],
-            service: 'smartGondor',
+            service: 'smartgondor',
             subservice: 'gardens'
         },
         Termometer: {
@@ -67,25 +68,25 @@ 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 deviceUpdated = {
     id: 'light1',
     type: 'Light',
-    name: 'light1',
-    service: 'smartGondor',
+    name: 'Light:light1',
+    service: 'smartgondor',
     subservice: 'gardens',
     internalId: 'newInternalId',
     lazy: [
@@ -104,8 +105,8 @@ const deviceUpdated = {
 const deviceCommandUpdated = {
     id: 'light1',
     type: 'Light',
-    name: 'light1',
-    service: 'smartGondor',
+    name: 'Light:light1',
+    service: 'smartgondor',
     subservice: 'gardens',
     internalId: 'newInternalId',
     commands: [
@@ -141,7 +142,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         nock.cleanAll();
 
         contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartGondor')
+            .matchHeader('fiware-service', 'smartgondor')
             .matchHeader('fiware-servicepath', 'gardens')
             .post('/v2/registrations')
             .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
@@ -150,7 +151,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder
         contextBrokerMock
-            .matchHeader('fiware-service', 'smartGondor')
+            .matchHeader('fiware-service', 'smartgondor')
             .matchHeader('fiware-servicepath', 'gardens')
             .post('/v2/entities?options=upsert')
             .reply(204);
@@ -172,7 +173,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
     describe('When a device is preregistered and its registration information updated', function () {
         beforeEach(function () {
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post(
                     '/v2/entities/Light:light1/attrs?type=Light',
@@ -186,13 +187,13 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
             // this function should use the new API. This is just a temporary solution which implies deleting the
             // registration and creating a new one.
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204);
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post(
                     '/v2/registrations',
@@ -204,15 +205,15 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         });
 
         it('should register as ContextProvider of its lazy attributes', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, function (error) {
+            iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
             });
         });
         it('should store the new values in the registry', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, function (error, data) {
-                iotAgentLib.getDevice(deviceUpdated.id, 'smartGondor', 'gardens', function (error, deviceResult) {
+            iotAgentLib.updateRegister(deviceUpdated, false, function (error, data) {
+                iotAgentLib.getDevice(deviceUpdated.id, 'smartgondor', 'gardens', function (error, deviceResult) {
                     should.not.exist(error);
                     should.exist(deviceResult);
                     deviceResult.internalId.should.equal(deviceUpdated.internalId);
@@ -228,7 +229,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         beforeEach(function () {
             delete deviceCommandUpdated.registrationId;
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post(
                     '/v2/entities/Light:light1/attrs?type=Light',
@@ -241,13 +242,13 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
             // registration and creating a new one.
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204);
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post(
                     '/v2/registrations',
@@ -259,15 +260,15 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         });
 
         it('should register as ContextProvider of its commands and create the additional attributes', function (done) {
-            iotAgentLib.updateRegister(deviceCommandUpdated, function (error) {
+            iotAgentLib.updateRegister(deviceCommandUpdated, false, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
             });
         });
         it('should store the new values in the registry', function (done) {
-            iotAgentLib.updateRegister(deviceCommandUpdated, function (error, data) {
-                iotAgentLib.getDevice(deviceCommandUpdated.id, 'smartGondor', 'gardens', function (
+            iotAgentLib.updateRegister(deviceCommandUpdated, false, function (error, data) {
+                iotAgentLib.getDevice(deviceCommandUpdated.id, 'smartgondor', 'gardens', function (
                     error,
                     deviceResult
                 ) {
@@ -284,7 +285,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
 
     describe('When a update action is executed in a non registered device', function () {
         it('should return a DEVICE_NOT_FOUND error', function (done) {
-            iotAgentLib.updateRegister(unknownDevice, function (error) {
+            iotAgentLib.updateRegister(unknownDevice, false, function (error) {
                 should.exist(error);
                 error.name.should.equal('DEVICE_NOT_FOUND');
                 done();
@@ -296,17 +297,17 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
             // FIXME: When https://github.com/telefonicaid/fiware-orion/issues/3007 is merged into master branch,
             // this function should use the new API. This is just a temporary solution which implies deleting the
             // registration and creating a new one.
-            contextBrokerMock.delete('/v2/registrations/6319a7f5254b05844116584d').reply(500, {});
+            contextBrokerMock.delete('/v2/registrations/6319a7f5254b05844116584d', '').reply(500, {});
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
                 .post('/v2/entities/Light:light1/attrs?type=Light')
                 .reply(204);
         });
 
         it('should return a REGISTRATION_ERROR error in the update action', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, function (error) {
+            iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
                 should.exist(error);
                 error.name.should.equal('UNREGISTRATION_ERROR');
                 done();