Merge "Refactor resmanager code"

90 files changed, 74 insertions, 96 deletions

diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/conf/License.txt b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/License.txt
index 8e698ecb..8e698ecb 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/conf/License.txt
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/License.txt
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/conf/globalconfig.json b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/globalconfig.json
index 20ce9a54..20ce9a54 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/conf/globalconfig.json
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/conf/globalconfig.json
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/RMain.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/RMain.css
index 12aa5066..12aa5066 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/css/RMain.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/RMain.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/VMMain.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/VMMain.css
index 048d814a..048d814a 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/css/VMMain.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/VMMain.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap-table.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap-table.min.css
index d72d0655..d72d0655 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap-table.min.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap-table.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap.min.css
index 679272d2..679272d2 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/css/bootstrap.min.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/bootstrap.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/jquery.dataTables.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/jquery.dataTables.min.css
index 781de6bf..781de6bf 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/css/jquery.dataTables.min.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/jquery.dataTables.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/css/resmgr.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/resmgr.css
index f635263b..f635263b 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/css/resmgr.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/css/resmgr.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/datacenter.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/datacenter.html
index 7c628222..7c628222 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/datacenter.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/datacenter.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/html/index.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/html/index.html
index 73508e09..73508e09 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/html/index.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/html/index.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/License.txt b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/License.txt
index 8e698ecb..8e698ecb 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/License.txt
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/License.txt
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/add.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/add.png
index d1f82993..d1f82993 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/add.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/add.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/arrow-down-enable.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/arrow-down-enable.png
index dc8ddbe6..dc8ddbe6 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/arrow-down-enable.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/arrow-down-enable.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/collapse_arrow.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/collapse_arrow.png
index 8830741a..8830741a 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/collapse_arrow.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/collapse_arrow.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/delete.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/delete.png
index 737f8797..737f8797 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/delete.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/delete.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/edit.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/edit.png
index 68d76257..68d76257 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/edit.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/edit.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/expand_arrow.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/expand_arrow.png
index f8935e1f..f8935e1f 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/expand_arrow.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/expand_arrow.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/ideo_default_select.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/ideo_default_select.png
index 50c3a251..50c3a251 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/ideo_default_select.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/ideo_default_select.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/import.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/import.png
index 8cfc5256..8cfc5256 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/import.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/import.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/line.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/line.png
index 9d340a8d..9d340a8d 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/line.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/line.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/loading-spinner-grey.gif b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/loading-spinner-grey.gif
index 6d614d3d..6d614d3d 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/loading-spinner-grey.gif
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/loading-spinner-grey.gif
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/openo.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/openo.png
index 328b7353..328b7353 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/openo.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/openo.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/page_l.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_l.png
index e8b98c7c..e8b98c7c 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/page_l.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_l.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/page_left_disabled.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_left_disabled.png
index f72a90bd..f72a90bd 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/page_left_disabled.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_left_disabled.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/page_r.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_r.png
index 2e637eee..2e637eee 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/page_r.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/page_r.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_asc.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_asc.png
index a88d7975..a88d7975 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_asc.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_asc.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_both.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_both.png
index 18670406..18670406 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_both.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_both.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_desc.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_desc.png
index def071ed..def071ed 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/images/sort_desc.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/images/sort_desc.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/SendMsg.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/SendMsg.js
index ba8d9ac7..ba8d9ac7 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/SendMsg.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/SendMsg.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/bootbox.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootbox.min.js
index a7ea24fe..a7ea24fe 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/bootbox.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootbox.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap-table.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap-table.min.js
index aa8e6854..aa8e6854 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap-table.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap-table.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap.min.js
index b04a0e82..b04a0e82 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/bootstrap.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/bootstrap.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/chart.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/chart.min.js
index 9a39f0fc..9a39f0fc 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/chart.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/chart.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/datacenter.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/datacenter.js
index 6c6ec2df..6c6ec2df 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/datacenter.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/datacenter.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/gconf.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/gconf.js
index abd1195c..abd1195c 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/gconf.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/gconf.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery-1.11.2.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery-1.11.2.min.js
index e6a051d0..e6a051d0 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery-1.11.2.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery-1.11.2.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.dataTables.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.dataTables.min.js
index 02694a4a..02694a4a 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.dataTables.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.dataTables.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.validate.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.validate.min.js
index 52646177..52646177 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/jquery.validate.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/jquery.validate.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/resmgr.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/resmgr.js
index e198ed83..e198ed83 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/resmgr.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/resmgr.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/validateset.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/validateset.js
index 8810c388..8810c388 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/validateset.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/validateset.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/js/vim.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/vim.js
index e39f4fb3..e39f4fb3 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/js/vim.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/js/vim.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/location.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/location.html
index c387d5d6..c387d5d6 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/location.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/location.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/resource.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/resource.html
index f8ee50a7..f8ee50a7 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/resource.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/resource.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-nfv/vim.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/vim.html
index d46b801c..d46b801c 100644
--- a/resmgr/src/main/webapp/bak/resmgr-nfv/vim.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-nfv/vim.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn.rar b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn.rar
index 5797c4fc..5797c4fc 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn.rar
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn.rar
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/conf/License.txt b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/License.txt
index 8e698ecb..8e698ecb 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/conf/License.txt
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/License.txt
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/conf/dataconfig.json b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/dataconfig.json
index 20ce9a54..20ce9a54 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/conf/dataconfig.json
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/conf/dataconfig.json
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/css/RMain.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/RMain.css
index 12aa5066..12aa5066 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/css/RMain.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/RMain.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/css/VMMain.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/VMMain.css
index 048d814a..048d814a 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/css/VMMain.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/VMMain.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap-table.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap-table.min.css
index d72d0655..d72d0655 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap-table.min.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap-table.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap.min.css b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap.min.css
index 679272d2..679272d2 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/css/bootstrap.min.css
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/css/bootstrap.min.css
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/License.txt b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/License.txt
index 8e698ecb..8e698ecb 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/License.txt
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/License.txt
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/add.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/add.png
index d1f82993..d1f82993 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/add.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/add.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/arrow-down-enable.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/arrow-down-enable.png
index dc8ddbe6..dc8ddbe6 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/arrow-down-enable.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/arrow-down-enable.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/collapse_arrow.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/collapse_arrow.png
index 8830741a..8830741a 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/collapse_arrow.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/collapse_arrow.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/delete.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/delete.png
index 737f8797..737f8797 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/delete.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/delete.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/edit.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/edit.png
index 68d76257..68d76257 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/edit.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/edit.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/expand_arrow.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/expand_arrow.png
index f8935e1f..f8935e1f 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/expand_arrow.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/expand_arrow.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/ideo_default_select.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/ideo_default_select.png
index 50c3a251..50c3a251 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/ideo_default_select.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/ideo_default_select.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/import.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/import.png
index 8cfc5256..8cfc5256 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/import.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/import.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/line.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/line.png
index 9d340a8d..9d340a8d 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/line.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/line.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/loading-spinner-grey.gif b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/loading-spinner-grey.gif
index 6d614d3d..6d614d3d 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/loading-spinner-grey.gif
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/loading-spinner-grey.gif
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/openo.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/openo.png
index 328b7353..328b7353 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/openo.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/openo.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/page_l.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_l.png
index e8b98c7c..e8b98c7c 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/page_l.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_l.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/page_left_disabled.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_left_disabled.png
index f72a90bd..f72a90bd 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/page_left_disabled.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_left_disabled.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/page_r.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_r.png
index 2e637eee..2e637eee 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/page_r.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/page_r.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_asc.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_asc.png
index a88d7975..a88d7975 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_asc.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_asc.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_both.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_both.png
index 18670406..18670406 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_both.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_both.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_desc.png b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_desc.png
index def071ed..def071ed 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/images/sort_desc.png
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/images/sort_desc.png
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js
index d321a08e..d321a08e 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table-filter-control.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table.min.js
index a939f007..a939f007 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap-table.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap-table.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap.min.js
index b04a0e82..b04a0e82 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/js/bootstrap.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/bootstrap.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/brs.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/brs.js
index f0d33b0f..f0d33b0f 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/js/brs.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/brs.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/js/jquery-1.11.2.min.js b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/jquery-1.11.2.min.js
index e6a051d0..e6a051d0 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/js/jquery-1.11.2.min.js
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/js/jquery-1.11.2.min.js
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/link.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/link.html
index c33fad78..c33fad78 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/link.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/link.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/ne.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/ne.html
index 6cf13052..6cf13052 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/ne.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/ne.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/port.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/port.html
index cc9442de..cc9442de 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/port.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/port.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/resource.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/resource.html
index 58f0a018..58f0a018 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/resource.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/resource.html
diff --git a/resmgr/src/main/webapp/bak/resmgr-sdn/site.html b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/site.html
index 3cb49918..3cb49918 100644
--- a/resmgr/src/main/webapp/bak/resmgr-sdn/site.html
+++ b/resmgr/src/main/webapp/resmgr/bak/resmgr-sdn/site.html
diff --git a/resmgr/src/main/webapp/index.html b/resmgr/src/main/webapp/resmgr/index.html
index a7152023..9a2300f0 100644
--- a/resmgr/src/main/webapp/index.html
+++ b/resmgr/src/main/webapp/resmgr/index.html
@@ -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"/>
diff --git a/resmgr/src/main/webapp/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index 6c2ef298..149739aa 100644
--- a/resmgr/src/main/webapp/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -139,41 +139,49 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();

 

 

