iotagent-node-lib 2.20.0 → 2.23.0

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

@@ -0,0 +1,27 @@
+{
+  "actionType": "update",
+  "entities": [
+    {
+      "id": "ws9b",
+      "type": "WeatherStation",
+      "pressure": {
+        "type": "Hgmm",
+        "value": "52"
+      }
+    },
+    {
+      "humidity": {
+        "type": "Percentage",
+        "value": "12",
+        "metadata": {
+          "unitCode": {
+            "type": "Text",
+            "value": "Hgmm"
+          }
+        }
+      },
+      "type": "Higrometer",
+      "id": "ws9b"
+    }
+  ]
+}

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

@@ -271,7 +271,7 @@ const iotAgentConfig = {
                     expression: "{coordinates: [lon,lat], type: 'Point'}"
                 }
             ],
-            explicitAttrs: '[ "location" ]'
+            explicitAttrs: ' location&&price ? [ "location", "price" ] : location ? [ "location" ] : []'
         },
         GPS4: {
             commands: [],
@@ -314,12 +314,14 @@ const iotAgentConfig = {
                     type: 'number'
                 },
                 {
-                    name: 'location',
-                    type: 'geo:json',
-                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                    object_id: 'theLocation',
+                    name: 'mylocation',
+                    type: 'geo:json'
                 }
             ],
-            explicitAttrs: '[ myattr ]'
+            explicitAttrs: "theLocation ? ['mylocation'] :  []"
+            // #1267 this is not working:
+            //explicitAttrs: "theLocation ? [{object_id: 'theLocation'}] :  []"
         },
         GPS6: {
             commands: [],
@@ -345,6 +347,30 @@ const iotAgentConfig = {
                 }
             ],
             explicitAttrs: true
+        },
+        GPS7: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            static: [
+                {
+                    name: 'color',
+                    type: 'string',
+                    value: 'blue'
+                }
+            ],
+            active: [
+                {
+                    name: 'price',
+                    type: 'number'
+                },
+                {
+                    name: 'location',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                }
+            ],
+            explicitAttrs: '[ ]'
         }
     },
     service: 'smartgondor',
@@ -1160,9 +1186,9 @@ describe('Java expression language (JEXL) based transformations plugin', functio
                 value: 13
             },
             {
-                name: 'myattr',
-                type: 'String',
-                value: 'location'
+                name: 'theLocation',
+                type: 'geo:json',
+                value: { coordinates: [13, 52], type: 'Point' }
             },
             {
                 name: 'TimeInstant',
@@ -1180,7 +1206,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/updateContextExpressionPlugin36.json'
                     )
                 )
                 .query({ type: 'GPS' })
