iotagent-node-lib 2.17.0 → 2.20.0

package/test/unit/ngsi-ld/provisioning/updateProvisionedDevices-test.js

@@ -27,10 +27,11 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const nock = require('nock');
 const async = require('async');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     logLevel: 'FATAL',
@@ -119,7 +120,7 @@ describe('NGSI-LD - Device provisioning API: Update provisioned devices', functi
             // registration and creating a new one.
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
-                .delete('/ngsi-ld/v1/csourceRegistrations/6719a7f5254b058441165849')
+                .delete('/ngsi-ld/v1/csourceRegistrations/6719a7f5254b058441165849', '')
                 .reply(204);
 
             const nockBody3 = utils.readExampleFile(
@@ -178,7 +179,7 @@ describe('NGSI-LD - Device provisioning API: Update provisioned devices', functi
 
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
-                .delete('/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d')
+                .delete('/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d', '')
                 .reply(204);
 
             contextBrokerMock
@@ -223,10 +224,8 @@ describe('NGSI-LD - Device provisioning API: Update provisioned devices', functi
 
                 request(options, function (error, response, body) {
                     /* jshint camelcase:false */
-
-                    const parsedBody = JSON.parse(body);
-                    parsedBody.entity_name.should.equal('ANewLightName');
-                    parsedBody.timezone.should.equal('Europe/Madrid');
+                    body.entity_name.should.equal('ANewLightName');
+                    body.timezone.should.equal('Europe/Madrid');
                     done();
                 });
             });
@@ -246,9 +245,8 @@ describe('NGSI-LD - Device provisioning API: Update provisioned devices', functi
                 request(options, function (error, response, body) {
                     /* jshint camelcase:false */
 
-                    const parsedBody = JSON.parse(body);
-                    parsedBody.entity_type.should.equal('TheLightType');
-                    parsedBody.service.should.equal('smartgondor');
+                    body.entity_type.should.equal('TheLightType');
+                    body.service.should.equal('smartgondor');
                     done();
                 });
             });
@@ -353,10 +351,8 @@ describe('NGSI-LD - Device provisioning API: Update provisioned devices', functi
                     should.not.exist(error);
                     response.statusCode.should.equal(200);
 
-                    const parsedBody = JSON.parse(body);
-
-                    parsedBody.attributes.length.should.equal(1);
-                    parsedBody.attributes[0].name.should.equal('newAttribute');
+                    body.attributes.length.should.equal(1);
+                    body.attributes[0].name.should.equal('newAttribute');
                     done();
                 });
             });
@@ -421,10 +417,8 @@ describe('NGSI-LD - Device provisioning API: Update provisioned devices', functi
                     should.not.exist(error);
                     response.statusCode.should.equal(200);
 
-                    const parsedBody = JSON.parse(body);
-
-                    parsedBody.static_attributes.length.should.equal(3);
-                    parsedBody.static_attributes[0].name.should.equal('cellID');
+                    body.static_attributes.length.should.equal(3);
+                    body.static_attributes[0].name.should.equal('cellID');
                     done();
                 });
             });

package/test/unit/ngsi-mixed/provisioning/ngsi-versioning-test.js

