From 5efec2c3cfcead17394beb825200e132f827eb31 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Tue, 30 Jul 2019 18:01:21 +0300
Subject: Fix /version endpoint

* Modify maven-replacer-plugin to set value in version.json
* Configure features.set.filename=onap.features.properties

Issue-ID: VID-507

Change-Id: I692ab3e9221118b836ae7249f483b5277a70bf6b
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../main/webapp/WEB-INF/conf/features.properties   | 46 ++--------------------
 .../webapp/WEB-INF/conf/onap.features.properties   | 38 ++++++++++++++++++
 2 files changed, 41 insertions(+), 43 deletions(-)
 create mode 100644 vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties

(limited to 'vid-app-common/src/main/webapp/WEB-INF')

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 fd236c39a..87f1017ed 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
@@ -4,47 +4,7 @@
 #    This file is, generally, empty.
 
 #    Configure `features.set.filename` in system.properties to use
-#    one of the ready-made sets:
-
-#    -  features.set.filename = ci.features.properties
-#    -  features.set.filename = ist.features.properties
-#    -  features.set.filename = e2e.features.properties
-
-FLAG_PNP_INSTANTIATION = true
-
-CREATE_INSTANCE_TEST = false
-FLAG_ADD_MSO_TESTAPI_FIELD = true
-FLAG_UNASSIGN_SERVICE = true
-FLAG_SERVICE_MODEL_CACHE = true
-FLAG_SHOW_ASSIGNMENTS = true
-FLAG_SHOW_VERIFY_SERVICE = false
-FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
-FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS = true
-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_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
-FLAG_HANDLE_SO_WORKFLOWS = true
-FLAG_CREATE_ERROR_REPORTS = true
-
-# Modern UI (Drawing-Board; View/Edit)
-# - - - - - - - - - - - - - - - - - -
-FLAG_COLLECTION_RESOURCE_SUPPORT = false
-FLAG_ASYNC_INSTANTIATION = false
-FLAG_ASYNC_JOBS = false
-EMPTY_DRAWING_BOARD_TEST = 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
-FLAG_ASYNC_ALACARTE_VNF = false
-FLAG_ASYNC_ALACARTE_VFMODULE = false
-FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI = false
-FLAG_SUPPLEMENTARY_FILE = false
-FLAG_1902_NEW_VIEW_EDIT=false
-FLAG_1902_VNF_GROUPING = false
+#    one of the ready-made sets; e.g.:
 
+#    -  features.set.filename = onap.features.properties
+#    -  features.set.filename = dublin.features.properties
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
new file mode 100644
index 000000000..66435b024
--- /dev/null
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
@@ -0,0 +1,38 @@
+FLAG_PNP_INSTANTIATION = true
+
+CREATE_INSTANCE_TEST = false
+FLAG_ADD_MSO_TESTAPI_FIELD = true
+FLAG_UNASSIGN_SERVICE = true
+FLAG_SERVICE_MODEL_CACHE = true
+FLAG_SHOW_ASSIGNMENTS = true
+FLAG_SHOW_VERIFY_SERVICE = false
+FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
+FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS = true
+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_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
+FLAG_HANDLE_SO_WORKFLOWS = true
+FLAG_CREATE_ERROR_REPORTS = true
+
+# Modern UI (Drawing-Board; View/Edit)
+# - - - - - - - - - - - - - - - - - -
+FLAG_COLLECTION_RESOURCE_SUPPORT = false
+FLAG_ASYNC_INSTANTIATION = false
+FLAG_ASYNC_JOBS = false
+EMPTY_DRAWING_BOARD_TEST = 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
+FLAG_ASYNC_ALACARTE_VNF = false
+FLAG_ASYNC_ALACARTE_VFMODULE = false
+FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI = false
+FLAG_SUPPLEMENTARY_FILE = false
+FLAG_1902_NEW_VIEW_EDIT=false
+FLAG_1902_VNF_GROUPING = false
+
-- 
cgit 1.2.3-korg