summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features.properties.md5
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt5
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/properties/Features.java1
-rw-r--r--vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties1
-rw-r--r--vid-automation/src/main/java/vid/automation/test/infra/Features.java2
-rw-r--r--vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java4
-rw-r--r--vid-automation/src/test/resources/features.properties11
-rw-r--r--vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts9
-rw-r--r--vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts4
-rw-r--r--vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts2
-rw-r--r--vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts2
-rw-r--r--vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts2
12 files changed, 24 insertions, 24 deletions
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.
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 9abf68bca..5ec0e253e 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
@@ -77,6 +77,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 8438172e3..dd22dcbcd 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
@@ -34,3 +34,4 @@ FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
FLAG_1902_VNF_GROUPING = 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-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/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/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',