iotagent-node-lib 2.26.0 → 3.1.0

package/test/unit/ngsiv2/expressions/expressionBasedTransformations-test.js

@@ -39,7 +39,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -197,9 +198,6 @@ describe('NGSI-v2 - Expression-based transformations plugin', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });

package/test/unit/ngsiv2/expressions/expressionCombinedTransformations-test.js

@@ -38,7 +38,8 @@ const iotAgentConfigJexl = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     defaultExpressionLanguage: 'jexl',
     types: {
@@ -83,7 +84,8 @@ const iotAgentConfigLegacy = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         WeatherStationLegacy: {
@@ -127,9 +129,6 @@ describe('Combine Jexl and legacy expressions (default JEXL) - NGSI v2', functio
 
         iotAgentLib.activate(iotAgentConfigJexl, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });
@@ -216,9 +215,6 @@ describe('Combine Jexl and legacy expressions (default Legacy) - NGSI v2', funct
 
         iotAgentLib.activate(iotAgentConfigLegacy, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });

package/test/unit/ngsiv2/expressions/jexlBasedTransformations-test.js

@@ -41,7 +41,8 @@ const iotAgentConfig = {
     },
     defaultExpressionLanguage: 'jexl',
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -346,7 +347,7 @@ const iotAgentConfig = {
                     expression: "{coordinates: [lon,lat], type: 'Point'}"
                 }
             ],
-            explicitAttrs: true
+            explicitAttrs: 'TimeInstant == null ? [] : true' // which is true
         },
         GPS7: {
             commands: [],
@@ -389,7 +390,8 @@ const iotAgentConfigTS = {
     },
     defaultExpressionLanguage: 'jexl',
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         GPS: {
@@ -418,9 +420,6 @@ describe('Java expression language (JEXL) based transformations plugin', functio
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });
@@ -1316,9 +1315,6 @@ describe('Java expression language (JEXL) based transformations plugin - Timesta
 
         iotAgentLib.activate(iotAgentConfigTS, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });

package/test/unit/ngsiv2/general/contextBrokerOAuthSecurityAccess-test.js

@@ -42,7 +42,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     authentication: {
         type: 'oauth2',

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

@@ -40,7 +40,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsiv2/general/https-support-test.js

@@ -40,7 +40,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsiv2/general/iotam-autoregistration-test.js

@@ -38,7 +38,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsiv2/general/startup-test.js

@@ -39,7 +39,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsiv2/lazyAndCommands/active-devices-attribute-update-test.js

@@ -42,7 +42,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsiv2/lazyAndCommands/command-test.js

@@ -43,7 +43,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsiv2/lazyAndCommands/lazy-devices-test.js

@@ -45,7 +45,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -343,11 +344,12 @@ describe('NGSI-v2 - IoT Agent Lazy Devices', function () {
                 .post('/v2/entities?options=upsert')
                 .reply(204);
 
-            async.series([apply(iotAgentLib.activate, iotAgentConfig), apply(iotAgentLib.register, device1)], function (
-                error
-            ) {
-                done();
-            });
+            async.series(
+                [apply(iotAgentLib.activate, iotAgentConfig), apply(iotAgentLib.register, device1)],
+                function (error) {
+                    done();
+                }
+            );
         });
 
         it('should not give any error', function (done) {

package/test/unit/ngsiv2/lazyAndCommands/polling-commands-test.js

@@ -43,7 +43,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -40,7 +40,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -463,7 +464,7 @@ describe('NGSI-v2 - Active attributes test', function () {
             done();
         });
 
-        it('should not override the received instant and should not add metadatas for this request', function (done) {
+        it('should not override the received instant and should add metadatas for this request', function (done) {
             iotAgentLib.update('light1', 'Light', '', modifiedValues, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();

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

@@ -39,7 +39,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -33,7 +33,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -38,7 +38,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -40,7 +40,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {},
     service: 'smartgondor',

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

@@ -39,7 +39,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -115,8 +116,6 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
                 done();
             });
         });

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

@@ -40,7 +40,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {},
     service: 'smartgondor',
@@ -241,7 +242,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
             let transformedHandler = false;
 
             function mockedHandler(device, values, callback) {
-
                 let latitudeFound = false;
                 let longitudeFound = false;
 
@@ -271,7 +271,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
         });
     });
 
-
     describe('When a notification with metadata arrives for a bidirectional attribute', function () {
         const notificationOptions = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/notify',
@@ -314,7 +313,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
 
         it('should execute the original handler', function (done) {
             function mockedHandler(device, notification, callback) {
-
                 notification[0].name.should.equal('location');
                 notification[0].value.should.equal('12.4, -9.6');
                 notification[0].metadata.qos.value.should.equal(1);
@@ -384,7 +382,6 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
         });
     });
 
-
     describe('When a new Group provisioning request arrives with bidirectional attributes', function () {
         const provisionGroup = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/services',

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

@@ -36,7 +36,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -122,8 +123,6 @@ describe('NGSI-v2 - Timestamp compression plugin', function () {
         logger.setLevel('FATAL');
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.compressTimestamp.updateNgsi2);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.compressTimestamp.queryNgsi2);
                 done();
             });
         });
@@ -217,34 +216,4 @@ describe('NGSI-v2 - Timestamp compression plugin', function () {
             });
         });
     });
