iotagent-node-lib 3.0.0 → 3.2.0

package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin25.json

@@ -0,0 +1,37 @@
+{
+  "actionType": "update",
+  "entities": [
+    {
+      "id": "gps1",
+      "type": "GPS",
+      "explicit": {
+        "type": "number",
+        "value": 12
+      },
+      "expectedAtt": {
+          "type": "number",
+          "value": 13
+      },
+      "nonexpectedAtt": {
+          "type": "number",
+          "value": null
+      }        
+    },
+    {
+      "explicit": {
+        "type": "number",
+        "value": 52
+      },
+      "type": "GPS",
+      "id": "SO5"
+    },
+    {
+      "explicit": {
+        "type": "number",
+        "value": 13
+      },
+      "type": "GPS",
+      "id": "SO6"
+    }
+  ]
+}

package/test/unit/ngsiv2/examples/contextRequests/updateContextProcessTimestamp.json

@@ -1,7 +1,13 @@
 {
   "state":{
     "type": "Boolean",
-    "value": true
+      "value": true,
+      "metadata": {
+          "TimeInstant": {
+              "type": "DateTime",
+              "value": "2016-05-30T16:25:22.304Z"
+          }
+      }
   },
   "TimeInstant":
   {

package/test/unit/ngsiv2/examples/contextRequests/updateContextTimestampOverride.json

@@ -1,7 +1,13 @@
 {
   "state": {
     "value": true,
-    "type": "boolean"
+    "type": "boolean",
+    "metadata": {
+        "TimeInstant":{
+            "type": "DateTime",
+            "value": "2015-12-14T08:06:01.468Z"
+        }
+    }
   },
   "TimeInstant":{
     "type": "DateTime",

package/test/unit/ngsiv2/examples/contextRequests/updateContextTimestampOverrideWithoutMilis.json

@@ -1,7 +1,13 @@
 {
   "state": {
     "value": true,
-    "type": "boolean"
+    "type": "boolean",
+    "metadata": {
+        "TimeInstant":{
+            "type": "DateTime",
+            "value": "2022-10-22T22:22:22Z"
+        }
+    }
   },
   "TimeInstant":{
     "type": "DateTime",

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

@@ -39,9 +39,9 @@ const iotAgentConfig = {
         port: '1026',
         ngsiVersion: 'v2'
     },
-    defaultExpressionLanguage: 'jexl',
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -125,7 +125,7 @@ const iotAgentConfig = {
                 {
                     name: 'weather',
                     type: 'Summary',
-                    expression: '"Humidity " + (humidity / 2) + " and pressure " + (pressure * 20)'
+                    expression: '"Humidity " + (humidity / 2) + " and pressure " + (p * 20)'
                 },
                 {
                     object_id: 'a',
@@ -249,6 +249,24 @@ const iotAgentConfig = {
             ],
             explicitAttrs: true
         },
+        GPS2b: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            active: [
+                {
+                    name: 'location',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                },
+                {
+                    name: 'temperature',
+                    type: 'Number',
+                    expression: 't * 10'
+                }
+            ],
+            explicitAttrs: true
+        },
         GPS3: {
             commands: [],
             type: 'GPS',
@@ -320,8 +338,31 @@ const iotAgentConfig = {
                 }
             ],
             explicitAttrs: "theLocation ? ['mylocation'] :  []"
-            // #1267 this is not working:
-            //explicitAttrs: "theLocation ? [{object_id: 'theLocation'}] :  []"
+        },
+        GPS5b: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            static: [
+                {
+                    name: 'lat',
+                    type: 'string',
+                    value: '52'
+                }
+            ],
+            active: [
+                {
+                    name: 'price',
+                    type: 'number'
+                },
+                {
+                    object_id: 'theLocation',
+                    name: 'mylocation',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                }
+            ],
+            explicitAttrs: "theLocation ? [{object_id: 'theLocation'}] : []"
         },
         GPS6: {
             commands: [],
@@ -387,9 +428,9 @@ const iotAgentConfigTS = {
         port: '1026',
         ngsiVersion: 'v2'
     },
-    defaultExpressionLanguage: 'jexl',
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         GPS: {
@@ -404,6 +445,57 @@ const iotAgentConfigTS = {
                 }
             ],
             explicitAttrs: true
+        },
+        WaterTank: {
+            commands: [],
+            type: 'WaterTank',
+            lazy: [],
+            active: [
+                {
+                    object_id: 'cnt2',
+                    name: 'contA',
+                    type: 'Number'
+                },
+                {
+                    object_id: 'cnt3',
+                    name: 'contB',
+                    type: 'Number'
+                },
+                {
+                    object_id: 'false2',
+                    name: 'waterLeavingTanks',
+                    type: 'Number',
+                    expression: 'cnt2*0.1',
+                    entity_name: 'PA_A_0001',
+                    entity_type: 'WaterTank'
+                },
+                {
+                    object_id: 'false3',
+                    name: 'waterLeavingTanks',
+                    type: 'Number',
+                    expression: 'cnt3*0.1',
+                    entity_name: 'PA_B_0001',
+                    entity_type: 'WaterTank'
+                },
+                {
+                    object_id: 'foostatus2',
+                    name: 'status',
+                    type: 'Text',
+                    expression: 'status',
+                    entity_name: 'PA_A_0001',
+                    entity_type: 'WaterTank'
+                },
+                {
+                    object_id: 'foostatus3',
+                    name: 'status',
+                    type: 'Text',
+                    expression: 'status',
+                    entity_name: 'PA_B_0001',
+                    entity_type: 'WaterTank'
+                }
+            ],
+            explicitAttrs:
+                "contA&&contB?['TimeInstant','contA',{object_id:'false2'},'contB',{object_id:'false3'},'status']:contA?['TimeInstant','contA',{object_id:'false2'},{object_id:'foostatus2'}]:contB?['TimeInstant','contB',{object_id:'false3'},{object_id:'foostatus3'}]:[]"
         }
     },
     timestamp: true,
@@ -1078,7 +1170,7 @@ describe('Java expression language (JEXL) based transformations plugin', functio
                 .patch(
                     '/v2/entities/gps1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin35.json'
                     )
                 )
                 .query({ type: 'GPS' })
@@ -1094,6 +1186,56 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
+    describe('When there is an extra measure sent by the device to be removed', function () {
+        // Case: Expression which results is sent as a new attribute
+        const values = [
+            {
+                name: 'lat',
+                type: 'Number',
+                value: 52
+            },
+            {
+                name: 'lon',
+                type: 'Number',
+                value: 13
+            },
+            {
+                name: 'another',
+                type: 'Number',
+                value: 99
+            },
+            {
+                name: 'TimeInstant',
+                type: 'DateTime',
+                value: '2015-08-05T07:35:01.468+00:00'
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .patch(
+                    '/v2/entities/gps1/attrs',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin41.json'
+                    )
+                )
+                .query({ type: 'GPS' })
+                .reply(204);
+        });
+
+        it('should calculate them and remove non-explicitAttrs from the payload', function (done) {
+            iotAgentLib.update('gps1', 'GPS2b', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
     describe('When there is an extra TimeInstant sent by the device to be removed by string', function () {
         // Case: Expression which results is sent as a new attribute
         const values = [
@@ -1234,6 +1376,46 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
+    describe('When there is an extra TimeInstant sent by the device to be removed by jexl expression with context defined with object_id', function () {
+        // Case: Expression which results is sent as a new attribute
+        const values = [
+            {
+                name: 'lon',
+                type: 'Number',
+                value: 13
+            },
+            {
+                name: 'TimeInstant',
+                type: 'DateTime',
+                value: '2015-08-05T07:35:01.468+00:00'
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .patch(
+                    '/v2/entities/gps1/attrs',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin36.json'
+                    )
+                )
+                .query({ type: 'GPS' })
+                .reply(204);
+        });
+
+        it('should calculate them and remove non-explicitAttrs by jexl expression with context from the payload ', function (done) {
+            iotAgentLib.update('gps1', 'GPS5b', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
     describe('When there is an extra TimeInstant sent by the device to be removedb jexl expression using static attrs', function () {
         // Case: Expression which results is sent as a new attribute
         const values = [
@@ -1376,4 +1558,46 @@ describe('Java expression language (JEXL) based transformations plugin - Timesta
             });
         });
     });
+
+    describe('When explicitAttrs is a jexl expression in a multientity case', function () {
+        // Case: Expression which results is sent as a new attribute
+        const values = [
+            {
+                name: 'cnt3',
+                type: 'Number',
+                value: '31450.000'
+            }
+        ];
+
+        beforeEach(function () {
+            const time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
+
+            timekeeper.freeze(time);
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .post(
+                    '/v2/op/update',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin40.json'
+                    )
+                )
+                .reply(204);
+        });
+
+        afterEach(function (done) {
+            timekeeper.reset();
+            done();
+        });
+
+        it('should calculate them and not remove the timestamp from the payload', function (done) {
+            iotAgentLib.update('water1', 'WaterTank', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                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: {
@@ -139,8 +140,7 @@ const device4 = {
     type: 'RobotExp',
     service: 'smartgondor',
     subservice: 'gardens',
-    polling: true,
-    expressionLanguage: 'jexl'
+    polling: true
 };
 
 describe('NGSI-v2 - Polling commands', function () {

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: {

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',
@@ -245,11 +246,11 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                 let longitudeFound = false;
 
                 for (let i = 0; i < values.length; i++) {
-                    if (values[i].name === 'latitude' && values[i].type === 'string' && values[i].value === '-9.6') {
+                    if (values[i].name === 'latitude' && values[i].type === 'Number' && values[i].value === -9.6) {
                         latitudeFound = true;
                     }
 
-                    if (values[i].name === 'longitude' && values[i].type === 'string' && values[i].value === '12.4') {
+                    if (values[i].name === 'longitude' && values[i].type === 'Number' && values[i].value === 12.4) {
                         longitudeFound = true;
                     }
                 }
@@ -356,11 +357,11 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                 let longitudeFound = false;
 
                 for (let i = 0; i < values.length; i++) {
-                    if (values[i].name === 'latitude' && values[i].type === 'string' && values[i].value === '-9.6') {
+                    if (values[i].name === 'latitude' && values[i].type === 'Number' && values[i].value === -9.6) {
                         latitudeFound = true;
                     }
 
-                    if (values[i].name === 'longitude' && values[i].type === 'string' && values[i].value === '12.4') {
+                    if (values[i].name === 'longitude' && values[i].type === 'Number' && values[i].value === 12.4) {
                         longitudeFound = true;
                     }
                 }
@@ -502,11 +503,11 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
                 let longitudeFound = false;
 
                 for (let i = 0; i < values.length; i++) {
-                    if (values[i].name === 'latitude' && values[i].type === 'string' && values[i].value === '-9.6') {
+                    if (values[i].name === 'latitude' && values[i].type === 'Number' && values[i].value === -9.6) {
                         latitudeFound = true;
                     }
 
-                    if (values[i].name === 'longitude' && values[i].type === 'string' && values[i].value === '12.4') {
+                    if (values[i].name === 'longitude' && values[i].type === 'Number' && values[i].value === 12.4) {
                         longitudeFound = true;
                     }
                 }

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: {