Merge "Merge from ECOMP's repository"

1 files changed, 23 insertions, 4 deletions

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 cc623d44f..6c521107f 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
@@ -10,10 +10,8 @@ public enum Features implements Feature {
      */
 
     FLAG_ASYNC_JOBS,
-    FLAG_REGION_ID_FROM_REMOTE,
     CREATE_INSTANCE_TEST,
     EMPTY_DRAWING_BOARD_TEST,
-    FLAG_ADVANCED_PORTS_FILTER,
     FLAG_ADD_MSO_TESTAPI_FIELD,
     FLAG_ASYNC_INSTANTIATION,
     FLAG_SERVICE_MODEL_CACHE,
@@ -21,9 +19,30 @@ public enum Features implements Feature {
     FLAG_NETWORK_TO_ASYNC_INSTANTIATION,
     FLAG_COLLECTION_RESOURCE_SUPPORT,
     FLAG_SHOW_ASSIGNMENTS,
-    FLAG_SHOW_VERIFY_SERVICE,
+    FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS,
+    FLAG_SHOW_VERIFY_SERVICE, // AKA POMBA
+    FLAG_DUPLICATE_VNF,
+    FLAG_DEFAULT_VNF,
     FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD,
-    FLAG_PNP_INSTANTIATION;
+    FLAG_PNP_INSTANTIATION,
+    FLAG_RESTRICTED_SELECT,
+    FLAG_5G_IN_NEW_INSTANTIATION_UI,
+    FLAG_ASYNC_ALACARTE_VNF,
+    FLAG_A_LA_CARTE_AUDIT_INFO,
+    FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS,
+    FLAG_ASYNC_ALACARTE_VFMODULE,
+    FLAG_SUPPLEMENTARY_FILE,
+    FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF,
+    FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI,
+    FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY,
+    FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST,
+    FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE,
+    FLAG_1810_AAI_LOCAL_CACHE,
+    FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI,
+    FLAG_1902_NEW_VIEW_EDIT,
+    FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER,
+    FLAG_1902_VNF_GROUPING,
+    ;
 
     public boolean isActive() {
         return FeatureContext.getFeatureManager().isActive(this);