iotagent-node-lib 2.15.1 → 2.19.0

package/test/unit/{ngsiService → ngsiv2/ngsiService}/queryDeviceInformationInCb-test.js

@@ -21,8 +21,7 @@
  * please contact with::[contacto@tid.es]
  */
 
-const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
-const utils = require('../../tools/utils');
+const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
@@ -30,7 +29,8 @@ let contextBrokerMock;
 const iotAgentConfig = {
     contextBroker: {
         host: '192.168.1.1',
-        port: '1026'
+        port: '1026',
+        ngsiVersion: 'v2'
     },
     server: {
         port: 4041
@@ -109,13 +109,13 @@ const iotAgentConfig = {
             ]
         }
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M'
 };
 
-describe('Query device information in the Context Broker', function () {
+describe('NGSI-v2 - Query device information in the Context Broker', function () {
     const attributes = ['state', 'dimming'];
 
     beforeEach(function (done) {
@@ -133,13 +133,10 @@ describe('Query device information in the Context Broker', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/queryContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/queryContext1.json')
-                )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/queryContext1Success.json'));
+                .get('/v2/entities/light1/attrs?attrs=state,dimming&type=Light')
+                .reply(200, {});
         });
 
         it('should return the information about the desired attributes', function (done) {
@@ -156,13 +153,13 @@ describe('Query device information in the Context Broker', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/queryContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/queryContext2.json')
-                )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/queryContext2Error.json'));
+                .get('/v2/entities/light3/attrs?attrs=state,dimming&type=Light')
+                .reply(404, {
+                    error: 'NotFound',
+                    description: 'The requested entity has not been found. Check type and id'
+                });
         });
 
         it('should return a DEVICE_NOT_FOUND_ERROR', function (done) {
@@ -174,55 +171,29 @@ describe('Query device information in the Context Broker', function () {
         });
     });
 
-    describe('When the user requests information and there are multiple responses, one of them a failure', function () {
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/queryContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/queryContext2.json')
-                )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/queryContext3Error.json'));
-        });
-
-        it('should return a ATTRIBUTE_NOT_FOUND_ERROR', function (done) {
-            iotAgentLib.query('light3', 'Light', '', attributes, function (error) {
-                should.exist(error);
-                error.name.should.equal('ATTRIBUTE_NOT_FOUND');
-                done();
-            });
-        });
-    });
-
     describe('When the user requests information and there is an unknown errorCode in the response', function () {
         beforeEach(function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/queryContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/queryContext2.json')
-                )
-                .reply(
-                    200,
-                    utils.readExampleFile('./test/unit/examples/contextResponses/queryContext2UnknownError.json')
-                );
+                .get('/v2/entities/light3/attrs?attrs=state,dimming&type=Light')
+                .reply(503, {
+                    error: 'Service Unavailable',
+                    description: 'The context broker is current down for maintenence'
+                });
         });
 
         it('should return a ENTITY_GENERIC_ERROR', function (done) {
             iotAgentLib.query('light3', 'Light', '', attributes, function (error) {
                 should.exist(error);
                 should.exist(error.name);
-                should.exist(error.details.code);
-                should.exist(error.details.reasonPhrase);
+                should.exist(error.code);
+                should.exist(error.details.description);
                 error.name.should.equal('ENTITY_GENERIC_ERROR');
-                error.details.code.should.equal('516');
-                error.details.reasonPhrase.should.equal('A new and unknown error');
+                error.code.should.equal(503);
+                error.details.description.should.equal('The context broker is current down for maintenence');
                 done();
             });
         });

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

@@ -77,9 +77,9 @@ const iotAgentConfig = {
         }
     },
     timestamp: true,
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com'
+    providerUrl: 'http://smartgondor.com'
 };
 
 describe('NGSI-v2 - Static attributes test', function () {
@@ -109,13 +109,13 @@ describe('NGSI-v2 - Static attributes test', 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/entities/light1/attrs')
+                .patch('/v2/entities/light1/attrs')
                 .query({ type: 'Light' })
                 .times(4)
                 .reply(204)
-                .post('/v2/entities/light1/attrs', function (body) {
+                .patch('/v2/entities/light1/attrs', function (body) {
                     let metadatas = 0;
                     for (const i in body) {
                         if (body[i].metadata) {

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

@@ -27,8 +27,9 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
-const request = require('request');
+
 const nock = require('nock');
 let contextBrokerMock;
 const iotAgentConfig = {
@@ -42,9 +43,9 @@ const iotAgentConfig = {
         port: 4041
     },
     types: {},
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com'
+    providerUrl: 'http://smartgondor.com'
 };
 
 describe('NGSI-v2 - Subscription tests', function () {
@@ -54,7 +55,7 @@ describe('NGSI-v2 - Subscription tests', function () {
             method: 'POST',
             json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
             headers: {
-                'fiware-service': 'smartGondor',
+                'fiware-service': 'smartgondor',
                 'fiware-servicepath': '/gardens'
             }
         };
@@ -63,7 +64,7 @@ describe('NGSI-v2 - Subscription tests', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             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',
@@ -74,7 +75,7 @@ describe('NGSI-v2 - Subscription tests', function () {
                 .reply(204);
 
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post(
                     '/v2/subscriptions',
@@ -102,7 +103,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', 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     should.not.exist(error);
 
@@ -113,9 +114,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', 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
-                    iotAgentLib.getDevice('MicroLight1', 'smartGondor', '/gardens', function (error, device) {
+                    iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
                         should.not.exist(error);
                         should.exist(device);
                         should.exist(device.subscriptions);
@@ -131,18 +132,18 @@ describe('NGSI-v2 - Subscription tests', function () {
     describe('When a client invokes the unsubscribe() function for an entity', function () {
         beforeEach(function (done) {
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8')
+                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8', '')
                 .reply(204);
 
             done();
         });
         it('should delete the subscription from the CB', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartGondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', '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', 'smartgondor', '/gardens', function (error, device) {
                             contextBrokerMock.done();
                             done();
                         });
@@ -151,10 +152,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', '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', 'smartgondor', '/gardens', function (error, device) {
                             should.not.exist(error);
                             should.exist(device);
                             should.exist(device.subscriptions);
@@ -169,18 +170,18 @@ describe('NGSI-v2 - Subscription tests', function () {
     describe('When a client removes a device from the registry', function () {
         beforeEach(function (done) {
             contextBrokerMock
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8')
+                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8', '')
                 .reply(204);
 
             done();
         });
 
         it('should delete the subscription from the CB', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartGondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', '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, 'smartgondor', '/gardens', function (error) {
                         contextBrokerMock.done();
                         done();
                     });
@@ -190,7 +191,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', 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     done();
                 });
@@ -203,7 +204,7 @@ describe('NGSI-v2 - Subscription tests', function () {
                 method: 'POST',
                 json: utils.readExampleFile('./test/unit/ngsiv2/examples/subscriptionRequests/simpleNotification.json'),
                 headers: {
-                    'fiware-service': 'smartGondor',
+                    'fiware-service': 'smartgondor',
                     'fiware-servicepath': '/gardens'
                 }
             };
@@ -229,7 +230,7 @@ describe('NGSI-v2 - Subscription tests', function () {
                 method: 'POST',
                 json: utils.readExampleFile('./test/unit/ngsiv2/examples/subscriptionRequests/simpleNotification.json'),
                 headers: {
-                    'fiware-service': 'smartGondor',
+                    'fiware-service': 'smartgondor',
                     'fiware-servicepath': '/gardens'
                 }
             };
@@ -271,7 +272,7 @@ describe('NGSI-v2 - Subscription tests', function () {
                 method: 'POST',
                 json: utils.readExampleFile('./test/unit/ngsiv2/examples/subscriptionRequests/simpleNotification.json'),
                 headers: {
-                    'fiware-service': 'smartGondor',
+                    'fiware-service': 'smartgondor',
                     'fiware-servicepath': '/gardens'
                 }
             };
@@ -309,7 +310,7 @@ describe('NGSI-v2 - Subscription tests', function () {
                 method: 'POST',
                 json: utils.readExampleFile('./test/unit/ngsiv2/examples/subscriptionRequests/errorNotification.json'),
                 headers: {
-                    'fiware-service': 'smartGondor',
+                    'fiware-service': 'smartgondor',
                     'fiware-servicepath': '/gardens'
                 }
             };

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

@@ -104,9 +104,9 @@ const iotAgentConfig = {
             ]
         }
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com'
+    providerUrl: 'http://smartgondor.com'
 };
 
 describe('NGSI-v2 - Attribute alias plugin', function () {
@@ -145,9 +145,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin1.json')
                 )
@@ -176,9 +176,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin2.json')
                 )
@@ -207,9 +207,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin3.json')
                 )
@@ -239,9 +239,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin3.json')
                 )
@@ -271,9 +271,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin4.json')
                 )
@@ -303,9 +303,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin5.json')
                 )
@@ -335,9 +335,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin6.json')
                 )
@@ -367,9 +367,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin7.json')
                 )
@@ -399,9 +399,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin8.json')
                 )
@@ -431,9 +431,9 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin9.json')
                 )