Fix resmgr NE create failed issue

Fix resmgr NE create failed issue

Change-Id: Ifaa56cabfac5041c40da43a931669628b3bb807d
Issue-ID:CLIENT-200
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

diff --git a/extsys/src/main/webapp/extsys/sdncontroller/js/app.js b/extsys/src/main/webapp/extsys/sdncontroller/js/app.js
index ab5fedc..1fd60c9 100644 (file)
--- a/extsys/src/main/webapp/extsys/sdncontroller/js/app.js
+++ b/extsys/src/main/webapp/extsys/sdncontroller/js/app.js
@@ -88,7 +88,7 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"])
             var text = $(modelTemplate).filter('#textfield').html();\r
             var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html();\r
 \r
-            var extName = {"ErrMsg" :     {"errmsg" : "Name is required.", "modalVar":"ext.Name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}};\r
+            var extName = {"ErrMsg" :     {"errmsg" : "Name is required.", "modalVar":"ext.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}};\r
             $('#myModal #name').append($compile(Mustache.to_html(text, extName.ErrMsg))($scope));\r
 \r
             var extURL = {"ErrMsg" :     {"errmsg" : "URL is required.", "modalVar":"ext.url", "errtag":"textboxErrURL", "errfunc":"validatetextboxURL", "required":true}};\r
@@ -97,16 +97,16 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"])
             var extUserName = {"ErrMsg" :     {"errmsg" : "UserName is required.", "modalVar":"ext.userName", "errtag":"textboxErrUserName", "errfunc":"validatetextboxUserName", "required":true}};\r
             $('#myModal #username').append($compile(Mustache.to_html(text, extUserName.ErrMsg))($scope));\r
 \r
-            var extPassword = {"ErrMsg" :     {"errmsg" : "Password is required.", "modalVar":"ext.Password", "errtag":"textboxErrPassword", "errfunc":"validatetextboxPassword", "required":true}};\r
+            var extPassword = {"ErrMsg" :     {"errmsg" : "Password is required.", "modalVar":"ext.password", "errtag":"textboxErrPassword", "errfunc":"validatetextboxPassword", "required":true}};\r
             $('#myModal #password').append($compile(Mustache.to_html(text, extPassword.ErrMsg))($scope));\r
 \r
-            var extVersion = {"ErrMsg" :     {"errmsg" : "Version is required.", "modalVar":"ext.Version"}};\r
+            var extVersion = {"ErrMsg" :     {"errmsg" : "Version is required.", "modalVar":"ext.version"}};\r
             $('#myModal #version').append($compile(Mustache.to_html(text, extVersion.ErrMsg))($scope));\r
 \r
-            var extVendor = {"ErrMsg" :     {"errmsg" : "Vendor is required.", "modalVar":"ext.Vendor"}};\r
+            var extVendor = {"ErrMsg" :     {"errmsg" : "Vendor is required.", "modalVar":"ext.vendor"}};\r
             $('#myModal #vendor').append($compile(Mustache.to_html(text, extVendor.ErrMsg))($scope));\r
 \r
-            var extDescription = {"ErrMsg" :     {"textboxErr" : "Description is required.", "modalVar":"ext.Description"}};\r
+            var extDescription = {"ErrMsg" :     {"textboxErr" : "Description is required.", "modalVar":"ext.description"}};\r
             $('#myModal #description').append($compile(Mustache.to_html(text, extDescription.ErrMsg))($scope));\r
 \r
             /*var extProtocol = {"ErrMsg" :     {"textboxErr" : "Protocol is required.", "modalVar":"ext.protocol"}};\r
@@ -171,7 +171,7 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"])
         }\r
 \r
         $scope.validatetextboxName = function (value){\r
-            if($scope.ext.Name) {\r
+            if($scope.ext.name) {\r
                 $scope.textboxErrName = false;\r
             }\r
             else\r
@@ -195,7 +195,7 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"])
         }\r
 \r
         $scope.validatetextboxPassword = function (value){\r
-            if($scope.ext.Password) {\r
+            if($scope.ext.password) {\r
                 $scope.textboxErrPassword = false;\r
             }\r
             else\r

diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
index a792de8..0718569 100644 (file)
--- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
+++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js
@@ -855,7 +855,7 @@ function scaleServiceInstance(nsInstanceId, scaleType, aspectId, numberOfSteps,
             }\r
         ]\r
     };\r
-    var nfvoUri = '/openoapi/nslcm/1.0/ns/' + nsInstanceId + '/scale';\r
+    var nfvoUri = '/openoapi/nslcm/v1/ns/' + nsInstanceId + '/scale';\r
     $.when(\r
         $.ajax({\r
             type: "POST",\r

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index 1c06d8a..be8f20f 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -198,7 +198,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var portOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.operState"}};\r
             $('#myModal #operState').append($compile(Mustache.to_html(text, portOperatingState.ErrMsg))($scope));\r
 \r
-            var neNativeId = {"ErrMsg" :     {"errmsg" : "The nativeid required.", "modalVar":"port.nativeId"}};\r
+            var neNativeId = {"ErrMsg" :     {"errmsg" : "The nativeid required.", "modalVar":"port.nativeID"}};\r
             $('#myModal #nativeId').append($compile(Mustache.to_html(text, neNativeId.ErrMsg))($scope));\r
 \r
             $scope.checkboxes = { 'checked': false, items: {} };\r
@@ -1204,7 +1204,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             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.neRole"}}; //,"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
@@ -1246,7 +1246,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
 \r
 \r
-            var neNativeId = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"ne.nativeId"}};\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
@@ -1333,7 +1333,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }\r
 \r
         $scope.validatetextboxRole = function (value){\r
-            if($scope.ne.role) {\r
+            if($scope.ne.neRole) {\r
                 $scope.textboxErrRole = false;\r
             }\r
             else\r
@@ -1381,7 +1381,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }\r
         $scope.saveData = function(id) {\r
             $scope.ne.controller = $('#medropdown').val();\r
-            $scope.ne.siteId = $('#siteIdDropdown').val();\r
+            $scope.ne.siteID = $('#siteIdDropdown').val();\r
 \r
             if (!$scope.textboxErrName && !$scope.textboxErrIP) {\r
                                \r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
index 350ed88..92f8c2f 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
@@ -133,7 +133,7 @@
                     <div class="form-group row" id="rowSpacing">\r
                         <label class="col-xs-4 col-form-label" id="textCenter">Site Name</label>\r
                         <div id="siteId" class="col-xs-8" >\r
-                            <select id="siteIdDropdown" class="form-control inputfield" ng-model="ne.siteId"></select>\r
+                            <select id="siteIdDropdown" class="form-control inputfield" ng-model="ne.siteID"></select>\r
                         </div>\r
                     </div>\r
                 </div>\r

diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
index ad960cd..0d7c234 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js
@@ -92,7 +92,7 @@ app.factory("portDataService", function($http,DataService, $log){
                 });\r
         },\r
         getAllNEData : function() {\r
-            return DataService.get("/openoapi/extsys/v1/sdncontrollers")\r
+            return DataService.get("/openoapi/sdnobrs/v1/managed-elements")\r
                 .then(function(response){\r
                     $log.info("in get data service data is  :"+response);\r
                     console.log(response);\r