iotagent-node-lib 2.26.0 → 3.1.0

package/test/unit/ngsi-ld/plugins/compress-timestamp-plugin_test.js

@@ -37,7 +37,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -123,8 +124,6 @@ describe('NGSI-LD - 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();
             });
         });
@@ -214,33 +213,4 @@ describe('NGSI-LD - 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')
-                .get('/ngsi-ld/v1/entities/urn:ngsi-ld:Light:light1?attrs=state,TheTargetValue')
-                .reply(
-                    200,
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/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/ngsi-ld/plugins/multientity-plugin_test.js

@@ -41,7 +41,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         WeatherStation: {
@@ -246,9 +247,6 @@ describe('NGSI-LD - Multi-entity plugin', function () {
         logger.setLevel('FATAL');
         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);
                 done();
             });
         });
@@ -614,15 +612,9 @@ describe('NGSI-LD - Multi-entity plugin', function () {
 
 describe('NGSI-LD - Multi-entity plugin is executed before timestamp process plugin', function () {
     beforeEach(function (done) {
-        logger.setLevel('FATAL');
-
         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();
             });
         });
@@ -731,13 +723,26 @@ describe('NGSI-LD - Multi-entity plugin is executed before timestamp process plu
         it('should propagate user provider timestamp to mapped entities', function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                    utils.readExampleFile(
+                .post('/ngsi-ld/v1/entityOperations/upsert/?options=update', function (body) {
+                    const expectedBody = utils.readExampleFile(
                         './test/unit/ngsi-ld/examples' +
                             '/contextRequests/updateContextMultientityTimestampPlugin3.json'
-                    )
-                )
+                    );
+
+                    // Note that TimeInstant fields are not included in the json used by this mock as they are dynamic
+                    // fields. The following code just checks that TimeInstant fields are present.
+                    if (!body[1].humidity.observedAt) {
+                        return false;
+                    }
+
+                    const timeInstantAtt = body[1].humidity.observedAt;
+                    if (moment(timeInstantAtt, 'YYYY-MM-DDTHH:mm:ss.SSSZ').isValid) {
+                        delete body[1].humidity.observedAt;
+                        delete expectedBody[1].humidity.observedAt;
+                        return JSON.stringify(body) === JSON.stringify(expectedBody);
+                    }
+                    return false;
+                })
                 .reply(204);
 
             const tsValue = [
@@ -772,10 +777,6 @@ describe('NGSI-LD - 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();
             });
         });

package/test/unit/ngsi-ld/plugins/timestamp-processing-plugin_test.js

@@ -28,6 +28,7 @@ const utils = require('../../../tools/utils');
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
+const moment = require('moment');
 let contextBrokerMock;
 const iotAgentConfig = {
     contextBroker: {
@@ -37,7 +38,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -68,7 +70,6 @@ describe('NGSI-LD - Timestamp processing plugin', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.timestampProcess.update);
                 done();
             });
         });
@@ -98,12 +99,25 @@ describe('NGSI-LD - Timestamp processing plugin', function () {
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                    utils.readExampleFile(
+                .post('/ngsi-ld/v1/entityOperations/upsert/?options=update', function (body) {
+                    const expectedBody = utils.readExampleFile(
                         './test/unit/ngsi-ld/examples/contextRequests/updateContextProcessTimestamp.json'
-                    )
-                )
+                    );
+
+                    // Note that TimeInstant fields are not included in the json used by this mock as they are dynamic
+                    // fields. The following code just checks that TimeInstant fields are present.
+                    if (!body[0].state.observedAt) {
+                        return false;
+                    }
+
+                    const timeInstantAtt = body[0].state.observedAt;
+                    if (moment(timeInstantAtt, 'YYYY-MM-DDTHH:mm:ss.SSSZ').isValid) {
+                        delete body[0].state.observedAt;
+                        delete expectedBody[0].state.observedAt;
+                        return JSON.stringify(body) === JSON.stringify(expectedBody);
+                    }
+                    return false;
+                })
                 .reply(204);
         });
 

