iotagent-node-lib 3.4.4 → 4.0.0

package/test/unit/ngsi-ld/provisioning/device-provisioning-api_test.js

@@ -96,14 +96,6 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
                     )
                 )
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
-
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile('./test/unit/ngsi-ld/examples/contextRequests/createProvisionedDevice.json')
-                )
-                .reply(204);
         });
 
         const options = {
@@ -208,16 +200,16 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
                 });
             });
         });
-        // FIXME: disabled test by #1421
-        // it('should create the initial entity in the Context Broker', function (done) {
-        //     request(options, function (error, response, body) {
-        //         response.statusCode.should.equal(201);
-        //         iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
-        //             contextBrokerMock.done();
-        //             done();
-        //         });
-        //     });
-        // });
+
+        it('should not send requests to the Context Broker', function (done) {
+            request(options, function (error, response, body) {
+                response.statusCode.should.equal(201);
+                iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
+                    contextBrokerMock.done();
+                    done();
+                });
+            });
+        });
     });
     describe('When a device provisioning request with a TimeInstant attribute arrives to the IoTA', function () {
         const options = {
@@ -243,23 +235,15 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
 
         beforeEach(function (done) {
             nock.cleanAll();
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile('./test/unit/ngsi-ld/examples/contextRequests/createTimeinstantDevice.json')
-                )
-                .reply(204);
-
             done();
         });
-        // FIXME: disabled test by #1421
-        // it('should send the appropriate requests to the Context Broker', function (done) {
-        //     request(options, function (error, response, body) {
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should not send requests to the Context Broker', function (done) {
+            request(options, function (error, response, body) {
+                contextBrokerMock.done();
+                done();
+            });
+        });
     });
 
     describe('When a device provisioning request with a timestamp provision attribute arrives to the IoTA', function () {
@@ -286,66 +270,49 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
 
         beforeEach(function (done) {
             nock.cleanAll();
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile('./test/unit/ngsi-ld/examples/contextRequests/createTimeinstantDevice.json')
-                )
-                .reply(204);
-
             done();
         });
-        // FIXME: disabled test by #1421
-        // it('should send the appropriate requests to the Context Broker', function (done) {
-        //     request(options, function (error, response, body) {
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should not send requests to the Context Broker', function (done) {
+            request(options, function (error, response, body) {
+                done();
+            });
+        });
     });
 
-    // describe('When a device provisioning request with a autoprovision attribute arrives to the IoTA', function () {
-    //     const options = {
-    //         url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
-    //         method: 'POST',
-    //         json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionAutoprovision.json'),
-    //         headers: {
-    //             'fiware-service': 'smartgondor',
-    //             'fiware-servicepath': '/gardens'
-    //         }
-    //     };
-
-    //     beforeEach(function (done) {
-    //         iotAgentLib.deactivate(function () {
-    //             iotAgentConfig.appendMode = false;
-    //             iotAgentLib.activate(iotAgentConfig, done);
-    //         });
-    //     });
-
-    //     afterEach(function () {
-    //         iotAgentConfig.appendMode = false;
-    //     });
-
-    //     beforeEach(function (done) {
-    //         nock.cleanAll();
-    //         contextBrokerMock = nock('http://192.168.1.1:1026')
-    //             .matchHeader('fiware-service', 'smartgondor')
-    //             .post(
-    //                 '/ngsi-ld/v1/entityOperations/upsert/',
-    //                 utils.readExampleFile('./test/unit/ngsi-ld/examples/contextRequests/createAutoprovisionDevice.json')
-    //             )
-    //             .reply(204);
-    //         done();
-    //     });
-
-    //     it('should send the appropriate requests to the Context Broker', function (done) {
-    //         request(options, function (error, response, body) {
-    //             contextBrokerMock.done();
-    //             done();
-    //         });
-    //     });
-    // });
+    describe('When a device provisioning request with a autoprovision attribute arrives to the IoTA', function () {
+        const options = {
+            url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
+            method: 'POST',
+            json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionAutoprovision.json'),
+            headers: {
+                'fiware-service': 'smartgondor',
+                'fiware-servicepath': '/gardens'
+            }
+        };
+
+        beforeEach(function (done) {
+            iotAgentLib.deactivate(function () {
+                iotAgentConfig.appendMode = false;
+                iotAgentLib.activate(iotAgentConfig, done);
+            });
+        });
+
+        afterEach(function () {
+            iotAgentConfig.appendMode = false;
+        });
+
+        beforeEach(function (done) {
+            nock.cleanAll();
+            done();
+        });
+
+        it('should not send requests to the Context Broker', function (done) {
+            request(options, function (error, response, body) {
+                done();
+            });
+        });
+    });
 
     describe('When a device provisioning request arrives to the IoTAand timestamp is enabled in configuration', function () {
         const options = {
@@ -371,25 +338,15 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
 
         beforeEach(function (done) {
             nock.cleanAll();
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/createTimeInstantMinimumDevice.json'
-                    )
-                )
-                .reply(204);
 
             done();
         });
-        // FIXME: disabled test by #1421
-        // it('should send the appropriate requests to the Context Broker', function (done) {
-        //     request(options, function (error, response, body) {
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should not send requests to the Context Broker', function (done) {
+            request(options, function (error, response, body) {
+                done();
+            });
+        });
     });
 
     describe('When a device provisioning request with the minimum required data arrives to the IoT Agent', function () {
@@ -405,25 +362,14 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
 
         beforeEach(function (done) {
             nock.cleanAll();
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/createMinimumProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
             done();
         });
-        // FIXME: disabled test by #1421
-        // it('should send the appropriate requests to the Context Broker', function (done) {
-        //     request(options, function (error, response, body) {
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should not send requests to the Context Broker', function (done) {
+            request(options, function (error, response, body) {
+                done();
+            });
+        });
 
         it('should add the device to the devices list', function (done) {
             request(options, function (error, response, body) {
@@ -463,25 +409,14 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
 
         beforeEach(function (done) {
             nock.cleanAll();
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/createGeopointProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
             done();
         });
-        // FIXME: disabled test by #1421
-        // it('should send the appropriate initial values to the Context Broker', function (done) {
-        //     request(options, function (error, response, body) {
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should not send any initial values to the Context Broker', function (done) {
+            request(options, function (error, response, body) {
+                done();
+            });
+        });
     });
 
     describe('When a device provisioning request with DateTime attributes arrives', function () {
@@ -497,25 +432,14 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
 
         beforeEach(function (done) {
             nock.cleanAll();
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/createDatetimeProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
             done();
         });
-        // FIXME: disabled test by #1421
-        // it('should send the appropriate initial values to the Context Broker', function (done) {
-        //     request(options, function (error, response, body) {
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should not send any initial values to the Context Broker', function (done) {
+            request(options, function (error, response, body) {
+                done();
+            });
+        });
     });
 
     describe('When two devices with the same ID but different services arrive to the agent', function () {
@@ -590,46 +514,6 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
         });
     });
 
