iotagent-node-lib 4.4.0 → 4.5.0

package/test/functional/testUtils.js

@@ -98,28 +98,61 @@ function sendMeasureIotaLib(measure, provision) {
  * @param {Object} json
  * @returns {Array} measures
  */
-function jsonToIotaMeasures(json) {
-    let measures = [];
-    for (let key in json) {
-        /* eslint-disable-next-line  no-prototype-builtins */
-        if (json.hasOwnProperty(key)) {
-            let measure = {
-                name: key,
-                value: json[key]
-            };
-            // A bit of Magic. If the key is TimeInstant, we set the type to DateTime.
-            // When sending the data through iot
-            if (key === 'TimeInstant') {
-                measure.type = 'DateTime';
-            } else {
-                // Although the type is not meaningfull and we could have picked any string for this,
-                // we have aligned with DEFAULT_ATTRIBUTE_TYPE constant in IOTA-JSON and IOTA-UL repositories
-                measure.type = 'Text';
+function jsonToIotaMeasures(originJson) {
+    // FIXME: maybe this could be refactored to use less code
+    if (originJson && originJson[0]) {
+        // multimeasure case
+        let finalMeasures = [];
+
+        for (let json of originJson) {
+            let measures = [];
+            for (let key in json) {
+                /* eslint-disable-next-line  no-prototype-builtins */
+                if (json.hasOwnProperty(key)) {
+                    let measure = {
+                        name: key,
+                        value: json[key]
+                    };
+                    // A bit of Magic. If the key is TimeInstant, we set the type to DateTime.
+                    // When sending the data through iot
+                    if (key === 'TimeInstant') {
+                        measure.type = 'DateTime';
+                    } else {
+                        // Although the type is not meaningfull and we could have picked any string for this,
+                        // we have aligned with DEFAULT_ATTRIBUTE_TYPE constant in IOTA-JSON and IOTA-UL repositories
+                        measure.type = 'Text';
+                    }
+                    measures.push(measure);
+                }
+            }
+            finalMeasures.push(measures);
+        }
+        return finalMeasures;
+    } else {
+        let json = originJson;
+
+        let measures = [];
+        for (let key in json) {
+            /* eslint-disable-next-line  no-prototype-builtins */
+            if (json.hasOwnProperty(key)) {
+                let measure = {
+                    name: key,
+                    value: json[key]
+                };
+                // A bit of Magic. If the key is TimeInstant, we set the type to DateTime.
+                // When sending the data through iot
+                if (key === 'TimeInstant') {
+                    measure.type = 'DateTime';
+                } else {
+                    // Although the type is not meaningfull and we could have picked any string for this,
+                    // we have aligned with DEFAULT_ATTRIBUTE_TYPE constant in IOTA-JSON and IOTA-UL repositories
+                    measure.type = 'Text';
+                }
+                measures.push(measure);
             }
-            measures.push(measure);
         }
+        return measures;
     }
-    return measures;
 }
 
 /**
@@ -170,7 +203,7 @@ async function testCase(measure, expectation, provision, env, config, type, tran
     let receivedContext = [];
     let cbMockRoute = '';
     // Set the correct route depending if the test is multientity or not
-    if (type === 'multientity') {
+    if (type === 'multientity' || type === 'multimeasure') {
         cbMockRoute = '/v2/op/update';
     } else {
         cbMockRoute = '/v2/entities?options=upsert';

package/test/unit/examples/deviceProvisioningRequests/updateProvisionDeviceWithApikey.json

@@ -0,0 +1,4 @@
+{
+    "apikey": "APIKEY2",
+    "timezone": "Europe/Madrid"
+}

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

@@ -186,14 +186,14 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
         });
 
         it('should register as ContextProvider of its lazy attributes', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
+            iotAgentLib.updateRegister(deviceUpdated, device1, 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.updateRegister(deviceUpdated, device1, false, function (error, data) {
                 iotAgentLib.getDevice(deviceUpdated.id, null, 'smartgondor', 'gardens', function (error, deviceResult) {
                     should.not.exist(error);
                     should.exist(deviceResult);
@@ -236,7 +236,7 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
         //     });
         // });
         it('should store the new values in the registry', function (done) {
-            iotAgentLib.updateRegister(deviceCommandUpdated, false, function (error, data) {
+            iotAgentLib.updateRegister(deviceCommandUpdated, device1, false, function (error, data) {
                 iotAgentLib.getDevice(
                     deviceCommandUpdated.id,
                     null,
@@ -257,7 +257,7 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
 
     describe('When a update action is executed in a non registered device', function () {
         it('should return a DEVICE_NOT_FOUND error', function (done) {
-            iotAgentLib.updateRegister(unknownDevice, false, function (error) {
+            iotAgentLib.updateRegister(unknownDevice, device1, false, function (error) {
                 should.exist(error);
                 error.name.should.equal('DEVICE_NOT_FOUND');
                 done();
@@ -273,7 +273,7 @@ describe('NGSI-LD - IoT Agent Device Update Registration', function () {
         });
 
         it('should return a REGISTRATION_ERROR error in the update action', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
+            iotAgentLib.updateRegister(deviceUpdated, device1, false, function (error) {
                 should.exist(error);
                 //error.name.should.equal('UNREGISTRATION_ERROR');
                 done();

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

@@ -197,7 +197,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         });
 
         it('should register as ContextProvider of its lazy attributes', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
+            iotAgentLib.updateRegister(deviceUpdated, device1, false, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -205,7 +205,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.updateRegister(deviceUpdated, device1, false, function (error, data) {
                 iotAgentLib.getDevice(deviceUpdated.id, null, 'smartgondor', 'gardens', function (error, deviceResult) {
                     should.not.exist(error);
                     should.exist(deviceResult);
@@ -253,7 +253,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         });
 
         it('should register as ContextProvider of its commands and create the additional attributes', function (done) {
-            iotAgentLib.updateRegister(deviceCommandUpdated, false, function (error) {
+            iotAgentLib.updateRegister(deviceCommandUpdated, device1, false, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -261,7 +261,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         });
 
         it('should store the new values in the registry', function (done) {
-            iotAgentLib.updateRegister(deviceCommandUpdated, false, function (error, data) {
+            iotAgentLib.updateRegister(deviceCommandUpdated, device1, false, function (error, data) {
                 iotAgentLib.getDevice(
                     deviceCommandUpdated.id,
                     null,
@@ -282,7 +282,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
 
     describe('When a update action is executed in a non registered device', function () {
         it('should return a DEVICE_NOT_FOUND error', function (done) {
-            iotAgentLib.updateRegister(unknownDevice, false, function (error) {
+            iotAgentLib.updateRegister(unknownDevice, device1, false, function (error) {
                 should.exist(error);
                 error.name.should.equal('DEVICE_NOT_FOUND');
                 done();
@@ -304,7 +304,7 @@ describe('NGSI-v2 - IoT Agent Device Update Registration', function () {
         });
 
         it('should return a REGISTRATION_ERROR error in the update action', function (done) {
-            iotAgentLib.updateRegister(deviceUpdated, false, function (error) {
+            iotAgentLib.updateRegister(deviceUpdated, device1, false, function (error) {
                 should.exist(error);
                 error.name.should.equal('UNREGISTRATION_ERROR');
                 done();

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

@@ -289,6 +289,41 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
             });
         });
     });
+    describe('When an update request arrives with a new Apikey', function () {
+        const optionsUpdate = {
+            url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices/Light1',
+            method: 'PUT',
+            headers: {
+                'fiware-service': 'smartgondor',
+                'fiware-servicepath': '/gardens'
+            },
+            json: utils.readExampleFile(
+                './test/unit/examples/deviceProvisioningRequests/updateProvisionDeviceWithApikey.json'
+            )
+        };
+
+        beforeEach(function () {
+            contextBrokerMock
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', '/gardens')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
+                .reply(204);
+
+            contextBrokerMock
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', '/gardens')
+                .post('/v2/registrations')
+                .reply(201, null, { Location: '/v2/registrations/4419a7f5254b058441165849' });
+        });
+
+        it('should raise a 204 error', function (done) {
+            request(optionsUpdate, function (error, response, body) {
+                should.not.exist(error);
+                response.statusCode.should.equal(204);
+                done();
+            });
+        });
+    });
     describe('When a wrong update request payload arrives', function () {
         const optionsUpdate = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices/Light1',