iotagent-node-lib 3.1.0 → 3.3.0

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/ngsi-mixed/provisioning/ngsi-versioning-test.js

@@ -189,8 +189,7 @@ describe('Mixed Mode: ngsiVersion test', function () {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
-                .patch('/v2/entities/light1/attrs')
-                .query({ type: 'Device' })
+                .post('/v2/entities?options=upsert')
                 .reply(204);
 
             request(optionsCreationDefault, function (error, response, body) {
@@ -211,8 +210,7 @@ describe('Mixed Mode: ngsiVersion test', function () {
             nock.cleanAll();
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
-                .patch('/v2/entities/light1/attrs')
-                .query({ type: 'Device' })
+                .post('/v2/entities?options=upsert')
                 .reply(204);
 
             request(optionsCreationV2, function (error, response, body) {
@@ -248,39 +246,37 @@ describe('Mixed Mode: ngsiVersion test', function () {
         });
     });
 
-    describe('When a new NGSI-LD device group is provisioned and overridden', function () {
-        beforeEach(function (done) {
-            nock.cleanAll();
+    // FIXME: ngisld may use also upsert when update entities in appendMode true (default behaviour)
+    // describe('When a new NGSI-LD device group is provisioned and overridden', function () {
+    //     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')
-                .reply(204);
+    //         contextBrokerMock = nock('http://192.168.1.1:1026')
+    //             .matchHeader('fiware-service', 'smartgondor')
+    //             .matchHeader('fiware-servicepath', 'gardens')
+    //             .post('/v2/entities?options=upsert')
+    //             .reply(204);
 
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .patch('/v2/entities/light2/attrs')
-                .query({ type: 'Device' })
-                .reply(204);
-            request(optionsCreationLD, function (error, response, body) {
-                request(deviceCreationV2, function (error, response, body) {
-                    done();
-                });
-            });
-        });
-        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();
-                }
-            );
-        });
-    });
+    //         contextBrokerMock = nock('http://192.168.1.1:1026').post('/v2/entities?options=upsert').reply(204);
+    //         request(optionsCreationLD, function (error, response, body) {
+    //             request(deviceCreationV2, function (error, response, body) {
+    //                 done();
+    //             });
+    //         });
+    //     });
+    //     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();
+    //             }
+    //         );
+    //     });
+    // });
 });

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/updateContext.json

