Merge branch 'master' into task/allow_ngsiv2_as_measure

telefonicaid · Oct 25, 2023 · 9928b4c · 9928b4c
2 parents de727ec + b6060de
commit 9928b4c
Show file tree

Hide file tree

Showing 22 changed files with 74 additions and 171 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,3 @@
 - Fix: binary data representation when sending data through HTTP & MQTT (#690)
 - Fix: ensure service and subservice from device in logs about error proccesing message
-- Remove: legacy code about unused parsedMessageError flag
+- Remove: legacy code about unused parsedMessageError flag
diff --git a/README.md b/README.md
@@ -82,27 +82,6 @@ their APIs can be found in the IoT Agent Library [documentation](https://iotagen
 The latest IoT Agent for JSON documentation is also available on
 [ReadtheDocs](https://fiware-iotagent-json.readthedocs.io/en/latest/)
 
-## Command-line Client
-
-The JSON IoT Agent comes with a client that can be used to test its features, simulating a device. The client can be
-executed with the following command:
-
-```console
-bin/iotaJsonTester.js
-```
-
-This will show a prompt where commands can be issued to the MQTT broker. For a list of the currently available commands
-type `help`.
-
-The client loads a global configuration used for all the commands, containing the host and port of the MQTT broker and
-the API Key and Device ID of the device to simulate. This information can be changed with the `config` command.
-
-In order to use any of the MQTT commands, you have to connect to the MQTT broker first. If no connection is available,
-MQTT commands will show an error message reminding you to connect.
-
-The command-line Client gets its default values from a config file in the root of the project: `client-config.js`. This
-config file can be used to permanently tune the MQTT broker parameters, or the default device ID and APIKey.
-
 ## Contributing
 
 If you'd like to contribute, start by searching through the issues and pull requests to see whether someone else has

diff --git a/lib/bindings/HTTPBinding.js b/lib/bindings/HTTPBinding.js
@@ -224,7 +224,7 @@ function executeCommand(apiKey, device, cmdName, serializedPayload, contentType,
                 .getLogger()
                 .info(
                     context,
-                    'Cmd:\n %j was sent to the device %s with http options %j',
+                    'Cmd: %j was sent to the device %s with http options %j',
                     serializedPayload,
                     cmdName,
                     options
@@ -236,7 +236,7 @@ function executeCommand(apiKey, device, cmdName, serializedPayload, contentType,
                 .getLogger()
                 .info(
                     context,
-                    'Cmd:\n %j was sent to the device %s with http options %j',
+                    'Cmd: %j was sent to the device %s with http options %j',
                     serializedPayload,
                     cmdName,
                     options

diff --git a/lib/bindings/MQTTBinding.js b/lib/bindings/MQTTBinding.js
@@ -146,7 +146,7 @@ function recreateSubscriptions(callback) {
                 callback(error);
             } else {
                 iotAgentLib.alarms.release(constants.MQTTB_ALARM);
-                config.getLogger().info(context, 'Successfully subscribed to the following topics:\n%j\n', topics);
+                config.getLogger().info(context, 'Successfully subscribed to the following topics: %j', topics);
                 if (callback) {
                     callback(null);
                 }
@@ -175,7 +175,7 @@ function sendConfigurationToDevice(apiKey, deviceId, results, callback) {
     if (config.getConfig().mqtt.retain === true) {
         options.retain = config.getConfig().mqtt.retain;
     }
-    config.getLogger().debug(context, 'Sending requested configuration to the device:\n %j', configurations);
+    config.getLogger().debug(context, 'Sending requested configuration to the device: %j', configurations);
     const leadingSlash = config.getConfig().mqtt.avoidLeadingSlash ? '' : '/';
 
     const commandTopic =
@@ -199,17 +199,17 @@ function sendConfigurationToDevice(apiKey, deviceId, results, callback) {
                         .getLogger()
                         .error(
                             context,
-                            'Error %j in Configuration:\n %j sent to the device %s with mqtt options %j',
+                            'Error %j in Configuration: %j sent to the device %s with mqtt options %j',
                             error,
                             JSON.stringify(configurations),
                             commandTopic,
                             options
                         );
                 }
             });
-        config.getLogger().info(context, 'Configuration:\n %j was sent to the device: %s', configurations, commandTopic);
+        config.getLogger().info(context, 'Configuration: %j was sent to the device: %s', configurations, commandTopic);
     } else {
-        config.getLogger().error(context, 'Configuration:\n %j was not set to the device: %s due to not connected', configurations, commandTopic);
+        config.getLogger().error(context, 'Configuration: %j was not set to the device: %s due to not connected', configurations, commandTopic);
     }
     callback();
 }
@@ -407,7 +407,7 @@ function executeCommand(apiKey, device, cmdName, serializedPayload, contentType,
                     .getLogger()
                     .error(
                         context,
-                        'Error %j in Cmd:\n %j sent to the device %s with mqtt options %j',
+                        'Error %j in Cmd: %j sent to the device %s with mqtt options %j',
                         error,
                         serializedPayload,
                         commandTopic,
@@ -419,7 +419,7 @@ function executeCommand(apiKey, device, cmdName, serializedPayload, contentType,
             .getLogger()
             .info(
                 context,
-                'Cmd:\n %j was sent to the device %s with mqtt options %j',
+                'Cmd: %j was sent to the device %s with mqtt options %j',
                 serializedPayload,
                 commandTopic,
                 options

diff --git a/lib/commandHandler.js b/lib/commandHandler.js
@@ -104,7 +104,7 @@ function generateCommandExecution(apiKey, device, attribute) {
         .getLogger()
         .debug(
             context,
-            'Sending command execution to device [%s] with apikey [%s] and payload [%j] ',
+            'Sending command execution to device %s with apikey %s and payload %j ',
             device.id,
             apiKey,
             payload
@@ -134,14 +134,7 @@ function generateCommandExecution(apiKey, device, attribute) {
 function commandHandler(id, type, service, subservice, attributes, callback) {
     config
         .getLogger()
-        .debug(
-            context,
-            'Handling command %j for device [%s] in service [%s - %s]',
-            attributes,
-            id,
-            service,
-            subservice
-        );
+        .debug(context, 'Handling command %j for device %s in service %s - %s', attributes, id, service, subservice);
 
     function concat(previous, current) {
         previous = previous.concat(current);
@@ -153,7 +146,7 @@ function commandHandler(id, type, service, subservice, attributes, callback) {
             config.getLogger().error(
                 context,
 
-                "COMMAND-001: Command execution could not be handled, as device for entity [%s] [%s] wasn't found",
+                "COMMAND-001: Command execution could not be handled, as device for entity %s %s wasn't found",
 
                 id,
                 type
@@ -207,20 +200,15 @@ function updateCommand(apiKey, deviceId, device, messageObj) {
                 context,
 
                 "COMMANDS-002: Couldn't update command status in the Context broker " +
-                    'for device [%s] with apiKey [%s]: %s',
+                    'for device %s with apiKey %s: %s',
                 device.id,
                 apiKey,
                 error
             );
         } else {
             config
                 .getLogger()
-                .debug(
-                    context,
-                    'Single measure for device [%s] with apiKey [%s] successfully updated',
-                    device.id,
-                    apiKey
-                );
+                .debug(context, 'Single measure for device %s with apiKey %s successfully updated', device.id, apiKey);
         }
     });
 }

diff --git a/lib/iotaUtils.js b/lib/iotaUtils.js
@@ -97,7 +97,7 @@ function manageConfiguration(apiKey, deviceId, device, objMessage, sendFunction,
                     .getLogger()
                     .error(
                         context,
-                        'CONFIG-002: There was an error subscribing device [%s] to attributes [%j]',
+                        'CONFIG-002: There was an error subscribing device %s to attributes %j',
                         device.name,
                         objMessage.fields
                     );
@@ -106,7 +106,7 @@ function manageConfiguration(apiKey, deviceId, device, objMessage, sendFunction,
                     .getLogger()
                     .debug(
                         context,
-                        'Successfully subscribed device [%s] to attributes[%j]',
+                        'Successfully subscribed device %s to attributes %j',
                         device.name,
                         objMessage.fields
                     );
@@ -115,7 +115,7 @@ function manageConfiguration(apiKey, deviceId, device, objMessage, sendFunction,
             callback(error);
         });
     } else {
-        config.getLogger().error(context, 'CONFIG-003: Unknown command type from device [%s]', device.name);
+        config.getLogger().error(context, 'CONFIG-003: Unknown command type from device %s', device.name);
         callback();
     }
 }
@@ -228,7 +228,7 @@ function retrieveDevice(deviceId, apiKey, transport, callback) {
                 config.getLogger().error(
                     context,
 
-                    "MEASURES-001: Couldn't find device data for APIKey [%s] and DeviceId[%s]",
+                    "MEASURES-001: Couldn't find device data for APIKey %s and DeviceId %s",
 
                     apiKey,
                     deviceId

diff --git a/lib/transportSelector.js b/lib/transportSelector.js
@@ -41,25 +41,25 @@ function startTransportBindings(newConfig, callback) {
 
     const bindings = fs.readdirSync(path.join(__dirname, './bindings'));
 
-    transportBindings = bindings.map(function(item) {
+    transportBindings = bindings.map(function (item) {
         return require('./bindings/' + item);
     });
 
     /* eslint-disable no-unused-vars */
-    async.map(transportBindings, invokeBinding, function(error) {
+    async.map(transportBindings, invokeBinding, function (error) {
         callback();
     });
 }
 
 function createExecutionsForBinding(argument, functionName, protocol) {
-    config.getLogger().debug('Creating execution for function [%s] and protocol [%s]', functionName, protocol);
+    config.getLogger().debug('Creating execution for function %s and protocol %s', functionName, protocol);
 
     function addHandler(current, binding) {
         if (binding[functionName] && (!protocol || binding.protocol === protocol)) {
             const args = [binding[functionName]].concat(argument);
             const boundFunction = binding[functionName].bind.apply(binding[functionName], args);
 
-            config.getLogger().debug('Binding found for function [%s] and protocol [%s]', functionName, protocol);
+            config.getLogger().debug('Binding found for function %s and protocol %s', functionName, protocol);
             current.push(boundFunction);
         }
 
@@ -79,7 +79,7 @@ function createExecutionsForBinding(argument, functionName, protocol) {
  * @param {String} protocol         Transport protocol where the function must be executed.
  */
 function applyFunctionFromBinding(argument, functionName, protocol, callback) {
-    config.getLogger().debug('Looking for bindings for the function [%s] and protocol [%s]', functionName, protocol);
+    config.getLogger().debug('Looking for bindings for the function %s and protocol %s', functionName, protocol);
 
     async.series(createExecutionsForBinding(argument, functionName, protocol), callback);
 }

diff --git a/test/deviceProvisioning/provisionDeviceTimeinstant2.json b/test/deviceProvisioning/provisionDeviceTimeinstant2.json
@@ -9,8 +9,7 @@
         },
         {
           "type": "DateTime",
-          "name": "TimeInstant",
-          "object_id": "t"
+          "name": "TimeInstant"
         }
       ],
       "entity_type": "sensor",

diff --git a/test/unit/ngsiv2/HTTP_reveice_measures-test.js b/test/unit/ngsiv2/HTTP_reveice_measures-test.js
@@ -154,9 +154,9 @@ describe('HTTP: Measure reception ', function () {
             url: 'http://localhost:' + config.http.port + '/iot/json',
             method: 'POST',
             json: {
-                humidity: '111222',
+                h: '111222',
                 pressure: '20',
-                TimeInstant: '20200222T222222'
+                TimeInstant: '2020-02-22T22:22:22Z'
             },
             headers: {
                 'fiware-service': 'smartgondor',
@@ -217,9 +217,9 @@ describe('HTTP: Measure reception ', function () {
             url: 'http://localhost:' + config.http.port + '/iot/json',
             method: 'POST',
             json: {
-                humidity: '111222',
+                h: '111222',
                 pressure: '20',
-                TimeInstant: '20200222T222222'
+                TimeInstant: '2020-02-22T22:22:22Z'
             },
             headers: {
                 'fiware-service': 'smartgondor',
@@ -280,7 +280,7 @@ describe('HTTP: Measure reception ', function () {
             url: 'http://localhost:' + config.http.port + '/iot/json',
             method: 'POST',
             json: {
-                humidity: '111222',
+                h: '111222',
                 pressure: '20'
             },
             headers: {
@@ -290,7 +290,7 @@ describe('HTTP: Measure reception ', function () {
             qs: {
                 i: 'dev0130101',
                 k: '1234',
-                t: '20200222T222222'
+                t: '2020-02-22T22:22:22Z'
             }
         };
         const provisionOptions = {
@@ -343,7 +343,7 @@ describe('HTTP: Measure reception ', function () {
             url: 'http://localhost:' + config.http.port + '/iot/json',
             method: 'POST',
             json: {
-                humidity: '111222',
+                h: '111222',
                 pressure: '20'
             },
             headers: {
@@ -353,7 +353,7 @@ describe('HTTP: Measure reception ', function () {
             qs: {
                 i: 'dev0130101',
                 k: '1234',
-                t: '20200222T222222'
+                t: '2020-02-22T22:22:22Z'
             }
         };
         const provisionOptions = {

diff --git a/test/unit/ngsiv2/HTTP_reveice_measures-test2.js b/test/unit/ngsiv2/HTTP_reveice_measures-test2.js
@@ -177,12 +177,12 @@ describe('HTTP: Measure reception ', function () {
             method: 'POST',
             json: [
                 {
-                    humidity: '111222',
-                    TimeInstant: '20200222T222222'
+                    h: '111222',
+                    TimeInstant: '2020-02-22T22:22:22Z'
                 },
                 {
-                    humidity: '111333',
-                    TimeInstant: '20200222T222222'
+                    h: '111333',
+                    TimeInstant: '2020-02-22T22:22:22Z'
                 }
             ],
             headers: {
@@ -254,10 +254,11 @@ describe('HTTP: Measure reception ', function () {
             method: 'POST',
             json: [
                 {
-                    humidity: '111222'
+                    h: '111222'
+
                 },
                 {
-                    humidity: '111333'
+                    h: '111333'
                 }
             ],
             headers: {
@@ -266,8 +267,8 @@ describe('HTTP: Measure reception ', function () {
             },
             qs: {
                 i: 'dev0130101',
-                k: '1234',
-                t: '20200222T222222'
+                k: '1234' ,
+                t:'2020-02-22T22:22:22Z'          
             }
         };
         const provisionOptions = {

diff --git a/test/unit/ngsiv2/MQTT_receive_measures-test.js b/test/unit/ngsiv2/MQTT_receive_measures-test.js
@@ -268,7 +268,7 @@ describe('MQTT: Measure reception ', function () {
             const values = {
                 humidity: '32',
                 temperature: '87',
-                TimeInstant: '20071103T131805'
+                TimeInstant: '2007-11-03T13:18:05Z'
             };
 
             mqttClient.publish('/1234/MQTT_2/attrs', JSON.stringify(values), null, function (error) {
@@ -282,7 +282,7 @@ describe('MQTT: Measure reception ', function () {
             const values = {
                 humidity: '32',
                 temperature: '87',
-                TimeInstant: '20071103T131805'
+                TimeInstant: '2007-11-03T13:18:05Z'
             };
 
             mqttClient.publish('json/1234/MQTT_2/attrs', JSON.stringify(values), null, function (error) {