Check ServiceType for details

Check ServiceType for details

Change-Id: I6ed1f19b6e91d01f19f664cd876d0b339cf767ad
Issue-ID:CLIENT-192
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
index 65189e4..04394a2 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
@@ -62,7 +62,7 @@ app.factory("DataService", function($http, $log){
             if(lcData) {\r
                 for (var i = 0; i < lcData.length; i++) {\r
                     if(lcData[i].serviceId == id) {\r
-                        returnData = lcData[i].inputParameters;\r
+                        returnData = lcData[i];\r
                         break;\r
                     }\r
                 }\r
@@ -93,8 +93,23 @@ app.factory("DataService", function($http, $log){
                 return response.data;\r
             });\r
         },\r
-        loadServiceDetails : function(id) {\r
-            return JSON.parse('[{"id":"12345", "name":"sdno"}, {"id":"23456", "name":"gso"},{"id":"12345", "name":"nfvo"}]');\r
+        loadServiceTopoSequence : function(id) {\r
+            return $http({\r
+                url: '/openoapi/gso/v1/services/toposequence/' + id,\r
+                //url: 'http://localhost:5000/api/getOverlayVPNData',\r
+                method: 'GET',\r
+                headers: {'Content-Type': 'application/json'}\r
+            }).then(function(response){\r
+                //$log.info(response);\r
+                var serviceToposequence = response.data;\r
+                var responseData = [];\r
+                for (var i = 0; i < serviceToposequence.service.segments.length; i++) {\r
+                    var segment = serviceToposequence.service.segments[i];\r
+                    responseData[i] = {"id":segment.serviceSegmentId, "name":segment.serviceSegmentType};\r
+                }\r
+                return responseData;\r
+            });\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

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index 053ee41..e1dbdbe 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
@@ -536,23 +536,25 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
         console.log("detailInfoCtrl --> $stateParams.id:: " + $stateParams.id);\r
         //$scope.currentId = $stateParams.id;\r
         $scope.rightPanelHeader = "VPN Manager";\r
-\r
-        var jsonData = DataService.loadServiceDetails($stateParams.id);\r
+        var rowData = DataService.getSavedLCData($stateParams.id);\r
+        var jsonData =[];\r
+        if(rowData.serviceType === "SDNO" || rowData.serviceType === "NFVO"){\r
+            jsonData[0] = {"id": $stateParams.id, "name": rowData.serviceType};\r
+        }\r
+        else{\r
+            jsonData = DataService.loadServiceTopoSequence($stateParams.id);\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
+            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(), $stateParams.id))($scope));\r
-            }\r
-            else if (jsonData[i].name == "gso") {\r
-                //console.log("Adding Accordian to GSO");\r
-                $(".accordion").append($compile(addAccordionData("gso", jsonData[i].name.toUpperCase(), $stateParams.id))($scope));\r
+                $(".accordion").append($compile(addAccordionData("sdno", jsonData[i].name.toUpperCase(), jsonData[i].id))($scope));\r
             }\r
-            else if (jsonData[i].name == "nfvo") {\r
+            else if (jsonData[i].name == "NFVO") {\r
                 //console.log("Adding Accordian to NFVO");\r
-                $(".accordion").append($compile(addAccordionData("nfvo", jsonData[i].name.toUpperCase(), $stateParams.id))($scope));\r
+                $(".accordion").append($compile(addAccordionData("nfvo", jsonData[i].name.toUpperCase(), jsonData[i].id))($scope));\r
             }\r
             else {\r
 \r
@@ -716,7 +718,8 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
 \r
     .controller('inputDataCtrl', function($scope, $stateParams, $log, DataService) {\r
         console.log("inputDataCtrl --> $stateParams.id:: " + $stateParams.id);\r
-        $scope.inputData = DataService.getSavedLCData($stateParams.id);\r
+        var rowData = DataService.getSavedLCData($stateParams.id);\r
+        $scope.inputData = rowData.inputParameters;\r
         $log.info($scope.inputData);\r
         $("div.inputDataElements").html("");\r
         $("div.inputDataElements").append(convertInputsToUI('', 'show', $scope.inputData));\r