Merge pull request #467 from telefonicaid/test-ngsiv1-removal

NGSIv1 removal

CHANGES_NEXT_RELEASE

@@ -1 +1,2 @@
 - Fix service and subservice to 'n/a' when apikey from measure is not found (needs iota-node-lib => 2.18) (#508)
+- Remove: NGSI-v1 specific behaviours (iotagent-lib#966)

lib/commonBindings.js

@@ -57,10 +57,7 @@ function guessType(attribute, device) {
     }
 
     if (attribute === constants.TIMESTAMP_ATTRIBUTE) {
-        if (iotAgentLib.configModule.isCurrentNgsi()) {
-            return constants.TIMESTAMP_TYPE_NGSI2;
-        }
-        return constants.TIMESTAMP_TYPE;
+        return constants.TIMESTAMP_TYPE_NGSI2;
     }
     return constants.DEFAULT_ATTRIBUTE_TYPE;
 }

lib/constants.js

@@ -33,7 +33,6 @@ module.exports = {
     DATE_FORMAT: "yyyymmdd'T'HHMMss'Z'",
 
     TIMESTAMP_ATTRIBUTE: 'TimeInstant',
-    TIMESTAMP_TYPE: 'ISO8601',
     TIMESTAMP_TYPE_NGSI2: 'DateTime',
 
     HTTP_MEASURE_PATH: '/iot/d',

lib/iotaUtils.js

@@ -299,25 +299,10 @@ function manageConfiguration(apiKey, deviceId, device, objMessage, sendFunction,
         callback(error);
     }
 
-    function extractAttributes(results, callback) {
-        if (iotAgentLib.configModule.isCurrentNgsi()) {
-            callback(null, results);
-        } else if (
-            results.contextResponses &&
-            results.contextResponses[0] &&
-            results.contextResponses[0].contextElement.attributes
-        ) {
-            callback(null, results.contextResponses[0].contextElement.attributes);
-        } else {
-            callback("Couldn't find any information in Context Broker response: " + JSON.stringify(results));
-        }
-    }
-
     if (objMessage.type === 'configuration') {
         async.waterfall(
             [
                 apply(iotAgentLib.query, device.name, device.type, '', objMessage.attributes, device),
-                extractAttributes,
                 apply(sendFunction, apiKey, deviceId)
             ],
             handleSendConfigurationError
@@ -358,22 +343,15 @@ function createConfigurationNotification(results) {
     const configurations = {};
     const now = new Date();
 
-    if (iotAgentLib.configModule.isCurrentNgsi()) {
-        // If it is the result of a subscription, results is an array
-        if (Array.isArray(results)){
-            for (let i = 0; i < results.length; i++) {
-                configurations[results[i].name] = results[i].value;
-            }
-        }
-        else {
-            for (var att in results) {
-                configurations[att] = results[att].value;
-            }
-        }
-    } else {
+    // If it is the result of a subscription, results is an array
+    if (Array.isArray(results)) {
         for (let i = 0; i < results.length; i++) {
             configurations[results[i].name] = results[i].value;
         }
+    } else {
+        for (var att in results) {
+            configurations[att] = results[att].value;
+        }
     }
 
     configurations.dt = dateFormat(now, constants.DATE_FORMAT);