iotagent-node-lib 4.6.0 → 4.7.0

package/test/unit/general/contextBrokerKeystoneSecurityAccess-test.js

@@ -85,7 +85,8 @@ const iotAgentConfig = {
     service: 'smartgondor',
     subservice: 'gardens',
     providerUrl: 'http://smartgondor.com',
-    deviceRegistrationDuration: 'P1M'
+    deviceRegistrationDuration: 'P1M',
+    useCBflowControl: true
 };
 
 describe('NGSI-v2 - Secured access to the Context Broker with Keystone', function () {
@@ -128,7 +129,7 @@ describe('NGSI-v2 - Secured access to the Context Broker with Keystone', functio
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .reply(204);
             iotAgentLib.activate(iotAgentConfig, done);
         });
@@ -165,7 +166,7 @@ describe('NGSI-v2 - Secured access to the Context Broker with Keystone', functio
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .reply(403, { name: 'ACCESS_FORBIDDEN' });
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -197,7 +198,7 @@ describe('NGSI-v2 - Secured access to the Context Broker with Keystone', functio
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('X-Auth-Token', '12345679ABCDEF')
-                .post('/v2/entities?options=upsert');
+                .post('/v2/entities?options=upsert,flowControl');
 
             iotAgentLib.activate(iotAgentConfig, done);
         });

package/test/unit/general/deviceService-test.js

@@ -123,7 +123,8 @@ const iotAgentConfig = {
     service: 'smartgondor',
     subservice: 'gardens',
     providerUrl: 'http://smartgondor.com',
-    deviceRegistrationDuration: 'P1M'
+    deviceRegistrationDuration: 'P1M',
+    useCBflowControl: true
 };
 const groupCreation = {
     url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/services',
@@ -222,7 +223,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .reply(204);
 
             async.series(
@@ -255,7 +256,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .reply(204);
 
             async.series(
@@ -290,7 +291,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .reply(204);
 
             async.series([request.bind(request, groupCreation)], function (error, results) {
@@ -326,7 +327,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'testservice')
                 .matchHeader('fiware-servicepath', '/testingPath')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .reply(204);
 
             async.series([request.bind(request, configGroupCreation)], function (error, results) {

package/test/unit/memoryRegistry/deviceRegistryMemory_test.js

@@ -48,7 +48,8 @@ const iotAgentConfig = {
     service: 'smartgondor',
     subservice: 'gardens',
     providerUrl: 'http://smartgondor.com',
-    deviceRegistrationDuration: 'P1M'
+    deviceRegistrationDuration: 'P1M',
+    useCBflowControl: true
 };
 let contextBrokerMock;
 
@@ -64,7 +65,7 @@ describe('NGSI-v2 - In memory device registry', function () {
     describe('When a the registry is queried for a device using an arbitrary attribute', function () {
         beforeEach(function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .times(10)
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
@@ -116,7 +117,7 @@ describe('NGSI-v2 - In memory device registry', function () {
     describe('When a the registry is queried for devices in multiple services', function () {
         beforeEach(function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .times(10)
                 .reply(204);
 
@@ -159,7 +160,7 @@ describe('NGSI-v2 - In memory device registry', function () {
     describe('When a the registry is queried for devices in a particular service', function () {
         beforeEach(function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .times(10)
                 .reply(204);
 
@@ -202,7 +203,7 @@ describe('NGSI-v2 - In memory device registry', function () {
     describe('When a the registry is queried for device in a particular name and type', function () {
         beforeEach(function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .times(10)
                 .reply(204);
 

package/test/unit/mongodb/mongodb-connectionoptions-test.js

@@ -75,8 +75,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -88,8 +86,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:98765/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -101,8 +97,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/examples',
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -114,9 +108,7 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        replicaSet: 'rs0',
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
+                        replicaSet: 'rs0'
                     }
                 }
             },
@@ -128,8 +120,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -141,8 +131,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -158,9 +146,7 @@ describe('dbConn.configureDb', function () {
                         auth: {
                             user: 'user01',
                             password: 'pass01'
-                        },
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
+                        }
                     }
                 }
             },
@@ -172,8 +158,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -194,9 +178,7 @@ describe('dbConn.configureDb', function () {
                         auth: {
                             user: 'user01',
                             password: 'pass01'
-                        },
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
+                        }
                     }
                 }
             },
@@ -208,9 +190,7 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        ssl: true,
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
+                        ssl: true
                     }
                 }
             },
@@ -224,8 +204,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME + '?retryWrites=true',
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -243,8 +221,6 @@ describe('dbConn.configureDb', function () {
                         dbConn.DEFAULT_DB_NAME +
                         '?retryWrites=true&readPreference=nearest',
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -256,8 +232,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -269,8 +243,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -282,8 +254,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
                     }
                 }
             },
@@ -312,9 +282,7 @@ describe('dbConn.configureDb', function () {
                             user: 'user01',
                             password: 'pass01'
                         },
-                        ssl: true,
-                        useNewUrlParser: true,
-                        useUnifiedTopology: true
+                        ssl: true
                     }
                 }
             }
@@ -330,7 +298,7 @@ describe('dbConn.configureDb', function () {
                     const cfg = Object.assign({}, iotAgentConfig, {
                         mongodb: params.mongodb
                     });
-                    stub = sinon.stub(mongoose, 'createConnection').callsFake(function (url, options, fn) {
+                    stub = sinon.stub(mongoose, 'connect').callsFake(function (url, options, fn) {
                         url.should.be.equal(params.expected.url);
                         options.should.be.eql(params.expected.options);
                         done();
@@ -365,7 +333,7 @@ describe('dbConn.configureDb', function () {
                 const cfg = Object.assign({}, iotAgentConfig, {
                     mongodb: params.mongodb
                 });
-                stub = sinon.stub(mongoose, 'createConnection').callsFake(function (url, options, fn) {
+                stub = sinon.stub(mongoose, 'connect').callsFake(function (url, options, fn) {
                     should.fail();
                 });
                 config.setConfig(cfg);

package/test/unit/ngsi-ld/expressions/jexlBasedTransformations-test.js

@@ -253,8 +253,7 @@ const iotAgentConfig = {
     service: 'smartgondor',
     subservice: 'gardens',
     providerUrl: 'http://smartgondor.com',
-    deviceRegistrationDuration: 'P1M',
-    throttling: 'PT5S'
+    deviceRegistrationDuration: 'P1M'
 };
 
 const iotAgentConfigTS = {

package/test/unit/ngsi-ld/general/config-jsonld-contexts-test.js

@@ -59,8 +59,7 @@ const iotAgentConfig = {
         }
     },
     providerUrl: 'http://smartgondor.com',
-    deviceRegistrationDuration: 'P1M',
-    throttling: 'PT5S'
+    deviceRegistrationDuration: 'P1M'
 };
 
 describe('NGSI-LD - JSON-LD @context parsing from environment variable', function () {

package/test/unit/ngsi-mixed/provisioning/ngsi-versioning-test.js

@@ -55,7 +55,8 @@ const iotAgentConfig = {
     service: 'smartgondor',
     subservice: 'gardens',
     providerUrl: 'http://smartgondor.com',
-    deviceRegistrationDuration: 'P1M'
+    deviceRegistrationDuration: 'P1M',
+    useCBflowControl: true
 };
 const mongo = require('mongodb').MongoClient;
 const mongoUtils = require('../../mongodb/mongoDBUtils');
@@ -68,6 +69,7 @@ const optionsCreationDefault = {
                 apikey: 'default-test',
                 entity_type: 'Device',
                 resource: '/iot/default',
+                useCBflowControl: true,
                 attributes: [
                     {
                         object_id: 's',
@@ -93,6 +95,7 @@ const optionsCreationV2 = {
                 ngsiVersion: 'v2',
                 entity_type: 'Device',
                 resource: '/iot/v2',
+                useCBflowControl: true,
                 attributes: [
                     {
                         object_id: 's',
@@ -189,7 +192,7 @@ describe('Mixed Mode: ngsiVersion test', function () {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .reply(204);
 
             request(optionsCreationDefault, function (error, response, body) {
@@ -210,7 +213,7 @@ describe('Mixed Mode: ngsiVersion test', function () {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
-                .post('/v2/entities?options=upsert')
+                .post('/v2/entities?options=upsert,flowControl')
                 .reply(204);
 
             request(optionsCreationV2, function (error, response, body) {
@@ -254,10 +257,10 @@ describe('Mixed Mode: ngsiVersion test', function () {
     //         contextBrokerMock = nock('http://192.168.1.1:1026')
     //             .matchHeader('fiware-service', 'smartgondor')
     //             .matchHeader('fiware-servicepath', 'gardens')
-    //             .post('/v2/entities?options=upsert')
+    //             .post('/v2/entities?options=upsert,flowControl')
     //             .reply(204);
 
-    //         contextBrokerMock = nock('http://192.168.1.1:1026').post('/v2/entities?options=upsert').reply(204);
+    //         contextBrokerMock = nock('http://192.168.1.1:1026').post('/v2/entities?options=upsert,flowControl').reply(204);
     //         request(optionsCreationLD, function (error, response, body) {
     //             request(deviceCreationV2, function (error, response, body) {
     //                 done();