Issue ID: GSO-37

Change-Id: I376471bf15f5c090d8e574e13524d736011a7a3e
Signed-off-by: j00302280 <j00101220@huawei.com>

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 75d61ac..ed86090 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
@@ -111,45 +111,104 @@ $(function () {
                 }\r
             });\r
     });\r
+    //init the templates combo\r
+    $.when(\r
+            generateTemplatesComponent()\r
+        ).then(\r
+            function (templates) {\r
+                document.getElementById("svcTempl").innerHTML = templates;\r
+            }\r
+        );\r
 })\r
 \r
+/**\r
+ * generate the templates Component\r
+ * @returns\r
+ */\r
+function generateTemplatesComponent(){\r
+       var defer = $.Deferred();\r
+       $.when(\r
+               queryTemplates()\r
+        ).then(\r
+            function (tmplatesResponse) {\r
+                var templatesInfo = translateToTemplatesInfo(tmplatesResponse);\r
+                defer.resolve(templatesInfo);\r
+            }\r
+        )\r
+    return defer;\r
+}\r
+\r
+/**\r
+ * query templates\r
+ * @returns\r
+ */\r
+function queryTemplates() {\r
+       var queryTemplatesUrl = '/openoapi/catalog/v1/servicetemplates';\r
+       return $.ajax({\r
+               type : "GET",\r
+               url : queryTemplatesUrl\r
+       });\r
+}\r
+\r
+/**\r
+ * generate templates html string\r
+ * @param templates\r
+ * @returns\r
+ */\r
+function translateToTemplatesInfo(templates) {\r
+       var options = '<option value="select">--select--</option>';\r
+       var i;\r
+       for (i = 0; i < templates.length; i += 1) {\r
+               var option = '<option value="' + templates[i].serviceTemplateId + '">' + templates[i].templateName\r
+                               + '</option>';\r
+               options = options + option;\r
+       }\r
+       return options;\r
+}\r
+\r
 /*******************************************Get Service**********************************************/\r
 function loadGetServiceData(){\r
 \r
-    var requestUrl = url + "/openoapi/inventory/v1/services";\r
+    var returnVal;\r
+    var requestUrl = "/openoapi/inventory/v1/services";\r
     $\r
         .ajax({\r
             type : "POST",\r
             url : requestUrl,\r
+            async: false,\r
             contentType : "application/json",\r
             success : function(jsonobj) {\r
                 // TODO return according to the json data received.\r
-                return jsonobj;\r
+               returnVal =  jsonobj;\r
             },\r
             error : function(xhr, ajaxOptions, thrownError) {\r
                 alert("Error on getting link data : " + xhr.responseText);\r
             }\r
         });\r
+    return returnVal;\r
 }\r
 \r
 /*********************************************Get Service Details********************************************/\r
 function loadServiceDetails(serviceId){\r
    \r
    // TODO re-confirm the latest url.\r
-    var requestUrl = url + "/openoapi/lifecyclemgr/v1/services/toposequence/" + serviceId;\r
+    var requestUrl ="/openoapi/gso/v1/services/toposequence/" + serviceId;\r
+    var returnObj;\r
     $\r
         .ajax({\r
             type : "GET",\r
+            async: false,\r
             url : requestUrl,\r
             contentType : "application/json",\r
             success : function(jsonobj) {\r
                 // TODO return according to the json data received.\r
-                return jsonobj;\r
+               returnObj = jsonobj;\r
             },\r
             error : function(xhr, ajaxOptions, thrownError) {\r
                 alert("Error on getting link data : " + xhr.responseText);\r
             }\r
         });\r
+    return returnObj;\r
 }\r
 \r
 function anchorClick(serviceId){\r