-    describe('When the Context Broker returns an unrecognized status code provisioning an entity', function () {
-        const options = {
-            url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
-            method: 'POST',
-            json: utils.readExampleFile('./test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice.json'),
-            headers: {
-                'fiware-service': 'smartgondor',
-                'fiware-servicepath': '/gardens'
-            }
-        };
-
-        beforeEach(function (done) {
-            nock.cleanAll();
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/createMinimumProvisionedDevice.json'
-                    )
-                )
-                .reply(207);
-
-            done();
-        });
-        // FIXME: disabled test by #1421
-        // it('should return an error message in the response body', function (done) {
-        //     request(options, function (error, response, body) {
-        //         should.not.exist(error);
-        //         response.body.name.should.equal('ENTITY_GENERIC_ERROR');
-        //         response.body.message.should.equal(
-        //             'Error accesing entity data for device: MicroLight1 of type: MicroLights'
-        //         );
-        //         response.statusCode.should.equal(200);
-
-        //         done();
-        //     });
-        // });
-    });
-
     describe('When the Context Broker returns a 200 status code (NGSI-LD v1.2.1) provisioning an entity', function () {
         const options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
@@ -733,15 +617,15 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
 
             done();
         });
-        // FIXME: disabled test by #1421
-        // it('should return a valid return code', function (done) {
-        //     request(options, function (error, response, body) {
-        //         should.not.exist(error);
-        //         response.statusCode.should.equal(500);
 
