Merge "Merge from ECOMP's repository"

2 files changed, 52 insertions, 16 deletions

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 8ff0db2ab..d82b043c5 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
@@ -1,14 +1,32 @@
 FLAG_ASYNC_INSTANTIATION = true
 FLAG_ASYNC_JOBS = true
-FLAG_REGION_ID_FROM_REMOTE = true
 CREATE_INSTANCE_TEST = false
 EMPTY_DRAWING_BOARD_TEST = false
-FLAG_ADVANCED_PORTS_FILTER = true
 FLAG_ADD_MSO_TESTAPI_FIELD = true
 FLAG_UNASSIGN_SERVICE = true
 FLAG_COLLECTION_RESOURCE_SUPPORT = true
-FLAG_NETWORK_TO_ASYNC_INSTANTIATION = true
+FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false
 FLAG_SERVICE_MODEL_CACHE = true
 FLAG_SHOW_ASSIGNMENTS = true
-FLAG_SHOW_VERIFY_SERVICE=false
-FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false
+
+FLAG_SHOW_VERIFY_SERVICE = true
+FLAG_DUPLICATE_VNF = true
+FLAG_DEFAULT_VNF = true
+FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = true
+FLAG_RESTRICTED_SELECT = false
+FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
+FLAG_A_LA_CARTE_AUDIT_INFO=true
+FLAG_5G_IN_NEW_INSTANTIATION_UI = true
+FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS = true
+FLAG_ASYNC_ALACARTE_VNF = true
+FLAG_ASYNC_ALACARTE_VFMODULE= true
+FLAG_SUPPLEMENTARY_FILE = true
+FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF = true
+FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI=false
+FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST=true
+FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY=true
+FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = true
+FLAG_1810_AAI_LOCAL_CACHE = true
+FLAG_1902_NEW_VIEW_EDIT= false
+FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
+FLAG_1902_VNF_GROUPING = true
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
index 3ca0e6e4c..87b2d6014 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
@@ -3,25 +3,43 @@
 
 #    This file is, generally, empty.
 
-#    Configure `featureFlags.filename` in system.properties to use
+#    Configure `features.set.filename` in system.properties to use
 #    one of the ready-made sets:
 
-#    -  featureFlags.filename = ci.features.properties
-#    -  featureFlags.filename = ist.features.properties
-#    -  featureFlags.filename = e2e.features.properties
+#    -  features.set.filename = ci.features.properties
+#    -  features.set.filename = ist.features.properties
+#    -  features.set.filename = e2e.features.properties
+
+FLAG_PNP_INSTANTIATION = true
 
 FLAG_ASYNC_INSTANTIATION = true
-FLAG_ASYNC_JOBS = false
-FLAG_REGION_ID_FROM_REMOTE = true
+FLAG_ASYNC_JOBS = true
 CREATE_INSTANCE_TEST = false
 EMPTY_DRAWING_BOARD_TEST = false
-FLAG_ADVANCED_PORTS_FILTER = true
 FLAG_ADD_MSO_TESTAPI_FIELD = true
 FLAG_UNASSIGN_SERVICE = true
 FLAG_COLLECTION_RESOURCE_SUPPORT = true
-FLAG_NETWORK_TO_ASYNC_INSTANTIATION = true
+FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false
 FLAG_SERVICE_MODEL_CACHE = true
 FLAG_SHOW_ASSIGNMENTS = true
-FLAG_SHOW_VERIFY_SERVICE=false
-FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false
-FLAG_PNP_INSTANTIATION = true
\ No newline at end of file
+FLAG_SHOW_VERIFY_SERVICE = false
+FLAG_DUPLICATE_VNF = true
+FLAG_DEFAULT_VNF = true
+FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = true
+FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
+FLAG_A_LA_CARTE_AUDIT_INFO=true
+FLAG_5G_IN_NEW_INSTANTIATION_UI = true
+FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS = true
+FLAG_ASYNC_ALACARTE_VNF = true
+FLAG_ASYNC_ALACARTE_VFMODULE= true
+FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF = true
+FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI=false
+FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST=true
+FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY=true
+FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = true
+FLAG_1810_AAI_LOCAL_CACHE = true
+FLAG_1902_NEW_VIEW_EDIT=false
+FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
+
+FLAG_SUPPLEMENTARY_FILE = true
+FLAG_1902_VNF_GROUPING = true