@@ -26,7 +26,9 @@
 /* eslint-disable no-unused-vars */
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
-const request = require('request');
+const utils = require('../../../tools/utils');
+const request = utils.request;
+
 const should = require('should');
 const iotAgentConfig = {
     logLevel: 'FATAL',

package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent3.json

@@ -0,0 +1,19 @@
+{
+  "dataProvided": {
+    "entities": [
+      {
+        "type": "Light",
+        "id": "Light:light1"
+      }
+    ],
+    "attrs": [
+      "temperature",
+      "position"
+    ]
+  },
+  "provider": {
+    "http": {
+      "url": "http://smartgondor.com"
+    }
+  }
+}

package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent5.json

@@ -0,0 +1,19 @@
+{
+  "dataProvided": {
+    "entities": [
+      {
+        "type": "TheLightType",
+        "id": "TheFirstLight"
+      }
+    ],
+    "attrs": [
+      "luminance",
+      "commandAttr"
+    ]
+  },
+  "provider": {
+    "http": {
+      "url": "http://smartgondor.com"
+    }
+  }
+}

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

@@ -1,5 +1,5 @@
 {
-  "pressure25":{
+  "pressure_25":{
     "type": "Number",
     "value": 52 
   },

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

@@ -0,0 +1,22 @@
+{
+  "pressure": {
+    "type": "Number",
+    "value": 1040
+  },
+  "consumption": {
+    "type": "Number",
+    "value": null
+  },
+  "weather": {
+    "type": "Summary",
+    "value": "Humidity NaN and pressure 1040"
+  },
+  "alive": {
+    "type": "None",
+    "value": null
+  },
+  "updated": {
+    "type": "Boolean",
+    "value": null
+  }
+}

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

@@ -0,0 +1,6 @@
+{
+  "pressure": {
+    "type": "Number",
+    "value": 1040
+  }
+}

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

@@ -0,0 +1,18 @@
+{
+  "undef": {
+    "type": "json",
+    "value": null
+  },
+  "nil": {
+    "type": "json",
+    "value": null
+  },
+  "falsy": {
+    "type": "Boolean",
+    "value": false
+  },
+  "zero": {
+    "type": "Number",
+    "value": 0
+  }
+}

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

@@ -0,0 +1,16 @@
+{
+  "location": {
+    "type": "geo:json",
+    "value": {
+      "coordinates": [
+        13,
+        52
+      ],
+      "type": "Point"
+    }
+  },
+  "TimeInstant": {
+    "type": "DateTime",
+    "value": "1970-01-01T00:00:00.001Z"
+  }
+}

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

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

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

@@ -0,0 +1,12 @@
+{
+  "location": {
+    "type": "geo:json",
+    "value": {
+      "coordinates": [
+        13,
+        52
+      ],
+      "type": "Point"
+    }
+  }
+}

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

@@ -0,0 +1,10 @@
+{
+  "state": {
+    "value": "true",
+    "type": "Boolean"
+  },
+  "dimming": {
+    "value": "87%",
+    "type": "Percentage"
+  }
+}

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

@@ -0,0 +1,10 @@
+{
+  "state": {
+    "value": "true",
+    "type": "Boolean"
+  },
+  "dimming": {
+    "value": "23",
+    "type": "Percentage"
+  }
+}

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

@@ -0,0 +1,13 @@
+{
+  "actionType": "update",
+  "entities": [
+    {
+      "id": "WrongStation1",
+      "type": "WrongStation",
+      "vol":{
+        "type": "Number",
+        "value": 0
+      }
+    }
+  ]
+}

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

@@ -0,0 +1,33 @@
+{
+  "actionType": "update",
+  "entities": [
+    {
+      "id": "sh1",
+      "type": "ShareStation",
+      "vol":{
+        "type": "Number",
+        "value": 0
+      }
+    },
+    {
+      "id": "WeatherStation1",
+      "type": "Type1",
+      "volt1":{
+        "type": "Number",
+        "value": 1
+      }
+    },
+    {
+      "id": "WeatherStation1",
+      "type": "Type2",
+      "volt2":{
+        "type": "Number",
+        "value": 2
+      },
+      "extravolt2": {
+        "type": "Number",
+        "value": 3
+      }
+    }
+  ]
+}

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

@@ -0,0 +1,33 @@
+{
+  "actionType": "update",
+  "entities": [
+    {
+      "id": "sh2",
+      "type": "ShareStation",
+      "vol":{
+        "type": "Number",
+        "value": 0
+      }
+    },
+    {
+      "id": "WeatherStation1",
+      "type": "Type1",
+      "vol":{
+        "type": "Number",
+        "value": 1
+      }
+    },
+    {
+      "id": "WeatherStation1",
+      "type": "Type2",
+      "vol":{
+        "type": "Number",
+        "value": 2
+      },
+      "extravol": {
+        "type": "Number",
+        "value": 3
+      }
+    }
+  ]
+}

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

@@ -0,0 +1,33 @@
+{
+  "actionType": "update",
+  "entities": [
+    {
+      "id": "sh3",
+      "type": "ShareStation",
+      "vol":{
+        "type": "Number",
+        "value": 0
+      }
+    },
+    {
+      "id": "WeatherStation1",
+      "type": "Type1",
+      "vol":{
+        "type": "Number",
+        "value": 0
+      }
+    },
+    {
+      "id": "WeatherStation1",
+      "type": "Type2",
+      "vol":{
+        "type": "Number",
+        "value": 0
+      },
+      "extravol": {
+        "type": "Number",
+        "value": 0
+      }
+    }
+  ]
+}

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

@@ -0,0 +1,25 @@
+{
+  "actionType": "update",
+  "entities": [
+    {
+      "id": "gps1",
+      "type": "GPS"
+    },
+    {
+      "explicit": {
+        "type": "number",
+        "value": 52
+      },
+      "type": "GPS",
+      "id": "SO5"
+    },
+    {
+      "explicit": {
+        "type": "number",
+        "value": 13
+      },
+      "type": "GPS",
+      "id": "SO6"
+    }
+  ]
+}

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

@@ -0,0 +1,25 @@
+{
+  "actionType": "update",
+  "entities": [
+    {
+      "id": "gps1",
+      "type": "GPS"
+    },
+    {
+      "attr1": {
+        "type": "number",
+        "value": 52
+      },
+      "type": "GPS",
+      "id": "SO5"
+    },
+    {
+      "attr2": {
+        "type": "number",
+        "value": 13
+      },
+      "type": "GPS",
+      "id": "SO6"
+    }
+  ]
+}

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

@@ -2,8 +2,6 @@
   "actionType": "update",
   "entities": [
     {
-      "id": "ws4",
-      "type": "WeatherStation",
       "pressure": {
         "type": "Hgmm",
         "value": "52",
@@ -17,11 +15,11 @@
       "TimeInstant": {
         "type": "DateTime",
         "value": "2016-05-30T16:25:22.304Z"
-      }
+      },
+      "id": "ws4",
+      "type": "WeatherStation"
     },
     {
-      "id": "Higro2000",
-      "type": "Higrometer",
       "humidity": {
         "type": "Percentage",
         "value": "12",
@@ -39,7 +37,9 @@
       "TimeInstant": {
         "type": "DateTime",
         "value": "2016-05-30T16:25:22.304Z"
-      }
+      },
+      "id": "Higro2000",
+      "type": "Higrometer"
     }
   ]
 }

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

@@ -6,8 +6,6 @@
       "type": "WeatherStation"
     },
     {
-      "id": "Higro2000",
-      "type": "Higrometer",
       "humidity": {
           "type": "Percentage",
           "value": "12",
@@ -22,7 +20,9 @@
       "TimeInstant": {
           "type": "DateTime",
           "value": "2018-06-13T13:28:34.611Z"
-      }
+      },
+      "id": "Higro2000",
+      "type": "Higrometer"
     }
   ]
 }

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

