Fix detail and resmgr issues in CMCC

Fix detail and resmgr issues in CMCC

Change-Id: Ic4cb0217aadd7e0ca8c124a974788386a230f319
Issue-ID:CLIENT-200
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 0718569..34c991f 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
@@ -74,32 +74,26 @@ app.factory("DataService", function($http, $log){
             else\r
                 return null;\r
         },\r
-        getOverlayData : function() {\r
+        getOverlayData : function(id) {\r
             return $http({\r
-                url: url+'/openoapi/sdnooverlayvpn/v1/site2dc-vpn',\r
+                url: url+'/openoapi/sdnooverlay/v1/vpns/' + id,\r
                 //url: 'http://localhost:5000/api/getOverlayVPNData',\r
                 method: 'GET',\r
                 data: null,\r
                 headers: {'Content-Type': 'application/json'}\r
             }).then(function(response){\r
                 //$log.info(response);\r
-                overLayData = response.data.overlayData;\r
+                overLayData = response.data;\r
                 return response.data;\r
             });\r
         },\r
         getOverlayVPNConnData : function(id, type){\r
             var returnData = null;\r
             if(overLayData) {\r
-                for (var i = 0; i < overLayData.length; i++) {\r
-                    if(overLayData[i].id == id) {\r
-                        returnData = overLayData[i][type];\r
-                        break;\r
-                    }\r
-                }\r
-                return returnData;\r
+                return overLayData[type];\r
             }\r
             else\r
-                return null;\r
+                return [];\r
         },\r
         getSiteListData : function() {\r
             return $http({\r
@@ -109,36 +103,78 @@ app.factory("DataService", function($http, $log){
                 data: null,\r
                 headers: {'Content-Type': 'application/json'}\r
             }).then(function(response){\r
-                //$log.info(response);\r
-                return response.data;\r
+                if(overLayData) {\r
+                    var sites = [];\r
+                    var index = 0;\r
+                    for(var i = 0 ; i < response.data.length; i++){\r
+                        var isContains = false;\r
+                        for(var j = 0; j < overLayData.siteList.length; j++){\r
+                            if(response.data[i].id == overLayData.siteList[j]){\r
+                                isContains = true;\r
+                            }\r
+                        }\r
+                        if(isContains){\r
+                            sites[index] = response.data[i];\r
+                            index ++;\r
+                        }\r
+                    }\r
+                    return sites;\r
+                }\r
+                else {\r
+                    return [];\r
+                }\r
+            });\r
+        },\r
+        getVpcListData : function() {\r
+            return $http({\r
+                url: url+'/openoapi/sdnovpc/v1/vpcs',\r
+                //url: 'http://localhost:5000/api/getOverlayVPNData',\r
+                method: 'GET',\r
+                data: null,\r
+                headers: {'Content-Type': 'application/json'}\r
+            }).then(function(response){\r
+                if(overLayData) {\r
+                    var vpcs = [];\r
+                    var index = 0;\r
+                    for(var i = 0 ; i < response.data.length; i++){\r
+                        var isContains = false;\r
+                        for(var j = 0; j < overLayData.vpcList.length; j++){\r
+                            if(response.data[i].id == overLayData.vpcList[j]){\r
+                                isContains = true;\r
+                            }\r
+                        }\r
+                        if(isContains){\r
+                            vpcs[index] = response.data[i];\r
+                            index ++;\r
+                        }\r
+                    }\r
+                    return vpcs;\r
+                }\r
+                else {\r
+                    return [];\r
+                }\r
             });\r
         },\r
-        getUnderlayData : function() {\r
+        getUnderlayData : function(id) {\r
             return $http({\r
-                url: url+'/openoapi/sdnol3vpn/v1/l3vpns',\r
+                url: url+'/openoapi/sdnol3vpn/v1/l3vpns/' + id,\r
                 //url: 'http://localhost:5000/api/getUnderlayVPNData',\r
                 method: 'GET',\r
                 data: null,\r
                 headers: {'Content-Type': 'application/json'}\r
             }).then(function(response){\r
                 //$log.info(response);\r
-                underlayData = response.data.data.underlayVPN;\r
+                underlayData = response.data;\r
                 return response.data;\r
             });\r
         },\r
-       getTPLinkData : function(id){\r
+       getTPLinkData : function(){\r
             var returnData = null;\r
-            if(underlayData) {\r
-                for (var i = 0; i < underlayData.length; i++) {\r
-                    if(underlayData[i].id == id) {\r
-                        returnData = underlayData[i].tp_details;\r
-                        break;\r
-                    }\r
-                }\r
-                return returnData;\r
+            if(underlayData) {                \r
+                return underlayData.accessPointList;\r
             }\r
             else\r
-                return null;\r
+                return [];\r
         },\r
         loadServiceTopoSequence : function(id) {\r
             return $http({\r

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
index bfc8833..529f1be 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js
@@ -665,9 +665,10 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
 \r
         $scope.init = function() {\r
             //console.log("Overlay VPN... ng-init + " +  $rootScope.lcmModelTemplate);\r
-            DataService.getOverlayData()\r
+            DataService.getOverlayData($stateParams.id)\r
                 .then(function(data){\r
-                    $scope.overlayData = data.overlayData;\r
+                    $scope.overlayData = [];\r
+                    $scope.overlayData[0] = data;\r
                     console.log("Data: ");\r
                     loadButtons();\r
                 }, function(reason){\r
@@ -722,7 +723,8 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
             //console.log("Underlay VPN... ng-init + " +  $rootScope.lcmModelTemplate);\r
             DataService.getUnderlayData()\r
                 .then(function(response){\r
-                    $scope.underlayVPN = response.data.underlayVPN;\r
+                    $scope.underlayVPN = [];\r
+                    $scope.underlayVPN[0] = response;\r
                     console.log("Data: ");\r
                     loadButtons();\r
                 }, function(reason){\r
@@ -765,7 +767,7 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
             $scope.selectedRow = row;\r
             $scope.tpTableShowing = true;\r
             console.log("Underlay table row click");\r
-            var tp_detData = DataService.getTPLinkData(id);\r
+            var tp_detData = DataService.getTPLinkData();\r
             $scope.tableParams_tpDetails = new NgTableParams({count: 5, sorting: {id: 'asc'}    //{page: 1,count: 10,filter: {name: 'M'},sorting: {name: 'desc'}\r
             }, { counts:[5, 10], dataset: tp_detData});\r
         }\r
@@ -861,7 +863,7 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', '
 \r
     .controller('vpcListCtrl', function($scope, $stateParams, NgTableParams, DataService) {\r
         $scope.message = "VPN List";\r
-        var rowData = DataService.getOverlayVPNConnData($stateParams.overlayId, "vpcList");\r
+        var rowData = DataService.getVpcListData();\r
         $scope.vpcListTable = new NgTableParams({count: 5, sorting: {id: 'asc'}    //{page: 1,count: 10,filter: {name: 'M'},sorting: {name: 'desc'}\r
         }, { counts:[5, 10], dataset: rowData});\r
     })\r

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN_L3.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN_L3.html
index b91ec32..230e0df 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN_L3.html
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/templates/underlayVPN_L3.html
@@ -33,8 +33,8 @@
         <td title="'Name'" filter="{ name: 'text'}" sortable="'name'">\r
             {{underlayData.name}}\r
         </td>\r
-        <td title="'State'" filter="{ thinCPE: 'text'}" sortable="'thinCPE'">\r
-            {{underlayData.thinCPE}}\r
+        <td title="'Status'" filter="{ operStatus: 'text'}" sortable="'operStatus'">\r
+            {{underlayData.operStatus}}\r
         </td>\r
         <td title="'Description'" filter="{ desc: 'text'}" sortable="'desc'">\r
             {{underlayData.desc}}\r
@@ -57,20 +57,14 @@
     <div class="panel panel-default">\r
     <table ng-table="tableParams_tpDetails" class="table table table-striped table-hover table-bordered lctable" show-filter="true">\r
         <tr ng-repeat="tpDetailsData in $data" ng-class="{rowSelected:$index==selectedRow}" ng-click="rowHighilited($index)">\r
-            <td title="'TP Name'" filter="{ tp_name: 'text'}" sortable="'tp_name'">\r
-                {{tpDetailsData.tp_name}}\r
+            <td title="'Name'" filter="{ name: 'text'}" sortable="'name'">\r
+                {{tpDetailsData.name}}\r
             </td>\r
-            <td title="'PE Name'" filter="{ pe_name: 'text'}" sortable="'pe_name'">\r
-                {{tpDetailsData.pe_name}}\r
+            <td title="'Status'" filter="{ operStatus: 'text'}" sortable="'operStatus'">\r
+                {{tpDetailsData.operStatus}}\r
             </td>\r
-            <td title="'VLAN ID'" filter="{ vlanId: 'text'}" sortable="'vlanId'">\r
-                {{tpDetailsData.vlanId}}\r
-            </td>\r
-            <td title="'Site CIDR'" filter="{ site_cidr: 'text'}" sortable="'site_cidr'">\r
-                {{tpDetailsData.site_cidr}}\r
-            </td>\r
-            <td title="'IP'" filter="{ ip: 'text'}" sortable="'ip'">\r
-                {{tpDetailsData.ip}}\r
+            <td title="'Type'" filter="{ type: 'text'}" sortable="'type'">\r
+                {{tpDetailsData.type}}\r
             </td>\r
         </tr>\r
     </table>\r

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index be8f20f..968f79a 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -1380,8 +1380,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $("#myModal").modal({}).draggable();\r
         }\r
         $scope.saveData = function(id) {\r
-            $scope.ne.controller = $('#medropdown').val();\r
-            $scope.ne.siteID = $('#siteIdDropdown').val();\r
+            $scope.ne.controllerID = [];\r
+            $scope.ne.controllerID[0] = $('#medropdown').val();\r
+            $scope.ne.siteID = [];\r
+            $scope.ne.siteID[0] = $('#siteIdDropdown').val();\r
 \r
             if (!$scope.textboxErrName && !$scope.textboxErrIP) {\r
                                \r