Merge "Change the coding on the new sg framework"

1 files changed, 1 insertions, 48 deletions

diff --git a/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js b/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js
index 8c6fecdd..f7a01ea2 100644
--- a/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js
+++ b/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js
@@ -169,7 +169,7 @@ function translateToTemplatesInfo(templates) {
 /*******************************************Get Service**********************************************/

 function loadGetServiceData(){

 

-    var returnVal;

+    var returnVal = [];

     var requestUrl = "/openoapi/inventory/v1/services";

     var parameter = {

             'sort': [],

@@ -220,53 +220,6 @@ function loadServiceDetails(serviceId){
     return returnObj;

 }

 

-//get the vim name by id.

-function getVimNameById(vimId){

-   

-   // TODO re-confirm the latest url.

-    var requestUrl ="/openoapi/extsys/v1/vims/" + vimId;

-    var returnObj;

-    $

-        .ajax({

-            type : "GET",

-            async: false,

-            url : requestUrl,

-            contentType : "application/json",

-            success : function(jsonobj) {

-                // TODO return according to the json data received.

-            	returnObj = jsonobj;

-            },

-            error : function(xhr, ajaxOptions, thrownError) {

-                alert("Error on getting link data : " + xhr.responseText);

-            }

-        });

-    return returnObj;

-}

-

-// get the sdn controller name by id.

-function getSdnControllerNameById(sdnControllerId){

-   

-   // TODO re-confirm the latest url.

-    var requestUrl ="/openoapi/extsys/v1/sdncontrollers/" + sdnControllerId;

-    var returnObj;

-    $

-        .ajax({

-            type : "GET",

-            async: false,

-            url : requestUrl,

-            contentType : "application/json",

-            success : function(jsonobj) {

-                // TODO return according to the json data received.

-            	returnObj = jsonobj;

-            },

-            error : function(xhr, ajaxOptions, thrownError) {

-                alert("Error on getting link data : " + xhr.responseText);

-            }

-        });

-    return returnObj;

-}

-

-

 

 function anchorClick(serviceId){

     var jsonData = loadServiceDetails(serviceId);