iotagent-node-lib 3.3.0 → 3.4.1

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

@@ -4,9 +4,5 @@
   "manufacturer": {
     "type": "Object",
     "value": { "name":"Manufacturer1", "VAT":"U12345678" }
-  },
-  "consumption_x":{
-    "type":"Number",
-    "value":null
   }
 }

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

@@ -4,9 +4,5 @@
   "revisions": {
     "type": "Array",
     "value": [ "v0.1", "v0.2", "v0.3" ]
-  },
-  "consumption_x":{
-    "type":"Number",
-    "value":null
   }
 }

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

@@ -5,20 +5,8 @@
     "type": "Number",
     "value": 8.8
   },
-  "pressure":{
-      "type":"Number",
-      "value":null
-  },
   "weather":{
       "type":"Summary",
       "value":"Humidity NaN and pressure NaN"
-  },
-  "alive":{
-      "type":"None",
-      "value":null
-  },
-  "updated":{
-      "type":"Boolean",
-      "value":null
   }
 }

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

@@ -4,9 +4,5 @@
   "updated": {
     "value": true,
     "type": "Boolean"
-  },
-  "consumption_x":{
-      "type":"Number",
-      "value":null
   }
 }

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

@@ -11,11 +11,7 @@
       "expectedAtt": {
           "type": "number",
           "value": 13
-      },
-      "nonexpectedAtt": {
-          "type": "number",
-          "value": null
-      }        
+      }
     },
     {
       "explicit": {

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

@@ -440,6 +440,19 @@ const iotAgentConfig = {
                     object_id: 'condition',
                     name: 'condition',
                     type: 'Number'
+                },
+                {
+                    object_id: 'nonProgressAtt1',
+                    name: 'nonProgressatt1',
+                    type: 'Number',
+                    expression: 'nonexistent * 2'
+                },
+                {
+                    object_id: 'nonProgressAtt2',
+                    name: 'nonProgressatt2',
+                    type: 'Number',
+                    expression: 'nonexistent * 2',
+                    skipValue: null
                 }
             ]
         }
@@ -952,23 +965,11 @@ describe('Java expression language (JEXL) based transformations plugin', functio
 
         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/updateContextExpressionPlugin12.json'
-                    )
-                )
-                .reply(204);
         });
 
         it('should apply the expression before sending the values', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
-                contextBrokerMock.done();
                 done();
             });
         });

package/test/unit/ngsiv2/general/contextBrokerOAuthSecurityAccess-test.js

