Merge "Remove redundant tempest cleanup utility"

2 files changed, 1 insertions, 82 deletions

diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 17e02466..10ffddf5 100644
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -28,7 +28,6 @@ from functest.opnfv_tests.openstack.refstack_client.tempest_conf \
 from functest.opnfv_tests.openstack.tempest import conf_utils
 from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
-import functest.utils.openstack_utils as os_utils
 
 # logging configuration """
 LOGGER = logging.getLogger(__name__)
@@ -77,7 +76,7 @@ class RefstackClient(testcase.TestCase):
         """Run default defcore sys command."""
         options = ["-v"] if not self.insecure else ["-v", self.insecure]
         cmd = (["refstack-client", "test", "-c", self.confpath] +
-               options + ["--test-list",  self.defcorelist])
+               options + ["--test-list", self.defcorelist])
         LOGGER.info("Starting Refstack_defcore test case: '%s'.", cmd)
 
         with open(os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
@@ -211,45 +210,6 @@ class RefstackClient(testcase.TestCase):
 
         return res
 
-    def create_snapshot(self):
-        """
-        Run the Tempest cleanup utility to initialize OS state.
-        For details, see https://docs.openstack.org/tempest/latest/cleanup.html
-
-        :return: TestCase.EX_OK
-        """
-        LOGGER.info("Initializing the saved state of the OpenStack deployment")
-
-        # Make sure that Tempest is configured
-        if not self.tempestconf:
-            self.generate_conf()
-
-        try:
-            os_utils.init_tempest_cleanup(
-                self.tempestconf.DEPLOYMENT_DIR, 'tempest.conf',
-                os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
-                             "tempest-cleanup-init.log"))
-        except Exception as err:
-            LOGGER.error(str(err))
-            return testcase.TestCase.EX_RUN_ERROR
-
-        return super(RefstackClient, self).create_snapshot()
-
-    def clean(self):
-        """
-        Run the Tempest cleanup utility to delete and destroy OS resources.
-        For details, see https://docs.openstack.org/tempest/latest/cleanup.html
-        """
-        LOGGER.info("Destroying the resources created for tempest")
-
-        os_utils.perform_tempest_cleanup(
-            self.tempestconf.DEPLOYMENT_DIR, 'tempest.conf',
-            os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
-                         "tempest-cleanup.log")
-        )
-
-        return super(RefstackClient, self).clean()
-
 
 class RefstackClientParser(object):  # pylint: disable=too-few-public-methods
     """Command line argument parser helper."""
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index c204d52b..19200142 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -24,7 +24,6 @@ from functest.opnfv_tests.openstack.snaps import snaps_utils
 from functest.opnfv_tests.openstack.tempest import conf_utils
 from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
-import functest.utils.openstack_utils as os_utils
 
 from snaps.openstack import create_flavor
 from snaps.openstack.create_flavor import FlavorSettings, OpenStackFlavor
@@ -256,46 +255,6 @@ class TempestCommon(testcase.TestCase):
         self.stop_time = time.time()
         return res
 
-    def create_snapshot(self):
-        """
-        Run the Tempest cleanup utility to initialize OS state.
-
-        :return: TestCase.EX_OK
-        """
-        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)
-
-        try:
-            os_utils.init_tempest_cleanup(
-                self.DEPLOYMENT_DIR, 'tempest.conf',
-                os.path.join(conf_utils.TEMPEST_RESULTS_DIR,
-                             "tempest-cleanup-init.log"))
-        except Exception as err:
-            logger.error(str(err))
-            return testcase.TestCase.EX_RUN_ERROR
-
-        return super(TempestCommon, self).create_snapshot()
-
-    def clean(self):
-        """
-        Run the Tempest cleanup utility to delete and destroy OS resources
-        created by Tempest.
-        """
-        logger.info("Destroying the resources created for refstack")
-
-        os_utils.perform_tempest_cleanup(
-            self.DEPLOYMENT_DIR, 'tempest.conf',
-            os.path.join(conf_utils.TEMPEST_RESULTS_DIR,
-                         "tempest-cleanup.log")
-        )
-
-        return super(TempestCommon, self).clean()
-
 
 class TempestSmokeSerial(TempestCommon):