Merge pull request #31 from helyOSFramework/fix_microservice_url

remove manipulation of microservice endpoint

Author: cviolbarbosa

demo/settings/config/microservices.yml

@@ -6,7 +6,7 @@ services:
       is_dummy: false
       domain: "Assignment planner"  # Assignment planner | Map Server | Storage server
       type: "drive"
-      url: https://my_path_planner:9002/api/
+      url: https://my_path_planner:9002/api/plan_job/
       enable: true
       apikey: "CN783V9SygdG0deHgfesdfsaeNuCqwbm"
       timeout: 300
@@ -27,7 +27,7 @@ services:
     maploader:
       domain: "Map server"  # Assignment planner | Map server | Storage server
       type: "map"
-      url: https://my_map_server:9002/api/
+      url: https://my_map_server:9002/api/map/
       enable: true
       apikey: "ABy40lwSsdfafasdBiCbvU2hVEeY7t"
       timeout: 180

helyos_server/src/services/microservice_services.js

@@ -7,30 +7,32 @@ const requestXHTTP = require('superagent');
 const getExtServiceEndpoint = (serviceUrl, serviceClass) => {
     let url = serviceUrl;
     if (!url) return " ";
-    url = url.replace(/\/$/, '');
-    const pattern = /(plan_job|map|storage|plan_job\/|map\/|storage\/)$/;
-    if (pattern.test(url)) {
-        return url;
-    } 
-    switch (serviceClass) {
-        case 'Map server':
-            url = url + '/map/';
-            break;
-        case 'Path planner':
-            url = url + '/plan_job/';
-            break;
-        case 'Assignment planner':
-            url = url + '/plan_job/';
-            break;
-        case 'Storage':
-            url = url + '/storage/';
-            break;    
-        default:
-            url = url + '/';
-            break;
-    }
-
     return url;
+
+    // url = url.replace(/\/$/, '');
+    // const pattern = /(plan_job|map|storage|plan_job\/|map\/|storage\/)$/;
+    // if (pattern.test(url)) {
+    //     return url;
+    // } 
+    // switch (serviceClass) {
+    //     case 'Map server':
+    //         url = url + '/map/';
+    //         break;
+    //     case 'Path planner':
+    //         url = url + '/plan_job/';
+    //         break;
+    //     case 'Assignment planner':
+    //         url = url + '/plan_job/';
+    //         break;
+    //     case 'Storage':
+    //         url = url + '/storage/';
+    //         break;    
+    //     default:
+    //         url = url + '/';
+    //         break;
+    // }
+
+    // return url;
 }
 
 

packaging/build.sh

@@ -1 +1 @@
-docker build --no-cache -f ./Dockerfile  -t helyosframework/helyos_core:test .. 
+docker build  -f ./Dockerfile  -t helyosframework/helyos_core:test .. 

tests/settings/config/microservices.yml

@@ -6,7 +6,7 @@ services:
       is_dummy: false
       domain: "Assignment planner"  # Assignment planner | Map Server | Storage server
       type: "drive"
-      url: http://my_path_planner:9002/api/
+      url: http://my_path_planner:9002/api/plan_job/
       enable: true
       apikey: "CN783V9SygdG0deHgfesdfsaeNuCqwbm"
       timeout: 6
@@ -25,7 +25,7 @@ services:
     maploader:
       domain: "Map server"  # Assignment planner | Map server | Storage server
       type: "map"
-      url: http://my_map_server:9002/api/
+      url: http://my_map_server:9002/api/map/
       enable: true
       apikey: "ABy40lwSsdfafasdBiCbvU2hVEeY7t"
       timeout: 180