-            var portName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.name", "errtag":"textboxErr", "errfunc":"validatetextbox", "required":true}};

+            var portName = {"ErrMsg" :     {"errmsg" : "Name is required.", "modalVar":"port.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}};

             $('#myModal #name').append($compile(Mustache.to_html(text, portName.ErrMsg))($scope));

 

-            var portMe = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.me", "errtag":"textboxErr", "errfunc":"validatetextbox", "required":true}};

+            var portMe = {"ErrMsg" :     {"errmsg" : "ME is required.", "modalVar":"port.me", "errtag":"textboxErrMe", "errfunc":"validatetextboxMe", "required":true}};

             $('#myModal #me').append($compile(Mustache.to_html(text, portMe.ErrMsg))($scope));

 

             //var portType = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"port.type"}};

             $('#myModal #type').append($compile(Mustache.to_html(dropDown, $scope.data.dropdowntypeData))($scope));

 

-            var portLayerRate = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"port.layerrate"}};

+            var portLayerRate = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.layerrate"}};

             $('#myModal #layerrate').append($compile(Mustache.to_html(text, portLayerRate.ErrMsg))($scope));

 

             //var portEdgePoint = {"ErrMsg" :     {"ipv4Err" : "IP Address is required.", "modalVar":"port.Edgepoint"}};

             $('#myModal #Edgepoint').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownEdgeData))($scope));

 

