Fix resmgr client showing errors

Fix resmgr client showing errors

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

diff --git a/extsys/src/main/webapp/extsys/sdncontroller/js/app.js b/extsys/src/main/webapp/extsys/sdncontroller/js/app.js
index 25fb256..9a47d6c 100644 (file)
--- a/extsys/src/main/webapp/extsys/sdncontroller/js/app.js
+++ b/extsys/src/main/webapp/extsys/sdncontroller/js/app.js
@@ -122,7 +122,7 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"])
 \r
             $('#myModal #protocol').append($compile(Mustache.to_html(dropDown, dropdowndata_protocol))($scope));*/\r
 \r
-            var dropdownResponse=[{"id":"netconf","name":"netconf"},{"id":"snmp","name":"snmp"}];\r
+            var dropdownResponse=[{"id":"netconf","name":"netconf"},{"id":"snmp","name":"snmp"},{"id":"https","name":"https"},{"id":"http","name":"http"}];\r
             var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
             $('#myModal #protocolDD').html(dropdownInfo);\r
 \r
@@ -156,7 +156,7 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"])
 \r
             //var data = [{id: 1, name: "Moroni", age: 50}, {id: 2, name: "ABC", age: 30}, {id: 3, name: "Morhoni", age: 10}, {id: 4, name: "DABC", age: 31}, {id: 5, name: "Noor", age: 30}, {id: 6, name: "ABCD", age: 40}, {id: 7, name: "DABC", age: 31}, {id: 8, name: "Noor", age: 30}, {id: 9, name: "ABCD", age: 40}, {id: 10, name: "DABC", age: 31}, {id: 11, name: "Noor", age: 30}, {id: 12, name: "ABCD", age: 40}];\r
             $scope.controllerTableParams = new NgTableParams({count: 5, sorting: {name: 'asc'}    //{page: 1,count: 10,filter: {name: 'M'},sorting: {name: 'desc'}\r
-            }, { counts:[5, 10, 20, 50], dataset: $scope.data.controllerData});\r
+            }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             /*$scope.$watch('checkboxes.checked', function(value) {\r
              angular.forEach($scope.data.controllerData, function(item) {\r

diff --git a/extsys/src/main/webapp/extsys/sdncontroller/templates/controller.html b/extsys/src/main/webapp/extsys/sdncontroller/templates/controller.html
index 1aab2bd..2d33610 100644 (file)
--- a/extsys/src/main/webapp/extsys/sdncontroller/templates/controller.html
+++ b/extsys/src/main/webapp/extsys/sdncontroller/templates/controller.html
@@ -30,32 +30,32 @@
             <input type="checkbox" ng-model="checkboxes.items[controllerData.id]" />\r
         </td>-->\r
         <td title="'Name'" filter="{ Name: 'text'}" sortable="'Name'">\r
-            {{controllerData.Name}}\r
+            {{controllerData.name}}\r
         </td>\r
         <td title="'Protocol'" filter="{ Protocol: 'text'}" sortable="'Protocol'">\r
-            {{controllerData.Protocol}}\r
+            {{controllerData.protocol}}\r
         </td>\r
         <td title="'Product Name'" filter="{ productName: 'text'}" sortable="'productName'">\r
             {{controllerData.productName}}\r
         </td>\r
         </td>\r
         <td title="'Type'" filter="{ Type: 'text'}" sortable="'Type'">\r
-            {{controllerData.Type}}\r
+            {{controllerData.type}}\r
         </td>\r
         <td title="'Vendor'" filter="{ Vendor: 'text'}" sortable="'Vendor'">\r
-            {{controllerData.Vendor}}\r
+            {{controllerData.vendor}}\r
         </td>\r
         <td title="'Version'" filter="{ Version: 'number'}" sortable="'Version'">\r
-            {{controllerData.Version}}\r
+            {{controllerData.version}}\r
         </td>\r
         <td title="'Description'" filter="{ Description: 'text'}" sortable="'Description'">\r
-            {{controllerData.Description}}\r
+            {{controllerData.description}}\r
         </td>\r
         <td title="'Create Time'" filter="{ createTime: 'number'}" sortable="'createTime'">\r
             {{controllerData.createTime}}\r
         </td>\r
         <td title="'Operation'" filter="{ Operation: 'text'}" sortable="'Operation'">\r
-            {{controllerData.Operation}}\r
+            {{controllerData.operation}}\r
         </td>\r
         <td title="'Action'">\r
            <!-- <span class="pull-right glyphicon glyphicon-edit" ng-click="editData(controllerData.name)" style="cursor: pointer;margin: 0 5px"></span>\r

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index 2ffcc2b..2ca5177 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -134,9 +134,18 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var portName = {"ErrMsg" :     {"errmsg" : "Name is required.", "modalVar":"port.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}};\r
             $('#myModal #name').append($compile(Mustache.to_html(text, portName.ErrMsg))($scope));\r
 \r
-            var portMe = {"ErrMsg" :     {"errmsg" : "ME is required.", "modalVar":"port.meID", "errtag":"textboxErrMe", "errfunc":"validatetextboxMe", "required":true}};\r
-            $('#myModal #meID').append($compile(Mustache.to_html(text, portMe.ErrMsg))($scope));\r
-\r
+            portDataService.getAllNEData().then(function(response) {\r
+                var medata = [];\r
+                for(var i = 0; i < response.managedElements.length; i+=1){\r
+                    medata[i] = {"serviceTemplateId":response.managedElements[i].id,"templateName":response.managedElements[i].name};\r
+                }\r
+                var dropdownInfo = translateToDropdownInfo(medata);\r
+                $("#myModal #medropdown").html(dropdownInfo);\r
+                console.log("Data: ");\r
+                $log.info(data);\r
+            }, function(reason) {\r
+                $scope.message = "Error is :" + JSON.stringify(reason);\r
+            });\r
             //var portType = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"port.type"}};\r
             //$('#myModal #type').append($compile(Mustache.to_html(dropDown, $scope.data.dropdowntypeData))($scope));\r
 \r
@@ -148,7 +157,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
             $('#myModal #type').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
                        \r
-                       var dropdownResponse=[{"serviceTemplateId":"tenant_site","templateName":"portType1"},{"serviceTemplateId":"tenant_site2","templateName":"portType2"}];\r
+                       var dropdownResponse=[{"serviceTemplateId":"ETH","templateName":"ETH"},{"serviceTemplateId":"POS","templateName":"POS"},{"serviceTemplateId":"Trunk","templateName":"Trunk"},{"serviceTemplateId":"Loopback","templateName":"Loopback"}];\r
                        var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
             document.getElementById("portdropdown").innerHTML = dropdownInfo;\r
 \r
@@ -169,7 +178,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
             $('#myModal #Edgepoint').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
                        \r
-                       var dropdownResponse=[{"serviceTemplateId":"tenant_site","templateName":"Edgepoint1"},{"serviceTemplateId":"tenant_site2","templateName":"Edgepoint2"}];\r
+                       var dropdownResponse=[{"serviceTemplateId":"true","templateName":"true"},{"serviceTemplateId":"false","templateName":"false"}];\r
                        var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
             document.getElementById("portEdropdown").innerHTML = dropdownInfo;\r
                        \r
@@ -464,7 +473,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
             $('#myModal #type').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
                        \r
-                       var dropdownResponse=[{"serviceTemplateId":"tenant_site","templateName":"tenant_site"},{"serviceTemplateId":"tenant_site2","templateName":"tenant_site2"}];\r
+                       var dropdownResponse=[{"serviceTemplateId":"network_site","templateName":"network_site"},{"serviceTemplateId":"tenant_site","templateName":"tenant_site"}];\r
                        var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
             document.getElementById("sitedropdown").innerHTML = dropdownInfo;\r
 \r
@@ -1212,7 +1221,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
             neDataService.getNECtrlDDList()\r
                 .then(function (response) {\r
-                    $scope.ctrlList = response.data;\r
+                    $scope.ctrlList = response;\r
                     var dropdownInfo = translateCtrlIDToDropdownInfo($scope.ctrlList);\r
                     $("#myModal #medropdown").html(dropdownInfo);\r
                     console.log("Data: ");\r
@@ -1224,7 +1233,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             /*var neController = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.controller"}};\r
             $('#myModal #controller').append($compile(Mustache.to_html(text, neController.ErrMsg))($scope));*/\r
 \r
