iotagent-node-lib 3.1.0 → 3.2.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "iotagent-node-lib",
   "license": "AGPL-3.0-only",
   "description": "IoT Agent library to interface with NGSI Context Broker",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "homepage": "https://github.com/telefonicaid/iotagent-node-lib",
   "keywords": [
     "fiware",

package/test/unit/examples/deviceProvisioningRequests/provisionBidirectionalDevice.json

@@ -12,17 +12,17 @@
         {
           "name":"location",
           "type":"geo:point",
-          "expression": "${latitude}, ${longitude}",
+          "expression": "latitude,longitude",
           "reverse": [
             {
               "object_id":"latitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, indexOf(@location, \",\") + 1, length(@location)))}"
+              "type": "Number",
+              "expression": "location | split(', ')[1] | parsefloat()"
             },
             {
               "object_id":"longitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, 0, indexOf(@location, \",\")))}"
+              "type": "Number",
+              "expression": "location | split(', ')[0] | parsefloat()"
             }
           ]
         }

package/test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice4.json

@@ -3,6 +3,7 @@
     {
       "device_id": "MicroLight1",
       "protocol": "GENERIC_PROTO",
+      "expressionLanguage": "jexl",
       "attributes": [
         {
           "name": "attr_name",

package/test/unit/examples/groupProvisioningRequests/bidirectionalGroup.json

@@ -14,13 +14,13 @@
           "reverse": [
             {
               "object_id":"latitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, indexOf(@location, \",\") + 1, length(@location)))}"
+              "type": "Number",
+              "expression": "location | split(', ')[1] | parsefloat()"
             },
             {
               "object_id":"longitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, 0, indexOf(@location, \",\")))}"
+              "type": "Number",
+              "expression": "location | split(', ')[0] | parsefloat()"
             }
           ]
         }

package/test/unit/ngsi-ld/expressions/jexlBasedTransformations-test.js

@@ -40,7 +40,6 @@ const iotAgentConfig = {
         ngsiVersion: 'ld',
         jsonLdContext: 'http://context.json-ld'
     },
-    defaultExpressionLanguage: 'jexl',
     server: {
         port: 4041
     },
@@ -266,7 +265,6 @@ const iotAgentConfigTS = {
         ngsiVersion: 'ld',
         jsonLdContext: 'http://context.json-ld'
     },
-    defaultExpressionLanguage: 'jexl',
     server: {
         port: 4041
     },

package/test/unit/ngsi-ld/plugins/bidirectional-plugin_test.js

@@ -240,11 +240,11 @@ describe('NGSI-LD - 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;
                     }
                 }
@@ -348,11 +348,11 @@ describe('NGSI-LD - 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;
                     }
                 }
@@ -461,11 +461,11 @@ describe('NGSI-LD - 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;
                     }
                 }
@@ -603,11 +603,11 @@ describe('NGSI-LD - 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/ngsi-ld/plugins/custom-plugin_test.js

@@ -0,0 +1,152 @@
+/*
+ * Copyright 2015 Telefonica Investigación y Desarrollo, S.A.U
+ *
+ * This file is part of fiware-iotagent-lib
+ *
+ * fiware-iotagent-lib is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * fiware-iotagent-lib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with fiware-iotagent-lib.
+ * If not, see http://www.gnu.org/licenses/.
+ *
+ * For those usages not covered by the GNU Affero General Public License
+ * please contact with::daniel.moranjimenez@telefonica.com
+ *
+ * Modified by: Daniel Calvo - ATOS Research & Innovation
+ */
+
+const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
+const should = require('should');
+const logger = require('logops');
+const nock = require('nock');
+let contextBrokerMock;
+const iotAgentConfig = {
+    contextBroker: {
+        host: '192.168.1.1',
+        port: '1026',
+        ngsiVersion: 'ld',
+        jsonLdContext: 'http://context.json-ld'
+    },
+    server: {
+        port: 4041
+    },
+    types: {
+        Light: {
+            commands: [],
+            type: 'Light',
+            lazy: [
+                {
+                    name: 'temperature',
+                    type: 'centigrades'
+                }
+            ],
+            active: [
+                {
+                    name: 'pressure',
+                    type: 'Hgmm'
+                }
+            ]
+        }
+    },
+    service: 'smartgondor',
+    subservice: 'gardens',
+    providerUrl: 'http://smartgondor.com'
+};
+
+describe('NGSI-LD - Custom plugin', function () {
+    let updateInvoked = false;
+    let queryInvoked = false;
+
+    function updatePlugin(entity, typeInformation, callback) {
+        updateInvoked = true;
+        return callback(null, entity, typeInformation);
+    }
+    function queryPlugin(entity, typeInformation, callback) {
+        queryInvoked = true;
+        return callback(null, entity, typeInformation);
+    }
+    beforeEach(function (done) {
+        logger.setLevel('FATAL');
+
+        iotAgentLib.activate(iotAgentConfig, function () {
+            iotAgentLib.clearAll(function () {
+                iotAgentLib.addUpdateMiddleware(updatePlugin);
+                iotAgentLib.addQueryMiddleware(queryPlugin);
+                done();
+            });
+        });
+    });
+
+    afterEach(function (done) {
+        iotAgentLib.clearAll(function () {
+            iotAgentLib.deactivate(done);
+            updateInvoked = false;
+            queryInvoked = false;
+        });
+    });
+    describe('When an update occurs', function () {
+        const values = [
+            {
+                name: 'state',
+                type: 'Boolean',
+                value: 'true'
+            },
+            {
+                name: 'dimming',
+                type: 'Number',
+                value: 23
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .post('/ngsi-ld/v1/entityOperations/upsert/')
+                .query({ options: 'update' })
+                .reply(204);
+        });
+
+        it('should invoke the plugin', function (done) {
+            iotAgentLib.update('light1', 'Light', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                updateInvoked.should.equal(true);
+                done();
+            });
+        });
+    });
+    describe('When an query occurs', function () {
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .get('/ngsi-ld/v1/entities/urn:ngsi-ld:Light:light1')
+                .query({ attrs: 'state,dimming' })
+                .reply(200, { state: 'good', dimming: '23' });
+        });
+
+        it('should invoke the plugin', function (done) {
+            const attributes = ['state', 'dimming'];
+            iotAgentLib.query('light1', 'Light', '', attributes, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                should.not.exist(error);
+                queryInvoked.should.equal(true);
+                done();
+            });
+        });
+    });
+});

