Service mgr bug fix

IssueID : CLIENT-189

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

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index 271041f..d3a351c 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -262,10 +262,13 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }\r
         $scope.saveData = function(id) {\r
             if (!$scope.textboxErrName && $scope.textboxErrMe) {\r
+                               var ports ={};\r
+                               ports.port=$scope.port;\r
                 if(id) {\r
+                                       \r
                     //edit data\r
                     console.log("Editing data.." + JSON.stringify($scope.port));\r
-                    portDataService.editPortData($scope.port)\r
+                    portDataService.editPortData(ports)\r
                         .then(function (data) {\r
                             $scope.message = "Success :-)";\r
                             $state.reload();\r
@@ -276,7 +279,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 }\r
                 else {\r
                     console.log("Adding data.." + JSON.stringify($scope.port));\r
-                    portDataService.addPortData($scope.port)\r
+                    portDataService.addPortData(ports)\r
                         .then(function (data) {\r
                             $scope.message = "Success :-)";\r
                             $state.reload();\r
@@ -721,10 +724,15 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }\r
         $scope.saveData = function(id) {\r
             if (!$scope.textboxErrLocation && !$scope.textboxErrCountry && !$scope.textboxErrLatitude && !$scope.textboxErrLongitude) {\r
+                               \r
+                               var locs = {}\r
+                                       locs.loc = $scope.loc\r
                 if(id) {\r
+                                       \r
+                                       \r
                     //edit data\r
                     console.log("Editing data.." + JSON.stringify($scope.loc));\r
-                    locationDataService.editLocationData($scope.loc)\r
+                    locationDataService.editLocationData(locs)\r
                         .then(function (data) {\r
                             $scope.message = "Success :-)";\r
                             $state.reload();\r
@@ -735,7 +743,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 }\r
                 else {\r
                     console.log("Adding data.." + JSON.stringify($scope.loc));\r
-                    locationDataService.addLocationData($scope.loc)\r
+                    locationDataService.addLocationData(locs)\r
                         .then(function (data) {\r
 \r
                             $scope.message = "Success :-)";\r
@@ -961,10 +969,16 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }\r
         $scope.saveData = function(id) {\r
             if (!$scope.textboxErr) {\r
+                               \r
+                       var links ={}\r
+                       links.link= $scope.link;\r
+                               \r
                 if(id) {\r
+                                       \r
+\r
                     //edit data\r
                     console.log("Editing data.." + JSON.stringify($scope.link));\r
-                    linkDataService.editLinkData($scope.link)\r
+                    linkDataService.editLinkData(links)\r
                         .then(function (data) {\r
                             $scope.message = "Success :-)";\r
                             $state.reload();\r
@@ -974,8 +988,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                         });\r
                 }\r
                 else {\r
-                    console.log("Adding data.." + JSON.stringify($scope.link));\r
-                    linkDataService.addLinkData($scope.link)\r
+                    console.log("Adding data.." + JSON.stringify(links));\r
+                    linkDataService.addLinkData(links)\r
                         .then(function (data) {\r
 \r
                             $scope.message = "Success :-)";\r
@@ -1192,10 +1206,13 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }\r
         $scope.saveData = function(id) {\r
             if (!$scope.textboxErrName && !$scope.textboxErrVersion) {\r
+                               \r
+                               var nes = {};\r
+                               nes.ne = $scope.ne;\r
                 if(id) {\r
                     //edit data\r
-                    console.log("Editing data.." + JSON.stringify($scope.ne));\r
-                    neDataService.editNEData($scope.ne)\r
+                    console.log("Editing data.." + JSON.stringify(nes));\r
+                    neDataService.editNEData(nes)\r
                         .then(function (data) {\r
                             $scope.message = "Success :-)";\r
                             $state.reload();\r
@@ -1206,7 +1223,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 }\r
                 else {\r
                     console.log("Adding data.." + JSON.stringify($scope.ne));\r
-                    neDataService.addNEData($scope.ne)\r
+                    neDataService.addNEData(nes)\r
                         .then(function (data) {\r
 \r
                             $scope.message = "Success :-)";\r
@@ -1433,10 +1450,13 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }\r
         $scope.saveData = function(id) {\r
             if (!$scope.textboxErr && !$scope.numericErr) {\r
+                               \r
+                               var dcs = {}\r
+                               dcs.dc =        $scope.datacenter;\r
                 if(id) {\r
                     //edit data\r
-                    console.log("Editing data.." + JSON.stringify($scope.datacenter));\r
-                    datacenterDataService.editDatacenterData($scope.datacenter)\r
+                    console.log("Editing data.." + JSON.stringify(dcs));\r
+                    datacenterDataService.editDatacenterData(dcs)\r
                         .then(function (data) {\r
                             $scope.message = "Success :-)";\r
                             $state.reload();\r
@@ -1447,7 +1467,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 }\r
                 else {\r
                     console.log("Adding data.." + JSON.stringify($scope.datacenter));\r
-                    datacenterDataService.addDatacenterData($scope.datacenter)\r
+                    datacenterDataService.addDatacenterData(dcs)\r
                         .then(function (data) {\r
 \r
                             $scope.message = "Success :-)";\r

diff --git a/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html b/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html
index 91a1c19..cd0c2c3 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html
+++ b/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html
@@ -55,8 +55,8 @@
             {{datacenterData.HardDisk}}\r
         </td>\r
         <td title="'Action'">\r
-            <span  ng-click="editData(datacenterData.Id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>\r
-            <span  ng-click="deleteData(datacenterData.Id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>\r
+            <span  ng-click="editData(datacenterData.Id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>\r
+            <span  ng-click="deleteData(datacenterData.Id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
         </td>\r
     </tr>\r
 </table>\r

diff --git a/resmgr/src/main/webapp/resmgr/nfv-resmgr/location/location.html b/resmgr/src/main/webapp/resmgr/nfv-resmgr/location/location.html
index 22e1813..f153a49 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/nfv-resmgr/location/location.html
+++ b/resmgr/src/main/webapp/resmgr/nfv-resmgr/location/location.html
@@ -47,8 +47,8 @@
         <td title="'Action'">\r
             <!--<span class="pull-right glyphicon glyphicon-edit" ng-click="editData(locationData.Id)" style="cursor: pointer;margin: 0 5px"></span>\r
             <span class="pull-right glyphicon glyphicon-trash" ng-click="deleteData(locationData.Id)" style="cursor: pointer;margin: 0 5px"></span>-->\r
-            <span  ng-click="editData(locationData.Id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>\r
-            <span  ng-click="deleteData(locationData.Id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>\r
+            <span  ng-click="editData(locationData.Id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>\r
+            <span  ng-click="deleteData(locationData.Id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
         </td>\r
     </tr>\r
 </table>\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
index 4acae5d..e28abfc 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
@@ -55,10 +55,10 @@
             {{linkData.operatingState}}\r
         <td title="'Action'">\r
         <!-- <span class="pull-right glyphicon glyphicon-edit" ng-click="editData(siteData.name)" style="cursor: pointer;margin: 0 5px"></span>-->\r
-        <span  ng-click="editData(linkData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>\r
+        <span  ng-click="editData(linkData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>\r
 \r
         <!--<span class="pull-right glyphicon glyphicon-trash" ng-click="deleteIndividualData(siteData.id)" style="cursor: pointer;margin: 0 5px"></span>-->\r
-        <span  ng-click="deleteData(linkData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>\r
+        <span  ng-click="deleteData(linkData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
 \r
     </td>\r
     </tr>\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
index 12eeb97..45f5da3 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
@@ -55,8 +55,8 @@
             {{neData.operState}}\r
         </td>\r
         <td title="'Action'">\r
-            <span  ng-click="editData(neData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>\r
-            <span  ng-click="deleteData(neData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>\r
+            <span  ng-click="editData(neData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>\r
+            <span  ng-click="deleteData(neData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
 \r
         </td>\r
     </tr>\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
index 31f48b4..09cf3a6 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
@@ -56,8 +56,8 @@
             {{portData.operState}}\r
         </td>\r
         <td title="'Action'">\r
-            <span  ng-click="editData(portData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>\r
-            <span  ng-click="deleteData(portData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>\r
+            <span  ng-click="editData(portData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>\r
+            <span  ng-click="deleteData(portData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
 \r
         </td>\r
     </tr>\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
index 1535799..fb25066 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
@@ -46,8 +46,8 @@
             {{siteData.location}}\r
         </td>\r
         <td title="'Action'">\r
-            <span  ng-click="editData(siteData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>\r
-            <span  ng-click="deleteData(siteData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>\r
+            <span  ng-click="editData(siteData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>\r
+            <span  ng-click="deleteData(siteData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>\r
 \r
 \r
         </td>\r