-            var neIPAddress = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.ipAddress","errtag":"textboxErrIP", "errfunc":"validatetextboxIP","required":true}};\r
+            var neIPAddress = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.ipAddress"}};\r
             $('#myModal #ipAddress').append($compile(Mustache.to_html(text, neIPAddress.ErrMsg))($scope));\r
 \r
 \r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
index f81265b..e980af6 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
@@ -95,6 +95,7 @@
                 <div class="form-group row" id="rowSpacing">\r
                     <label class="col-xs-4 col-form-label" id="textCenter">me</label>\r
                     <div id="meID" class="col-xs-8" >\r
+                     <select id="medropdown" class="form-control inputfield" ng-model="siteData.optSelect"></select>\r
                     </div>\r
                 </div>\r
                 <div class="form-group row" id="rowSpacing">\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
index 6bed264..ad960cd 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
@@ -90,6 +90,14 @@ app.factory("portDataService", function($http,DataService, $log){
                     console.log(response);\r
                     return response;\r
                 });\r
+        },\r
+        getAllNEData : function() {\r
+            return DataService.get("/openoapi/extsys/v1/sdncontrollers")\r
+                .then(function(response){\r
+                    $log.info("in get data service data is  :"+response);\r
+                    console.log(response);\r
+                    return response;\r
+                });\r
         }\r
     }\r
 });
\ No newline at end of file