Merge "Fix the tempest error when creating snapshot"

2 files changed, 6 insertions, 6 deletions

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index fccfebce..52fa6003 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -130,9 +130,6 @@ def backup_tempest_config(conf_file):
     """
     Copy config file to tempest results directory
     """
-    if not os.path.exists(TEMPEST_RESULTS_DIR):
-        os.makedirs(TEMPEST_RESULTS_DIR)
-
     shutil.copyfile(conf_file,
                     os.path.join(TEMPEST_RESULTS_DIR, 'tempest.conf'))
 
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 5129a56e..c7ad4df2 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -261,6 +261,9 @@ class TempestCommon(testcase.TestCase):
         """
         logger.info("Initializing the saved state of the OpenStack deployment")
 
+        if not os.path.exists(conf_utils.TEMPEST_RESULTS_DIR):
+            os.makedirs(conf_utils.TEMPEST_RESULTS_DIR)
+
         # Make sure that the verifier is configured
         conf_utils.configure_verifier(self.DEPLOYMENT_DIR)
 
@@ -277,11 +280,11 @@ class TempestCommon(testcase.TestCase):
         Run the Tempest cleanup utility to delete and destroy OS resources
         created by Tempest.
         """
-        logger.info("Initializing the saved state of the OpenStack deployment")
+        logger.info("Destroying the resources created for refstack")
 
-        os_utils.init_tempest_cleanup(
+        os_utils.perform_tempest_cleanup(
             self.DEPLOYMENT_DIR, 'tempest.conf',
-            os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
+            os.path.join(conf_utils.TEMPEST_RESULTS_DIR,
                          "tempest-cleanup.log")
         )