iotagent-node-lib 3.2.0 → 3.3.0

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

@@ -1,5 +1,5 @@
 {
-  "actionType": "update",
+  "actionType": "append",
   "entities": [
     { "id": "ws6",
       "type": "WeatherStation"

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

@@ -1,5 +1,5 @@
 {
-  "actionType": "update",
+  "actionType": "append",
   "entities": [
             {
                 "id": "Sensor",

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

@@ -1,5 +1,5 @@
 {
-  "actionType": "update",
+  "actionType": "append",
   "entities": [
             {
                 "id": "Sensor",

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

@@ -1,5 +1,5 @@
 {
-  "actionType": "update",
+  "actionType": "append",
   "entities": [
     {
       "id": "ws7",

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

@@ -1,5 +1,5 @@
 {
-  "actionType": "update",
+  "actionType": "append",
   "entities": [
     {
       "id": "ws8",

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

@@ -41,5 +41,5 @@
             }
         }
     ],
-    "actionType": "update"
+    "actionType": "append"
 }

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

@@ -24,5 +24,5 @@
       }
     }
   ],
-  "actionType": "update"
+  "actionType": "append"
 }

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

@@ -1,5 +1,5 @@
 {
-  "actionType": "update",
+  "actionType": "append",
   "entities": [
     {
       "id": "ws5",

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

@@ -1,4 +1,6 @@
 {
+    "id":"sensorCommand",
+    "type":"SensorCommand",
     "PING_status": {
       "type": "commandStatus",
       "value": "OK",

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

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

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

@@ -1,4 +1,6 @@
 {
+    "id":"motion1",
+    "type":"Motion",    
     "moving":{
         "value": true,
         "type": "boolean"

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

@@ -1,4 +1,6 @@
 {
+  "id":"lamp1",
+  "type":"Lamp",
   "luminosity": {
     "value": "100",
     "type": "text"
@@ -13,4 +15,4 @@
       }
     }
   }
-}
+}

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

@@ -1,4 +1,6 @@
 {
+    "id":"light1",
+    "type":"Light",
   "state": {
     "value": true,
     "type": "boolean",
@@ -26,4 +28,4 @@
     "type": "DateTime",
     "value": "2015-08-05T07:35:01.468Z"
   }
-}
+}

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

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

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

@@ -0,0 +1,12 @@
+{
+  "id": "lightNoTimestamp1",
+  "type": "Light",
+  "state": {
+      "value": true,
+      "type": "boolean"
+  },
+  "TimeInstant": {
+      "value": "2015-12-14T08:06:01.468Z",
+      "type": "DateTime"
+  }
+}

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

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

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

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

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

@@ -1,4 +1,6 @@
 {
+    "id":"light1",
+    "type":"Light",    
   "state": {
     "value": true,
     "type": "boolean",
@@ -26,4 +28,4 @@
     "type": "DateTime",
     "value": "2015-08-05T00:35:01.468-07:00"
   }
-}
+}

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

@@ -412,6 +412,36 @@ const iotAgentConfig = {
                 }
             ],
             explicitAttrs: '[ ]'
+        },
+        skipvalue: {
+            commands: [],
+            type: 'skipvalue',
+            lazy: [],
+            active: [
+                {
+                    name: 'alwaysSkip',
+                    type: 'Number',
+                    skipValue: true,
+                    expression: 'true'
+                },
+                {
+                    name: 'neverSkip',
+                    type: 'Number',
+                    skipValue: true,
+                    expression: 'false'
+                },
+                {
+                    name: 'skip',
+                    type: 'Number',
+                    skipValue: 33,
+                    expression: 'condition'
+                },
+                {
+                    object_id: 'condition',
+                    name: 'condition',
+                    type: 'Number'
+                }
+            ]
         }
     },
     service: 'smartgondor',
@@ -537,13 +567,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin30.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -577,13 +606,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/ws1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin2.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
                 .reply(204);
         });
 
@@ -618,13 +646,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/ws1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin4.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
                 .reply(204);
         });
 
@@ -653,13 +680,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin11.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -688,13 +714,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/ws1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin1.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
                 .reply(204);
         });
 
@@ -724,13 +749,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin3.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -760,13 +784,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/ws1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin8.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
                 .reply(204);
         });
 
@@ -796,13 +819,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin5.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -832,13 +854,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin9.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -867,13 +888,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin6.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -903,13 +923,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin7.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -937,13 +956,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin12.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -971,13 +989,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin13.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -1010,13 +1027,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin13.json'
                     )
                 )
-                .query({ type: 'Light' })
                 .reply(204);
         });
 
@@ -1044,13 +1060,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/ws1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin29.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
                 .reply(204);
         });
 
@@ -1077,13 +1092,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/ws1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin31.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
                 .reply(204);
         });
 
@@ -1122,13 +1136,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/gps1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin32.json'
                     )
                 )
-                .query({ type: 'GPS' })
                 .reply(204);
         });
 
@@ -1167,13 +1180,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/gps1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin35.json'
                     )
                 )
-                .query({ type: 'GPS' })
                 .reply(204);
         });
 
@@ -1217,13 +1229,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/gps1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin41.json'
                     )
                 )
-                .query({ type: 'GPS' })
                 .reply(204);
         });
 
@@ -1262,13 +1273,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/gps1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json'
                     )
                 )
-                .query({ type: 'GPS' })
                 .reply(204);
         });
 
@@ -1307,13 +1317,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/gps1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json'
                     )
                 )
-                .query({ type: 'GPS' })
                 .reply(204);
         });
 
@@ -1357,13 +1366,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/gps1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin36.json'
                     )
                 )
-                .query({ type: 'GPS' })
                 .reply(204);
         });
 
@@ -1397,13 +1405,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/gps1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin36.json'
                     )
                 )
-                .query({ type: 'GPS' })
                 .reply(204);
         });
 
@@ -1432,13 +1439,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/gps1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json'
                     )
                 )
-                .query({ type: 'GPS' })
                 .reply(204);
         });
 
@@ -1487,6 +1493,59 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             });
         });
     });
+
+    describe('When using skipValue is expression in a device', function () {
+        // Case: Expression which results is sent as a new attribute
+        const values = [
+            {
+                name: 'alwaysSkip',
+                type: 'Number',
+                value: 1
+            },
+            {
+                name: 'neverSkip',
+                type: 'Number',
+                value: 2
+            },
+            {
+                name: 'skip',
+                type: 'Number',
+                value: 3
+            },
+            {
+                name: 'condition',
+                type: 'Number',
+                value: 33
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .post(
+                    '/v2/entities?options=upsert',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionSkip.json'
+                    )
+                )
+                .reply(204);
+        });
+
+        afterEach(function (done) {
+            done();
+        });
+
+        it('should not propagate skipped values', function (done) {
+            iotAgentLib.update('skip1', 'skipvalue', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
 });
 
 describe('Java expression language (JEXL) based transformations plugin - Timestamps', function () {
@@ -1535,13 +1594,12 @@ describe('Java expression language (JEXL) based transformations plugin - Timesta
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/gps1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin33.json'
                     )
                 )
-                .query({ type: 'GPS' })
                 .reply(204);
         });