iotagent-node-lib 3.4.4 → 4.0.1

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

@@ -377,7 +377,6 @@ describe('NGSI-v2 - Active attributes test', function () {
             ];
 
             timekeeper.freeze(time);
-
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
@@ -922,7 +921,6 @@ describe('NGSI-v2 - Active attributes test', function () {
         ];
 
         beforeEach(function (done) {
-
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
@@ -970,7 +968,6 @@ describe('NGSI-v2 - Active attributes test', function () {
         ];
 
         beforeEach(function (done) {
-
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
@@ -1018,7 +1015,6 @@ describe('NGSI-v2 - Active attributes test', function () {
         ];
 
         beforeEach(function (done) {
-
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')

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

@@ -75,6 +75,102 @@ const iotAgentConfig = {
                     type: 'type4'
                 }
             ]
+        },
+        Light_Explicit_True: {
+            commands: [],
+            type: 'Light_Explicit_True',
+            explicitAttrs: true,
+            timestamp: false,
+            active: [
+                {
+                    name: 'pressure',
+                    type: 'Number'
+                }
+            ],
+            staticAttributes: [
+                {
+                    name: 'attr1',
+                    type: 'Text',
+                    value: 'Static Text'
+                },
+                {
+                    name: 'attr2',
+                    type: 'Number',
+                    value: 123
+                }
+            ]
+        },
+        Light_Explicit_False: {
+            commands: [],
+            type: 'Light_Explicit_False',
+            explicitAttrs: false,
+            timestamp: false,
+            active: [
+                {
+                    name: 'pressure',
+                    type: 'Number'
+                }
+            ],
+            staticAttributes: [
+                {
+                    name: 'attr1',
+                    type: 'Text',
+                    value: 'Static Text'
+                },
+                {
+                    name: 'attr2',
+                    type: 'Number',
+                    value: 123
+                }
+            ]
+        },
+        Light_Explicit_Array: {
+            commands: [],
+            type: 'Light_Explicit_Array',
+            explicitAttrs: '[ "pressure", "attr1" ]',
+            timestamp: false,
+            active: [
+                {
+                    name: 'pressure',
+                    type: 'Number'
+                }
+            ],
+            staticAttributes: [
+                {
+                    name: 'attr1',
+                    type: 'Text',
+                    value: 'Static Text'
+                },
+                {
+                    name: 'attr2',
+                    type: 'Number',
+                    value: 123
+                }
+            ]
+        },
+        Light_Explicit_Expression: {
+            commands: [],
+            type: 'Light_Explicit_Expression',
+            explicitAttrs: ' pressure ? [ "pressure", "attr1" ] : [ "attr2" ] ',
+            timestamp: false,
+            active: [
+                {
+                    name: 'pressure',
+                    type: 'Number'
+                }
+            ],
+            staticAttributes: [
+                {
+                    name: 'attr1',
+                    type: 'Text',
+                    value: 'Static Text'
+                },
+                {
+                    name: 'attr2',
+                    type: 'Number',
+                    value: 123
+                }
+            ]
         }
     },
     timestamp: true,
@@ -146,4 +242,175 @@ describe('NGSI-v2 - Static attributes test', function () {
             );
         });
     });
+
+    describe('When using explicitAttrs true', function () {
+        const newValues = [
+            {
+                name: 'pressure',
+                type: 'Number',
+                value: 321
+            }
+        ];
+
+        beforeEach(function (done) {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .post('/v2/entities?options=upsert', {
+                    id: 'light2',
+                    type: 'Light_Explicit_True',
+                    pressure: {
+                        value: 321,
+                        type: 'Number'
+                    },
+                    attr1: {
+                        value: 'Static Text',
+                        type: 'Text'
+                    },
+                    attr2: {
+                        value: 123,
+                        type: 'Number'
+                    }
+                })
+                .reply(204);
+
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
+
+        it('should include all the statics', function (done) {
+            iotAgentLib.update('light2', 'Light_Explicit_True', '', newValues, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
+    describe('When using explicitAttrs false', function () {
+        const newValues = [
+            {
+                name: 'pressure',
+                type: 'Number',
+                value: 321
+            }
+        ];
+
+        beforeEach(function (done) {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .post('/v2/entities?options=upsert', {
+                    id: 'light2',
+                    type: 'Light_Explicit_True',
+                    pressure: {
+                        value: 321,
+                        type: 'Number'
+                    },
+                    attr1: {
+                        value: 'Static Text',
+                        type: 'Text'
+                    },
+                    attr2: {
+                        value: 123,
+                        type: 'Number'
+                    }
+                })
+                .reply(204);
+
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
+
+        it('should include all the statics', function (done) {
+            iotAgentLib.update('light2', 'Light_Explicit_True', '', newValues, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
+    describe('When using explicitAttrs as array', function () {
+        const newValues = [
+            {
+                name: 'pressure',
+                type: 'Number',
+                value: 321
+            }
+        ];
+
+        beforeEach(function (done) {
+            nock.cleanAll();
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .post('/v2/entities?options=upsert', {
+                    id: 'light2',
+                    type: 'Light_Explicit_Array',
+                    pressure: {
+                        value: 321,
+                        type: 'Number'
+                    },
+                    attr1: {
+                        value: 'Static Text',
+                        type: 'Text'
+                    }
+                })
+                .reply(204);
+
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
+
+        it('should include only statics defined into the array', function (done) {
+            iotAgentLib.update('light2', 'Light_Explicit_Array', '', newValues, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
+    describe('When using explicitAttrs as expression', function () {
+        const newValues = [
+            {
+                name: 'pressure',
+                type: 'Number',
+                value: 321
+            }
+        ];
+
+        beforeEach(function (done) {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .post('/v2/entities?options=upsert', {
+                    id: 'light2',
+                    type: 'Light_Explicit_Expression',
+                    pressure: {
+                        value: 321,
+                        type: 'Number'
+                    },
+                    attr1: {
+                        value: 'Static Text',
+                        type: 'Text'
+                    }
+                })
+                .reply(204);
+
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
+
+        it('should include statics as the result on the expression', function (done) {
+            iotAgentLib.update('light2', 'Light_Explicit_Expression', '', newValues, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
 });

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

@@ -32,7 +32,6 @@ const logger = require('logops');
 const nock = require('nock');
 let contextBrokerMock;
 const iotAgentConfig = {
-    autocast: true,
     contextBroker: {
         host: '192.168.1.1',
         port: '1026',
@@ -90,7 +89,8 @@ const iotAgentConfig = {
                 {
                     object_id: 'al',
                     name: 'keep_alive',
-                    type: 'None'
+                    type: 'None',
+                    skipValue: 'null passes'
                 },
                 {
                     object_id: 'ta',
@@ -113,7 +113,6 @@ const iotAgentConfig = {
 describe('NGSI-v2 - Attribute alias plugin', function () {
     beforeEach(function (done) {
         logger.setLevel('FATAL');
-
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
                 done();
@@ -131,7 +130,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             {
                 name: 't',
                 type: 'centigrades',
-                value: '52'
+                value: 52
             },
             {
                 name: 'p',
@@ -153,7 +152,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -166,7 +165,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             {
                 name: 'l',
                 type: 'lums',
-                value: '9'
+                value: 9
             }
         ];
 
@@ -183,7 +182,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -196,7 +195,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             {
                 name: 'ut',
                 type: 'Number',
-                value: '99823423'
+                value: 99823423
             }
         ];
 
@@ -227,7 +226,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             {
                 name: 'ut',
                 type: 'Number',
-                value: '99823423'
+                value: 99823423
             }
         ];
 
@@ -244,7 +243,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -258,7 +257,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             {
                 name: 'ap',
                 type: 'Number',
-                value: '0.45'
+                value: 0.45
             }
         ];
 
@@ -275,7 +274,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -306,7 +305,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -320,13 +319,12 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             {
                 name: 'al',
                 type: 'None',
-                value: 'null'
+                value: null
             }
         ];
 
         beforeEach(function () {
             nock.cleanAll();
-
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
@@ -337,7 +335,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -351,7 +349,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             {
                 name: 'ta',
                 type: 'Array',
-                value: '["iot","device"]'
+                value: ['iot', 'device']
             }
         ];
 
@@ -368,7 +366,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -382,7 +380,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
             {
                 name: 'c',
                 type: 'Object',
-                value: '{"firmware": {"version": "1.1.0","hash": "cf23df2207d99a74fbe169e3eba035e633b65d94"}}'
+                value: { firmware: { version: '1.1.0', hash: 'cf23df2207d99a74fbe169e3eba035e633b65d94' } }
             }
         ];
 
@@ -399,7 +397,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -430,7 +428,7 @@ describe('NGSI-v2 - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();

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

@@ -272,7 +272,7 @@ const iotAgentConfig = {
             commands: [],
             type: 'WeatherStation',
             lazy: [],
-            static: [
+            staticAttributes: [
                 {
                     name: 'st1',
                     type: 'Number',
@@ -522,7 +522,13 @@ const iotAgentConfig = {
                     expression: 'z+1'
                 },
                 {
-                    name: 'nonexpectedAtt',
+                    name: 'alsoexpectedAtt',
+                    type: 'number',
+                    expression: 'w+1',
+                    skipValue: 'loquesea'
+                },
+                {
+                    name: 'nonexpectedAttByDefaultSkipValue',
                     type: 'number',
                     expression: 'w+1'
                 },
@@ -564,7 +570,7 @@ const iotAgentConfig = {
                     object_id: 'y'
                 }
             ],
-            static: [
+            staticAttributes: [
                 {
                     name: 'bar',
                     type: 'text',
@@ -600,7 +606,7 @@ const iotAgentConfig = {
 
 describe('NGSI-v2 - Multi-entity plugin', function () {
     beforeEach(function (done) {
-        logger.setLevel('DEBUG');
+        logger.setLevel('FATAL');
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
@@ -702,7 +708,6 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
 
         beforeEach(function () {
             nock.cleanAll();
-
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
@@ -740,7 +745,6 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
 
         beforeEach(function () {
             nock.cleanAll();
-
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
@@ -779,7 +783,6 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
 
         beforeEach(function () {
             nock.cleanAll();
-
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
@@ -1120,7 +1123,7 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
                 .post(
                     '/v2/op/update',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin10.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin10b.json'
                     )
                 )
                 .reply(204);
@@ -1151,7 +1154,7 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
             .reply(204);
     });
 
-    describe('When an update comes for a multientity whith a wrong mapping)', function () {
+    describe('When an update comes for a multientity whith a wrong mapping', function () {
         const values = [
             {
                 name: 'v',
@@ -1172,7 +1175,6 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
 
         beforeEach(function () {
             nock.cleanAll();
-
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
@@ -1372,7 +1374,6 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
 
             beforeEach(function () {
                 nock.cleanAll();
-
                 contextBrokerMock = nock('http://192.168.1.1:1026')
                     .matchHeader('fiware-service', 'smartgondor')
                     .matchHeader('fiware-servicepath', 'gardens')
@@ -1424,7 +1425,6 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
 
             beforeEach(function () {
                 nock.cleanAll();
-
                 contextBrokerMock = nock('http://192.168.1.1:1026')
                     .matchHeader('fiware-service', 'smartgondor')
                     .matchHeader('fiware-servicepath', 'gardens')
@@ -1489,7 +1489,6 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
 describe('NGSI-v2 - 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 () {
@@ -1560,7 +1559,7 @@ describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plu
 
                         delete expectedBody.entities[1].TimeInstant;
                         delete expectedBody.entities[1].humidity.metadata.TimeInstant;
-                        return JSON.stringify(body) === JSON.stringify(expectedBody);
+                        return utils.deepEqual(body, expectedBody);
                     }
                     return false;
                 })
@@ -1583,22 +1582,22 @@ describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plu
                     );
                     // 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.entities[1].TimeInstant || !body.entities[1].humidity.metadata.TimeInstant) {
+                    if (!body.entities[0].TimeInstant || !body.entities[0].humidity.metadata.TimeInstant) {
                         return false;
                     }
 
-                    const timeInstantEntity2 = body.entities[1].TimeInstant;
-                    const timeInstantAtt = body.entities[1].humidity.metadata.TimeInstant;
+                    const timeInstantEntity2 = body.entities[0].TimeInstant;
+                    const timeInstantAtt = body.entities[0].humidity.metadata.TimeInstant;
                     if (
                         moment(timeInstantEntity2, 'YYYY-MM-DDTHH:mm:ss.SSSZ').isValid &&
                         moment(timeInstantAtt, 'YYYY-MM-DDTHH:mm:ss.SSSZ').isValid
                     ) {
-                        delete body.entities[1].TimeInstant;
-                        delete body.entities[1].humidity.metadata.TimeInstant;
+                        delete body.entities[0].TimeInstant;
+                        delete body.entities[0].humidity.metadata.TimeInstant;
 
-                        delete expectedBody.entities[1].TimeInstant;
-                        delete expectedBody.entities[1].humidity.metadata.TimeInstant;
-                        return JSON.stringify(body) === JSON.stringify(expectedBody);
+                        delete expectedBody.entities[0].TimeInstant;
+                        delete expectedBody.entities[0].humidity.metadata.TimeInstant;
+                        return utils.deepEqual(body, expectedBody);
                     }
                     return false;
                 })
@@ -1636,7 +1635,6 @@ describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plu
                     value: '2018-06-13T13:28:34.611Z'
                 }
             ];
-
             iotAgentLib.update('ws5', 'WeatherStation', '', tsValue, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -1649,7 +1647,6 @@ describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plu
 describe('NGSI-v2 - Multi-entity plugin is executed for a command update for a regular entity ', function () {
     beforeEach(function (done) {
         logger.setLevel('FATAL');
-
         iotAgentConfig.timestamp = true;
         const time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
         timekeeper.freeze(time);