-
-    describe('When a query comes for a timestamp through the plugin', function () {
-        const values = ['state', 'TheTargetValue'];
-
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .get('/v2/entities/light1/attrs?attrs=state,TheTargetValue&type=Light')
-                .reply(
-                    200,
-                    utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextResponses/queryContextCompressTimestamp1Success.json'
-                    )
-                );
-        });
-
-        it('should return an entity with all its timestamps without separators (basic format)', function (done) {
-            iotAgentLib.query('light1', 'Light', '', values, function (error, response) {
-                should.not.exist(error);
-                should.exist(response);
-                should.exist(response.TheTargetValue);
-                should.exist(response.TheTargetValue.value);
-                response.TheTargetValue.value.should.equal('20071103T131805');
-                done();
-            });
-        });
-    });
 });

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

@@ -41,7 +41,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         WeatherStation: {
@@ -573,10 +574,6 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.multiEntity.update);
                 done();
             });
         });
@@ -1117,6 +1114,7 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
             .post(
                 '/v2/op/update',
                 utils.readExampleFile(
+                    // Updated test same case that updateContextMultientityPlugin4.json
                     './test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin11.json'
                 )
             )
@@ -1423,10 +1421,6 @@ describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plu
         iotAgentConfig.timestamp = true;
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.multiEntity.update);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.timestampProcess.update);
                 done();
             });
         });
@@ -1507,7 +1501,7 @@ describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plu
             });
         });
 
-        it('should send two context elements, one for each entity', function (done) {
+        it('should send two context elements, one for each entity bis', function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
@@ -1589,10 +1583,6 @@ describe('NGSI-v2 - Multi-entity plugin is executed for a command update for a r
         timekeeper.freeze(time);
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.multiEntity.update);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.timestampProcess.update);
                 done();
             });
         });
@@ -1609,8 +1599,9 @@ 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')
-            .post(
-                '/v2/op/update',
+            .patch(
+                //'/v2/op/update',
+                '/v2/entities/sensorCommand/attrs?type=SensorCommand',
                 utils.readExampleFile(
                     './test/unit/ngsiv2/examples/contextRequests/updateContextMultientityTimestampPlugin4.json'
                 )

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

@@ -36,7 +36,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -67,7 +68,6 @@ describe('NGSI-v2 - Timestamp processing plugin', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.timestampProcess.update);
                 done();
             });
         });
@@ -100,6 +100,7 @@ describe('NGSI-v2 - Timestamp processing plugin', function () {
                 .matchHeader('fiware-servicepath', 'gardens')
                 .patch(
                     '/v2/entities/light1/attrs',
+                    // 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'
                     )

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

@@ -41,6 +41,7 @@ const iotAgentConfig = {
     server: {
         name: 'testAgent',
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

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

@@ -56,6 +56,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {

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

@@ -42,6 +42,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

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

@@ -40,7 +40,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -39,7 +39,8 @@ const iotAgentConfig = {
         ngsiVersion: 'v2'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -268,17 +269,19 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         });
         it('should store the new values in the registry', function (done) {
             iotAgentLib.updateRegister(deviceCommandUpdated, false, function (error, data) {
-                iotAgentLib.getDevice(deviceCommandUpdated.id, 'smartgondor', 'gardens', function (
-                    error,
-                    deviceResult
-                ) {
-                    should.not.exist(error);
-                    should.exist(deviceResult);
-                    deviceResult.internalId.should.equal(deviceUpdated.internalId);
-                    deviceResult.commands[0].name.should.equal('move');
-                    deviceResult.active[0].name.should.equal('temperature');
-                    done();
-                });
+                iotAgentLib.getDevice(
+                    deviceCommandUpdated.id,
+                    'smartgondor',
+                    'gardens',
+                    function (error, deviceResult) {
+                        should.not.exist(error);
+                        should.exist(deviceResult);
+                        deviceResult.internalId.should.equal(deviceUpdated.internalId);
+                        deviceResult.commands[0].name.should.equal('move');
+                        deviceResult.active[0].name.should.equal('temperature');
+                        done();
+                    }
+                );
             });
         });
     });

package/test/unit/ngsiv2/provisioning/listProvisionedDevices-test.js

@@ -42,6 +42,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

package/test/unit/ngsiv2/provisioning/provisionDeviceMultientity-test.js

@@ -41,6 +41,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

package/test/unit/ngsiv2/provisioning/removeProvisionedDevice-test.js

@@ -42,6 +42,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

package/test/unit/ngsiv2/provisioning/singleConfigurationMode-test.js

@@ -41,6 +41,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

package/test/unit/ngsiv2/provisioning/updateProvisionedDevices-test.js

@@ -42,6 +42,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

package/test/unit/plugins/capture-configuration-inPlugins_test.js

@@ -35,7 +35,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/plugins/capture-provision-inPlugins_test.js

@@ -37,7 +37,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {