LCM supports GSO case

SDNO-1559

Change-Id: I5b05a1dfc189110a5605e9ec261729c7b222629c
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index 8803c62..066953a 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
@@ -111,13 +111,13 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
                 controller : "inputDataCtrl"\r
             })\r
             .state("home.lcTabs.detailInfo.nfvoDetail", {\r
-                url : "/nfvoDetailInfo",\r
+                url : "/nfvoDetailInfo/:segmentId",\r
                 templateUrl: "templates/nfvoDetail.html",\r
                 controller: "nfvoDetailCtrl"\r
             })\r
 \r
             .state("home.lcTabs.detailInfo.vpnManager", {\r
-                url : "/vpnManager",\r
+                url : "/vpnManager/:segmentId",\r
                 templateUrl : "templates/vpnManager.html",\r
                 controller : "vpnManagerCtrl"\r
             })\r
@@ -558,7 +558,7 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
 \r
     })\r
 \r
-    .controller('detailInfoCtrl', function($scope, $stateParams, $compile, DataService) {\r
+    .controller('detailInfoCtrl', function($scope, $stateParams, $compile, DataService, $log) {\r
         console.log("detailInfoCtrl --> $stateParams.id:: " + $stateParams.id);\r
         //$scope.currentId = $stateParams.id;\r
 \r
@@ -567,42 +567,55 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
         if(rowData.serviceType === "SDNO"){\r
             $scope.rightPanelHeader = "SDNO VPN Manager";\r
             jsonData[0] = {"id": $stateParams.id, "name": rowData.serviceType};\r
+            inializeAccordion(jsonData);\r
         }\r
         else if(rowData.serviceType === "NFVO"){\r
             //TODO - NFVO Pages should be loaded here\r
             $scope.rightPanelHeader = "NFVO VPN Manager";\r
             jsonData[0] = {"id": $stateParams.id, "name": rowData.serviceType};\r
+            inializeAccordion(jsonData);\r
         }\r
         else{\r
-            jsonData = DataService.loadServiceTopoSequence($stateParams.id);\r
+            DataService.loadServiceTopoSequence($stateParams.id)\r
+                .then(function (response) {\r
+                    console.log("Data Param Template :: ");\r
+                    $log.info(response);\r
+                    inializeAccordion(response);\r
+                }, function (reason) {\r
+                    $scope.error = "Error ! " + reason;\r
+                });\r
         }\r
-        $(".accordion").html("");\r
-        for (var i = 0; i < jsonData.length; i++) {\r
-            //console.log("jsonData Name: " + jsonData[i].name);\r
-            if (jsonData[i].name == "SDNO") {\r
-                //$("#sdnoLink").text(jsonData[i].name.toUpperCase());\r
-                //console.log("Adding Accordian to SDNO");\r
-                $(".accordion").append($compile(addAccordionData("sdno", jsonData[i].name.toUpperCase(), jsonData[i].id))($scope));\r
-            }\r
-            else if (jsonData[i].name == "NFVO") {\r
-                //console.log("Adding Accordian to NFVO");\r
-                $(".accordion").append($compile(addAccordionData("nfvo", jsonData[i].name.toUpperCase(), jsonData[i].id))($scope));\r
-            }\r
-            else {\r
 \r
+        function inializeAccordion(jsonData) {\r
+            $(".accordion").html("");\r
+            for (var i = 0; i < jsonData.length; i++) {\r
+                //console.log("jsonData Name: " + jsonData[i].name);\r
+                if (jsonData[i].name == "SDNO") {\r
+                    //$("#sdnoLink").text(jsonData[i].name.toUpperCase());\r
+                    //console.log("Adding Accordian to SDNO");\r
+                    $(".accordion").append($compile(addAccordionData("sdno", jsonData[i].name.toUpperCase(), jsonData[i].id))($scope));\r
+                }\r
+                else if (jsonData[i].name == "NFVO") {\r
+                    //console.log("Adding Accordian to NFVO");\r
+                    $(".accordion").append($compile(addAccordionData("nfvo", jsonData[i].name.toUpperCase(), jsonData[i].id))($scope));\r
+                }\r
+                else {\r
+\r
+                }\r
             }\r
         }\r
 \r
+\r
         function addAccordionData(type, text, id) {\r
             console.log("id:"+id);\r
             var content = '';\r
             content += '<div class="panel panel-default"><div class="panel-heading">';\r
             content += '<h6 class="panel-title">';\r
             if(type == "sdno") {\r
-                content += '<a style="text-decoration:none;" data-toggle="collapse" data-parent="#accordion" data-target="#collapseOne_' + type + '" ui-sref=".vpnManager" ui-sref-active="link_active_DetailInfo" href="#/home/lcTabs/' + id + '/detailInfo/vpnManager">';\r
+                content += '<a style="text-decoration:none;" data-toggle="collapse" data-parent="#accordion" data-target="#collapseOne_' + type + '" ui-sref=".vpnManager({segmentId: \'' + id + '\'})" ui-sref-active="link_active_DetailInfo" href="#/home/lcTabs/' + id + '/detailInfo/vpnManager">';\r
             }\r
             else if(type == "nfvo") {\r
-                content += '<a style="text-decoration:none;" data-toggle="collapse" data-parent="#accordion" data-target="#collapseOne_' + type + '" ui-sref=".nfvoDetail" ui-sref-active="link_active_DetailInfo" href="#/home/lcTabs/' + id + '/detailInfo/nfvoDetailInfo">';\r
+                content += '<a style="text-decoration:none;" data-toggle="collapse" data-parent="#accordion" data-target="#collapseOne_' + type + '" ui-sref=".nfvoDetail({segmentId: \'' + id + '\'})" ui-sref-active="link_active_DetailInfo" href="#/home/lcTabs/' + id + '/detailInfo/nfvoDetailInfo">';\r
             }\r
             content += '<span id="sdnoLink">'+text+'</span></a>';\r
             content += '</h6></div>';\r
@@ -662,6 +675,7 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
     .controller("overlayVPNCtrl", function($scope, $rootScope, $stateParams, $compile, DataService, NgTableParams){\r
         $scope.message = "Overlay VPN";\r
         console.log("Service Id: "+ $stateParams.id);\r
+        console.log("Segment Id: "+ $stateParams.segmentId);\r
 \r
         $scope.init = function() {\r
             //console.log("Overlay VPN... ng-init + " +  $rootScope.lcmModelTemplate);\r
@@ -717,6 +731,7 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
     .controller("underlayVPNCtrl", function($scope, $rootScope, $stateParams, $compile, DataService, NgTableParams){\r
         $scope.message = "Underlay VPN";\r
         console.log("Service Id: "+ $stateParams.id);\r
+        console.log("Segment Id: "+ $stateParams.segmentId);\r
         $scope.tpTableShowing = false;\r
 \r
         $scope.init = function() {\r
@@ -791,6 +806,7 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
 \r
     .controller('nfvoDetailCtrl', function($scope, $stateParams, $compile, DataService) {\r
         console.log("nfvoDetailCtrl --> $stateParams.id:: " + $stateParams.id);\r
+        console.log("nfvoDetailCtrl --> $stateParams.segmentId:: " + $stateParams.segmentId);\r
         //$scope.currentId = $stateParams.id;\r
 \r
         var jsonData = DataService.loadNfvoServiceDetails($stateParams.id);\r