diff options
author | 2018-08-15 15:00:25 +0300 | |
---|---|---|
committer | 2018-08-15 15:00:25 +0300 | |
commit | 38f2c232dabeff5078216a5143f4b0df00524dcc (patch) | |
tree | 6d99a9b66547cf0214ba0e86e594f4d4a5bf25af | |
parent | 290473a25ae6d1236489aecd980497f4636f556b (diff) |
Remove Controller Type field
Change-Id: I24a571aab0b4277762c915bb9900cca610c782a7
Issue-ID: VID-250
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
3 files changed, 2 insertions, 16 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js index f71213bf2..b2441fbe4 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js @@ -106,8 +106,6 @@ appDS2.constant("VIDCONFIGURATION", (function() { var SCHEDULER_CALLBACK_URL = "";
var SCHEDULER_PORTAL_URL = "";
-
- var SCALE_OUT_CONTROLLERS = ["", "SDNC", "APPC"];
var SDNC_SHOW_ASSIGNMENTS_URL = "https://sdnc.api.simpledemo.onap.org:8448/configAdapter/index#/resource_manager/<SERVICE_INSTANCE_ID>";
@@ -124,7 +122,6 @@ appDS2.constant("VIDCONFIGURATION", (function() { COMPONENT_LIST_NAMED_QUERY_ID : COMPONENT_LIST_NAMED_QUERY_ID,
SCHEDULER_CALLBACK_URL: SCHEDULER_CALLBACK_URL,
SCHEDULER_PORTAL_URL: SCHEDULER_PORTAL_URL,
- SDNC_SHOW_ASSIGNMENTS_URL: SDNC_SHOW_ASSIGNMENTS_URL,
- SCALE_OUT_CONTROLLERS: SCALE_OUT_CONTROLLERS
+ SDNC_SHOW_ASSIGNMENTS_URL: SDNC_SHOW_ASSIGNMENTS_URL
};
})())
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 39182191b..c55092e4c 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 @@ -10,7 +10,7 @@ vm.hasScheduler = !!VIDCONFIGURATION.SCHEDULER_PORTAL_URL; vm.configUpdatePatternError = "Invalid file type. Please select a file with a CSV extension."; vm.configUpdateContentError = "Invalid file structure."; - vm.controllers = VIDCONFIGURATION.SCALE_OUT_CONTROLLERS; + vm.wizardStep = 1; vm.nextStep = function(){ vm.wizardStep++; @@ -225,7 +225,6 @@ 'operations_timeout':changeManagement.operationTimeout }; requestParametersData = { - controllerType: changeManagement.controllerType, payload: JSON.stringify(payloadObj) } }else if(workflowType=="VNF Config Update"){ @@ -237,13 +236,11 @@ if(moduleToScale.userParams) { requestParametersData = { - controllerType: changeManagement.controllerType, userParams: moduleToScale.userParams //,usePreload: true } }else{ requestParametersData = { - controllerType: changeManagement.controllerType, userParams: [] //,usePreload: false } 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 5679af417..ec1d4cde6 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,14 +84,6 @@ </div> </div> - <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" - ng-options="o as o for o in vm.controllers"> - </select> - </div> - </div> </div> <div class="modal-body step2 scale-out-modules" ng-if="vm.wizardStep === 2"> |