add FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS

Issue-ID: VID-649
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: I0a9ba9422c27360a7de11c7496af70e4aba0e38e
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>

diff --git a/features.properties.md b/features.properties.md
index a7f9c63..1f9fecc 100644 (file)
--- a/features.properties.md
+++ b/features.properties.md
@@ -181,3 +181,6 @@
    
 * FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI
   Any a-la-carte new service deployment will be open in modern UI, besides excluded services : Port mirroring, VLAN Tagging
+
+* FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS
+  When flag is true the new popup will be opened with additional options to perform on VFM.
\ No newline at end of file

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 fea76e8..5bf4fbd 100644 (file)
--- 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
@@ -81,6 +81,7 @@ public enum Features implements Feature {
     FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH,
     FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE,
     FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI,
+    FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS,
     ;
 
 

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 93e4447..a2892e5 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java
+++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java
@@ -56,6 +56,7 @@ public enum Features implements Feature {
     FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH,
     FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE,
     FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI,
+    FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS,
     ;
 
     public boolean isActive() {

diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
index 93b5e15..5dd02cb 100644 (file)
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
@@ -19,5 +19,6 @@
   "FLAG_ENABLE_WEBPACK_MODERN_UI": true,
   "FLAG_FLASH_REPLACE_VF_MODULE": true,
   "FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT": true,
-  "FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE": false
+  "FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE": false,
+  "FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS" : false
 }

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 689465c..39a947f 100644 (file)
--- 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
@@ -11,7 +11,8 @@ export enum Features {
   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',
-  FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT ='FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT'
+  FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT ='FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT',
+  FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS = 'FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS'
 }
 
 @Injectable()