@@ -1230,6 +1256,43 @@ 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 but with empty explicitAttrs', 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: 'myattr',
+                type: 'String',
+                value: 'location'
+            },
+            {
+                name: 'TimeInstant',
+                type: 'DateTime',
+                value: '2015-08-05T07:35:01.468+00:00'
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+        });
+
+        it('should calculate them and remove non-explicitAttrs by jexl expression with context from the payload ', function (done) {
+            iotAgentLib.update('gps1', 'GPS7', '', values, function (error) {
+                should.not.exist(error);
+                done();
+            });
+        });
+    });
 });
 
 describe('Java expression language (JEXL) based transformations plugin - Timestamps', function () {

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

@@ -98,6 +98,18 @@ const iotAgentConfig = {
             lazy: [],
             staticAttributes: [],
             active: []
+        },
+        RobotExp: {
+            commands: [
+                {
+                    name: 'positionExp',
+                    type: 'Array',
+                    expression: '[22]'
+                }
+            ],
+            lazy: [],
+            staticAttributes: [],
+            active: []
         }
     },
     deviceRegistry: {
@@ -122,6 +134,14 @@ const device3 = {
     subservice: 'gardens',
     polling: true
 };
+const device4 = {
+    id: 'r2d4',
+    type: 'RobotExp',
+    service: 'smartgondor',
+    subservice: 'gardens',
+    polling: true,
+    expressionLanguage: 'jexl'
+};
 
 describe('NGSI-v2 - Polling commands', function () {
     beforeEach(function (done) {
@@ -386,3 +406,134 @@ describe('NGSI-v2 - Polling commands', function () {
         });
     });
 });
+
+describe('NGSI-v2 - Polling commands expressions', function () {
+    beforeEach(function (done) {
+        logger.setLevel('FATAL');
+
+        nock.cleanAll();
+
+        contextBrokerMock = nock('http://192.168.1.1:1026')
+            .matchHeader('fiware-service', 'smartgondor')
+            .matchHeader('fiware-servicepath', 'gardens')
+            .post('/v2/registrations')
+            .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584m' });
+
+        contextBrokerMock
+            .matchHeader('fiware-service', 'smartgondor')
+            .matchHeader('fiware-servicepath', 'gardens')
+            .post('/v2/entities?options=upsert')
+            .reply(204);
+
+        iotAgentConfig.pollingExpiration = 0;
+        iotAgentConfig.pollingDaemonFrequency = 0;
+        iotAgentLib.activate(iotAgentConfig, done);
+    });
+
+    afterEach(function (done) {
+        delete device4.registrationId;
+        iotAgentLib.clearAll(function () {
+            iotAgentLib.deactivate(function () {
+                mongoUtils.cleanDbs(function () {
+                    nock.cleanAll();
+                    iotAgentLib.setDataUpdateHandler();
+                    iotAgentLib.setCommandHandler();
+                    done();
+                });
+            });
+        });
+    });
+
+    describe('When a command update arrives to the IoT Agent for a device with polling', function () {
+        const options = {
+            url: 'http://localhost:' + iotAgentConfig.server.port + '/v2/op/update',
+            method: 'POST',
+            json: {
+                actionType: 'update',
+                entities: [
+                    {
+                        id: 'RobotExp:r2d4',
+                        type: 'RobotExp',
+                        positionExp: {
+                            type: 'Array',
+                            value: '[28, -104, 23]'
+                        }
+                    }
+                ]
+            },
+            headers: {
+                'fiware-service': 'smartgondor',
+                'fiware-servicepath': 'gardens'
+            }
+        };
+
+        beforeEach(function (done) {
+            statusAttributeMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .patch(
+                    '/v2/entities/RobotExp:r2d4/attrs?type=RobotExp',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextCommandStatus2.json'
+                    )
+                )
+                .reply(204);
+
+            iotAgentLib.register(device4, function (error) {
+                done();
+            });
+        });
+
+        it('should not call the client handler', function (done) {
+            let handlerCalled = false;
+
+            iotAgentLib.setCommandHandler(function (id, type, service, subservice, attributes, callback) {
+                handlerCalled = true;
+                callback(null, {
+                    id,
+                    type,
+                    attributes: [
+                        {
+                            name: 'positionExp',
+                            type: 'Array',
+                            value: '[28, -104, 23]'
+                        }
+                    ]
+                });
+            });
+
+            request(options, function (error, response, body) {
+                should.not.exist(error);
+                handlerCalled.should.equal(false);
+                done();
+            });
+        });
+        it('should create the attribute with the "_status" prefix in the Context Broker', function (done) {
+            iotAgentLib.setCommandHandler(function (id, type, service, subservice, attributes, callback) {
+                callback(null);
+            });
+
+            request(options, function (error, response, body) {
+                should.not.exist(error);
+                statusAttributeMock.done();
+                done();
+            });
+        });
+        it('should store the commands in the queue', function (done) {
+            iotAgentLib.setCommandHandler(function (id, type, service, subservice, attributes, callback) {
+                callback(null);
+            });
+
+            request(options, function (error, response, body) {
+                iotAgentLib.commandQueue('smartgondor', 'gardens', 'r2d4', function (error, listCommands) {
+                    should.not.exist(error);
+                    listCommands.count.should.equal(1);
+                    listCommands.commands[0].name.should.equal('positionExp');
+                    listCommands.commands[0].type.should.equal('Array');
+                    listCommands.commands[0].value[0].should.equal(22);
+                    done();
+                });
+            });
+        });
+    });
+});

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

@@ -215,6 +215,31 @@ const iotAgentConfig = {
                 }
             ]
         },
+        WeatherStation9: {
+            commands: [],
+            type: 'WeatherStation',
+            name: 'ws9b',
+            lazy: [],
+            active: [
+                {
+                    object_id: 'p',
+                    name: 'pressure',
+                    type: 'Hgmm'
+                },
+                {
+                    object_id: 'h',
+                    name: 'humidity',
+                    type: 'Percentage',
+                    entity_type: 'Higrometer',
+                    metadata: {
+                        unitCode: {
+                            type: 'Text',
+                            value: 'Hgmm'
+                        }
+                    }
+                }
+            ]
+        },
         WeatherStation8Jexl: {
             commands: [],
             type: 'WeatherStation',
@@ -581,6 +606,44 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
         });
     });
 
+    describe('When an update comes for a multientity measurement based on entity_type', function () {
+        const values = [
+            {
+                name: 'p',
+                type: 'centigrades',
+                value: '52'
+            },
+            {
+                name: 'h',
+                type: 'Percentage',
+                value: '12'
+            }
+        ];
+
+        beforeEach(function () {
+            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/updateContextMultientityPlugin17.json'
+                    )
+                )
+                .reply(204);
+        });
+
+        it('should send two context elements, one for each entity', function (done) {
+            iotAgentLib.update('ws9b', 'WeatherStation9', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
     describe('When an update comes for a multientity measurement with same attribute name', function () {
         const values = [
             {