Add controllerType to In place update flow

Change-Id: I133fda81e626fe143b01db0428c7ac581feb2953
Issue-ID: VID-224
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

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 68f3b02..26b1819 100644 (file)
--- 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 fa06258..bf3579e 100644 (file)
--- 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"