From cbcc92a846108386803d07fbb5d9c7838889090a Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 14 Mar 2018 08:37:21 +0100 Subject: Refactor TempestCommon to simplify subclasses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8d265b6939861fd9d02a3d0f31aef53b9bfcb035 Signed-off-by: Cédric Ollivier --- .../opnfv_tests/openstack/refstack/refstack.py | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'functest/opnfv_tests/openstack/refstack') diff --git a/functest/opnfv_tests/openstack/refstack/refstack.py b/functest/opnfv_tests/openstack/refstack/refstack.py index b5766a020..a55b147f1 100644 --- a/functest/opnfv_tests/openstack/refstack/refstack.py +++ b/functest/opnfv_tests/openstack/refstack/refstack.py @@ -18,8 +18,6 @@ from refstack_client import list_parser from xtesting.core import testcase from xtesting.energy import energy -from functest.opnfv_tests.openstack.snaps import snaps_utils -from functest.opnfv_tests.openstack.tempest import conf_utils from functest.opnfv_tests.openstack.tempest import tempest from functest.utils import config @@ -45,27 +43,17 @@ class Refstack(tempest.TempestCommon): """Start Refstack testcase.""" self.start_time = time.time() try: - if not os.path.exists(self.res_dir): - os.makedirs(self.res_dir) - resources = self.resources.create() - compute_cnt = snaps_utils.get_active_compute_cnt( - self.resources.os_creds) - conf_file = conf_utils.configure_verifier(self.deployment_dir) - conf_utils.configure_tempest_update_params( - conf_file, self.res_dir, - network_name=resources.get("network_name"), - image_id=resources.get("image_id"), - flavor_id=resources.get("flavor_id"), - compute_cnt=compute_cnt) - parser = list_parser.TestListParser('/src/tempest') + self.configure() + parser = list_parser.TestListParser( + getattr(config.CONF, 'dir_repo_tempest')) nfile = parser.get_normalized_test_list(Refstack.defcorelist) shutil.copyfile(nfile, self.list) self.run_verifier_tests() self.parse_verifier_result() self.generate_report() res = testcase.TestCase.EX_OK - except Exception as err: # pylint: disable=broad-except - self.__logger.error('Error with run: %s', err) + except Exception: # pylint: disable=broad-except + self.__logger.exception('Error with run') res = testcase.TestCase.EX_RUN_ERROR finally: self.resources.cleanup() -- cgit 1.2.3-korg