NFVO Detail information display wrong

Issue-id: CLIENT-205

Change-Id: Iab9dcf9f1cc8fabe0fda4bfb2287c06cd5f06491
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
index 34c991f..0361864 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
@@ -195,8 +195,16 @@ app.factory("DataService", function($http, $log){
             });\r
             //return JSON.parse('[{"id":"12345", "name":"sdno"}, {"id":"23456", "name":"gso"},{"id":"12345", "name":"nfvo"}]');\r
         },\r
-        loadNfvoServiceDetails : function(id) {\r
-            return JSON.parse('{"vnfInfoId": [{ "vnfInstanceId": "123", "vnfInstanceName": "vnf instance 1", "vnfProfileId": "321" }, { "vnfInstanceId": "123", "vnfInstanceName": "vnf instance 1", "vnfProfileId": "321" }],  "vlInfo": [{ "networkResource": {"resourceName": "network resource 1"}, "linkPortResource": { "resourceName": "link port resource 1"}}, { "networkResource": {"resourceName": "network resource 1"}, "linkPortResource": { "resourceName": "link port resource 1"}}], "vnffgInfo": [{"vnfId": "vnfid-123", "virtualLinkId": "virtual link 123", "cpId": "cp id 123", "nfp": "nfp 123"}, {"vnfId": "vnfid-123", "virtualLinkId": "virtual link 123", "cpId": "cp id 123", "nfp": "nfp 123"}]}');\r
+        loadNfvoServiceDetails : function(id, processFun) {\r
+            return $http({\r
+                url: url+'/openoapi/nslcm/v1/ns/' + id,\r
+                method: 'GET',\r
+                data: null,\r
+                headers: {'Content-Type': 'application/json'}\r
+            }).then(function(response){\r
+                processFun(response.data);\r
+            });\r
+            // return JSON.parse('{"vnfInfoId": [{ "vnfInstanceId": "123", "vnfInstanceName": "vnf instance 1", "vnfProfileId": "321" }, { "vnfInstanceId": "123", "vnfInstanceName": "vnf instance 1", "vnfProfileId": "321" }],  "vlInfo": [{ "networkResource": {"resourceName": "network resource 1"}, "linkPortResource": { "resourceName": "link port resource 1"}}, { "networkResource": {"resourceName": "network resource 1"}, "linkPortResource": { "resourceName": "link port resource 1"}}], "vnffgInfo": [{"vnfId": "vnfid-123", "virtualLinkId": "virtual link 123", "cpId": "cp id 123", "nfp": "nfp 123"}, {"vnfId": "vnfid-123", "virtualLinkId": "virtual link 123", "cpId": "cp id 123", "nfp": "nfp 123"}]}');\r
         },\r
 \r
         generateTemplatesComponent : function() {\r

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index 8803c62..1d6114f 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
@@ -793,16 +793,18 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
         console.log("nfvoDetailCtrl --> $stateParams.id:: " + $stateParams.id);\r
         //$scope.currentId = $stateParams.id;\r
 \r
-        var jsonData = DataService.loadNfvoServiceDetails($stateParams.id);\r
         var table_tpl = $(lcmModelTemplate).filter('#table').html();\r
-        var vnfData = fetchDataForVnf(jsonData);\r
-        $('#vnfInfoTable').html(Mustache.to_html(table_tpl, vnfData));\r
+        var processFun = function (jsonData) {\r
+            var vnfData = fetchDataForVnf(jsonData);\r
+            $('#vnfInfoTable').html(Mustache.to_html(table_tpl, vnfData));\r
 \r
-        var vlData = fetchDataForVl(jsonData);\r
-        $('#vlInfoTable').html(Mustache.to_html(table_tpl, vlData));\r
+            var vlData = fetchDataForVl(jsonData);\r
+            $('#vlInfoTable').html(Mustache.to_html(table_tpl, vlData));\r
 \r
-        var vnffgData = fetchDataForVnffg(jsonData);\r
-        $('#vnffgInfoTable').html(Mustache.to_html(table_tpl, vnffgData));\r
+            var vnffgData = fetchDataForVnffg(jsonData);\r
+            $('#vnffgInfoTable').html(Mustache.to_html(table_tpl, vnffgData));\r
+        };\r
+        DataService.loadNfvoServiceDetails($stateParams.id, processFun);\r
 \r
         function fetchDataForVnf(jsonData) {\r
             var header = ["Vnf instance Name"];\r