iotagent-node-lib 4.4.0 → 4.6.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/provisionFullDevice.json

@@ -25,19 +25,7 @@
         {
           "name":"location",
           "type":"geo:point",
-          "expression": "${latitude}, ${longitude}",
-          "reverse": [
-            {
-              "object_id":"latitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, indexOf(@location, \",\") + 1, length(@location)))}"
-            },
-            {
-              "object_id":"longitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, 0, indexOf(@location, \",\")))}"
-            }
-          ]
+          "expression": "${latitude}, ${longitude}"
         }
       ],
       "static_attributes": [],

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

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

package/test/unit/examples/groupProvisioningRequests/multipleConfigGroupsCreation.json

@@ -0,0 +1,44 @@
+{
+  "groups": [
+    {
+      "resource": "/deviceTest",
+      "apikey": "801230BJKL23Y9090DSFL123HJK09H324HV8732",
+      "entity_type": "Light",
+      "trust": "8970A9078A803H3BL98PINEQRW8342HBAMS",
+      "cbHost": "http://unexistentHost:1026",
+      "commands": [
+        {
+          "name": "wheel1",
+          "type": "Wheel"
+        }
+      ],
+      "lazy": [
+        {
+          "name": "luminescence",
+          "type": "Lumens"
+        }
+      ],
+      "attributes": [
+        {
+          "name": "status",
+          "type": "Boolean"
+        }
+      ]
+    },
+    {
+      "resource": "/deviceTest",
+      "apikey": "23HJK3Y9090DSFL173209HV8801232",
+      "entity_type": "Termometer",
+      "trust": "BL9803H3QRW8342HBAMS8A8",
+      "cbHost": "http://unexistentHost:1026",
+      "commands": [
+        {
+          "name": "temperature",
+          "type": "degrees"
+        }
+      ],
+      "lazy": [],
+      "attributes": []
+    }
+  ]
+}

package/test/unit/examples/groupProvisioningRequests/provisionDuplicateConfigGroup.json

@@ -0,0 +1,35 @@
+{
+  "groups": [
+    {
+      "resource": "/deviceDuplicateGroup",
+      "apikey": "JK09H3L12K09H3L123HJK0732L123HJK38K09H3",
+      "entity_type": "CommandMachinery",
+      "trust": "8970A9078A803H3BL98PINEQRW8342HBAMS",
+      "commands": [
+        {
+          "name": "wheel1",
+          "type": "Wheel"
+        }
+      ],
+      "lazy": [
+        {
+          "name": "luminescence",
+          "type": "Lumens"
+        }
+      ],
+      "attributes": [
+        {
+          "name": "status",
+          "type": "Boolean"
+        }
+      ],
+      "static_attributes": [
+        {
+          "name": "bootstrapServer",
+          "type": "Address",
+          "value": "127.0.0.1"
+        }
+      ]
+    }
+  ]
+}

package/test/unit/examples/groupProvisioningRequests/provisionFullConfigGroup.json

@@ -0,0 +1,36 @@
+{
+  "groups": [
+    {
+      "resource": "/deviceTest",
+      "apikey": "801230BJKL23Y9090DSFL123HJK09H324HV8732",
+      "entity_type": "SensorMachine",
+      "trust": "8970A9078A803H3BL98PINEQRW8342HBAMS",
+      "cbHost": "http://unexistentHost:1026",
+      "commands": [
+        {
+          "name": "wheel1",
+          "type": "Wheel"
+        }
+      ],
+      "lazy": [
+        {
+          "name": "luminescence",
+          "type": "Lumens"
+        }
+      ],
+      "attributes": [
+        {
+          "name": "status",
+          "type": "Boolean"
+        }
+      ],
+      "static_attributes": [
+        {
+          "name": "bootstrapServer",
+          "type": "Address",
+          "value": "127.0.0.1"
+        }
+      ]
+    }
+  ]
+}

package/test/unit/examples/groupProvisioningRequests/provisionFullConfigGroupAlternate.json