package/test/unit/ngsi-ld/provisioning/device-provisioning-api_test.js

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

package/test/unit/ngsi-ld/provisioning/device-registration_test.js

@@ -41,7 +41,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsi-ld/provisioning/device-update-registration_test.js

@@ -40,7 +40,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -244,17 +245,19 @@ describe('NGSI-LD - 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/ngsi-ld/provisioning/listProvisionedDevices-test.js

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

package/test/unit/ngsi-ld/provisioning/provisionDeviceMultientity-test.js

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

package/test/unit/ngsi-ld/provisioning/removeProvisionedDevice-test.js

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

package/test/unit/ngsi-ld/provisioning/singleConfigurationMode-test.js

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

package/test/unit/ngsi-ld/provisioning/updateProvisionedDevices-test.js

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

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

@@ -40,6 +40,7 @@ const iotAgentConfig = {
     server: {
         name: 'testAgent',
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},
@@ -268,13 +269,18 @@ describe('Mixed Mode: ngsiVersion test', function () {
             });
         });
         it('should operate using NGSI-v2', function (done) {
-            iotAgentLib.update('light2', 'Device', 'v2-test', values, { ngsiVersion: 'v2', type: 'Device' }, function (
-                error
-            ) {
-                should.not.exist(error);
-                contextBrokerMock.done();
-                done();
-            });
+            iotAgentLib.update(
+                'light2',
+                'Device',
+                'v2-test',
+                values,
+                { ngsiVersion: 'v2', type: 'Device' },
+                function (error) {
+                    should.not.exist(error);
+                    contextBrokerMock.done();
+                    done();
+                }
+            );
         });
     });
 });

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

@@ -9,10 +9,10 @@
   },
   "pressure": {
     "type":"Number",
-    "value":20071103,
+    "value":"20071103T131805",
     "metadata": {
       "type":"Property",
       "value":"Hgmm"
     }
   }
-}
+}

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

@@ -7,6 +7,12 @@
         52
       ],
       "type": "Point"
+    },
+    "metadata": {
+        "TimeInstant": {
+            "type": "DateTime",
+            "value": "1970-01-01T00:00:00.001Z"
+        }
     }
   },
   "TimeInstant": {

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

@@ -1,6 +1,10 @@
 {
   "actionType": "update",
-  "entities": [
+    "entities": [
+    {
+        "id": "ws11",
+        "type": "WrongStation"
+    },
     {
       "id": "WrongStation1",
       "type": "WrongStation",

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

@@ -5,19 +5,19 @@
       "type": "WeatherStation"
     },
     {
-      "id": "Higro2002",
+      "id": "Higro2000",
       "type": "Higrometer",
       "pressure": {
         "type": "Hgmm",
-        "value": "17"
+        "value": "16"
       }
     },
     {
-      "id": "Higro2000",
+      "id": "Higro2002",
       "type": "Higrometer",
       "pressure": {
         "type": "Hgmm",
-        "value": "16"
+        "value": "17"
       }
     }
   ]

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

@@ -12,22 +12,6 @@
                 },
                 "type": "WM",
                 "id": "SO1"
-            },
-            {
-                "type": "WM",
-                "id": "SO2"
-            },
-            {
-                "type": "WM",
-                "id": "SO3"
-            },
-            {
-                "type": "WM",
-                "id": "SO4"
-            },
-            {
-                "type": "WM",
-                "id": "SO5"
             }
         ]
 }

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

@@ -29,10 +29,6 @@
                 "type": "WM",
                 "id": "SO3"
             },
-            {
-                "type": "WM",
-                "id": "SO4"
-            },
             {
                 "vol": {
                     "type": "number",

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

@@ -5,6 +5,14 @@
       "id": "ws7",
       "type": "WeatherStation"
     },
+    {
+      "pressure": {
+        "type": "Hgmm",
+        "value": "16"
+      },
+      "type": "Higrometer",
+      "id": "Higro2000"
+    },
     {
       "pressure": {
         "type": "Hgmm",
@@ -18,14 +26,6 @@
       },
       "type": "Higrometer",
       "id": "Higro2002"
-    },
-    {
-      "pressure": {
-        "type": "Hgmm",
-        "value": "16"
-      },
-      "type": "Higrometer",
-      "id": "Higro2000"
     }
   ]
 }

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

