diff options
21 files changed, 46 insertions, 47 deletions
diff --git a/deliveries/pom.xml b/deliveries/pom.xml index ef4d27385..ee5c43e45 100755 --- a/deliveries/pom.xml +++ b/deliveries/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.vid</groupId> <artifactId>vid-parent</artifactId> - <version>5.0.3-SNAPSHOT</version> + <version>6.0.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index f9b55f0e6..8f63a6d0c 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -8,7 +8,7 @@ the Portal team. --> <groupId>org.onap.vid</groupId> <artifactId>epsdk-app-onap</artifactId> - <version>5.0.3-SNAPSHOT</version> + <version>6.0.0-SNAPSHOT</version> <packaging>war</packaging> <name>ECOMP SDK Webapp for OpenSource</name> <description>ECOMP SDK Web Application for public release</description> diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties index 70310a855..19ee1fbf4 100644 --- a/epsdk-app-onap/version.properties +++ b/epsdk-app-onap/version.properties @@ -2,9 +2,9 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major=5 +major=6 minor=0 -patch=3 +patch=0 base_version=${major}.${minor}.${patch} diff --git a/features.properties.md b/features.properties.md index 7b2250b94..2823c662e 100644 --- a/features.properties.md +++ b/features.properties.md @@ -169,4 +169,7 @@ * FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH Add cloud-region and nf-role as an optional search criteria fields when fetching VNF details. -
\ No newline at end of file + +* FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE + Let the user set the order of resource instantiation while using drawing board (new view edit) + for a-la-carte instantiation. @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vid</groupId> <artifactId>vid-parent</artifactId> - <version>5.0.3-SNAPSHOT</version> + <version>6.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vid</name> @@ -86,7 +86,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <build.version>5.0.3-SNAPSHOT</build.version> + <build.version>6.0.0-SNAPSHOT</build.version> <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>content/repositories/releases/</releaseNexusPath> diff --git a/version.properties b/version.properties index 70310a855..19ee1fbf4 100644 --- a/version.properties +++ b/version.properties @@ -2,9 +2,9 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major=5 +major=6 minor=0 -patch=3 +patch=0 base_version=${major}.${minor}.${patch} diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index 7f2b27c9f..78d9af771 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -9,7 +9,7 @@ inherit from a parent maven module. --> <groupId>org.onap.vid</groupId> <artifactId>vid-app-common</artifactId> - <version>5.0.3-SNAPSHOT</version> + <version>6.0.0-SNAPSHOT</version> <packaging>war</packaging> <name>VID Common</name> <description>VID Common code for opensource version</description> diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt index 2c50e03cd..8c769d68d 100644 --- a/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt +++ b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt @@ -222,11 +222,6 @@ abstract class ResourceCommand( else -> InternalState.IN_PROGRESS } - InternalState.REPLACE_MYSELF -> when (jobStatus) { - JobStatus.IN_PROGRESS -> InternalState.REPLACE_MYSELF - else -> InternalState.IN_PROGRESS - } - InternalState.IN_PROGRESS -> { when { jobStatus != JobStatus.COMPLETED -> InternalState.IN_PROGRESS diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java index 00d8424d1..7384c97e2 100644 --- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java +++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java @@ -78,6 +78,7 @@ public enum Features implements Feature { FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG, FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT, FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH, + FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, ; diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties index ff542d012..db2ff8e97 100644 --- a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties +++ b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties @@ -35,3 +35,4 @@ FLAG_1902_VNF_GROUPING = true FLAG_DISABLE_HOMING = true FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH=false FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG = false +FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE = false diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties index 70310a855..19ee1fbf4 100755 --- a/vid-app-common/version.properties +++ b/vid-app-common/version.properties @@ -2,9 +2,9 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major=5 +major=6 minor=0 -patch=3 +patch=0 base_version=${major}.${minor}.${patch} diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index ff187d6c6..6a15d8961 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -51,7 +51,9 @@ public enum Features implements Feature { FLAG_HANDLE_SO_WORKFLOWS, FLAG_CREATE_ERROR_REPORTS, FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT, + FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG, FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH, + FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, ; public boolean isActive() { diff --git a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java index 3d1dfb2ce..69267fd4d 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java @@ -730,7 +730,7 @@ public class AaiApiTest extends BaseApiAaiTest { getResourceAsString("serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json"), response); } - + @FeatureTogglingTest(value = Features.FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG, flagActive = false) @Test public void getVnfDataByGlobalIdAndServiceType() { @@ -836,7 +836,7 @@ public class AaiApiTest extends BaseApiAaiTest { } @Test - @FeatureTogglingTest(Features.FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH) + @FeatureTogglingTest(Features.FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG) public void getVnfsWithCustomQueryNewReducedResponse() throws URISyntaxException { String globalCustomerId = "globalCustomerId1-360-as988q"; diff --git a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java index 84574947e..3ec0c16e4 100644 --- a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java +++ b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java @@ -1,6 +1,14 @@ package org.onap.vid.more; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.junit.Assert.assertThat; + import com.fasterxml.jackson.databind.JsonNode; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,15 +20,6 @@ import org.testng.annotations.Test; import vid.automation.test.infra.SkipTestUntil; import vid.automation.test.services.SimulatorApi; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertThat; - public class LoggerFormatTest extends BaseApiTest { private final static String logChecker = System.getProperty("EELF_LOG_CHECKER", "http://my-logchecker:8888/validate"); @@ -36,7 +35,7 @@ public class LoggerFormatTest extends BaseApiTest { SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); } - @SkipTestUntil("2019-08-22") + @SkipTestUntil("2019-09-24") @Test public void validateAuditLogsFormat() { validateLogsFormat("audit"); @@ -47,7 +46,7 @@ public class LoggerFormatTest extends BaseApiTest { validateLogsFormat("error"); } - @SkipTestUntil("2019-08-22") + @SkipTestUntil("2019-09-24") @Test public void validateMetricsLogsFormat() { validateLogsFormat("metrics", "metric"); diff --git a/vid-automation/src/test/resources/features.properties b/vid-automation/src/test/resources/features.properties index 25bdff696..796c8be8d 100644 --- a/vid-automation/src/test/resources/features.properties +++ b/vid-automation/src/test/resources/features.properties @@ -29,9 +29,10 @@ FLAG_VF_MODULE_RESUME_STATUS_CREATE = true FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL = false FLAG_1906_COMPONENT_INFO = false FLAG_1906_INSTANTIATION_API_USER_VALIDATION = true -FLAG_1908_RESUME_MACRO_SERVICE=true -FLAG_1908_RELEASE_TENANT_ISOLATION=true -FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT=true -FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH=false -FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG=true +FLAG_1908_RESUME_MACRO_SERVICE = true +FLAG_1908_RELEASE_TENANT_ISOLATION = true +FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT = true +FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH = false +FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG = true +FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE = false diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml index 9e7dd0da6..59aa42d68 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>5.0.3-SNAPSHOT</version> + <version>6.0.0-SNAPSHOT</version> <packaging>war</packaging> <name>VID UI</name> <description>VID UI</description> diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts index 8b7f1a4f5..01ae898f5 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts @@ -1,8 +1,5 @@ -import {TestBed, getTestBed} from '@angular/core/testing'; -import { - HttpClientTestingModule, - HttpTestingController -} from '@angular/common/http/testing'; +import {getTestBed, TestBed} from '@angular/core/testing'; +import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing'; import {NgRedux} from "@angular-redux/store"; import {DragAndDropService} from "./dragAndDrop.service"; import {AppState} from "../../../../shared/store/reducers"; @@ -15,7 +12,7 @@ class MockAppStore<T> { return { global: { flags: { - "DRAG_AND_DROP_OPERATION" : true + "FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE" : true } }, service: { diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts index 01763c685..15da89ad3 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts @@ -11,7 +11,7 @@ export class DragAndDropService { constructor(private store: NgRedux<AppState>){} isAllow(): boolean { - return FeatureFlagsService.getFlagState(Features.DRAG_AND_DROP_OPERATION, this.store); + return FeatureFlagsService.getFlagState(Features.FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, this.store); } /******************************************************************** * manage drawing-board drag and drop operation @@ -23,7 +23,7 @@ export class DragAndDropService { ************************************************************/ drag(store, instanceId : string , nodes, {from, to}) :void{ - if (!store.getState().global.flags["DRAG_AND_DROP_OPERATION"]) return; + if (!store.getState().global.flags["FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE"]) return; let firstLevelNames : DragAndDropModel[] = [ new DragAndDropModel('VF',true), diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts index d3f04fe66..7ab2f5b5b 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts @@ -39,7 +39,7 @@ class MockAppStore<T> { global: { 'drawingBoardStatus': DrawingBoardModes.CREATE, flags : { - DRAG_AND_DROP_OPERATION : false + FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE : false } } } diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts index 7a908b7fd..8ddb4ba2d 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts @@ -106,7 +106,7 @@ export class ObjectToInstanceTreeService { } sortElementsByPosition(nodes: any[]): any[] { - if (!FeatureFlagsService.getFlagState(Features.DRAG_AND_DROP_OPERATION, this.store)) return nodes; + if (!FeatureFlagsService.getFlagState(Features.FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, this.store)) return nodes; return nodes.sort((nodeA, nodeB) => { return nodeA.position - nodeB.position; }); diff --git a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts index 7df15fcda..689465c69 100644 --- a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts +++ b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts @@ -7,7 +7,7 @@ export enum Features { FLAG_1902_NEW_VIEW_EDIT='FLAG_1902_NEW_VIEW_EDIT', FLAG_1902_VNF_GROUPING='FLAG_1902_VNF_GROUPING', FLAG_VF_MODULE_RESUME_STATUS_CREATE = 'FLAG_VF_MODULE_RESUME_STATUS_CREATE', - DRAG_AND_DROP_OPERATION = 'DRAG_AND_DROP_OPERATION', + FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE = 'FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE', FLAG_1906_COMPONENT_INFO = 'FLAG_1906_COMPONENT_INFO', FLAG_1908_RESUME_MACRO_SERVICE = 'FLAG_1908_RESUME_MACRO_SERVICE', FLAG_FLASH_REPLACE_VF_MODULE ='FLAG_FLASH_REPLACE_VF_MODULE', |