summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSonsino, Ofir (os0695) <os0695@intl.att.com>2018-05-14 14:02:02 +0300
committerSonsino, Ofir (os0695) <os0695@intl.att.com>2018-05-14 14:02:02 +0300
commit89b3a253bcf6244b4152a42c08ad15922f8bc16f (patch)
tree6a2808cd41f24e78590e5762de797632e381489b
parent84183c37cc8fa626f85e1651df8827cae2a94819 (diff)
Add controllerType to In place update flow
Change-Id: I133fda81e626fe143b01db0428c7ac581feb2953 Issue-ID: VID-224 Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js3
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html2
2 files changed, 3 insertions, 2 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
index 68f3b02f..26b1819b 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
@@ -186,7 +186,8 @@
'operations_timeout':changeManagement.operationTimeout
};
requestParametersData = {
- payload: JSON.stringify(payloadObj)
+ controllerType: changeManagement.controllerType,
+ payload: JSON.stringify(payloadObj)
}
}else if(workflowType=="VNF Config Update"){
requestParametersData = {
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
index fa06258f..bf3579ea 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
@@ -84,7 +84,7 @@
</div>
</div>
- <div ng-if="vm.isScaleOut()">
+ <div ng-if="vm.isScaleOut() || vm.shouldShowVnfInPlaceFields()">
<div class="form-group">
<label class="control-label">Controller Type</label>
<select class="form-control" ng-model="vm.changeManagement.controllerType" name="controllerType" id="controllerType"