summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2017-04-29 03:39:34 +0000
committerGerrit Code Review <gerrit@open-o.org>2017-04-29 03:39:34 +0000
commit766319d08692368f4c1b3b2130cead4a1c0ac27f (patch)
tree8bb8c9461b950cf13cf292b2393386e724a7c57f
parent82b4ce0fb90bf5aa0e431d33236bb3dd73fcbc89 (diff)
parent7dae73cc54f435f4644a255eb3cb70c67109b852 (diff)
Merge "vlinfo field parse wrong"
-rw-r--r--lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index 138c6edf..3913fa02 100644
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
@@ -831,9 +831,12 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
}
function fetchDataForVl(jsonData) {
- var header = ["Network Resource Name","Link Port Resource Name"];
+ var header = ["Virtual Link Instance Name","Related CP List"];
var rowData = jsonData.vlInfo.map(function (vl) {
- return {"values": [vl.networkResource.resourceName, vl.linkPortResource.resourceName]}
+ return {"values": [vl.vlInstanceName, vl.relatedCpInstanceId.map(
+ function (cp) {
+ return cp.cpInstanceName;
+ }).join(', ')]}
});
return {"itemHeader": header,"rowitem": rowData,"striped": false,"border": true,"hover": true,"condensed": false,"filter": false,"action": "","searchField": ""}
}