iotagent-node-lib 3.2.0 → 3.4.0

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

@@ -129,11 +129,10 @@ describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider',
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('Authorization', 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJ3cHdWclJ3')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext1.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204, {});
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -169,11 +168,10 @@ describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider',
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('Authorization', 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJ3cHdWclJ3')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext1.json')
                 )
-                .query({ type: 'Light' })
                 .reply(403, {});
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -205,8 +203,8 @@ describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider',
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('Authorization', 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJ3cHdWclJ3')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext1.json')
                 )
                 .reply(204, {});
@@ -293,15 +291,6 @@ describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider',
                     )
                     .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-                contextBrokerMock
-                    .post(
-                        '/v2/entities?options=upsert',
-                        utils.readExampleFile(
-                            './test/unit/ngsiv2/examples/contextRequests/createProvisionedDeviceWithGroupAndStatic3.json'
-                        )
-                    )
-                    .reply(204, {});
-
                 contextBrokerMock
                     .post(
                         '/v2/subscriptions',
@@ -321,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);
 
@@ -342,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();
@@ -396,11 +385,10 @@ describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider (F
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('Authorization', 'Bearer c1b752e377680acd1349a3ed59db855a1db07605')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext1.json')
                 )
-                .query({ type: 'Light' })
                 .reply(204, {});
 
             iotAgentConfig.authentication.tokenPath = '/oauth2/token';
@@ -536,11 +524,10 @@ describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider (F
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'electricity')
                 .matchHeader('Authorization', 'Bearer c1b752e377680acd1349a3ed59db855a1db07605')
-                .patch(
-                    '/v2/entities/light1/attrs',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext1.json')
                 )
-                .query({ type: 'Light' })
                 .reply(401, 'Auth-token not found in request header');
 
             iotAgentLib.activate(iotAgentConfig, done);
