summaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/tempest/tempest.py
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-09-07 03:28:48 +0000
committerLinda Wang <wangwulin@huawei.com>2017-09-07 03:41:45 +0000
commit842d0b381755176a63b55d045325ed8c1d662407 (patch)
tree0b1934c0818dc8aced3f6195d3be1ed9f06ffdda /functest/opnfv_tests/openstack/tempest/tempest.py
parentcbb64439160caa48d5725b3ee8be0023103a9ec7 (diff)
Remove redundant tempest cleanup utility
All the resources including the project, user, network, images and flavors to enable tempest running, are created by snaps-OO, which will definitely clean up those finally. Change-Id: Iea3e3f275cc6cfd2cee421fcafef90aaf2e6cf3e Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py')
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py41
1 files changed, 0 insertions, 41 deletions
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):