-            var portIndex = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"port.portindex"}};

+            var portIndex = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.portindex"}};

             $('#myModal #portindex').append($compile(Mustache.to_html(text, portIndex.ErrMsg))($scope));

 

-            var portIp = {"ErrMsg" :     {"textboxErr" : "The ip is required.", "modalVar":"port.ipaddress"}};

+            var portIp = {"ErrMsg" :     {"errmsg" : "The ip is required.", "modalVar":"port.ipaddress"}};

             $('#myModal #ipaddress').append($compile(Mustache.to_html(text, portIp.ErrMsg))($scope));

 

-            var portAdmin = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"port.adminState"}};

+            var portAdmin = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.adminState"}};

             $('#myModal #adminState').append($compile(Mustache.to_html(text, portAdmin.ErrMsg))($scope));

 

-            var portOperatingState = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"port.operatingState"}};

+            var portOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.operatingState"}};

             $('#myModal #operatingState').append($compile(Mustache.to_html(text, portOperatingState.ErrMsg))($scope));

 

         }

 

-        $scope.validatetextbox = function (value){

+        $scope.validatetextboxName = function (value){

             if($scope.port.name) {

-                $scope.textboxErr = false;

+                $scope.textboxErrName = false;

             }

             else

-                $scope.textboxErr = true;

+                $scope.textboxErrName = true;

+        }

+

+        $scope.validatetextboxMe = function (value){

+            if($scope.port.me) {

+                $scope.textboxErrMe = false;

+            }

+            else

+                $scope.textboxErrMe = true;

         }

 

         $scope.validateipv4 = function (value){

@@ -219,7 +227,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.port = {};

             //$("#myModal").modal();

             $("#myModal").modal({}).draggable();

-            $scope.textboxErr = false;

+            $scope.textboxErrName = false;

+            $scope.textboxErrMe = false;

             $scope.ipv4Err = false;

             $scope.numericErr = false;

         }

@@ -367,29 +376,29 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var text = $(modelTemplate).filter('#textfield').html();

             var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();

 

-            var siteName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"site.name", "errtag":"textboxErr", "errfunc":"validatetextbox", "required":true}};

