summaryrefslogtreecommitdiffstats
path: root/vid-app-common
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-12-01 13:14:49 +0000
committerGerrit Code Review <gerrit@onap.org>2019-12-01 13:14:49 +0000
commitb167cf459a0064310235c3f48918378202e4a41f (patch)
tree60a9e64e8e4d8e01e324ba540b96789affc42f05 /vid-app-common
parent434c95a0731b5135a1067f76dfaac9a30878d6cb (diff)
parenta6f08e35c331cd50073b9875886b79c7645bae38 (diff)
Merge changes Ia06b7afe,I31b646b4
* changes: remove FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD remove FLAG_DEFAULT_VNF
Diffstat (limited to 'vid-app-common')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/properties/Features.java2
-rw-r--r--vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties2
-rw-r--r--vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties2
3 files changed, 0 insertions, 6 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 507ebbe2b..5da64653e 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
@@ -36,8 +36,6 @@ public enum Features implements Feature {
FLAG_UNASSIGN_SERVICE,
FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS,
FLAG_SHOW_VERIFY_SERVICE, // AKA POMBA
- FLAG_DEFAULT_VNF,
- FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD,
FLAG_RESTRICTED_SELECT,
FLAG_5G_IN_NEW_INSTANTIATION_UI,
FLAG_ASYNC_ALACARTE_VNF,
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 a45f6db34..2a0cb5b88 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
@@ -10,8 +10,6 @@ FLAG_HANDLE_SO_WORKFLOWS = true
FLAG_CREATE_ERROR_REPORTS = true
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
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
index 461d63fbc..58f677abc 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
@@ -22,8 +22,6 @@ FLAG_ENABLE_WEBPACK_MODERN_UI = false
FLAG_ASYNC_JOBS = false
FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false
FLAG_DUPLICATE_VNF = false
-FLAG_DEFAULT_VNF = false
-FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false
FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF = false
FLAG_A_LA_CARTE_AUDIT_INFO = false
FLAG_5G_IN_NEW_INSTANTIATION_UI = false