@@ -624,26 +611,24 @@ describe(
                     .matchHeader('fiware-service', 'testservice')
                     .matchHeader('fiware-servicepath', '/testingPath')
                     .matchHeader('Authorization', 'Bearer c1b752e377680acd1349a3ed59db855a1db07605')
-                    .patch(
-                        '/v2/entities/machine1/attrs',
+                    .post(
+                        '/v2/entities?options=upsert',
                         utils.readExampleFile(
                             './test/unit/ngsiv2/examples/contextRequests/updateContext3WithStatic.json'
                         )
                     )
-                    .query({ type: 'SensorMachine' })
                     .reply(204, {});
 
                 contextBrokerMock2 = nock('http://unexistentHost:1026')
                     .matchHeader('fiware-service', 'testservice')
                     .matchHeader('fiware-servicepath', '/testingPath')
                     .matchHeader('Authorization', 'Bearer bbb752e377680acd1349a3ed59db855a1db076aa')
-                    .patch(
-                        '/v2/entities/machine1/attrs',
+                    .post(
+                        '/v2/entities?options=upsert',
                         utils.readExampleFile(
                             './test/unit/ngsiv2/examples/contextRequests/updateContext3WithStatic.json'
                         )
                     )
-                    .query({ type: 'SensorMachine' })
                     .reply(204, {});
 
                 iotAgentConfig.authentication.tokenPath = '/oauth2/token';
@@ -693,7 +678,6 @@ describe(
                     'fiware-servicepath': '/testingPath'
                 }
             };
-            let contextBrokerMock2;
             let contextBrokerMock3;
             beforeEach(function (done) {
                 const time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
@@ -750,27 +734,14 @@ describe(
                     )
                     .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-                contextBrokerMock2 = nock('http://unexistenthost:1026')
+                contextBrokerMock3 = nock('http://unexistentHost:1026')
                     .matchHeader('fiware-service', 'testservice')
                     .matchHeader('fiware-servicepath', '/testingPath')
                     .matchHeader('authorization', 'Bearer bea752e377680acd1349a3ed59db855a1db07zxc')
                     .post(
                         '/v2/entities?options=upsert',
-                        utils.readExampleFile(
-                            './test/unit/ngsiv2/examples/contextRequests/createProvisionedDeviceWithGroupAndStatic2.json'
-                        )
-                    )
-                    .reply(204, {});
-
-                contextBrokerMock3 = nock('http://unexistentHost:1026')
-                    .matchHeader('fiware-service', 'testservice')
-                    .matchHeader('fiware-servicepath', '/testingPath')
-                    .matchHeader('authorization', 'Bearer zzz752e377680acd1349a3ed59db855a1db07bbb')
-                    .patch(
-                        '/v2/entities/Light1/attrs',
                         utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContext4.json')
                     )
-                    .query({ type: 'SensorMachine' })
                     .reply(204, {});
 
                 iotAgentConfig.authentication.tokenPath = '/oauth2/token';
@@ -790,7 +761,6 @@ describe(
                     should.not.exist(error);
                     response.statusCode.should.equal(201);
                     contextBrokerMock.done();
-                    contextBrokerMock2.done();
                     done();
                 });
             });
@@ -845,14 +815,13 @@ describe(
                 contextBrokerMock = nock('http://unexistentHost:1026')
                     .matchHeader('fiware-service', 'testservice')
                     .matchHeader('fiware-servicepath', '/testingPath')
-                    .matchHeader('Authorization', 'Bearer 999210dacf913772606c95dd0b895d5506cbc988')
-                    .patch(
-                        '/v2/entities/machine1/attrs',
+                    .matchHeader('Authorization', 'Bearer 000210dacf913772606c95dd0b895d5506cbc700')
+                    .post(
+                        '/v2/entities?options=upsert',
                         utils.readExampleFile(
                             './test/unit/ngsiv2/examples/contextRequests/updateContext3WithStatic.json'
                         )
                     )
-                    .query({ type: 'SensorMachine' })
                     .reply(204, {});
 
                 iotAgentConfig.authentication.tokenPath = '/oauth2/token';
@@ -865,7 +834,6 @@ describe(
             it('should send the permanent token in the auth header', function (done) {
                 iotAgentLib.update('machine1', 'SensorMachine', '', values, function (error) {
                     should.not.exist(error);
-                    contextBrokerMock.done();
                     done();
                 });
             });
@@ -873,7 +841,6 @@ describe(
             it('should use the permanent trust token in the following requests', function (done) {
                 iotAgentLib.update('machine1', 'SensorMachine', '', values, function (error) {
                     should.not.exist(error);
-                    contextBrokerMock.done();
                     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);
 
@@ -229,11 +229,7 @@ describe('NGSI-v2 - HTTPS support tests', 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('https://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerMock = nock('https://192.168.1.1:1026');
 
             const nockBody = utils.readExampleFile(
                 './test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent1.json'

package/test/unit/ngsiv2/lazyAndCommands/command-test.js

@@ -130,12 +130,6 @@ describe('NGSI-v2 - Command functionalities', 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, done);
     });
 
@@ -269,8 +263,8 @@ describe('NGSI-v2 - Command functionalities', function () {
             statusAttributeMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/r2d2/attrs?type=Robot',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextCommandFinish.json')
                 )
                 .reply(204);
@@ -293,8 +287,8 @@ describe('NGSI-v2 - Command functionalities', function () {
             statusAttributeMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/r2d2/attrs?type=Robot',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextCommandError.json')
                 )
                 .reply(204);

package/test/unit/ngsiv2/lazyAndCommands/polling-commands-test.js

@@ -202,14 +202,7 @@ describe('NGSI-v2 - Polling commands', function () {
         };
 
         beforeEach(function (done) {
-            statusAttributeMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/Robot:r2d2/attrs?type=Robot',
-                    utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextCommandStatus.json')
-                )
-                .reply(204);
+            statusAttributeMock = nock('http://192.168.1.1:1026');
 
             iotAgentLib.register(device3, function (error) {
                 done();
@@ -299,8 +292,8 @@ describe('NGSI-v2 - Polling commands', function () {
             statusAttributeMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/Robot:r2d2/attrs?type=Robot',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextCommandStatus.json')
                 )
                 .reply(204);
@@ -352,8 +345,8 @@ describe('NGSI-v2 - Polling commands', function () {
             statusAttributeMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/Robot:r2d2/attrs?type=Robot',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile('./test/unit/ngsiv2/examples/contextRequests/updateContextCommandStatus.json')
                 )
                 .reply(204);
@@ -361,8 +354,8 @@ describe('NGSI-v2 - Polling commands', function () {
             statusAttributeMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/Robot:r2d2/attrs?type=Robot',
+                .post(
+                    '/v2/entities?options=upsert',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextCommandExpired.json'
                     )
@@ -468,16 +461,7 @@ describe('NGSI-v2 - Polling commands expressions', function () {
         };
 
         beforeEach(function (done) {
-            statusAttributeMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .patch(
-                    '/v2/entities/RobotExp:r2d4/attrs?type=RobotExp',
-                    utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextCommandStatus2.json'
-                    )
-                )
-                .reply(204);
+            statusAttributeMock = nock('http://192.168.1.1:1026');
 
             iotAgentLib.register(device4, function (error) {
                 done();