@@ -310,7 +310,7 @@ describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider',
         });
 
         it('subscribe requests use auth header', function (done) {
-            iotAgentLib.getDevice('Light1', 'smartgondor', 'electricity', function (error, device) {
+            iotAgentLib.getDevice('Light1', null, 'smartgondor', 'electricity', function (error, device) {
                 iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
                     should.not.exist(error);
 
@@ -331,7 +331,7 @@ describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider',
 
             contextBrokerMock.delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8', '').reply(204);
 
-            iotAgentLib.getDevice('Light1', 'smartgondor', 'electricity', function (error, device) {
+            iotAgentLib.getDevice('Light1', null, 'smartgondor', 'electricity', function (error, device) {
                 iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
                     iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
                         contextBrokerMock.done();

package/test/unit/ngsiv2/general/https-support-test.js

@@ -210,7 +210,7 @@ describe('NGSI-v2 - HTTPS support tests', function () {
         });
 
         it('should send the appropriate request to the Context Broker', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     should.not.exist(error);
 

package/test/unit/ngsiv2/ngsiService/active-devices-test.js

@@ -827,7 +827,7 @@ describe('NGSI-v2 - Active attributes test', function () {
         });
     });
 
-    describe('When the IoT Agent receives new information from a device and the appendMode flag is on', function () {
+    describe('When the IoT Agent receives new information from a device', function () {
         beforeEach(function (done) {
             nock.cleanAll();
 
@@ -840,13 +840,10 @@ describe('NGSI-v2 - Active attributes test', function () {
                 )
                 .reply(204);
 
-            iotAgentConfig.appendMode = true;
             iotAgentLib.activate(iotAgentConfig, done);
         });
 
         afterEach(function (done) {
-            iotAgentConfig.appendMode = false;
-
             done();
         });
 
@@ -868,16 +865,14 @@ describe('NGSI-v2 - Active attributes test', function () {
             contextBrokerMock = nock('http://cbhost: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/updateContext6.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204);
 
             iotAgentLib.activate(iotAgentConfig, done);
         });
-
         it('should change the value of the corresponding attribute in the context broker', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);

package/test/unit/ngsiv2/ngsiService/subscriptions-test.js

@@ -95,7 +95,7 @@ describe('NGSI-v2 - Subscription tests', function () {
 
     describe('When a client invokes the subscribe() function for device', function () {
         it('should send the appropriate request to the Context Broker', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     should.not.exist(error);
 
@@ -106,9 +106,9 @@ describe('NGSI-v2 - Subscription tests', function () {
             });
         });
         it('should store the subscription ID in the Device Registry', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
-                    iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+                    iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                         should.not.exist(error);
                         should.exist(device);
                         should.exist(device.subscriptions);
@@ -132,10 +132,10 @@ describe('NGSI-v2 - Subscription tests', function () {
             done();
         });
         it('should delete the subscription from the CB', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
-                        iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+                        iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                             contextBrokerMock.done();
                             done();
                         });
@@ -144,10 +144,10 @@ describe('NGSI-v2 - Subscription tests', function () {
             });
         });
         it('should remove the id from the subscriptions array', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
-                        iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+                        iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                             should.not.exist(error);
                             should.exist(device);
                             should.exist(device.subscriptions);
@@ -171,9 +171,9 @@ describe('NGSI-v2 - Subscription tests', function () {
         });
 
         it('should delete the subscription from the CB', function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
-                    iotAgentLib.unregister(device.id, 'smartgondor', '/gardens', function (error) {
+                    iotAgentLib.unregister(device.id, null, 'smartgondor', '/gardens', function (error) {
                         contextBrokerMock.done();
                         done();
                     });
@@ -183,7 +183,7 @@ describe('NGSI-v2 - Subscription tests', function () {
     });
     describe('When a new notification comes to the IoTAgent', function () {
         beforeEach(function (done) {
-            iotAgentLib.getDevice('MicroLight1', 'smartgondor', '/gardens', function (error, device) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
                     done();
                 });

package/test/unit/ngsiv2/provisioning/device-provisioning-api_test.js

@@ -311,7 +311,6 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
             nock.cleanAll();
             done();
         });
-
         it('should send the appropriate requests to the Context Broker', function (done) {
             request(options, function (error, response, body) {
                 contextBrokerMock.done();
@@ -813,31 +812,19 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
 
         beforeEach(function (done) {
             iotAgentLib.deactivate(function () {
-                iotAgentConfig.appendMode = false;
                 iotAgentLib.activate(iotAgentConfig, done);
             });
         });
 
-        afterEach(function () {
-            iotAgentConfig.appendMode = false;
-        });
+        afterEach(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',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createAutoprovisionDevice.json')
-                )
-                .reply(204);
             done();
         });
 
-        it('should send the appropriate requests to the Context Broker', function (done) {
+        it('should should not appropriate requests to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -867,36 +854,11 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', 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', function (body) {
-                    const expectedBody = utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/createTimeInstantMinimumDevice.json'
-                    );
-                    if (!body.TimeInstant.value) {
-                        return false;
-                    } else if (moment(body.TimeInstant.value, 'YYYY-MM-DDTHH:mm:ss.SSSZ').isValid()) {
-                        const timeInstantDiff = moment().diff(body.TimeInstant.value, 'milliseconds');
-                        if (timeInstantDiff < 500) {
-                            delete body.TimeInstant;
-
-                            return JSON.stringify(body) === JSON.stringify(expectedBody);
-                        }
-
-                        return false;
-                    } else {
-                        return false;
-                    }
-                })
-                .reply(204);
-
             done();
         });
 
-        it('should send the appropriate requests to the Context Broker', function (done) {
+        it('should not send any requests to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -915,23 +877,11 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', 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',
-                    utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/createMinimumProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
             done();
         });
 
-        it('should send the appropriate requests to the Context Broker', function (done) {
+        it('should not send any requests to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -974,23 +924,10 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', 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',
-                    utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/createGeopointProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
             done();
         });
-
-        it('should send the appropriate initial values to the Context Broker', function (done) {
+        it('should not send any initial values to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -1009,23 +946,10 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', 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',
-                    utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/createDatetimeProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
             done();
         });
-
-        it('should send the appropriate initial values to the Context Broker', function (done) {
+        it('should not send any initial values to the Context Broker', function (done) {
             request(options, function (error, response, body) {
-                contextBrokerMock.done();
                 done();
             });
         });
@@ -1122,23 +1046,13 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 .matchHeader('fiware-servicepath', '/gardens')
                 .post('/v2/registrations')
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
-
-            // This mock does not check the payload since the aim of the test is not to verify
-            // device provisioning functionality. Appropriate verification is done in tests under
-            // provisioning folder
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .replyWithError({ message: 'Description of the error', code: 'STRING_CODE' });
-
             done();
         });
 
         it('should return a valid return code', function (done) {
             request(options, function (error, response, body) {
                 should.not.exist(error);
-                response.statusCode.should.equal(500);
+                response.statusCode.should.equal(201);
 
                 done();
             });
@@ -1165,22 +1079,13 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 .post('/v2/registrations')
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-            // This mock does not check the payload since the aim of the test is not to verify
-            // device provisioning functionality. Appropriate verification is done in tests under
-            // provisioning folder
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .replyWithError({ message: 'Description of the error', code: 123456789 });
-
             done();
         });
 
         it('should return a valid return code (three character number)', function (done) {
             request(options, function (error, response, body) {
                 should.not.exist(error);
-                response.statusCode.should.equal(500);
+                response.statusCode.should.equal(201);
 
                 done();
             });

package/test/unit/ngsiv2/provisioning/device-registration_test.js

@@ -82,13 +82,15 @@ const device1 = {
     id: 'light1',
     type: 'Light',
     service: 'smartgondor',
-    subservice: 'gardens'
+    subservice: 'gardens',
+    apikey: null
 };
 const device2 = {
     id: 'term2',
     type: 'Termometer',
     service: 'smartgondor',
-    subservice: 'gardens'
+    subservice: 'gardens',
+    apikey: null
 };
 
 describe('NGSI-v2 - IoT Agent Device Registration', function () {
@@ -223,7 +225,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
 
         it("should return all the device's information", function (done) {
             iotAgentLib.register(device1, function (error) {
-                iotAgentLib.getDevice('light1', 'smartgondor', 'gardens', function (error, data) {
+                iotAgentLib.getDevice('light1', null, 'smartgondor', 'gardens', function (error, data) {
                     should.not.exist(error);
                     should.exist(data);
                     data.type.should.equal('Light');
@@ -254,7 +256,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
 
         it('should return a ENTITY_NOT_FOUND error', function (done) {
             iotAgentLib.register(device1, function (error) {
-                iotAgentLib.getDevice('lightUnexistent', 'smartgondor', 'gardens', function (error, data) {
+                iotAgentLib.getDevice('lightUnexistent', null, 'smartgondor', 'gardens', function (error, data) {
                     should.exist(error);
                     should.not.exist(data);
                     error.code.should.equal(404);
@@ -301,7 +303,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
         });
 
         it('should update the devices information in Context Broker', function (done) {
-            iotAgentLib.unregister(device1.id, 'smartgondor', 'gardens', function (error) {
+            iotAgentLib.unregister(device1.id, null, 'smartgondor', 'gardens', function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -346,7 +348,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
 
         it('should not remove the device from the internal registry');
         it('should return a UNREGISTRATION_ERROR error to the caller', function (done) {
-            iotAgentLib.unregister(device1.id, 'smartgondor', 'gardens', function (error) {
+            iotAgentLib.unregister(device1.id, null, 'smartgondor', 'gardens', function (error) {
                 should.exist(error);
                 should.exist(error.name);
                 error.name.should.equal('UNREGISTRATION_ERROR');

package/test/unit/ngsiv2/provisioning/device-update-registration_test.js

@@ -206,7 +206,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
 
         it('should store the new values in the registry', function (done) {
             iotAgentLib.updateRegister(deviceUpdated, false, function (error, data) {
-                iotAgentLib.getDevice(deviceUpdated.id, 'smartgondor', 'gardens', function (error, deviceResult) {
+                iotAgentLib.getDevice(deviceUpdated.id, null, 'smartgondor', 'gardens', function (error, deviceResult) {
                     should.not.exist(error);
                     should.exist(deviceResult);
                     deviceResult.internalId.should.equal(deviceUpdated.internalId);
@@ -264,6 +264,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
             iotAgentLib.updateRegister(deviceCommandUpdated, false, function (error, data) {
                 iotAgentLib.getDevice(
                     deviceCommandUpdated.id,
+                    null,
                     'smartgondor',
                     'gardens',
                     function (error, deviceResult) {

package/test/unit/ngsiv2/provisioning/updateProvisionedDevices-test.js

@@ -240,7 +240,6 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
 
                 request(options, function (error, response, body) {
                     /* jshint camelcase:false */
-
                     body.entity_name.should.equal('ANewLightName');
                     body.timezone.should.equal('Europe/Madrid');
                     done();