diff options
7 files changed, 10 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore index 4bc3fd84b..40efedd6b 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,8 @@ deliveries/target/ /vid-webpack-master/target/vid-webpack-master.war /vid-webpack-master/target/vid-webpack-master/app/ui/NO-WEBPACK.txt /vid-webpack-master/target/vid-webpack-master/WEB-INF/web.xml +/vid-automation/.classpath +/vid-automation/.project +/vid-automation/.settings/org.eclipse.jdt.core.prefs +/vid-automation/.settings/org.eclipse.m2e.core.prefs +/vid-ext-services-simulator/.gitignore diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index 2814e1155..6ae5056ac 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -477,7 +477,7 @@ <dependency>
<groupId>org.onap.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
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"> diff --git a/vid-automation/.gitignore b/vid-automation/.gitignore index 23f1f5e44..4ced2a7e4 100644 --- a/vid-automation/.gitignore +++ b/vid-automation/.gitignore @@ -40,3 +40,4 @@ buildNumber.properties target/* *.iml ExtentReport +/bin/ diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml index 8a02b2e1d..62d883d41 100644 --- a/vid-webpack-master/pom.xml +++ b/vid-webpack-master/pom.xml @@ -9,7 +9,7 @@ inherit from a parent maven module. --> <groupId>org.onap.vid</groupId> <artifactId>vid-webpack-master</artifactId> - <version>1.3.0</version> + <version>1.3.0-SNAPSHOT</version> <packaging>war</packaging> <name>VID UI</name> <description>VID UI</description> |