Bugfix: Revert soft-delete to restore VF-module deletion

Issue-ID: VID-503

Change-Id: Ic19613e92c3fd2869dd94931533db2c2053fd189
Signed-off-by: Ittay Stern <ittay.stern@att.com>

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index cb7ca7f..89f3349 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -6,6 +6,10 @@ VID Release Notes
 Version: 4.3.2
 --------------
 
+**Resolved Issues**
+
+Reverted the soft-delete feature, to resolve this:
+  - `VID-503 <https://jira.onap.org/browse/VID-503>`_ Delete VF module does not trigger any action
 
 
 Version: 4.3.1

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 8ba1484..71e104d 100644 (file)
--- 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
@@ -26,7 +26,7 @@ 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_CR_SOFT_DELETE_ALACARTE_VF_MODULE = false
 FLAG_1810_AAI_LOCAL_CACHE = true
 FLAG_1902_NEW_VIEW_EDIT= false
 FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false

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 7bdc659..7a386b5 100644 (file)
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
@@ -22,7 +22,7 @@ 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_CR_SOFT_DELETE_ALACARTE_VF_MODULE = false
 FLAG_1810_AAI_LOCAL_CACHE = true
 FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
 FLAG_HANDLE_SO_WORKFLOWS = true