Refactor resmanager code
authorSeshu-Kumar-M <seshu.kumar.m@huawei.com>
Wed, 1 Mar 2017 08:57:14 +0000 (14:27 +0530)
committerSeshu-Kumar-M <seshu.kumar.m@huawei.com>
Wed, 1 Mar 2017 08:59:25 +0000 (14:29 +0530)
IssueId :CLIENT-4

Change-Id: Ib254a228cbe17243422cb2f1919d9922ee9691d0
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
90 files changed:
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/License.txt [moved from resmgr/src/main/webapp/bak/resmgr-nfv/conf/License.txt with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/globalconfig.json [moved from resmgr/src/main/webapp/bak/resmgr-nfv/conf/globalconfig.json with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/RMain.css [moved from resmgr/src/main/webapp/bak/resmgr-nfv/css/RMain.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/VMMain.css [moved from resmgr/src/main/webapp/bak/resmgr-nfv/css/VMMain.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap-table.min.css [moved from resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap-table.min.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap.min.css [moved from resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap.min.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/jquery.dataTables.min.css [moved from resmgr/src/main/webapp/bak/resmgr-nfv/css/jquery.dataTables.min.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/resmgr.css [moved from resmgr/src/main/webapp/bak/resmgr-nfv/css/resmgr.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/datacenter.html [moved from resmgr/src/main/webapp/bak/resmgr-nfv/datacenter.html with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/html/index.html [moved from resmgr/src/main/webapp/bak/resmgr-nfv/html/index.html with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/License.txt [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/License.txt with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/add.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/add.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/arrow-down-enable.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/arrow-down-enable.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/collapse_arrow.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/collapse_arrow.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/delete.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/delete.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/edit.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/edit.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/expand_arrow.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/expand_arrow.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/ideo_default_select.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/ideo_default_select.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/import.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/import.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/line.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/line.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/loading-spinner-grey.gif [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/loading-spinner-grey.gif with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/openo.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/openo.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_l.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/page_l.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_left_disabled.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/page_left_disabled.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_r.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/page_r.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_asc.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_asc.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_both.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_both.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_desc.png [moved from resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_desc.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/SendMsg.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/SendMsg.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootbox.min.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/bootbox.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap-table.min.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap-table.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap.min.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/chart.min.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/chart.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/datacenter.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/datacenter.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/gconf.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/gconf.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery-1.11.2.min.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery-1.11.2.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.dataTables.min.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.dataTables.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.validate.min.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.validate.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/resmgr.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/resmgr.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/validateset.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/validateset.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/vim.js [moved from resmgr/src/main/webapp/bak/resmgr-nfv/js/vim.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/location.html [moved from resmgr/src/main/webapp/bak/resmgr-nfv/location.html with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/resource.html [moved from resmgr/src/main/webapp/bak/resmgr-nfv/resource.html with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/vim.html [moved from resmgr/src/main/webapp/bak/resmgr-nfv/vim.html with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn.rar [moved from resmgr/src/main/webapp/bak/resmgr-sdn.rar with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/License.txt [moved from resmgr/src/main/webapp/bak/resmgr-sdn/conf/License.txt with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/dataconfig.json [moved from resmgr/src/main/webapp/bak/resmgr-sdn/conf/dataconfig.json with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/RMain.css [moved from resmgr/src/main/webapp/bak/resmgr-sdn/css/RMain.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/VMMain.css [moved from resmgr/src/main/webapp/bak/resmgr-sdn/css/VMMain.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap-table.min.css [moved from resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap-table.min.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap.min.css [moved from resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap.min.css with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/License.txt [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/License.txt with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/add.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/add.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/arrow-down-enable.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/arrow-down-enable.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/collapse_arrow.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/collapse_arrow.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/delete.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/delete.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/edit.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/edit.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/expand_arrow.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/expand_arrow.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/ideo_default_select.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/ideo_default_select.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/import.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/import.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/line.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/line.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/loading-spinner-grey.gif [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/loading-spinner-grey.gif with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/openo.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/openo.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_l.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/page_l.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_left_disabled.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/page_left_disabled.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_r.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/page_r.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_asc.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_asc.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_both.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_both.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_desc.png [moved from resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_desc.png with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js [moved from resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table.min.js [moved from resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap.min.js [moved from resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/brs.js [moved from resmgr/src/main/webapp/bak/resmgr-sdn/js/brs.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/jquery-1.11.2.min.js [moved from resmgr/src/main/webapp/bak/resmgr-sdn/js/jquery-1.11.2.min.js with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/link.html [moved from resmgr/src/main/webapp/bak/resmgr-sdn/link.html with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/ne.html [moved from resmgr/src/main/webapp/bak/resmgr-sdn/ne.html with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/port.html [moved from resmgr/src/main/webapp/bak/resmgr-sdn/port.html with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/resource.html [moved from resmgr/src/main/webapp/bak/resmgr-sdn/resource.html with 100% similarity]
resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/site.html [moved from resmgr/src/main/webapp/bak/resmgr-sdn/site.html with 100% similarity]
resmgr/src/main/webapp/resmgr/index.html [moved from resmgr/src/main/webapp/index.html with 97% similarity]
resmgr/src/main/webapp/resmgr/js/app.js [moved from resmgr/src/main/webapp/js/app.js with 87% similarity]
resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html [moved from resmgr/src/main/webapp/sdn-resmgr/link/link.html with 100% similarity]
resmgr/src/main/webapp/resmgr/sdn-resmgr/link/linkRest.js [moved from resmgr/src/main/webapp/sdn-resmgr/link/linkRest.js with 100% similarity]
resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html [moved from resmgr/src/main/webapp/sdn-resmgr/ne/ne.html with 100% similarity]
resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/neRest.js [moved from resmgr/src/main/webapp/sdn-resmgr/ne/neRest.js with 100% similarity]
resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html [moved from resmgr/src/main/webapp/sdn-resmgr/port/port.html with 100% similarity]
resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js [moved from resmgr/src/main/webapp/sdn-resmgr/port/portRest.js with 100% similarity]
resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html [moved from resmgr/src/main/webapp/sdn-resmgr/site/site.html with 100% similarity]
resmgr/src/main/webapp/resmgr/sdn-resmgr/site/siteRest.js [moved from resmgr/src/main/webapp/sdn-resmgr/site/siteRest.js with 100% similarity]
resmgr/src/main/webapp/resmgr/templates/resource.html [moved from resmgr/src/main/webapp/templates/resource.html with 100% similarity]

similarity index 97%
rename from resmgr/src/main/webapp/index.html
rename to resmgr/src/main/webapp/resmgr/index.html
index a715202..9a2300f 100644 (file)
@@ -26,7 +26,7 @@
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
     <link href="thirdparty/css/magic-check.css" rel="stylesheet"/>
     <link rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css">
-    <link href="framework/css/open-ostyle.css" rel="stylesheet"/>
+    <!--<link href="framework/css/open-ostyle.css" rel="stylesheet"/>-->
     <!--<link rel="stylesheet" href="framework/css/RMain.css">
     <link rel="stylesheet" href="framework/css/VMMain.css">-->
     <link href="framework/css/open-ostyle.css" rel="stylesheet"/>
similarity index 87%
rename from resmgr/src/main/webapp/js/app.js
rename to resmgr/src/main/webapp/resmgr/js/app.js
index 6c2ef29..149739a 100644 (file)
@@ -139,41 +139,49 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();\r
 \r
 \r
-            var portName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.name", "errtag":"textboxErr", "errfunc":"validatetextbox", "required":true}};\r
+            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" : "The name is required.", "modalVar":"port.me", "errtag":"textboxErr", "errfunc":"validatetextbox", "required":true}};\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
 \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 portLayerRate = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"port.layerrate"}};\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 portIndex = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"port.portindex"}};\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" :     {"textboxErr" : "The ip is required.", "modalVar":"port.ipaddress"}};\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" :     {"textboxErr" : "The name is required.", "modalVar":"port.adminState"}};\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" :     {"textboxErr" : "The name is required.", "modalVar":"port.operatingState"}};\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
 \r
         }\r
 \r
-        $scope.validatetextbox = function (value){\r
+        $scope.validatetextboxName = function (value){\r
             if($scope.port.name) {\r
-                $scope.textboxErr = false;\r
+                $scope.textboxErrName = false;\r
             }\r
             else\r
-                $scope.textboxErr = true;\r
+                $scope.textboxErrName = true;\r
+        }\r
+\r
+        $scope.validatetextboxMe = function (value){\r
+            if($scope.port.me) {\r
+                $scope.textboxErrMe = false;\r
+            }\r
+            else\r
+                $scope.textboxErrMe = true;\r
         }\r
 \r
         $scope.validateipv4 = function (value){\r
@@ -219,7 +227,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.port = {};\r
             //$("#myModal").modal();\r
             $("#myModal").modal({}).draggable();\r
-            $scope.textboxErr = false;\r
+            $scope.textboxErrName = false;\r
+            $scope.textboxErrMe = false;\r
             $scope.ipv4Err = false;\r
             $scope.numericErr = false;\r
         }\r
@@ -367,29 +376,29 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var text = $(modelTemplate).filter('#textfield').html();\r
             var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();\r
 \r
-            var siteName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"site.name", "errtag":"textboxErr", "errfunc":"validatetextbox", "required":true}};\r
+            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
             $('#myModal #type').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownsiteData))($scope));\r
 \r
-            var siteTenantName = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"site.tenatname"}};\r
+            var siteTenantName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"site.tenatname"}};\r
             $('#myModal #tenantname').append($compile(Mustache.to_html(text, siteTenantName.ErrMsg))($scope));\r
 \r
-            var siteTenantType = {"ErrMsg" :     {"textboxErr" : "The tenanttype is required.", "modalVar":"site.tenanttype"}};\r
+            var siteTenantType = {"ErrMsg" :     {"errmsg" : "The tenanttype is required.", "modalVar":"site.tenanttype"}};\r
             $('#myModal #tenanttype').append($compile(Mustache.to_html(text, siteTenantType.ErrMsg))($scope));\r
 \r
-            var siteLocation = {"ErrMsg" :     {"textboxErr" : "Location is required.", "modalVar":"site.location", "placeholder":"Location"}};\r
+            var siteLocation = {"ErrMsg" :     {"errmsg" : "Location is required.", "modalVar":"site.location", "placeholder":"Location"}};\r
             $('#myModal #location').append($compile(Mustache.to_html(text, siteLocation.ErrMsg))($scope));\r
 \r
 \r
         }\r
 \r
-        $scope.validatetextbox = function (value){\r
+        $scope.validatetextboxName = function (value){\r
             if($scope.site.name) {\r
-                $scope.textboxErr = false;\r
+                $scope.textboxErrName = false;\r
             }\r
             else\r
-                $scope.textboxErr = true;\r
+                $scope.textboxErrName = true;\r
         }\r
 \r
 \r
@@ -409,7 +418,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.site = {};\r
             //$("#myModal").modal();\r
             $("#myModal").modal({}).draggable();\r
-            $scope.textboxErr = false;\r
+            $scope.textboxErrName = false;\r
         }\r
         $scope.saveData = function(id) {\r
             if(id) {\r
@@ -558,82 +567,57 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var ipv4 = $(modelTemplate).filter('#ipv4').html();\r
             var number = $(modelTemplate).filter('#numeric').html();\r
 \r
-            var locId = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Id", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Country", "placeholder":"Id"}};\r
+            var locId = {"ErrMsg" :     {"errmsg" : "Name is required.", "modalVar":"loc.Id", "errtag":"textboxErrId", "errfunc":"validatetextboxId", "placeholder":"Country", "placeholder":"Id"}};\r
             $('#myModal #Name').append($compile(Mustache.to_html(text, locId.ErrMsg))($scope));\r
 \r
-            var locCountry = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Country", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Country","required":true}};\r
+            var locCountry = {"ErrMsg" :     {"errmsg" : "Country is required.", "modalVar":"loc.Country", "errtag":"textboxErrCountry", "errfunc":"validatetextboxCountry", "placeholder":"Country","required":true}};\r
             $('#myModal #Country').append($compile(Mustache.to_html(text, locCountry.ErrMsg))($scope));\r
 \r
-            var locLocation = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Location", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Location","required":true}};\r
+            var locLocation = {"ErrMsg" :     {"errmsg" : "Location is required.", "modalVar":"loc.Location", "errtag":"textboxErrLocation", "errfunc":"validatetextboxLocation", "placeholder":"Location","required":true}};\r
             $('#myModal #Location').append($compile(Mustache.to_html(text, locLocation.ErrMsg))($scope));\r
 \r
             var locDescription = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Description", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Description "}};\r
             $('#myModal #Description').append($compile(Mustache.to_html(text, locDescription.ErrMsg))($scope));\r
 \r
-            var locLatitude = {"ErrMsg" :     {"ipv4Err" : "IP Address is required.", "modalVar":"loc.Latitude", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Latitude","required":true}};\r
+            var locLatitude = {"ErrMsg" :     {"errmsg" : "Latitude is required.", "modalVar":"loc.Latitude", "errtag":"textboxErrLatitude", "errfunc":"validatetextboxLatitude", "placeholder":"Latitude","required":true}};\r
             $('#myModal #Latitude').append($compile(Mustache.to_html(text, locLatitude.ErrMsg))($scope));\r
 \r
-            var locLongitude = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Longitude", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Longitude","required":true}};\r
+            var locLongitude = {"ErrMsg" :     {"errmsg" : "Longitude is required.", "modalVar":"loc.Longitude", "errtag":"textboxErrLongitude", "errfunc":"validatetextboxLongitude", "placeholder":"Longitude","required":true}};\r
             $('#myModal #Longitude').append($compile(Mustache.to_html(text, locLongitude.ErrMsg))($scope));\r
         }\r
 \r
-        $scope.validatetextbox = function (value){\r
-            if($scope.loc.Id) {\r
-                $scope.textboxErr = false;\r
-            }\r
-            else\r
-                $scope.textboxErr = true;\r
-        }\r
-\r
-        $scope.validatetextbox = function (value){\r
-            if($scope.loc.Country) {\r
-                $scope.textboxErr = false;\r
-            }\r
-            else\r
-                $scope.textboxErr = true;\r
-        }\r
-\r
-        $scope.validatetextbox = function (value){\r
+        $scope.validatetextboxLocation = function (value){\r
             if($scope.loc.Location) {\r
-                $scope.textboxErr = false;\r
-            }\r
-            else\r
-                $scope.textboxErr = true;\r
-        }\r
-\r
-        $scope.validatetextbox = function (value){\r
-            if($scope.loc.Latitude) {\r
-                $scope.textboxErr = false;\r
+                $scope.textboxErrLocation = false;\r
             }\r
             else\r
-                $scope.textboxErr = true;\r
+                $scope.textboxErrLocation = true;\r
         }\r
 \r
-        $scope.validatetextbox = function (value){\r
-            if($scope.loc.Longitude) {\r
-                $scope.textboxErr = false;\r
+        $scope.validatetextboxCountry = function (value){\r
+            if($scope.loc.Country) {\r
+                $scope.textboxErrCountry = false;\r
             }\r
             else\r
-                $scope.textboxErr = true;\r
+                $scope.textboxErrCountry = true;\r
         }\r
 \r
-        $scope.validatenumeric = function (value){\r
+        $scope.validatetextboxLatitude = function (value){\r
             if($scope.loc.Latitude) {\r
-                $scope.numericErr = false;\r
+                $scope.textboxErrLatitude = false;\r
             }\r
             else\r
-                $scope.numericErr = true;\r
+                $scope.textboxErrLatitude = true;\r
         }\r
 \r
-        $scope.validatenumeric = function (value){\r
+        $scope.validatetextboxLongitude = function (value){\r
             if($scope.loc.Longitude) {\r
-                $scope.numericErr = false;\r
+                $scope.textboxErrLongitude = false;\r
             }\r
             else\r
-                $scope.numericErr = true;\r
+                $scope.textboxErrLongitude = true;\r
         }\r
 \r
-\r
         $scope.closeModal = function() {\r
             console.log("Closing Modal...");\r
             $('#myModal').modal('hide');\r
@@ -651,8 +635,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.location = {};\r
             //$("#myModal").modal();\r
             $("#myModal").modal({}).draggable();\r
-            $scope.textboxErr = false;\r
-            $scope.numericErr = false;\r
+            $scope.textboxErrLocation = false;\r
+            $scope.textboxErrCountry = false;\r
+            $scope.textboxErrLatitude = false;\r
+            $scope.textboxErrLongitude = false;\r
         }\r
         $scope.saveData = function(id) {\r
             if(id) {\r
@@ -806,25 +792,25 @@ 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 linkLayerRate = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.layerRate"}};\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" :     {"numericErr" : "The name is required.", "modalVar":"link.sourcePort"}};\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
 \r
-            var linkSinkPort = {"ErrMsg" :     {"numericErr" : "IP Address is required.", "modalVar":"link.sinkPort"}};\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
 \r
-            var linkSourceNe = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.sourceNE"}};\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
 \r
-            var linkSinkNe = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.sinkNE"}};\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
 \r
-            var linkAdminState = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.adminState"}};\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
 \r
-            var linkOperatingState = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.operatingState"}};\r
+            var linkOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.operatingState"}};\r
             $('#myModal #operatingState').append($compile(Mustache.to_html(text, linkOperatingState.ErrMsg))($scope));\r
 \r
         }\r
@@ -1018,58 +1004,51 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var number = $(modelTemplate).filter('#numeric').html();\r
             var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();\r
 \r
-            var neName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.name", "errtag":"textboxErr", "errfunc":"validatetextbox","required":true}};\r
+            var neName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName","required":true}};\r
             $('#myModal #name').append($compile(Mustache.to_html(text, neName.ErrMsg))($scope));\r
 \r
-            var neVersion = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.version","errtag":"textboxErr", "errfunc":"validatetextbox","required":true}};\r
+            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" :     {"textboxErr" : "The name is required.", "modalVar":"ne.productname" }};\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
 \r
-            var neIPAddress = {"ErrMsg" :     {"ipv4Err" : "IP Address is required.", "modalVar":"ne.ipaddress"}};\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" :     {"textboxErr" : "The name is required.", "modalVar":"ne.nerole"}};\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
 \r
-            var neAdminState = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"ne.adminState"}};\r
+            var neAdminState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.adminState"}};\r
             $('#myModal #adminState').append($compile(Mustache.to_html(text, neAdminState.ErrMsg))($scope));\r
 \r
-            var neOperatingState = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"ne.operatingState"}};\r
+            var neOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.operatingState"}};\r
             $('#myModal #operatingState').append($compile(Mustache.to_html(text, neOperatingState.ErrMsg))($scope));\r
 \r
         }\r
 \r
-        $scope.validatetextbox = function (value){\r
+        $scope.validatetextboxName = function (value){\r
             if($scope.ne.name) {\r
-                $scope.textboxErr = false;\r
+                $scope.textboxErrName = false;\r
             }\r
             else\r
-                $scope.textboxErr = true;\r
+                $scope.textboxErrName = true;\r
         }\r
 \r
-        $scope.validatetextbox = function (value){\r
+        $scope.validatetextboxVersion = function (value){\r
             if($scope.ne.version) {\r
-                $scope.textboxErr = false;\r
+                $scope.textboxErrVersion = false;\r
             }\r
             else\r
-                $scope.textboxErr = true;\r
-        }\r
-\r
-        $scope.validateipv4 = function (value){\r
-            if($scope.ne.ipaddress) {\r
-                $scope.ipv4Err = false;\r
-            }\r
-            else\r
-                $scope.ipv4Err = true;\r
+                $scope.textboxErrVersion = true;\r
         }\r
 \r
         $scope.closeModal = function() {\r
             console.log("Closing Modal...");\r
             $('#myModal').modal('hide');\r
+            $scope.textboxErrName = false;\r
         }\r
 \r
 \r
@@ -1083,9 +1062,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         $scope.showAddModal = function() {\r
             console.log("Showing Modal to Add data");\r
             $scope.ne = {};\r
-            $scope.textboxErr = false;\r
-            $scope.ipv4Err = false;\r
-            $scope.numericErr = false;\r
+            $scope.textboxErrName = false;\r
+            $scope.textboxErrVersion = false;\r
             //$("#myModal").modal();\r
             $("#myModal").modal({}).draggable();\r
         }\r