+            var siteName = {"ErrMsg" :     {"errmsg" : "Name is required.", "modalVar":"site.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}};

             $('#myModal #name').append($compile(Mustache.to_html(text, siteName.ErrMsg))($scope));

 

             $('#myModal #type').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownsiteData))($scope));

 

-            var siteTenantName = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"site.tenatname"}};

+            var siteTenantName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"site.tenatname"}};

             $('#myModal #tenantname').append($compile(Mustache.to_html(text, siteTenantName.ErrMsg))($scope));

 

-            var siteTenantType = {"ErrMsg" :     {"textboxErr" : "The tenanttype is required.", "modalVar":"site.tenanttype"}};

+            var siteTenantType = {"ErrMsg" :     {"errmsg" : "The tenanttype is required.", "modalVar":"site.tenanttype"}};

             $('#myModal #tenanttype').append($compile(Mustache.to_html(text, siteTenantType.ErrMsg))($scope));

 

-            var siteLocation = {"ErrMsg" :     {"textboxErr" : "Location is required.", "modalVar":"site.location", "placeholder":"Location"}};

+            var siteLocation = {"ErrMsg" :     {"errmsg" : "Location is required.", "modalVar":"site.location", "placeholder":"Location"}};

             $('#myModal #location').append($compile(Mustache.to_html(text, siteLocation.ErrMsg))($scope));

 

 

         }

 

-        $scope.validatetextbox = function (value){

+        $scope.validatetextboxName = function (value){

             if($scope.site.name) {

-                $scope.textboxErr = false;

+                $scope.textboxErrName = false;

             }

             else

-                $scope.textboxErr = true;

+                $scope.textboxErrName = true;

         }

 

 

@@ -409,7 +418,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.site = {};

             //$("#myModal").modal();

             $("#myModal").modal({}).draggable();

-            $scope.textboxErr = false;

+            $scope.textboxErrName = false;

         }

         $scope.saveData = function(id) {

             if(id) {

@@ -558,82 +567,57 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var ipv4 = $(modelTemplate).filter('#ipv4').html();

             var number = $(modelTemplate).filter('#numeric').html();

 

-            var locId = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Id", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Country", "placeholder":"Id"}};

+            var locId = {"ErrMsg" :     {"errmsg" : "Name is required.", "modalVar":"loc.Id", "errtag":"textboxErrId", "errfunc":"validatetextboxId", "placeholder":"Country", "placeholder":"Id"}};

             $('#myModal #Name').append($compile(Mustache.to_html(text, locId.ErrMsg))($scope));

 

-            var locCountry = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Country", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Country","required":true}};

+            var locCountry = {"ErrMsg" :     {"errmsg" : "Country is required.", "modalVar":"loc.Country", "errtag":"textboxErrCountry", "errfunc":"validatetextboxCountry", "placeholder":"Country","required":true}};

             $('#myModal #Country').append($compile(Mustache.to_html(text, locCountry.ErrMsg))($scope));

 

