Disable SDC resources cleanup

SDC resources deletion makes a lot of issues, so should be enabled on demand
and enabled for all tests after all needed fixes

Issue-ID: INT-2193
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: Ice1d3558403851e98a05c99608a5ed0ecf0d6689

diff --git a/src/onaptests/configuration/basic_onboard_settings.py b/src/onaptests/configuration/basic_onboard_settings.py
index de8d95c..d4aa3ec 100644 (file)
--- a/src/onaptests/configuration/basic_onboard_settings.py
+++ b/src/onaptests/configuration/basic_onboard_settings.py
@@ -65,4 +65,3 @@ VENDOR_NAME = "basic_onboard_vendor"
 
 MODEL_YAML_TEMPLATE = None
 CLEANUP_FLAG = True
-SDC_CLEANUP = True

diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py
index da4e25c..a315525 100644 (file)
--- a/src/onaptests/configuration/pnf_macro_settings.py
+++ b/src/onaptests/configuration/pnf_macro_settings.py
@@ -48,4 +48,3 @@ PNF_REGISTRATION_NUMBER_OF_TRIES = 20
 
 # Disable YAML SDC model definition which means all SDC config reside in SERVICE_YAML_TEMPLATE
 MODEL_YAML_TEMPLATE = None
-SDC_CLEANUP = True

diff --git a/src/onaptests/configuration/settings.py b/src/onaptests/configuration/settings.py
index 3ca9af9..7561ebc 100644 (file)
--- a/src/onaptests/configuration/settings.py
+++ b/src/onaptests/configuration/settings.py
@@ -38,10 +38,7 @@ LOG_CONFIG = {
     }
 }
 CLEANUP_FLAG = False
-# Additional flag to enable SDC resources cleanup
-# Added as SDC's VSP deletion is broken and most tests fail due to that
-# Should be removed as soon as SDC resource deletion is fixed
-SDC_CLEANUP = True
+SDC_CLEANUP = False
 
 REPORTING_FILE_PATH = "/tmp/reporting.html"
 K8S_REGION_TYPE = "k8s"