@@ -1,4 +1,6 @@
 {
+    "id": "light1",
+    "type": "Light",
     "state":{
         "value": true,
         "type": "boolean"

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

@@ -1,4 +1,6 @@
 {
+    "id":"light1",
+    "type":"Light",
     "state": {
         "type": "Boolean",
         "value": "true"
@@ -8,4 +10,4 @@
         "type": "Percentage",
         "value": "87"
     }
-}
+}

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

@@ -1,4 +1,6 @@
 {
+    "id":"machine1",
+    "type":"SensorMachine",
     "status": {
         "value": "STARTING",
         "type": "String"

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

@@ -1,4 +1,6 @@
 {
+    "id":"Light1",
+    "type":"SensorMachine",    
     "status": {
         "type": "String",
         "value": "STARTING"
@@ -7,4 +9,5 @@
         "type": "Address",
         "value": "127.0.0.1"
     }
-}
+}
+

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

@@ -0,0 +1,12 @@
+{
+    "id":"humSensor",
+    "type":"Humidity",
+    "state":{
+        "value": true,
+        "type": "boolean"
+    },
+    "dimming":{
+        "value": 87,
+        "type": "number"
+    }
+}

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

@@ -0,0 +1,10 @@
+{
+    "state":{
+        "value": true,
+        "type": "boolean"
+    },
+    "dimming":{
+        "value": 87,
+        "type": "number"
+    }
+}

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

@@ -1,4 +1,6 @@
 {
+    "id":"light1",
+    "type":"Light",        
   "temperature": {
     "type":"Number",
     "value":52,

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

@@ -1,4 +1,6 @@
 {
+    "id":"light1",
+    "type":"Light",
   "luminance": {
     "type": "Number",
     "value": 9,
@@ -7,4 +9,4 @@
       "value":"CAL"
     }
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",
   "unix_timestamp": {
     "type": "Number",
     "value": 99823423
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",
   "active_power": {
     "type": "Number",
     "value": 0.45
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",
   "status": {
     "type": "Boolean",
     "value": false
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",    
   "keep_alive": {
     "type": "None",
     "value": null
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",    
   "tags": {
     "type": "Array",
     "value": ["iot","device"]
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",
   "configuration": {
     "type": "Object",
     "value": {"firmware": {"version": "1.1.0","hash": "cf23df2207d99a74fbe169e3eba035e633b65d94"}}
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",    
   "configuration": {
     "type": "Object",
     "value": "string_value"
   }
-}
+}

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

@@ -1,4 +1,6 @@
 {
+    "id":"light1",
+    "type":"Light",    
     "pressure":{
         "value": 23,
         "type": "Number"

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

@@ -1,4 +1,6 @@
 {
+    "id":"light1",
+    "type":"Light",        
     "temperature":{
         "value": 14.4,
         "type": "Number"

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",            
   "status": {
     "type": "Boolean",
     "value": true
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",
   "status": {
     "type": "Boolean",
     "value": false
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",    
   "keep_alive": {
     "type": "None",
     "value": null
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",
   "tags": {
     "type": "Array",
     "value": ["iot","device"]
   }
-}
+}

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

@@ -1,6 +1,8 @@
 {
+    "id":"light1",
+    "type":"Light",
   "configuration": {
     "type": "Object",
     "value": {"firmware": {"version": "1.1.0","hash": "cf23df2207d99a74fbe169e3eba035e633b65d94"}}
   }
-}
+}

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

@@ -1,4 +1,6 @@
 {
+  "id":"r2d2",
+  "type":"Robot",
   "position_status": {
     "value": "ERROR",
     "type": "commandStatus"
@@ -7,4 +9,4 @@
     "value": "Stalled",
     "type": "commandResult"
   }
-}
+}

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

@@ -1,4 +1,6 @@
 {
+  "id":"Robot:r2d2",
+  "type":"Robot",
   "position_status": {
     "value": "ERROR",
     "type": "commandStatus"
@@ -7,4 +9,4 @@
     "value": "EXPIRED",
     "type": "commandResult"
   }
-}
+}

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

@@ -1,4 +1,6 @@
 {
+  "id":"r2d2",
+  "type":"Robot",
   "position_status": {
     "value": "FINISHED",
     "type": "commandStatus"
@@ -7,4 +9,4 @@
     "value": "[72, 368, 1]",
     "type": "commandResult"
   }
-}
+}

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

@@ -1,4 +1,6 @@
 {
+  "id":"Robot:r2d2",
+  "type":"Robot",
   "position_status": {
     "type": "commandStatus",
     "value": "PENDING"

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

@@ -1,4 +1,6 @@
 {
+  "id":"RobotExp:r2d4",
+  "type":"RobotExp",    
   "positionExp_status": {
     "type": "commandStatus",
     "value": "PENDING"

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

@@ -1,4 +1,6 @@
 {
+    "id":"light1",
+    "type":"Light",
   "state": {
     "type": "Boolean",
     "value": "true"
@@ -7,4 +9,4 @@
     "type": "DateTime",
     "value": "+002007-11-03T13:18:05"
   }
-}
+}

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

@@ -1,4 +1,6 @@
 {
+    "id":"light1",
+    "type":"Light",    
   "state": {
     "type": "Boolean",
     "value": true,
@@ -13,4 +15,4 @@
     "type": "DateTime",
     "value": "+002007-11-03T13:18:05"
   }
-}
+}

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

@@ -1,4 +1,6 @@
 {
+  "id":"ws1",
+  "type":"WeatherStation",
   "pressure": {
     "value": 1040,
     "type": "Number"