-            var locLocation = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Location", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Location","required":true}};

+            var locLocation = {"ErrMsg" :     {"errmsg" : "Location is required.", "modalVar":"loc.Location", "errtag":"textboxErrLocation", "errfunc":"validatetextboxLocation", "placeholder":"Location","required":true}};

             $('#myModal #Location').append($compile(Mustache.to_html(text, locLocation.ErrMsg))($scope));

 

             var locDescription = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Description", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Description "}};

             $('#myModal #Description').append($compile(Mustache.to_html(text, locDescription.ErrMsg))($scope));

 

-            var locLatitude = {"ErrMsg" :     {"ipv4Err" : "IP Address is required.", "modalVar":"loc.Latitude", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Latitude","required":true}};

+            var locLatitude = {"ErrMsg" :     {"errmsg" : "Latitude is required.", "modalVar":"loc.Latitude", "errtag":"textboxErrLatitude", "errfunc":"validatetextboxLatitude", "placeholder":"Latitude","required":true}};

             $('#myModal #Latitude').append($compile(Mustache.to_html(text, locLatitude.ErrMsg))($scope));

 

-            var locLongitude = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"loc.Longitude", "errtag":"textboxErr", "errfunc":"validatetextbox", "placeholder":"Longitude","required":true}};

+            var locLongitude = {"ErrMsg" :     {"errmsg" : "Longitude is required.", "modalVar":"loc.Longitude", "errtag":"textboxErrLongitude", "errfunc":"validatetextboxLongitude", "placeholder":"Longitude","required":true}};

             $('#myModal #Longitude').append($compile(Mustache.to_html(text, locLongitude.ErrMsg))($scope));

         }

 

-        $scope.validatetextbox = function (value){

-            if($scope.loc.Id) {

-                $scope.textboxErr = false;

-            }

-            else

-                $scope.textboxErr = true;

-        }

-

-        $scope.validatetextbox = function (value){

-            if($scope.loc.Country) {

-                $scope.textboxErr = false;

-            }

-            else

-                $scope.textboxErr = true;

-        }

-

