SDNO BRS issue fix

IssueId : CLIENT-197

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

diff --git a/resmgr/src/main/webapp/resmgr/css/style.css b/resmgr/src/main/webapp/resmgr/css/style.css
index 7686568..1f81d81 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/css/style.css
+++ b/resmgr/src/main/webapp/resmgr/css/style.css
@@ -16,6 +16,18 @@
 \r
 .containerh{\r
        background-color:white !important;\r
-       min-height:500px;\r
+       min-height:800px;\r
 \r
+}\r
+\r
+#textCenter{\r
+    padding-top:8px;\r
+}\r
+\r
+#rowSpacing{\r
+    margin-bottom: 9px;\r
+}\r
+\r
+#borderSpacing{\r
+    margin-bottom: -15px;\r
 }
\ No newline at end of file

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index a1e63a7..d930cbb 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -68,11 +68,11 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 controller : "datacenterCtrl"\r
             })\r
 \r
-           /* .state("resource.vim", {\r
+            .state("resource.vim", {\r
                 url: "/vim",\r
                 templateUrl : "nfv-resmgr/vim/vim.html",\r
                 controller : "vimCtrl"\r
-            })*/\r
+            })\r
 \r
     })\r
 \r
@@ -316,6 +316,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
         $scope.deleteData = function(id) {\r
             var confirmation=false;\r
+            var checkbox = false;\r
             var dialog_tpl = $(modelTemplate).filter('#personDialog').html();\r
             var error = {"err_data" : { "title": "Error",\r
                 "showClose": "true",\r
@@ -803,6 +804,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
         $scope.deleteData = function(id) {\r
             var confirmation=false;\r
+            var checkbox = false;\r
             var dialog_tpl = $(modelTemplate).filter('#personDialog').html();\r
             var error = {"err_data" : { "title": "Error",\r
                 "showClose": "true",\r
@@ -1066,6 +1068,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
         $scope.deleteData = function(id) {\r
             var confirmation=false;\r
+            var checkbox = false;\r
             var dialog_tpl = $(modelTemplate).filter('#personDialog').html();\r
             var error = {"err_data" : { "title": "Error",\r
                 "showClose": "true",\r
@@ -1181,13 +1184,13 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             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 version is required.", "modalVar":"ne.version","errtag":"textboxErrVersion", "errfunc":"validatetextboxVersion","required":true}};\r
+            var neVersion = {"ErrMsg" :     {"errmsg" : "The version 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 neNERole = {"ErrMsg" :     {"errmsg" : "The role is required.", "modalVar":"ne.role","errtag":"textboxErrRole", "errfunc":"validatetextboxRole","required":true}};\r
+            var neNERole = {"ErrMsg" :     {"errmsg" : "The role is required.", "modalVar":"ne.role"}}; //,"errtag":"textboxErrRole", "errfunc":"validatetextboxRole","required":true\r
             $('#myModal #nerole').append($compile(Mustache.to_html(text, neNERole.ErrMsg))($scope));\r
 \r
-            var serialNumber = {"ErrMsg" :     {"errmsg" : "The serialNumber is required.", "modalVar":"ne.serialNumber","errtag":"textboxErrSerial", "errfunc":"validatetextboxSerial","required":true}};\r
+            var serialNumber = {"ErrMsg" :     {"errmsg" : "The serialNumber is required.", "modalVar":"ne.serialNumber"}}; //,"errtag":"textboxErrSerial", "errfunc":"validatetextboxSerial","required":true\r
             $('#myModal #serialNumber').append($compile(Mustache.to_html(text, serialNumber.ErrMsg))($scope));\r
 \r
             var neProductName = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.productName" }};\r
@@ -1209,23 +1212,23 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             /*var neController = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.controller"}};\r
             $('#myModal #controller').append($compile(Mustache.to_html(text, neController.ErrMsg))($scope));*/\r
 \r
-            var neIPAddress = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.ipAddress"}};\r
+            var neIPAddress = {"ErrMsg" :     {"errmsg" : "IP Address is required.", "modalVar":"ne.ipAddress","errtag":"textboxErrIP", "errfunc":"validatetextboxIP","required":true}};\r
             $('#myModal #ipAddress').append($compile(Mustache.to_html(text, neIPAddress.ErrMsg))($scope));\r
 \r
 \r
 \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
+            var neNativeId = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.nativeId"}};\r
+            $('#myModal #nativeId').append($compile(Mustache.to_html(text, neNativeId.ErrMsg))($scope));\r
 \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
+            /*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
             neDataService.getNESiteDDList()\r
                 .then(function (data) {\r
                     $scope.siteIDList = data.sites;\r
                     var dropdownInfo = translateSiteIdToDropdownInfo($scope.siteIDList);\r
-                    $("#siteIdDropdown").html(dropdownInfo);\r
+                    $("#myModal #siteIdDropdown").html(dropdownInfo);\r
                     console.log("Data: ");\r
                     $log.info(data);\r
                 }, function (reason) {\r
@@ -1304,6 +1307,14 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 $scope.textboxErrSerial = true;\r
         }\r
 \r
+        $scope.validatetextboxIP = function (value){\r
+            if($scope.ne.ipAddress) {\r
+                $scope.textboxErrIP = false;\r
+            }\r
+            else\r
+                $scope.textboxErrIP = true;\r
+        }\r
+\r
         $scope.closeModal = function() {\r
             console.log("Closing Modal...");\r
             $('#myModal').modal('hide');\r
@@ -1328,7 +1339,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $("#myModal").modal({}).draggable();\r
         }\r
         $scope.saveData = function(id) {\r
-            if (!$scope.textboxErrName && !$scope.textboxErrVersion && !$scope.textboxErrRole && !$scope.textboxErrSerial) {\r
+            if (!$scope.textboxErrName && !$scope.textboxErrIP) {\r
                                \r
                                var nes = {};\r
                                nes.managedElement = $scope.ne;\r
@@ -1362,6 +1373,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
         $scope.deleteData = function(id) {\r
             var confirmation=false;\r
+            var checkbox = false;\r
             var dialog_tpl = $(modelTemplate).filter('#personDialog').html();\r
             var error = {"err_data" : { "title": "Error",\r
                 "showClose": "true",\r
@@ -1623,6 +1635,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
         $scope.deleteData = function(id) {\r
             var confirmation=false;\r
+            var checkbox = false;\r
             var dialog_tpl = $(modelTemplate).filter('#personDialog').html();\r
             var error = {"err_data" : { "title": "Error",\r
                 "showClose": "true",\r
@@ -1694,6 +1707,15 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
     })\r
 \r
+\r
+    .controller("vimCtrl", function($scope, $log){\r
+        $scope.message = "vimCtrl";\r
+        //loadVimData();\r
+    })\r
+\r
+\r
+\r
+\r
 // ---------------------------------------------------------------------------------------------------------------------------------------------\r
 \r
 var modelTemplate = "";\r