@@ -0,0 +1,36 @@
+{
+  "groups": [
+    {
+      "resource": "/deviceTest",
+      "apikey": "754KL23Y9090DSFL123HSFL12380KL23Y2",
+      "entity_type": "AnotherMachine",
+      "trust": "8970A9078A803H3BL98PINEQRW8342HBAMS",
+      "cbHost": "http://unexistentHost:1026",
+      "commands": [
+        {
+          "name": "wheel1",
+          "type": "Wheel"
+        }
+      ],
+      "lazy": [
+        {
+          "name": "luminescence",
+          "type": "Lumens"
+        }
+      ],
+      "attributes": [
+        {
+          "name": "status",
+          "type": "Boolean"
+        }
+      ],
+      "static_attributes": [
+        {
+          "name": "bootstrapServer",
+          "type": "Address",
+          "value": "127.0.0.1"
+        }
+      ]
+    }
+  ]
+}

package/test/unit/general/deviceService-test.js

@@ -153,6 +153,36 @@ const groupCreation = {
         'fiware-servicepath': '/testingPath'
     }
 };
+
+const configGroupCreation = {
+    url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/groups',
+    method: 'POST',
+    json: {
+        groups: [
+            {
+                resource: '',
+                apikey: '801230BJKL23Y9090DSFL123HJK09H324HV8732',
+                entity_type: 'TheLightType',
+                trust: '8970A9078A803H3BL98PINEQRW8342HBAMS',
+                cbHost: 'http://192.168.1.1:1026',
+                commands: [],
+                lazy: [],
+                attributes: [
+                    {
+                        name: 'status',
+                        type: 'Boolean'
+                    }
+                ],
+                static_attributes: []
+            }
+        ]
+    },
+    headers: {
+        'fiware-service': 'testservice',
+        'fiware-servicepath': '/testingPath'
+    }
+};
+
 const deviceCreation = {
     url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
     method: 'POST',
@@ -180,6 +210,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
         async.series([iotAgentLib.clearAll, iotAgentLib.deactivate], done);
     });
 