-        $scope.validatetextbox = function (value){

+        $scope.validatetextboxLocation = function (value){

             if($scope.loc.Location) {

-                $scope.textboxErr = false;

-            }

-            else

-                $scope.textboxErr = true;

-        }

-

-        $scope.validatetextbox = function (value){

-            if($scope.loc.Latitude) {

-                $scope.textboxErr = false;

+                $scope.textboxErrLocation = false;

             }

             else

-                $scope.textboxErr = true;

+                $scope.textboxErrLocation = true;

         }

 

-        $scope.validatetextbox = function (value){

-            if($scope.loc.Longitude) {

-                $scope.textboxErr = false;

+        $scope.validatetextboxCountry = function (value){

+            if($scope.loc.Country) {

+                $scope.textboxErrCountry = false;

             }

             else

-                $scope.textboxErr = true;

+                $scope.textboxErrCountry = true;

         }

 

-        $scope.validatenumeric = function (value){

+        $scope.validatetextboxLatitude = function (value){

             if($scope.loc.Latitude) {

-                $scope.numericErr = false;

+                $scope.textboxErrLatitude = false;

             }

             else

-                $scope.numericErr = true;

+                $scope.textboxErrLatitude = true;

         }

 

-        $scope.validatenumeric = function (value){

+        $scope.validatetextboxLongitude = function (value){

             if($scope.loc.Longitude) {

-                $scope.numericErr = false;

+                $scope.textboxErrLongitude = false;

             }

             else

-                $scope.numericErr = true;

+                $scope.textboxErrLongitude = true;

         }

 

-

         $scope.closeModal = function() {

             console.log("Closing Modal...");

             $('#myModal').modal('hide');

@@ -651,8 +635,10 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.location = {};

             //$("#myModal").modal();

             $("#myModal").modal({}).draggable();

-            $scope.textboxErr = false;

-            $scope.numericErr = false;

+            $scope.textboxErrLocation = false;

+            $scope.textboxErrCountry = false;

+            $scope.textboxErrLatitude = false;

+            $scope.textboxErrLongitude = false;

         }

         $scope.saveData = function(id) {

             if(id) {

@@ -806,25 +792,25 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             //var linkType = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.type"}};

             $('#myModal #type').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownlinkData))($scope));

 

-            var linkLayerRate = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.layerRate"}};

+            var linkLayerRate = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.layerRate"}};

             $('#myModal #layerRate').append($compile(Mustache.to_html(text, linkLayerRate.ErrMsg))($scope));

 

-            var linkSourcePort = {"ErrMsg" :     {"numericErr" : "The name is required.", "modalVar":"link.sourcePort"}};

+            var linkSourcePort = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.sourcePort"}};

             $('#myModal #sourcePort').append($compile(Mustache.to_html(text, linkSourcePort.ErrMsg))($scope));

 

-            var linkSinkPort = {"ErrMsg" :     {"numericErr" : "IP Address is required.", "modalVar":"link.sinkPort"}};

+            var linkSinkPort = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"link.sinkPort"}};

             $('#myModal #sinkPort').append($compile(Mustache.to_html(text, linkSinkPort.ErrMsg))($scope));

 

-            var linkSourceNe = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.sourceNE"}};

+            var linkSourceNe = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.sourceNE"}};

             $('#myModal #sourceNE').append($compile(Mustache.to_html(text, linkSourceNe.ErrMsg))($scope));

 

-            var linkSinkNe = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.sinkNE"}};

+            var linkSinkNe = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.sinkNE"}};

             $('#myModal #sinkNE').append($compile(Mustache.to_html(text, linkSinkNe.ErrMsg))($scope));

 

-            var linkAdminState = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.adminState"}};

+            var linkAdminState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.adminState"}};

             $('#myModal #adminState').append($compile(Mustache.to_html(text, linkAdminState.ErrMsg))($scope));

 

-            var linkOperatingState = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"link.operatingState"}};

+            var linkOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"link.operatingState"}};

             $('#myModal #operatingState').append($compile(Mustache.to_html(text, linkOperatingState.ErrMsg))($scope));

 

         }

@@ -1018,58 +1004,51 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var number = $(modelTemplate).filter('#numeric').html();

             var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();

 

-            var neName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.name", "errtag":"textboxErr", "errfunc":"validatetextbox","required":true}};

+            var neName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName","required":true}};

             $('#myModal #name').append($compile(Mustache.to_html(text, neName.ErrMsg))($scope));

 

-            var neVersion = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.version","errtag":"textboxErr", "errfunc":"validatetextbox","required":true}};

+            var neVersion = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.version","errtag":"textboxErrVersion", "errfunc":"validatetextboxVersion","required":true}};

             $('#myModal #version').append($compile(Mustache.to_html(text, neVersion.ErrMsg))($scope));

 

-            var neProductName = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"ne.productname" }};

+            var neProductName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.productname" }};

             $('#myModal #productname').append($compile(Mustache.to_html(text, neProductName.ErrMsg))($scope));

 

             $('#myModal #controller').append($compile(Mustache.to_html(dropDown, $scope.data.dropdownneData))($scope));

 

-            var neIPAddress = {"ErrMsg" :     {"ipv4Err" : "IP Address is required.", "modalVar":"ne.ipaddress"}};

+            var neIPAddress = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.ipaddress"}};

             $('#myModal #ipaddress').append($compile(Mustache.to_html(text, neIPAddress.ErrMsg))($scope));

 

-            var neNERole = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"ne.nerole"}};

+            var neNERole = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.nerole"}};

             $('#myModal #nerole').append($compile(Mustache.to_html(text, neNERole.ErrMsg))($scope));

 

-            var neAdminState = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"ne.adminState"}};