package/test/unit/ngsi-ld/plugins/multientity-plugin_test.js

@@ -96,7 +96,7 @@ const iotAgentConfig = {
                     object_id: 'h',
                     name: 'humidity',
                     type: 'Percentage',
-                    entity_name: 'Station Number ${@sn * 10}'
+                    entity_name: '"Station Number "+sn*10'
                 }
             ]
         },

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

@@ -1,8 +1,12 @@
 {
-  "id": "EntityNameByExp",    
+  "id": "MicroLight1__SUFFIX",
   "type": "MicroLights",
   "attr_name": {
     "type": "string",
     "value": null
+  },
+  "suffix_st": {
+      "type": "Text",
+      "value": "SUFFIX"
   }
 }

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

@@ -1,12 +1,4 @@
 {
-  "undef": {
-    "type": "json",
-    "value": null
-  },
-  "nil": {
-    "type": "json",
-    "value": null
-  },
   "falsy": {
     "type": "Boolean",
     "value": false

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

@@ -1,2 +1,22 @@
 {
+    "TimeInstant": {
+        "type": "DateTime",
+        "value": "2015-08-05T07:35:01.468+00:00"
+    },
+    "location": {
+        "value": {
+            "coordinates": [
+                13,
+                52
+            ],
+            "type": "Point"
+        },
+        "type": "geo:json",
+        "metadata": {
+            "TimeInstant": {
+                "type": "DateTime",
+                "value": "2015-08-05T07:35:01.468+00:00"
+            }
+        }
+    }
 }

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

@@ -0,0 +1,42 @@
+{
+        "entities": [
+            {
+                "id": "water1",
+                "type": "WaterTank",
+                "contB": {
+                    "value": "31450.000",
+                    "type": "Number",
+                    "metadata": {
+                        "TimeInstant": {
+                            "type": "DateTime",
+                            "value": "2015-08-05T07:35:01.468Z"
+                        }
+                    }
+                },
+                "TimeInstant": {
+                    "type": "DateTime",
+                    "value": "2015-08-05T07:35:01.468Z"
+                }
+            },
+            {
+                "id": "PA_B_0001",
+                "type": "WaterTank",
+                "waterLeavingTanks": {
+                    "value": 3145,
+                    "type": "Number",
+                    "metadata": {
+                        "TimeInstant": {
+                            "type": "DateTime",
+                            "value": "2015-08-05T07:35:01.468Z"
+                        }
+                    }
+                },
+                "TimeInstant": {
+                    "type": "DateTime",
+                    "value": "2015-08-05T07:35:01.468Z"
+                }
+            }
+        ],
+        "actionType": "update"
+}
+

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

@@ -0,0 +1,32 @@
+{
+    "TimeInstant": {
+        "type": "DateTime",
+        "value": "2015-08-05T07:35:01.468+00:00"
+    },
+    "location": {
+        "value": {
+            "coordinates": [
+                13,
+                52
+            ],
+            "type": "Point"
+        },
+        "type": "geo:json",
+        "metadata": {
+            "TimeInstant": {
+                "type": "DateTime",
+                "value": "2015-08-05T07:35:01.468+00:00"
+            }
+        }
+    },
+    "temperature": {
+        "value": null,
+        "type": "Number",
+        "metadata": {
+            "TimeInstant": {
+                "type": "DateTime",
+                "value": "2015-08-05T07:35:01.468+00:00"
+            }
+        }
+    }
+}

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"
+    }
+  ]
+}