aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/refstack_client
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/refstack_client
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/refstack_client')
-rw-r--r--functest/opnfv_tests/openstack/refstack_client/refstack_client.py42
1 files changed, 1 insertions, 41 deletions
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 17e024666..10ffddf54 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."""