Merge pull request #697 from telefonicaid/fix/use_trust_cbHost_from_d…

…eviceGroup Use trust and cbHost from deviceGroup in typeInformation
telefonicaid · Nov 21, 2018 · 2f986b7 · 2f986b7
2 parents 7da6d83 + eb3dd3f
commit 2f986b7
Show file tree

Hide file tree

Showing 9 changed files with 414 additions and 7 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+Fix: use trust and cbHost from deviceGroup (#685)
 Fix: multientity multimeasure with the same att name
 Add missed conf env vars about authentication (#704)
 Add timestamp in device and group provision (#655)
@@ -8,8 +9,8 @@ Fix: object_id fields are not introduced in CB requests by alias plugin (#660)
 Add: uses provisioned timezone to generate TimeInstant values (#672)
 Using precise dependencies (~=) in packages.json
 Fix: updating dependencies due to known vulnerabilities in the previous ones
-        async: 1.5.2 -> 2.6.1
-        body-parser: ~1.11.0 -> ~1.18.3
+    async: 1.5.2 -> 2.6.1
+    body-parser: ~1.11.0 -> ~1.18.3
     express: ~4.11.2 -> ~4.16.4
     jison: 0.4.17 -> 0.4.18
     moment: ~2.19.4 -> ~2.22.2

diff --git a/lib/services/common/iotManagerService.js b/lib/services/common/iotManagerService.js
@@ -46,6 +46,7 @@ function register(callback) {
         return {
             apikey: service.apikey,
             token: service.trust,
+            cbHost: service.cbHost,
             entity_type: service.type,
             resource: service.resource,
             service: service.service,

diff --git a/lib/services/devices/deviceService.js b/lib/services/devices/deviceService.js
@@ -283,6 +283,12 @@ function createInitialEntityNgsi2(deviceData, newDevice, callback) {
         }
     };
 
+    if (deviceData.cbHost && deviceData.cbHost.indexOf('://') !== -1) {
+        options.url = deviceData.cbHost + '/v2/entities?options=upsert';
+    } else if (deviceData.cbHost && deviceData.cbHost.indexOf('://') === -1) {
+        options.url = 'http://' + deviceData.cbHost + '/v2/entities?options=upsert';
+    }
+
     jsonConcat(options.json, formatAttributesNgsi2(deviceData.active, false));
     jsonConcat(options.json, formatAttributesNgsi2(deviceData.staticAttributes, true));
     jsonConcat(options.json, formatCommandsNgsi2(deviceData.commands));
@@ -429,6 +435,12 @@ function updateEntityNgsi2(deviceData, updatedDevice, callback) {
         }
     };
 
+    if (deviceData.cbHost && deviceData.cbHost.indexOf('://') !== -1) {
+        options.url = deviceData.cbHost + '/v2/entities/' + String(deviceData.name) + '/attrs';
+    } else if (deviceData.cbHost && deviceData.cbHost.indexOf('://') === -1) {
+        options.url = 'http://' + deviceData.cbHost + '/v2/entities/' + String(deviceData.name) + '/attrs';
+    }
+
     jsonConcat(options.json, formatAttributesNgsi2(deviceData.active, false));
     jsonConcat(options.json, formatAttributesNgsi2(deviceData.staticAttributes, true));
     jsonConcat(options.json, formatCommandsNgsi2(deviceData.commands));

diff --git a/lib/services/devices/registrationUtils.js b/lib/services/devices/registrationUtils.js
@@ -215,7 +215,11 @@ function sendUnregistrationsNgsi2(deviceData, callback) {
             'fiware-servicepath': deviceData.subservice
         }
     };
-
+    if (deviceData.cbHost && deviceData.cbHost.indexOf('://') !== -1) {
+        options.url = deviceData.cbHost + '/v2/registrations/' + deviceData.registrationId;
+    } else if (deviceData.cbHost && deviceData.cbHost.indexOf('://') === -1) {
+        options.url = 'http://' + deviceData.cbHost + '/v2/registrations/' + deviceData.registrationId;
+    }
     if (deviceData.registrationId) {
         logger.debug(context, 'Sending device unregistrations to Context Broker at [%s]', options.url);
         logger.debug(context, 'Using the following request:\n\n%s\n\n', JSON.stringify(options, null, 4));

diff --git a/lib/services/ngsi/ngsiService.js b/lib/services/ngsi/ngsiService.js
@@ -203,7 +203,7 @@ function createRequestObject(url, typeInformation, token) {
     if (config.getConfig().authentication && config.getConfig().authentication.enabled) {
         headers[config.getConfig().authentication.header] = token;
     }
-
+    logger.debug(context, 'typeInformation %j', typeInformation);
     if (typeInformation) {
         if (typeInformation.service) {
             headers['fiware-service'] = typeInformation.service;
@@ -215,8 +215,10 @@ function createRequestObject(url, typeInformation, token) {
             serviceContext.subservice = typeInformation.subservice;
         }
 
-        if (typeInformation.cbHost) {
+        if (typeInformation.cbHost && typeInformation.cbHost.indexOf('://') !== -1) {
             cbHost = typeInformation.cbHost;
+        } else if (typeInformation.cbHost && typeInformation.cbHost.indexOf('://') === -1) {
+            cbHost = 'http://' + typeInformation.cbHost;
         }
     }
 
@@ -791,6 +793,10 @@ function executeWithDeviceInformation(operationFunction) {
                 }
             } else {
                 typeInformation = deviceInformation;
+                if (deviceGroup && deviceGroup.trust && deviceGroup.cbHost) {
+                    typeInformation.trust = deviceGroup.trust;
+                    typeInformation.cbHost = deviceGroup.cbHost;
+                }
             }
 
             if (config.getConfig().authentication && config.getConfig().authentication.enabled) {

diff --git a/lib/services/ngsi/subscriptionService.js b/lib/services/ngsi/subscriptionService.js
@@ -179,7 +179,9 @@ function subscribeNgsi1(device, triggers, content, callback) {
         store = false;
     }
 
-    if (device.cbHost) {
+    if (device.cbHost && device.cbHost.indexOf('://') !== -1) {
+        options.uri = device.cbHost + '/v1/subscribeContext';
+    } else if (device.cbHost && device.cbHost.indexOf('://') === -1) {
         options.uri = 'http://' + device.cbHost + '/v1/subscribeContext';
     } else {
         options.uri = config.getConfig().contextBroker.url + '/v1/subscribeContext';
@@ -239,7 +241,9 @@ function subscribeNgsi2(device, triggers, content, callback) {
         store = false;
     }
 
-    if (device.cbHost) {
+    if (device.cbHost && device.cbHost.indexOf('://') !== -1) {
+        options.uri = device.cbHost + '/v2/subscriptions';
+    } else if (device.cbHost && device.cbHost.indexOf('://') === -1) {
         options.uri = 'http://' + device.cbHost + '/v2/subscriptions';
     } else {
         options.uri = config.getConfig().contextBroker.url + '/v2/subscriptions';

diff --git a/test/unit/examples/iotamRequests/registrationWithGroups.json b/test/unit/examples/iotamRequests/registrationWithGroups.json
@@ -7,6 +7,7 @@
     {
       "apikey": "801230BJKL23Y9090DSFL123HJK09H324HV8732",
       "token": "8970A9078A803H3BL98PINEQRW8342HBAMS",
+      "cbHost":"http://unexistentHost:1026",
       "entity_type": "SensorMachine",
       "resource": "/deviceTest",
       "service": "theService",

diff --git a/test/unit/examples/iotamRequests/registrationWithStaticGroups.json b/test/unit/examples/iotamRequests/registrationWithStaticGroups.json
@@ -7,6 +7,7 @@
     {
       "apikey": "801230BJKL23Y9090DSFL123HJK09H324HV8732",
       "token": "8970A9078A803H3BL98PINEQRW8342HBAMS",
+      "cbHost":"http://unexistentHost:1026",
       "entity_type": "SensorMachine",
       "resource": "/deviceTest",
       "service": "theService",