summaryrefslogtreecommitdiffstats
path: root/usecaseui-lcm/src
diff options
context:
space:
mode:
authorzhangab <zhanganbing@chinamobile.com>2018-05-15 17:51:02 +0800
committerzhangab <zhanganbing@chinamobile.com>2018-05-15 17:51:57 +0800
commit1ab6dcbbb3c804615c6a8bcef875f231a3b11885 (patch)
tree6e75630ef8aafdfce217353e4c3e576622d3768b /usecaseui-lcm/src
parent3316e8d2a893fcaf8cddff1dd47fa0d6d106487c (diff)
fix service scaling bug
Change-Id: Ibc7ab6a671d755df5ca10ae16fa088b41afea33b Issue-ID: USECASEUI-115 Signed-off-by: zhangab <zhanganbing@chinamobile.com>
Diffstat (limited to 'usecaseui-lcm/src')
-rw-r--r--usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js36
-rw-r--r--usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/scale-service-dialog.html84
2 files changed, 101 insertions, 19 deletions
diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
index a7091f83..9d404c87 100644
--- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
+++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
@@ -488,38 +488,36 @@ app.controller('lcmCtrl', ['$scope', '$uibModal', '$log', '$http', '$timeout', '
console.log(customer);
console.log(serviceType);
console.log(serviceInstance);
-
+
ServiceTemplateService.getScaleServiceDialog(customer.name,serviceType.name,serviceInstance.serviceInstanceId,function(data){
console.log(data.data);
ctrl.nsData = data.data;
// console.log(ctrl)
})
ctrl.scaleTypes = ["SCALE_NS","SCALE_VNF"];
- ctrl.scaleType = "";
ctrl.scalingDirections = ["SCALE_IN","SCALE_OUT"];
- ctrl.scalingDirection = "";
- ctrl.aspectId = null;
- ctrl.numberOfStep = null;
ctrl.ok = function () {
+ let resources = [];
+ ctrl.nsData.forEach(function(item){
+ resources.push({
+ "resourceInstanceId": item.netWorkServiceId,
+ "scaleType": item.scaleType,
+ "scaleNsData": {
+ "scaleNsByStepsData": {
+ "aspectId": item.aspectId,
+ "numberOfSteps": item.numberOfStep,
+ "scalingDirection": item.scalingDirection
+ }
+ }
+ })
+ })
var requestBody = {
"service":{
"serviceInstanceName": serviceInstance.serviceInstanceName,
- "serviceType": serviceType,
+ "serviceType": serviceType.value,
"globalSubscriberId": serviceInstance.serviceInstanceId,
- "resources": [
- {
- "resourceInstanceId": "ns111",
- "scaleType": ctrl.scaleType,
- "scaleNsData": {
- "scaleNsByStepsData": {
- "aspectId": ctrl.aspectId,
- "numberOfSteps": ctrl.numberOfStep,
- "scalingDirection": ctrl.scalingDirection
- }
- }
- }
- ]
+ "resources": resources
}
};
var errorMessage = function () {
diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/scale-service-dialog.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/scale-service-dialog.html
new file mode 100644
index 00000000..19fa8edd
--- /dev/null
+++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/scale-service-dialog.html
@@ -0,0 +1,84 @@
+<!--
+
+ Copyright 2016-2017 ZTE Corporation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<div class="modal-header">
+ <h4 class="modal-title" id="myModalLabel">
+ <span>Scale</span>
+ </h4>
+ </div>
+
+ <div class="modal-body">
+ <div ng-repeat='nsdata in ctrl.nsData'>
+ <h4>{{nsdata.netWorkServiceName}}</h4>
+ <hr>
+ <form class="form-horizontal" role="form" id="neForm">
+
+ <div id="basicInfoTab" style="margin-top:20px;">
+ <div class="mT15 form-group" style="margin-left:25px;">
+ <label class="col-sm-3 control-label">
+ <span>aspectId</span>
+ <span class="required">*</span>
+ </label>
+ <div class="col-sm-7">
+ <input type="text" id="svcName" name="svcName" class="form-control" placeholder="aspectId" maxlength="256" ng-model="nsdata.aspectId"/>
+ </div>
+ </div>
+ <div class="mT15 form-group" style="margin-left:25px;">
+ <label class="col-sm-3 control-label">
+ <span>numberOfSteps</span>
+ <span class="required">*</span>
+ </label>
+ <div class="col-sm-7">
+ <input type="text" id="svcDesc" name="" class="form-control" placeholder="numberOfStep" maxlength="256" ng-model="nsdata.numberOfStep"/>
+ </div>
+ </div>
+ <div class="form-group" style="margin-left:25px;margin-bottom:15px;">
+ <label class="col-sm-3 control-label">
+ <span>scaleType</span>
+ <span class="required">*</span>
+ </label>
+ <div class="col-sm-7">
+ <select class="form-control" style="padding-top: 0px;padding-bottom: 0px;" id="svcTempl" name="svcTempl" ng-change="" ng-model="nsdata.scaleType" ng-options="template for template in ctrl.scaleTypes">
+ <option value="">--select--</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group" style="margin-left:25px;margin-bottom:15px;">
+ <label class="col-sm-3 control-label">
+ <span>scalingDirection</span>
+ <span class="required">*</span>
+ </label>
+ <div class="col-sm-7">
+ <select class="form-control" style="padding-top: 0px;padding-bottom: 0px;" id="svcTempl" name="svcTempl" ng-change="" ng-model="nsdata.scalingDirection" ng-options="template for template in ctrl.scalingDirections">
+ <option value="">--select--</option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+ </form>
+ </div>
+ </div>
+
+ <div class="modal-footer">
+ <button type="button" style="width:80px;" class="btn btn-primary" ng-click="ctrl.ok()" id="startToCreateService">
+ <span id="nfv-virtualApplication-iui-text-cancelBtn">OK</span>
+ </button>
+ <button type="button" style="width:80px;" class="btn btn-warning" ng-click="ctrl.cancel()">
+ <span id="nfv-virtualApplication-iui-text-previousBtn">Cancel</span>
+ </button>
+ </div>