+            var neAdminState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.adminState"}};

             $('#myModal #adminState').append($compile(Mustache.to_html(text, neAdminState.ErrMsg))($scope));

 

-            var neOperatingState = {"ErrMsg" :     {"textboxErr" : "The name is required.", "modalVar":"ne.operatingState"}};

+            var neOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.operatingState"}};

             $('#myModal #operatingState').append($compile(Mustache.to_html(text, neOperatingState.ErrMsg))($scope));

 

         }

 

-        $scope.validatetextbox = function (value){

+        $scope.validatetextboxName = function (value){

             if($scope.ne.name) {

-                $scope.textboxErr = false;

+                $scope.textboxErrName = false;

             }

             else

-                $scope.textboxErr = true;

+                $scope.textboxErrName = true;

         }

 

-        $scope.validatetextbox = function (value){

+        $scope.validatetextboxVersion = function (value){

             if($scope.ne.version) {

-                $scope.textboxErr = false;

+                $scope.textboxErrVersion = false;

             }

             else

-                $scope.textboxErr = true;

-        }

-

-        $scope.validateipv4 = function (value){

-            if($scope.ne.ipaddress) {

-                $scope.ipv4Err = false;

-            }

-            else

-                $scope.ipv4Err = true;

+                $scope.textboxErrVersion = true;

         }

 

         $scope.closeModal = function() {

             console.log("Closing Modal...");

             $('#myModal').modal('hide');

+            $scope.textboxErrName = false;

         }

 

 

@@ -1083,9 +1062,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         $scope.showAddModal = function() {

             console.log("Showing Modal to Add data");

             $scope.ne = {};

-            $scope.textboxErr = false;

-            $scope.ipv4Err = false;

-            $scope.numericErr = false;

+            $scope.textboxErrName = false;

+            $scope.textboxErrVersion = false;

             //$("#myModal").modal();

             $("#myModal").modal({}).draggable();

         }

diff --git a/resmgr/src/main/webapp/sdn-resmgr/link/link.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
index a581d986..a581d986 100644
--- a/resmgr/src/main/webapp/sdn-resmgr/link/link.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
diff --git a/resmgr/src/main/webapp/sdn-resmgr/link/linkRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/linkRest.js
index 4040c79a..4040c79a 100644
--- a/resmgr/src/main/webapp/sdn-resmgr/link/linkRest.js
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/linkRest.js
diff --git a/resmgr/src/main/webapp/sdn-resmgr/ne/ne.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
index 2c978135..2c978135 100644
--- a/resmgr/src/main/webapp/sdn-resmgr/ne/ne.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
diff --git a/resmgr/src/main/webapp/sdn-resmgr/ne/neRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/neRest.js
index ba9e8b02..ba9e8b02 100644
--- a/resmgr/src/main/webapp/sdn-resmgr/ne/neRest.js
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/neRest.js
diff --git a/resmgr/src/main/webapp/sdn-resmgr/port/port.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
index 741b4722..741b4722 100644
--- a/resmgr/src/main/webapp/sdn-resmgr/port/port.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
diff --git a/resmgr/src/main/webapp/sdn-resmgr/port/portRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
index c6c59d0b..c6c59d0b 100644
--- a/resmgr/src/main/webapp/sdn-resmgr/port/portRest.js
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
diff --git a/resmgr/src/main/webapp/sdn-resmgr/site/site.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
index c6f2039d..c6f2039d 100644
--- a/resmgr/src/main/webapp/sdn-resmgr/site/site.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
diff --git a/resmgr/src/main/webapp/sdn-resmgr/site/siteRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/siteRest.js
index c407f7fb..c407f7fb 100644
--- a/resmgr/src/main/webapp/sdn-resmgr/site/siteRest.js
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/siteRest.js
diff --git a/resmgr/src/main/webapp/templates/resource.html b/resmgr/src/main/webapp/resmgr/templates/resource.html
index 4742778f..4742778f 100644
--- a/resmgr/src/main/webapp/templates/resource.html
+++ b/resmgr/src/main/webapp/resmgr/templates/resource.html