From 4d9160177ac89c9a365db774c3f90685324edd64 Mon Sep 17 00:00:00 2001
From: Xiuchao Wu <xiuchao.wu@huawei.com>
Date: Fri, 21 Oct 2016 15:27:02 +0100
Subject: Remove unnecessary URL prefix "org.openo.sdno.brs" when portal calls
 BRS that is running in a docker [ SDNO-750 ]

Change-Id: I8db05101e00875ada34a887a5bc73794dd599e0d
Signed-off-by: Xiuchao Wu <xiuchao.wu@huawei.com>
---
 openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/brs.js | 2 +-
 .../portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js         | 2 +-
 openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/vpn.js | 2 +-
 openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 1c07026d..17648d34 100644
--- 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 @@
 
 var url = "";
 $.getJSON("./conf/dataconfig.json", function (jsonData){
-    url = jsonData.url +":"+ jsonData.port + "/org.openo.sdno.brs";
+    url = jsonData.url +":"+ jsonData.port;
     console.log("URL = " + url);
 });
 
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 ed860901..a05271bc 100644
--- 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);
         var newJson = {"managedElement": jsonobj};
         formData = JSON.stringify(newJson);
-        var requestUrl = url + "/org.openo.sdno.brs/openoapi/sdnobrs/v1/managed-elements";
+        var requestUrl = url + "/openoapi/sdnobrs/v1/managed-elements";
         $
             .ajax({
                 type : "POST",
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 f12ec533..71ffdf3e 100644
--- 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 @@
 
 var url = "";
 $.getJSON("./conf/dataconfig.json", function (jsonData){
-    url = jsonData.url +":"+ jsonData.port + "/org.openo.sdno.brs";
+    url = jsonData.url +":"+ jsonData.port;
     console.log("URL = " + url);
 });
 
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 df28de3f..2a27603e 100644
--- 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 @@
  */
 var url = "";
 $.getJSON("./conf/dataconfig.json", function (jsonData){
-    url = jsonData.url +":"+ jsonData.port + "/org.openo.sdno.brs";
+    url = jsonData.url +":"+ jsonData.port;
     console.log("URL = " + url);
 });
 
-- 
cgit 1.2.3-korg