diff options
| author |   pierfranco ferronato <pierfranco.ferronato@huawei.com> | 2016-10-25 08:36:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@open-o.org> | 2016-10-25 08:36:25 +0000 |
| commit | 194cd1911efd9e3c8ea67a2a8e7f62626106c092 (patch) | |
| tree | 052c0fc94b38effa569c81d3a92294afe78a8952 | |
| parent | a25591c2afe5e34240c934dae7c92b4cc1be5f16 (diff) | |
| parent | f833c8b9010fcc60cb28d7c8a74319b99a6cb3ce (diff) | |
Merge "Remove unnecessary URL prefix "org.openo.sdno.brs" when portal calls BRS that is running in a docker [ SDNO-750 ]" into sun
4 files changed, 7 insertions, 7 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..3dbc7ebd 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);
});
@@ -346,4 +346,4 @@ $(function () { });
});
-})
\ No newline at end of file +})
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 8fce8c64..ae8a0474 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..f898e3de 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);
});
@@ -309,4 +309,4 @@ $(function () { });
});
-})
\ No newline at end of file +})
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..b9cace8a 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);
});
@@ -344,4 +344,4 @@ $(function () { });
});
-})
\ No newline at end of file +})
|