Remove unnecessary URL prefix "org.openo.sdno.brs" when portal calls BRS

that is running in a docker [ SDNO-750 ]

Change-Id: I1dda47c089098c8039a306ef30da376a54a8c3d8
Signed-off-by: Xiuchao Wu <xiuchao.wu@huawei.com>

diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/brs.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/brs.js
index 1c07026..3dbc7eb 100644 (file)
--- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/brs.js
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/brs.js
@@ -15,7 +15,7 @@
 \r
 var url = "";\r
 $.getJSON("./conf/dataconfig.json", function (jsonData){\r
-    url = jsonData.url +":"+ jsonData.port + "/org.openo.sdno.brs";\r
+    url = jsonData.url +":"+ jsonData.port;\r
     console.log("URL = " + url);\r
 });\r
 \r
@@ -346,4 +346,4 @@ $(function () {
             });\r
     });\r
 \r
-})
\ No newline at end of file
+})\r

diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js
index 8fce8c6..ae8a047 100644 (file)
--- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js
@@ -91,7 +91,7 @@ $(function () {
         var jsonobj = JSON.parse(formData);\r
         var newJson = {"managedElement": jsonobj};\r
         formData = JSON.stringify(newJson);\r
-        var requestUrl = url + "/org.openo.sdno.brs/openoapi/sdnobrs/v1/managed-elements";\r
+        var requestUrl = url + "/openoapi/sdnobrs/v1/managed-elements";\r
         $\r
             .ajax({\r
                 type : "POST",\r

diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/vpn.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/vpn.js
index f12ec53..f898e3d 100644 (file)
--- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/vpn.js
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/vpn.js
@@ -15,7 +15,7 @@
 \r
 var url = "";\r
 $.getJSON("./conf/dataconfig.json", function (jsonData){\r
-    url = jsonData.url +":"+ jsonData.port + "/org.openo.sdno.brs";\r
+    url = jsonData.url +":"+ jsonData.port;\r
     console.log("URL = " + url);\r
 });\r
 \r
@@ -309,4 +309,4 @@ $(function () {
             });\r
     });\r
 \r
-})
\ No newline at end of file
+})\r

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js
index df28de3..b9cace8 100644 (file)
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js
@@ -14,7 +14,7 @@
  */\r
 var url = "";\r
 $.getJSON("./conf/dataconfig.json", function (jsonData){\r
-    url = jsonData.url +":"+ jsonData.port + "/org.openo.sdno.brs";\r
+    url = jsonData.url +":"+ jsonData.port;\r
     console.log("URL = " + url);\r
 });\r
 \r
@@ -344,4 +344,4 @@ $(function () {
             });\r
     });\r
 \r
-})
\ No newline at end of file
+})\r