@@ -151,8 +151,8 @@ const iotAgentConfig = {
                     expression: '${trim(@pressure)}'
                 },
                 {
-                    object_id: 'p25',
-                    name: 'pressure25',
+                    object_id: 'p_25',
+                    name: 'pressure_25',
                     type: 'Number'
                 },
                 {
@@ -169,7 +169,7 @@ const iotAgentConfig = {
                 {
                     name: 'weather',
                     type: 'Summary',
-                    expression: 'Humidity ${@humidity12 / 2} and pressure ${@pressure25 * 20}'
+                    expression: 'Humidity ${@humidity12 / 2} and pressure ${@pressure_25 * 20}'
                 },
                 {
                     object_id: 'a',
@@ -276,7 +276,7 @@ describe('NGSI-v2 - Expression-based transformations plugin', function () {
 
         const values = [
             {
-                name: 'p25',
+                name: 'p_25',
                 type: 'Number',
                 value: 52
             },
@@ -917,4 +917,37 @@ describe('NGSI-v2 - Expression-based transformations plugin', function () {
             });
         });
     });
+    describe('When a measure arrives and there is not enough information to calculate an expression', function () {
+        const values = [
+            {
+                name: 'p',
+                type: 'centigrades',
+                value: '52'
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .patch(
+                    '/v2/entities/ws1/attrs',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin30.json'
+                    )
+                )
+                .query({ type: 'WeatherStation' })
+                .reply(204);
+        });
+
+        it('should not calculate the expression', function (done) {
+            iotAgentLib.update('ws1', 'WeatherStation', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
 });