iotagent-node-lib 3.4.3 → 4.0.0

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

@@ -156,6 +156,52 @@ const iotAgentConfig = {
                     }
                 }
             ]
+        },
+        StupidDevice: {
+            type: 'StupidDevice',
+            commands: [],
+            lazy: [],
+            staticAttributes: [],
+            active: [
+                {
+                    name: 'type',
+                    object_id: 't',
+                    type: 'text'
+                },
+                {
+                    name: 'id',
+                    object_id: 'i',
+                    type: 'text'
+                },
+                {
+                    name: 'meas',
+                    object_id: 'm',
+                    type: 'String'
+                }
+            ]
+        },
+        StupidDevice2: {
+            type: 'StupidDevice2',
+            commands: [],
+            lazy: [],
+            staticAttributes: [],
+            active: [
+                {
+                    name: 'type',
+                    object_id: 'type',
+                    type: 'text'
+                },
+                {
+                    name: 'id',
+                    object_id: 'id',
+                    type: 'text'
+                },
+                {
+                    name: 'meas',
+                    object_id: 'meas',
+                    type: 'String'
+                }
+            ]
         }
     },
     service: 'smartgondor',
@@ -331,7 +377,6 @@ describe('NGSI-v2 - Active attributes test', function () {
             ];
 
             timekeeper.freeze(time);
-
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
@@ -856,6 +901,147 @@ describe('NGSI-v2 - Active attributes test', function () {
         });
     });
 
+    describe('When the IoT Agent receives autoprovisioned id and type measures', function () {
+        const valuesIdType = [
+            {
+                name: 'id',
+                type: 'text',
+                value: 'idIoTA'
+            },
+            {
+                name: 'type',
+                type: 'text',
+                value: 'typeIoTA'
+            },
+            {
+                name: 'm',
+                type: 'text',
+                value: 'measIoTA'
+            }
+        ];
+
+        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: 'stupiddevice1',
+                    type: 'StupidDevice',
+                    meas: {
+                        value: 'measIoTA',
+                        type: 'String'
+                    }
+                })
+                .reply(204);
+
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
+
+        it('should not affect to the real ID and Type to store in the context broker', function (done) {
+            iotAgentLib.update('stupiddevice1', 'StupidDevice', '', valuesIdType, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
+    describe('When the IoT Agent receives provisioned id and type measures with different object_id names', function () {
+        const valuesIdType2 = [
+            {
+                name: 'i',
+                type: 'text',
+                value: 'idIoTA2'
+            },
+            {
+                name: 't',
+                type: 'text',
+                value: 'typeIoTA2'
+            },
+            {
+                name: 'm',
+                type: 'text',
+                value: 'measIoTA2'
+            }
+        ];
+
+        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: 'stupiddevice2',
+                    type: 'StupidDevice',
+                    meas: {
+                        value: 'measIoTA2',
+                        type: 'String'
+                    }
+                })
+                .reply(204);
+
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
+
+        it('should not affect to the real ID and Type to store in the context broker', function (done) {
+            iotAgentLib.update('stupiddevice2', 'StupidDevice', '', valuesIdType2, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
+    describe('When the IoT Agent receives provisioned id and type measures with the same object_id name', function () {
+        const valuesIdType3 = [
+            {
+                name: 'id',
+                type: 'text',
+                value: 'idIoTA'
+            },
+            {
+                name: 'type',
+                type: 'text',
+                value: 'typeIoTA'
+            },
+            {
+                name: 'meas',
+                type: 'text',
+                value: 'measIoTA'
+            }
+        ];
+
+        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: 'stupiddevice3',
+                    type: 'StupidDevice2',
+                    meas: {
+                        value: 'measIoTA',
+                        type: 'String'
+                    }
+                })
+                .reply(204);
+
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
+
+        it('should not affect to the real ID and Type to store in the context broker', function (done) {
+            iotAgentLib.update('stupiddevice3', 'StupidDevice2', '', valuesIdType3, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
     describe('When the IoT Agent receives new information from a device and CBis defined using environment variables', function () {
         beforeEach(function (done) {
             process.env.IOTA_CB_HOST = 'cbhost';
@@ -873,6 +1059,7 @@ describe('NGSI-v2 - Active attributes test', function () {
 
             iotAgentLib.activate(iotAgentConfig, done);
         });
+
         it('should change the value of the corresponding attribute in the context broker', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);

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();