+    // #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
     describe('When an existing device tries to be retrieved with retrieveOrCreate()', function () {
         beforeEach(function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
@@ -213,6 +244,41 @@ describe('NGSI-v2 - Device Service: utils', function () {
         });
     });
 
+    describe('When an existing device tries to be retrieved with retrieveOrCreate()', function () {
+        beforeEach(function (done) {
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'testservice')
+                .matchHeader('fiware-servicepath', '/testingPath')
+                .post('/v2/registrations')
+                .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
+
+            contextBrokerMock
+                .matchHeader('fiware-service', 'testservice')
+                .matchHeader('fiware-servicepath', '/testingPath')
+                .post('/v2/entities?options=upsert')
+                .reply(204);
+
+            async.series(
+                [request.bind(request, configGroupCreation), request.bind(request, deviceCreation)],
+                function (error, results) {
+                    done();
+                }
+            );
+        });
+
+        it('should return the existing device', function (done) {
+            iotAgentLib.retrieveDevice('Light1', '801230BJKL23Y9090DSFL123HJK09H324HV8732', function (error, device) {
+                should.not.exist(error);
+                should.exist(device);
+
+                device.id.should.equal('Light1');
+                done();
+            });
+        });
+    });
+
+    // #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
+
     describe('When an unexisting device tries to be retrieved for an existing APIKey', function () {
         beforeEach(function (done) {
             contextBrokerMock = nock('http://192.168.1.1:1026')
@@ -249,6 +315,42 @@ describe('NGSI-v2 - Device Service: utils', function () {
         });
     });
 
+    describe('When an unexisting device tries to be retrieved for an existing APIKey', function () {
+        beforeEach(function (done) {
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'testservice')
+                .matchHeader('fiware-servicepath', '/testingPath')
+                .post('/v2/registrations')
+                .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
+
+            contextBrokerMock
+                .matchHeader('fiware-service', 'testservice')
+                .matchHeader('fiware-servicepath', '/testingPath')
+                .post('/v2/entities?options=upsert')
+                .reply(204);
+
+            async.series([request.bind(request, configGroupCreation)], function (error, results) {
+                done();
+            });
+        });
+
+        it('should register the device and return it', function (done) {
+            iotAgentLib.retrieveDevice(
+                'UNEXISTENT_DEV',
+                '801230BJKL23Y9090DSFL123HJK09H324HV8732',
+                function (error, device) {
+                    should.not.exist(error);
+                    should.exist(device);
+
+                    device.id.should.equal('UNEXISTENT_DEV');
+                    should.exist(device.protocol);
+                    device.protocol.should.equal('MQTT_UL');
+                    done();
+                }
+            );
+        });
+    });
+
     describe('When an unexisting device tries to be retrieved for an unexisting APIKey', function () {
         it('should raise an error', function (done) {
             iotAgentLib.retrieveDevice(

package/test/unit/general/statistics-service_test.js

@@ -35,9 +35,6 @@ const iotAgentConfig = {
         host: 'localhost',
         baseRoot: '/'
     },
-    stats: {
-        interval: 100
-    },
     types: {},
     service: 'smartgondor',
     subservice: 'gardens',
@@ -51,9 +48,7 @@ describe('Statistics service', function () {
         oldConfig = commonConfig.getConfig();
         commonConfig.setConfig(iotAgentConfig);
 
-        statsService.globalLoad({}, function () {
-            statsService.clearTimers(done);
-        });
+        statsService.globalLoad({}, done);
     });
 
     afterEach(function (done) {
@@ -74,16 +69,6 @@ describe('Statistics service', function () {
             );
         });
 
-        it('should appear the modified value in the getCurrent() statistics', function (done) {
-            statsService.add(statName, statValue, function () {
-                statsService.getCurrent(statName, function (error, value) {
-                    should.not.exist(error);
-                    should.exist(value);
-                    value.should.equal(statValue);
-                    done();
-                });
-            });
-        });
         it('should add the value to the global values', function (done) {
             statsService.add(statName, statValue, function () {
                 statsService.getGlobal(statName, function (error, value) {
@@ -119,62 +104,4 @@ describe('Statistics service', function () {
             });
         });
     });
-    describe('When the current statistics are reset', function () {
-        beforeEach(function (done) {
-            statsService.add('statA', 42, function () {
-                statsService.add('statB', 52, done);
-            });
-        });
-
-        it('should return a value of zero for any of the individual statistics', function (done) {
-            statsService.resetCurrent(function (error) {
-                should.not.exist(error);
-
-                statsService.getAllCurrent(function (error, data) {
-                    should.exist(data);
-                    should.exist(data.statA);
-                    should.exist(data.statB);
-                    data.statA.should.equal(0);
-                    data.statB.should.equal(0);
-                    done();
-                });
-            });
-        });
-    });
-    describe('When a new periodic stats action is set', function () {
-        let valueCurrent = 0;
-        let valueGlobal = 0;
-        let times = 0;
-
-        beforeEach(function (done) {
-            statsService.globalLoad(
-                {
-                    stat1: 10
-                },
-                function () {
-                    statsService.add('stat1', 5, done);
-                }
-            );
-        });
-
-        function mockedAction(current, global, callback) {
-            valueCurrent = current.stat1;
-            valueGlobal = global.stat1;
-            times++;
-            callback();
-        }
-
-        it('should be triggered with the periodicity stated in the config.stats.interval parameter', function (done) {
-            statsService.addTimerAction(mockedAction, function () {
-                setTimeout(function () {
-                    statsService.clearTimers(function () {
-                        valueCurrent.should.equal(5);
-                        valueGlobal.should.equal(15);
-                        times.should.equal(4);
-                        done();
-                    });
-                }, 480);
-            });
-        });
-    });
 });