@@ -1,45 +1,45 @@
 {
-  "actionType": "update",
-  "entities": [
-    {
-      "pressure": {
-        "type": "Hgmm",
-        "value": "52",
-        "metadata": {
-          "TimeInstant": {
-            "type": "DateTime",
-            "value": "2016-05-30T16:25:22.304Z"
-          }
+    "entities": [
+        {
+            "id": "ws4",
+            "type": "WeatherStation",
+            "TimeInstant": {
+                "type": "DateTime",
+                "value": "2016-05-30T16:25:22.304Z"
+            },
+            "pressure": {
+                "value": "52",
+                "type": "Hgmm",
+                "metadata": {
+                    "TimeInstant": {
+                        "type": "DateTime",
+                        "value": "2016-05-30T16:25:22.304Z"
+                    }
+                }
+            }
+        },
+        {
+            "id": "Higro2000",
+            "type": "Higrometer",
+            "humidity": {
+                "value": "12",
+                "type": "Percentage",
+                "metadata": {
+                    "unitCode": {
+                        "type": "Text",
+                        "value": "Hgmm"
+                    },
+                    "TimeInstant": {
+                        "type": "DateTime",
+                        "value": "2016-05-30T16:25:22.304Z"
+                    }
+                }
+            },
+            "TimeInstant": {
+                "type": "DateTime",
+                "value": "2016-05-30T16:25:22.304Z"
+            }
         }
-      },
-      "TimeInstant": {
-        "type": "DateTime",
-        "value": "2016-05-30T16:25:22.304Z"
-      },
-      "id": "ws4",
-      "type": "WeatherStation"
-    },
-    {
-      "humidity": {
-        "type": "Percentage",
-        "value": "12",
-        "metadata": {
-          "unitCode": {
-            "type": "Text",
-            "value": "Hgmm"
-          },
-          "TimeInstant": {
-            "type": "DateTime",
-            "value": "2016-05-30T16:25:22.304Z"
-          }
-        }
-      },
-      "TimeInstant": {
-        "type": "DateTime",
-        "value": "2016-05-30T16:25:22.304Z"
-      },
-      "id": "Higro2000",
-      "type": "Higrometer"
-    }
-  ]
+    ],
+    "actionType": "update"
 }

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

@@ -1,14 +1,15 @@
 {
-  "actionType": "update",
   "entities": [
     {
       "id": "ws4",
       "type": "WeatherStation"
     },
     {
-      "humidity": {
-          "type": "Percentage",
+      "id": "Higro2000",
+      "type": "Higrometer",
+        "humidity": {
           "value": "12",
+          "type": "Percentage",
           "metadata": {
               "TimeInstant": {
                   "type": "DateTime",
@@ -20,9 +21,8 @@
       "TimeInstant": {
           "type": "DateTime",
           "value": "2018-06-13T13:28:34.611Z"
-      },
-      "id": "Higro2000",
-      "type": "Higrometer"
+      }
     }
-  ]
+  ],
+  "actionType": "update"
 }

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

@@ -1,8 +1,4 @@
 {
-  "actionType": "update",
-  "entities": [{
-    "id": "sensorCommand",
-    "type": "SensorCommand",
     "PING_status": {
       "type": "commandStatus",
       "value": "OK",
@@ -27,5 +23,4 @@
       "type": "DateTime",
       "value": "2015-08-05T07:35:01.468Z"
     }
-  }]
 }

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

@@ -1,13 +1,13 @@
 {
   "state":{
     "type": "Boolean",
-    "value": true,
-    "metadata": {
-      "TimeInstant":{
-        "type": "DateTime",
-        "value": "2016-05-30T16:25:22.304Z"
+      "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",