From b321ffb9b4ba3d071565356608044ab265ff8d96 Mon Sep 17 00:00:00 2001 From: c00149107 Date: Wed, 26 Apr 2017 15:20:14 +0800 Subject: Fix resmgr NE create failed issue Fix resmgr NE create failed issue Change-Id: Ifaa56cabfac5041c40da43a931669628b3bb807d Issue-ID:CLIENT-200 Signed-off-by: c00149107 --- extsys/src/main/webapp/extsys/sdncontroller/js/app.js | 14 +++++++------- .../src/main/webapp/lifecyclemgr/js/DataService.js | 2 +- resmgr/src/main/webapp/resmgr/js/app.js | 10 +++++----- resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html | 2 +- resmgr/src/main/webapp/resmgr/sdn-resmgr/port/portRest.js | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/extsys/src/main/webapp/extsys/sdncontroller/js/app.js b/extsys/src/main/webapp/extsys/sdncontroller/js/app.js index ab5fedc1..1fd60c99 100644 --- 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(); var dropDown = $(modelTemplate).filter('#simpleDropdownTmpl').html(); - var extName = {"ErrMsg" : {"errmsg" : "Name is required.", "modalVar":"ext.Name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}}; + var extName = {"ErrMsg" : {"errmsg" : "Name is required.", "modalVar":"ext.name", "errtag":"textboxErrName", "errfunc":"validatetextboxName", "required":true}}; $('#myModal #name').append($compile(Mustache.to_html(text, extName.ErrMsg))($scope)); var extURL = {"ErrMsg" : {"errmsg" : "URL is required.", "modalVar":"ext.url", "errtag":"textboxErrURL", "errfunc":"validatetextboxURL", "required":true}}; @@ -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}}; $('#myModal #username').append($compile(Mustache.to_html(text, extUserName.ErrMsg))($scope)); - var extPassword = {"ErrMsg" : {"errmsg" : "Password is required.", "modalVar":"ext.Password", "errtag":"textboxErrPassword", "errfunc":"validatetextboxPassword", "required":true}}; + var extPassword = {"ErrMsg" : {"errmsg" : "Password is required.", "modalVar":"ext.password", "errtag":"textboxErrPassword", "errfunc":"validatetextboxPassword", "required":true}}; $('#myModal #password').append($compile(Mustache.to_html(text, extPassword.ErrMsg))($scope)); - var extVersion = {"ErrMsg" : {"errmsg" : "Version is required.", "modalVar":"ext.Version"}}; + var extVersion = {"ErrMsg" : {"errmsg" : "Version is required.", "modalVar":"ext.version"}}; $('#myModal #version').append($compile(Mustache.to_html(text, extVersion.ErrMsg))($scope)); - var extVendor = {"ErrMsg" : {"errmsg" : "Vendor is required.", "modalVar":"ext.Vendor"}}; + var extVendor = {"ErrMsg" : {"errmsg" : "Vendor is required.", "modalVar":"ext.vendor"}}; $('#myModal #vendor').append($compile(Mustache.to_html(text, extVendor.ErrMsg))($scope)); - var extDescription = {"ErrMsg" : {"textboxErr" : "Description is required.", "modalVar":"ext.Description"}}; + var extDescription = {"ErrMsg" : {"textboxErr" : "Description is required.", "modalVar":"ext.description"}}; $('#myModal #description').append($compile(Mustache.to_html(text, extDescription.ErrMsg))($scope)); /*var extProtocol = {"ErrMsg" : {"textboxErr" : "Protocol is required.", "modalVar":"ext.protocol"}}; @@ -171,7 +171,7 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"]) } $scope.validatetextboxName = function (value){ - if($scope.ext.Name) { + if($scope.ext.name) { $scope.textboxErrName = false; } else @@ -195,7 +195,7 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"]) } $scope.validatetextboxPassword = function (value){ - if($scope.ext.Password) { + if($scope.ext.password) { $scope.textboxErrPassword = false; } else diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/DataService.js index a792de8f..0718569a 100644 --- 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, } ] }; - var nfvoUri = '/openoapi/nslcm/1.0/ns/' + nsInstanceId + '/scale'; + var nfvoUri = '/openoapi/nslcm/v1/ns/' + nsInstanceId + '/scale'; $.when( $.ajax({ type: "POST", diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js index 1c06d8ac..be8f20ff 100644 --- 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"}}; $('#myModal #operState').append($compile(Mustache.to_html(text, portOperatingState.ErrMsg))($scope)); - var neNativeId = {"ErrMsg" : {"errmsg" : "The nativeid required.", "modalVar":"port.nativeId"}}; + var neNativeId = {"ErrMsg" : {"errmsg" : "The nativeid required.", "modalVar":"port.nativeID"}}; $('#myModal #nativeId').append($compile(Mustache.to_html(text, neNativeId.ErrMsg))($scope)); $scope.checkboxes = { 'checked': false, items: {} }; @@ -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 $('#myModal #version').append($compile(Mustache.to_html(text, neVersion.ErrMsg))($scope)); - var neNERole = {"ErrMsg" : {"errmsg" : "The role is required.", "modalVar":"ne.role"}}; //,"errtag":"textboxErrRole", "errfunc":"validatetextboxRole","required":true + var neNERole = {"ErrMsg" : {"errmsg" : "The role is required.", "modalVar":"ne.neRole"}}; //,"errtag":"textboxErrRole", "errfunc":"validatetextboxRole","required":true $('#myModal #nerole').append($compile(Mustache.to_html(text, neNERole.ErrMsg))($scope)); var serialNumber = {"ErrMsg" : {"errmsg" : "The serialNumber is required.", "modalVar":"ne.serialNumber"}}; //,"errtag":"textboxErrSerial", "errfunc":"validatetextboxSerial","required":true @@ -1246,7 +1246,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) - var neNativeId = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.nativeId"}}; + var neNativeId = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.nativeID"}}; $('#myModal #nativeId').append($compile(Mustache.to_html(text, neNativeId.ErrMsg))($scope)); /*var neOperatingState = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"ne.operatingState"}}; @@ -1333,7 +1333,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) } $scope.validatetextboxRole = function (value){ - if($scope.ne.role) { + if($scope.ne.neRole) { $scope.textboxErrRole = false; } else @@ -1381,7 +1381,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) } $scope.saveData = function(id) { $scope.ne.controller = $('#medropdown').val(); - $scope.ne.siteId = $('#siteIdDropdown').val(); + $scope.ne.siteID = $('#siteIdDropdown').val(); if (!$scope.textboxErrName && !$scope.textboxErrIP) { 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 350ed88c..92f8c2fc 100644 --- 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 @@
- +
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 ad960cd7..0d7c2349 100644 --- 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){ }); }, getAllNEData : function() { - return DataService.get("/openoapi/extsys/v1/sdncontrollers") + return DataService.get("/openoapi/sdnobrs/v1/managed-elements") .then(function(response){ $log.info("in get data service data is :"+response); console.log(response); -- cgit 1.2.3-korg