-        //         done();
-        //     });
-        // });
+        it('should return a valid return code', function (done) {
+            request(options, function (error, response, body) {
+                should.not.exist(error);
+                response.statusCode.should.equal(201);
+
+                done();
+            });
+        });
     });
 
     describe('When there is a connection error with a Number code connecting the CB', function () {
@@ -761,27 +645,18 @@ describe('NGSI-LD - Device provisioning API: Provision devices', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/')
-                .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/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')
-                .post('/ngsi-ld/v1/entityOperations/upsert/')
-                .replyWithError({ message: 'Description of the error', code: 123456789 });
+                .reply(400, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
             done();
         });
-        // FIXME: disabled test by #1421
-        // 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);
 
-        //         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(201);
+                done();
+            });
+        });
     });
 
     describe('When a device provisioning request with missing data arrives to the IoT Agent', function () {

package/test/unit/ngsi-ld/provisioning/device-registration_test.js

@@ -109,19 +109,10 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
     describe('When a new device is connected to the IoT Agent', function () {
         beforeEach(function (done) {
             nock.cleanAll();
-
-            // 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 = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post('/ngsi-ld/v1/entityOperations/upsert/')
-                .reply(204);
-
             const nockBody = utils.readExampleFile(
                 './test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent1.json'
             );
-            contextBrokerMock
+            contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/', nockBody)
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
@@ -130,14 +121,14 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
                 iotAgentLib.clearAll(done);
             });
         });
-        // FIXME: disabled test by #1421
-        // it('should register as ContextProvider of its lazy attributes', function (done) {
-        //     iotAgentLib.register(device1, function (error) {
-        //         should.not.exist(error);
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should register as ContextProvider of its lazy attributes', function (done) {
+            iotAgentLib.register(device1, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
     });
 
     describe('When the Context Broker returns a NGSI error while registering a device', function () {
@@ -156,15 +147,15 @@ describe('NGSI-LD - IoT Agent Device Registration', function () {
                 iotAgentLib.clearAll(done);
             });
         });
-        // FIXME: disabled test by #1421
-        // it('should register as ContextProvider of its lazy attributes', function (done) {
-        //     iotAgentLib.register(device1, function (error) {
-        //         should.exist(error);
-        //         error.name.should.equal('BAD_REQUEST');
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should register as ContextProvider of its lazy attributes', function (done) {
+            iotAgentLib.register(device1, function (error) {
+                should.exist(error);
+                error.name.should.equal('BAD_REQUEST');
+                contextBrokerMock.done();
+                done();
+            });
+        });
     });
 
     describe('When the Context Broker returns an HTTP transport error while registering a device', function () {

package/test/unit/ngsi-ld/provisioning/device-update-registration_test.js

@@ -148,14 +148,6 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
             .post('/ngsi-ld/v1/csourceRegistrations/')
             .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/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')
-            .post('/ngsi-ld/v1/entityOperations/upsert/')
-            .reply(204);
-
         iotAgentLib.activate(iotAgentConfig, function (error) {
             iotAgentLib.register(device1, function (error) {
                 done();
@@ -192,14 +184,14 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
                 )
                 .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
         });
-        // FIXME: disabled test by #1421
-        // it('should register as ContextProvider of its lazy attributes', function (done) {
-        //     iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
-        //         should.not.exist(error);
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should register as ContextProvider of its lazy attributes', function (done) {
+            iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
         it('should store the new values in the registry', function (done) {
             iotAgentLib.updateRegister(deviceUpdated, false, function (error, data) {
                 iotAgentLib.getDevice(deviceUpdated.id, null, 'smartgondor', 'gardens', function (error, deviceResult) {

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

@@ -322,11 +322,6 @@ describe('NGSI-LD - Device provisioning API: Update provisioned devices', functi
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post('/ngsi-ld/v1/entityOperations/upsert/')
-                .reply(204);
-
-            contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/entityOperations/upsert/?options=update',
@@ -358,14 +353,6 @@ describe('NGSI-LD - Device provisioning API: Update provisioned devices', functi
                 });
             });
         });
-        // FIXME: disabled test by #1421
-        // it('should create the initial values for the attributes in the Context Broker', function (done) {
-        //     request(optionsUpdate, function (error, response, body) {
-        //         should.not.exist(error);
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
     });
 
     describe('When a device is updated to add static attributes', function () {

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

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

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

@@ -0,0 +1,8 @@
+{
+  "id": "1234",
+  "type": "WeatherStation",
+  "pressure": {
+    "value": 1040,
+    "type": "Number"
+  }
+}

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

@@ -3,6 +3,6 @@
   "type": "Light",
   "pressure": {
     "type": "Number",
-    "value": 1040
+    "value": null
   }
 }

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

@@ -9,12 +9,6 @@
         52
       ],
       "type": "Point"
-    },
-    "metadata": {
-        "TimeInstant": {
-            "type": "DateTime",
-            "value": "1970-01-01T00:00:00.001Z"
-        }
     }
   },
   "TimeInstant": {

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

@@ -1,6 +1,14 @@
 {
   "id":"gps1",
   "type":"GPS",
+  "lat": {
+    "type": "Number",
+    "value": 52
+  },
+  "lon": {
+    "type": "Number",
+    "value": 13
+  },
   "location": {
     "type": "geo:json",
     "value": {

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

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

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

@@ -1,10 +1,6 @@
 {
     "id":"gps1",
     "type":"GPS",
-    "TimeInstant": {
-        "type": "DateTime",
-        "value": "2015-08-05T07:35:01.468+00:00"
-    },
     "location": {
         "value": {
             "coordinates": [
@@ -13,12 +9,6 @@
             ],
             "type": "Point"
         },
-        "type": "geo:json",
-        "metadata": {
-            "TimeInstant": {
-                "type": "DateTime",
-                "value": "2015-08-05T07:35:01.468+00:00"
-            }
-        }
+        "type": "geo:json"
     }
 }