Fix for ResourceManager:

IssueId: CLIENT-189

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

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index f6cd34f..af3a17a 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -96,7 +96,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         $scope.init = function() {\r
             portDataService.getAllPortData()\r
                 .then(function (data) {\r
-                    $scope.data = data;\r
+                    $scope.data = data.logicalTerminationPoints;\r
                     console.log("Data: ");\r
                     $log.info(data);\r
                     loadButtons();\r
@@ -134,54 +134,59 @@ 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.me", "errtag":"textboxErrMe", "errfunc":"validatetextboxMe", "required":true}};\r
-            $('#myModal #me').append($compile(Mustache.to_html(text, portMe.ErrMsg))($scope));\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
             //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
-            var dropSimple_data = {\r
+            /*var dropSimple_data = {\r
                 "modalVar" : "port.type",\r
                 "labelField" : "itemLabel",\r
                 "optionsValue" : $scope.data ? JSON.stringify($scope.data.dropdowntypeData.item) : ""\r
             };\r
 \r
-            $('#myModal #type').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));\r
+            $('#myModal #type').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
 \r
+            var portType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.logicalType"}};\r
+            $('#myModal #logicalType').append($compile(Mustache.to_html(text, portType.ErrMsg))($scope));\r
 \r
-            var portLayerRate = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.layerrate"}};\r
-            $('#myModal #layerrate').append($compile(Mustache.to_html(text, portLayerRate.ErrMsg))($scope));\r
+            var portLayerRate = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.layerRate"}};\r
+            $('#myModal #layerRate').append($compile(Mustache.to_html(text, portLayerRate.ErrMsg))($scope));\r
 \r
             //var portEdgePoint = {"ErrMsg" :     {"ipv4Err" : "IP Address is required.", "modalVar":"port.Edgepoint"}};\r
             //$('#myModal #Edgepoint').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownEdgeData))($scope));\r
 \r
-            var dropSimple_data = {\r
+           /* var dropSimple_data = {\r
                 "modalVar" : "port.Edgepoint",\r
                 "labelField" : "itemLabel",\r
                 "optionsValue" : $scope.data ? JSON.stringify($scope.data.dropdownEdgeData.item) : ""\r
             };\r
 \r
-            $('#myModal #Edgepoint').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));\r
+            $('#myModal #Edgepoint').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
+\r
+            var portEdgepoint = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.isEdgePoint"}};\r
+            $('#myModal #isEdgePoint').append($compile(Mustache.to_html(text, portEdgepoint.ErrMsg))($scope));\r
 \r
-            var portIndex = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.portindex"}};\r
-            $('#myModal #portindex').append($compile(Mustache.to_html(text, portIndex.ErrMsg))($scope));\r
+            var portIndex = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.portIndex"}};\r
+            $('#myModal #portIndex').append($compile(Mustache.to_html(text, portIndex.ErrMsg))($scope));\r
 \r
-            var portIp = {"ErrMsg" :     {"errmsg" : "The ip is required.", "modalVar":"port.ipaddress"}};\r
-            $('#myModal #ipaddress').append($compile(Mustache.to_html(text, portIp.ErrMsg))($scope));\r
+            var portIp = {"ErrMsg" :     {"errmsg" : "The ip is required.", "modalVar":"port.ipAddress"}};\r
+            $('#myModal #ipAddress').append($compile(Mustache.to_html(text, portIp.ErrMsg))($scope));\r
 \r
             var portAdmin = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.adminState"}};\r
             $('#myModal #adminState').append($compile(Mustache.to_html(text, portAdmin.ErrMsg))($scope));\r
 \r
-            var portOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.operatingState"}};\r
-            $('#myModal #operatingState').append($compile(Mustache.to_html(text, portOperatingState.ErrMsg))($scope));\r
+            var portOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.operState"}};\r
+            $('#myModal #operState').append($compile(Mustache.to_html(text, portOperatingState.ErrMsg))($scope));\r
 \r
             $scope.checkboxes = { 'checked': false, items: {} };\r
 \r
             $scope.portTableParams = 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.portData});\r
+            }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.data.portData, function(item) {\r
+                angular.forEach($scope.data, function(item) {\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
                     }\r
@@ -199,7 +204,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }\r
 \r
         $scope.validatetextboxMe = function (value){\r
-            if($scope.port.me) {\r
+            if($scope.port.meID) {\r
                 $scope.textboxErrMe = false;\r
             }\r
             else\r
@@ -342,7 +347,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         $scope.editData = function(id) {\r
             console.log("To be edited : " + id);\r
             var dataFound = false;\r
-            angular.forEach($scope.data.portData, function(data) {\r
+            angular.forEach($scope.data, function(data) {\r
                 if(!dataFound) {\r
                     if (data.id == id) {\r
                         console.log("Found : " + data.id);\r
@@ -422,7 +427,6 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var siteName = {"ErrMsg" :     {"errmsg" : "Name is required.", "modalVar":"site.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}};\r
             $('#myModal #name').append($compile(Mustache.to_html(text, siteName.ErrMsg))($scope));\r
 \r
-//TODO check for the dropdown if possible based on static Site types\r
             /*var dropSimple_data = {\r
                 "modalVar" : "site.type",\r
                 "labelField" : "itemLabel",\r
@@ -517,6 +521,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                         "text": "Ok", "action": "deleteConfirmation("+id+")"\r
                     }]\r
             }};\r
+\r
             angular.forEach($scope.checkboxes.items, function(value) {\r
               if(value) {\r
                   checkbox = true;\r
@@ -814,7 +819,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         $scope.init = function() {\r
             linkDataService.getAllLinkData()\r
                 .then(function (data) {\r
-                    $scope.data = data;\r
+                    $scope.data = data.topologicalLinks;\r
                     console.log("Data: ");\r
                     $log.info(data);\r
                     loadButtons();\r
@@ -854,28 +859,31 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             //var linkType = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.type"}};\r
             //$('#myModal #type').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownlinkData))($scope));\r
 \r
-            var dropSimple_data = {\r
+           /* var dropSimple_data = {\r
                 "modalVar" : "link.type",\r
                 "labelField" : "itemLabel",\r
                 "optionsValue" : $scope.data ? JSON.stringify($scope.data.dropdownlinkData.item) : ""\r
             };\r
 \r
-            $('#myModal #type').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));\r
+            $('#myModal #type').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
+\r
+            var linkType = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.logicalType"}};\r
+            $('#myModal #logicalType').append($compile(Mustache.to_html(text, linkType.ErrMsg))($scope));\r
 \r
             var linkLayerRate = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.layerRate"}};\r
             $('#myModal #layerRate').append($compile(Mustache.to_html(text, linkLayerRate.ErrMsg))($scope));\r
 \r
-            var linkSourcePort = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.sourcePort"}};\r
-            $('#myModal #sourcePort').append($compile(Mustache.to_html(text, linkSourcePort.ErrMsg))($scope));\r
+            var linkSourcePort = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.aEnd"}};\r
+            $('#myModal #aEnd').append($compile(Mustache.to_html(text, linkSourcePort.ErrMsg))($scope));\r
 \r
-            var linkSinkPort = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"link.sinkPort"}};\r
-            $('#myModal #sinkPort').append($compile(Mustache.to_html(text, linkSinkPort.ErrMsg))($scope));\r
+            var linkSinkPort = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"link.zEnd"}};\r
+            $('#myModal #zEnd').append($compile(Mustache.to_html(text, linkSinkPort.ErrMsg))($scope));\r
 \r
-            var linkSourceNe = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.sourceNE"}};\r
-            $('#myModal #sourceNE').append($compile(Mustache.to_html(text, linkSourceNe.ErrMsg))($scope));\r
+            var linkSourceNe = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.aEndME"}};\r
+            $('#myModal #aEndME').append($compile(Mustache.to_html(text, linkSourceNe.ErrMsg))($scope));\r
 \r
-            var linkSinkNe = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.sinkNE"}};\r
-            $('#myModal #sinkNE').append($compile(Mustache.to_html(text, linkSinkNe.ErrMsg))($scope));\r
+            var linkSinkNe = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.zEndME"}};\r
+            $('#myModal #zEndME').append($compile(Mustache.to_html(text, linkSinkNe.ErrMsg))($scope));\r
 \r
             var linkAdminState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.adminState"}};\r
             $('#myModal #adminState').append($compile(Mustache.to_html(text, linkAdminState.ErrMsg))($scope));\r
@@ -886,10 +894,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.checkboxes = { 'checked': false, items: {} };\r
 \r
             $scope.linkTableParams = 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.linkData});\r
+            }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.data.linkData, function(item) {\r
+                angular.forEach($scope.data, function(item) {\r
                     console.log(item.id);\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
@@ -1031,7 +1039,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         $scope.editData = function(id) {\r
             console.log("To be edited : " + id);\r
             var dataFound = false;\r
-            angular.forEach($scope.data.linkData, function(data) {\r
+            angular.forEach($scope.data, function(data) {\r
                 if(!dataFound) {\r
                     if (data.id == id) {\r
                         console.log("Found : " + data.id);\r
@@ -1051,7 +1059,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         $scope.init = function() {\r
             neDataService.getAllNEData()\r
                 .then(function (data) {\r
-                    $scope.data = data;\r
+                    $scope.data = data.managedElements;\r
                     console.log("Data: ");\r
                     $log.info(data);\r
                     loadButtons();\r
@@ -1092,21 +1100,23 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var neVersion = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.version","errtag":"textboxErrVersion", "errfunc":"validatetextboxVersion","required":true}};\r
             $('#myModal #version').append($compile(Mustache.to_html(text, neVersion.ErrMsg))($scope));\r
 \r
-            var neProductName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.productname" }};\r
-            $('#myModal #productname').append($compile(Mustache.to_html(text, neProductName.ErrMsg))($scope));\r
+            var neProductName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.productName" }};\r
+            $('#myModal #productName').append($compile(Mustache.to_html(text, neProductName.ErrMsg))($scope));\r
 \r
             //$('#myModal #controller').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownneData))($scope));\r
-            var dropSimple_data = {\r
+            /*var dropSimple_data = {\r
                 "modalVar" : "ne.controller",\r
                 "labelField" : "itemLabel",\r
-                "optionsValue" : $scope.data ? JSON.stringify($scope.data.dropdownneData.item): ""\r
+                "optionsValue" : "$scope.data ? JSON.stringify($scope.data.dropdownneData.item)"\r
             };\r
 \r
-            $('#myModal #controller').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));\r
+            $('#myModal #controller').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
 \r
+            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"}};\r
-            $('#myModal #ipaddress').append($compile(Mustache.to_html(text, neIPAddress.ErrMsg))($scope));\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
             var neNERole = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.nerole"}};\r
             $('#myModal #nerole').append($compile(Mustache.to_html(text, neNERole.ErrMsg))($scope));\r
@@ -1120,10 +1130,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.checkboxes = { 'checked': false, items: {} };\r
 \r
             $scope.neTableParams = 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.neData});\r
+            }, { counts:[5, 10, 20, 50], dataset: $scope.data});\r
 \r
             $scope.$watch('checkboxes.checked', function(value) {\r
-                angular.forEach($scope.data.neData, function(item) {\r
+                angular.forEach($scope.data, function(item) {\r
                     if (angular.isDefined(item.id)) {\r
                         $scope.checkboxes.items[item.id] = value;\r
                     }\r
@@ -1259,7 +1269,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         $scope.editData = function(id) {\r
             console.log("To be edited : " + id);\r
             var dataFound = false;\r
-            angular.forEach($scope.data.neData, function(data) {\r
+            angular.forEach($scope.data, function(data) {\r
                 if(!dataFound) {\r
                     if (data.id == id) {\r
                         console.log("Found : " + data.id);\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
index a581d98..4596467 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
@@ -29,24 +29,24 @@
         <td title="'Name'" filter="{ name: 'text'}" sortable="'name'">\r
             {{linkData.name}}\r
         </td>\r
-        <td title="'Type'" filter="{ type: 'text'}" sortable="'type'">\r
-            {{linkData.type}}\r
+        <td title="'Type'" filter="{ logicalType: 'text'}" sortable="'logicalType'">\r
+            {{linkData.logicalType}}\r
         </td>\r
         <td title="'Layer Rate'" filter="{ layerRate: 'text'}" sortable="'layerRate'">\r
             {{linkData.layerRate}}\r
         </td>\r
         </td>\r
-        <td title="'Source Port'" filter="{ sourcePort: 'number'}" sortable="'sourcePort'">\r
-            {{linkData.sourcePort}}\r
+        <td title="'Source Port'" filter="{ aEnd: 'number'}" sortable="'aEnd'">\r
+            {{linkData.aEnd}}\r
         </td>\r
-        <td title="'Sink Port'" filter="{ sinkPort: 'number'}" sortable="'sinkPort'">\r
-            {{linkData.sinkPort}}\r
+        <td title="'Sink Port'" filter="{ zEnd: 'number'}" sortable="'zEnd'">\r
+            {{linkData.zEnd}}\r
         </td>\r
-        <td title="'Source NE'" filter="{ sourceNE: 'text'}" sortable="'sourceNE'">\r
-            {{linkData.sourceNE}}\r
+        <td title="'Source NE'" filter="{ aEndME: 'text'}" sortable="'aEndME'">\r
+            {{linkData.aEndME}}\r
         </td>\r
-        <td title="'Sink NE'" filter="{ sinkNE: 'text'}" sortable="'sourceNE'">\r
-            {{linkData.sinkNE}}\r
+        <td title="'Sink NE'" filter="{ zEndME: 'text'}" sortable="'zEndME'">\r
+            {{linkData.zEndME}}\r
         </td>\r
         <td title="'Admin State'" filter="{ adminState: 'text'}" sortable="'adminState'">\r
             {{linkData.adminState}}\r
@@ -93,7 +93,7 @@
                     </div>\r
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Type</label>\r
-                        <div id="type" class="col-xs-8" >\r
+                        <div id="logicalType" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r
@@ -103,22 +103,22 @@
                     </div>\r
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Source Port</label>\r
-                        <div id="sourcePort" class="col-xs-8" >\r
+                        <div id="aEnd" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Sink Port</label>\r
-                        <div id="sinkPort" class="col-xs-8" >\r
+                        <div id="zEnd" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Source NE</label>\r
-                        <div id="sourceNE" class="col-xs-8" >\r
+                        <div id="aEndME" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Sink NE</label>\r
-                        <div id="sinkNE" class="col-xs-8" >\r
+                        <div id="zEndME" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
 \r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
index 7245fcb..37b4a13 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
@@ -35,15 +35,15 @@
         <td title="'Version'" filter="{ version: 'number'}" sortable="'version'">\r
             {{neData.version}}\r
         </td>\r
-        <td title="'Product Name'" filter="{ productname: 'text'}" sortable="'productname'">\r
-            {{neData.productname}}\r
+        <td title="'Product Name'" filter="{ productName: 'text'}" sortable="'productName'">\r
+            {{neData.productName}}\r
         </td>\r
         </td>\r
         <td title="'Controller'" filter="{ controller: 'text'}" sortable="'controller'">\r
             {{neData.controller}}\r
         </td>\r
-        <td title="'IP Address'" filter="{ ipaddress: 'number'}" sortable="'ipaddress'">\r
-            {{neData.ipaddress}}\r
+        <td title="'IP Address'" filter="{ ipAddress: 'number'}" sortable="'ipAddress'">\r
+            {{neData.ipAddress}}\r
         </td>\r
         <td title="'Role'" filter="{ nerole: 'text'}" sortable="'nerole'">\r
             {{neData.nerole}}\r
@@ -51,8 +51,8 @@
         <td title="'Admin State'" filter="{ adminState: 'text'}" sortable="'adminState'">\r
             {{neData.adminState}}\r
         </td>\r
-        <td title="'Operating State'" filter="{ operatingState: 'text'}" sortable="'operatingState'">\r
-            {{neData.operatingState}}\r
+        <td title="'Operating State'" filter="{ operState: 'text'}" sortable="'operState'">\r
+            {{neData.operState}}\r
         </td>\r
         <td title="'Action'">\r
             <span  ng-click="editData(neData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>\r
@@ -98,7 +98,7 @@
                     </div>\r
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">Product Name</label>\r
-                        <div id="productname" class="col-xs-8" >\r
+                        <div id="productName" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\r
@@ -108,7 +108,7 @@
                     </div>\r
                     <div class="form-group row">\r
                         <label class="col-xs-4 col-form-label">IP Address</label>\r
-                        <div id="ipaddress" class="col-xs-8" >\r
+                        <div id="ipAddress" class="col-xs-8" >\r
                         </div>\r
                     </div>\r
                     <div class="form-group row">\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 741b472..43d40a8 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
@@ -31,29 +31,29 @@
         <td title="'Name'" filter="{ name: 'text'}" sortable="'name'">\r
             {{portData.name}}\r
         </td>\r
-        <td title="'ME'" filter="{ me: 'number'}" sortable="'me'">\r
-            {{portData.me}}\r
+        <td title="'ME'" filter="{ meID: 'number'}" sortable="'meID'">\r
+            {{portData.meID}}\r
         </td>\r
-        <td title="'Type'" filter="{ type: 'text'}" sortable="'type'">\r
-            {{portData.type}}\r
+        <td title="'Type'" filter="{ logicalType: 'text'}" sortable="'logicalType'">\r
+            {{portData.logicalType}}\r
         </td>\r
-        <td title="'LayerRate'" filter="{ layerrate: 'text'}" sortable="'layerrate'">\r
-            {{portData.layerrate}}\r
+        <td title="'LayerRate'" filter="{ layerRate: 'text'}" sortable="'layerRate'">\r
+            {{portData.layerRate}}\r
         </td>\r
-        <td title="'Edge Point'" filter="{ Edgepoint: 'text'}" sortable="'Edgepoint'">\r
-            {{portData.Edgepoint}}\r
+        <td title="'Edge Point'" filter="{ isEdgePoint: 'text'}" sortable="'isEdgePoint'">\r
+            {{portData.isEdgePoint}}\r
         </td>\r
-        <td title="'Port Index'" filter="{ portindex: 'text'}" sortable="'portindex'">\r
-            {{portData.portindex}}\r
+        <td title="'Port Index'" filter="{ portIndex: 'text'}" sortable="'portIndex'">\r
+            {{portData.portIndex}}\r
         </td>\r
-        <td title="'IP Address'" filter="{ ipaddress: 'number'}" sortable="'ipaddress'">\r
-            {{portData.ipaddress}}\r
+        <td title="'IP Address'" filter="{ ipAddress: 'number'}" sortable="'ipAddress'">\r
+            {{portData.ipAddress}}\r
         </td>\r
         <td title="'Admin State'" filter="{ adminState: 'text'}" sortable="'adminState'">\r
             {{portData.adminState}}\r
         </td>\r
-        <td title="'Operating State'" filter="{ operatingState: 'text'}" sortable="'operatingState'">\r
-            {{portData.operatingState}}\r
+        <td title="'Operating State'" filter="{ operState: 'text'}" sortable="'operState'">\r
+            {{portData.operState}}\r
         </td>\r
         <td title="'Action'">\r
             <span  ng-click="editData(portData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>\r
@@ -94,32 +94,32 @@
 \r
                 <div class="form-group row">\r
                     <label class="col-xs-4 col-form-label">me</label>\r
-                    <div id="me" class="col-xs-8" >\r
+                    <div id="meID" class="col-xs-8" >\r
                     </div>\r
                 </div>\r
                 <div class="form-group row">\r
                     <label class="col-xs-4 col-form-label">Type</label>\r
-                    <div id="type" class="col-xs-8" >\r
+                    <div id="logicalType" class="col-xs-8" >\r
                     </div>\r
                 </div>\r
                 <div class="form-group row">\r
                     <label class="col-xs-4 col-form-label">Layer Rate</label>\r
-                    <div id="layerrate" class="col-xs-8" >\r
+                    <div id="layerRate" class="col-xs-8" >\r
                     </div>\r
                 </div>\r
                 <div class="form-group row">\r
                     <label class="col-xs-4 col-form-label">Edge Point</label>\r
-                    <div id="Edgepoint" class="col-xs-8" >\r
+                    <div id="isEdgePoint" class="col-xs-8" >\r
                     </div>\r
                 </div>\r
                 <div class="form-group row">\r
                     <label class="col-xs-4 col-form-label">Port Index</label>\r
-                    <div id="portindex" class="col-xs-8" >\r
+                    <div id="portIndex" class="col-xs-8" >\r
                     </div>\r
                 </div>\r
                 <div class="form-group row">\r
                     <label class="col-xs-4 col-form-label">Ip Address</label>\r
-                    <div id="ipaddress" class="col-xs-8" >\r
+                    <div id="ipAddress" class="col-xs-8" >\r
                     </div>\r
                 </div>\r
 \r