From: Seshu Kumar M Date: Thu, 27 Apr 2017 09:54:03 +0000 (+0000) Subject: Merge "LCM supports GSO case" X-Git-Tag: release/mercury~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b2a5e9170e5d67d97752c2afc49356d9ac59845c;p=vnfsdk%2Frefrepo.git Merge "LCM supports GSO case" --- b2a5e9170e5d67d97752c2afc49356d9ac59845c diff --cc lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js index 1d6114f8,066953a7..8412dcab --- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js +++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js @@@ -791,20 -806,19 +806,21 @@@ var app = angular.module("lcApp", ["ui. .controller('nfvoDetailCtrl', function($scope, $stateParams, $compile, DataService) { console.log("nfvoDetailCtrl --> $stateParams.id:: " + $stateParams.id); + console.log("nfvoDetailCtrl --> $stateParams.segmentId:: " + $stateParams.segmentId); //$scope.currentId = $stateParams.id; - var jsonData = DataService.loadNfvoServiceDetails($stateParams.id); var table_tpl = $(lcmModelTemplate).filter('#table').html(); - var vnfData = fetchDataForVnf(jsonData); - $('#vnfInfoTable').html(Mustache.to_html(table_tpl, vnfData)); + var processFun = function (jsonData) { + var vnfData = fetchDataForVnf(jsonData); + $('#vnfInfoTable').html(Mustache.to_html(table_tpl, vnfData)); - var vlData = fetchDataForVl(jsonData); - $('#vlInfoTable').html(Mustache.to_html(table_tpl, vlData)); + var vlData = fetchDataForVl(jsonData); + $('#vlInfoTable').html(Mustache.to_html(table_tpl, vlData)); - var vnffgData = fetchDataForVnffg(jsonData); - $('#vnffgInfoTable').html(Mustache.to_html(table_tpl, vnffgData)); + var vnffgData = fetchDataForVnffg(jsonData); + $('#vnffgInfoTable').html(Mustache.to_html(table_tpl, vnffgData)); + }; + DataService.loadNfvoServiceDetails($stateParams.id, processFun); function fetchDataForVnf(jsonData) { var header = ["Vnf instance Name"];