iotagent-node-lib 3.1.0 → 3.3.0

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

@@ -100,15 +100,6 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                     )
                 )
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
-
-            contextBrokerMock
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/createProvisionedDevice.json')
-                )
-                .reply(204);
         });
 
         const options = {
@@ -214,7 +205,7 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
             });
         });
 
-        it('should create the initial entity in the Context Broker', function (done) {
+        it('should not 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) {
@@ -248,15 +239,6 @@ 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/createTimeinstantDevice.json')
-                )
-                .reply(204);
-
             done();
         });
 
@@ -292,15 +274,6 @@ 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/createTimeinstantDevice.json')
-                )
-                .reply(204);
-
             done();
         });
 
@@ -336,15 +309,6 @@ 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/createExplicitAttrsDevice.json')
-                )
-                .reply(204);
-
             done();
         });
 
@@ -394,17 +358,6 @@ 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();
             });
 
@@ -552,12 +505,12 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 done();
             });
 
-            it('should store the device with static attributes provided in configuration', function (done) {
+            it('should not store the device with static attributes provided in configuration', function (done) {
                 request(groupCreation, function (error, response, body) {
                     request(options, function (error, response, body) {
                         iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                             should.exist(results.devices[0].staticAttributes);
-                            results.devices[0].staticAttributes[0].name.should.equal('bootstrapServer');
+                            results.devices[0].staticAttributes.length.should.equal(0);
                             done();
                         });
                     });
@@ -692,12 +645,12 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 done();
             });
 
-            it('should store the device with static attributes provided in configuration as well as device', function (done) {
+            it('should store the device with static attributes provided in device but no in configuration', function (done) {
                 request(groupCreation, function (error, response, body) {
                     request(options, function (error, response, body) {
                         iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                             should.exist(results.devices[0].staticAttributes);
-                            results.devices[0].staticAttributes.length.should.equal(2);
+                            results.devices[0].staticAttributes.length.should.equal(1);
                             done();
                         });
                     });
@@ -726,8 +679,15 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                         apikey: '801230BJKL23Y9090DSFL123HJK09H324HV8732',
                         /*jshint camelcase: false */
                         entity_type: 'MicroLights',
-                        entityNameExp: 'EntityNameByExp',
-                        cbHost: 'http://192.168.1.1:1026'
+                        entityNameExp: "id + '__' + suffix_st",
+                        cbHost: 'http://192.168.1.1:1026',
+                        static_attributes: [
+                            {
+                                name: 'suffix_st',
+                                type: 'Text',
+                                value: 'SUFFIX'
+                            }
+                        ]
                     }
                 ]
             },
@@ -758,7 +718,7 @@ describe('NGSI-v2 - Device provisioning API: Provision devices', function () {
                 request(options, function (error, response, body) {
                     iotAgentLib.listDevices('smartgondor', '/gardens', function (error, results) {
                         should.exist(results.devices[0].name);
-                        results.devices[0].name.should.equal('EntityNameByExp');
+                        results.devices[0].name.should.equal('MicroLight1__SUFFIX');
                         done();
                     });
                 });

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

@@ -112,11 +112,7 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             // 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')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerMock = nock('http://192.168.1.1:1026');
 
             const nockBody = utils.readExampleFile(
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent1.json'
@@ -279,7 +275,6 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             // 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.post('/v2/entities?options=upsert').reply(204);
 
             contextBrokerMock
                 .post('/v2/registrations')
@@ -288,7 +283,6 @@ describe('NGSI-v2 - IoT Agent Device Registration', function () {
             // 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.post('/v2/entities?options=upsert').reply(204);
 
             contextBrokerMock
                 .delete('/v2/registrations/6319a7f5254b05844116584d', '')

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

@@ -148,15 +148,6 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', 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')
-            .reply(204);
-
         iotAgentLib.activate(iotAgentConfig, function (error) {
             iotAgentLib.register(device1, function (error) {
                 done();
@@ -212,6 +203,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
                 done();
             });
         });
+
         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) {
@@ -267,6 +259,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
                 done();
             });
         });
+
         it('should store the new values in the registry', function (done) {
             iotAgentLib.updateRegister(deviceCommandUpdated, false, function (error, data) {
                 iotAgentLib.getDevice(

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

@@ -288,17 +288,6 @@ describe('NGSI-v2 - Provisioning API: Single service mode', function () {
                 )
                 .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-            contextBrokerMock
-                .matchHeader('fiware-service', 'testservice')
-                .matchHeader('fiware-servicepath', '/testingPath')
-                .post(
-                    '/v2/entities?options=upsert',
-                    utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/createProvisionedDeviceWithGroupAndStatic.json'
-                    )
-                )
-                .reply(204);
-
             request(groupCreation, done);
         });
 

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

@@ -376,13 +376,6 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
                 });
             });
         });
-        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/plugins/capture-provision-inPlugins_test.js

@@ -89,12 +89,6 @@ describe('NGSI-v2 - Data Mapping Plugins: device provision', function () {
             )
             .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-        contextBrokerMock
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
-
         iotAgentLib.activate(iotAgentConfig, function (error) {
             iotAgentLib.clearAll(done);
         });