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 --- functest/opnfv_tests/openstack/patrole/patrole.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'functest/opnfv_tests/openstack/patrole/patrole.py') diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py index ebc3d1448..211abb931 100644 --- a/functest/opnfv_tests/openstack/patrole/patrole.py +++ b/functest/opnfv_tests/openstack/patrole/patrole.py @@ -15,7 +15,6 @@ import time from xtesting.core import testcase -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 @@ -32,7 +31,6 @@ class Patrole(tempest.TempestCommon): self.res_dir = os.path.join( getattr(config.CONF, 'dir_results'), 'patrole') self.list = os.path.join(self.res_dir, 'tempest-list.txt') - self.conf_file = None def run(self, **kwargs): self.start_time = time.time() @@ -41,26 +39,15 @@ class Patrole(tempest.TempestCommon): self.mode = "'{}(?=patrole_tempest_plugin.tests.api.({}))'".format( self.mode, '|'.join(kwargs.get('services', []))) 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) - self.conf_file = conf_utils.configure_verifier(self.deployment_dir) - conf_utils.configure_tempest_update_params( - self.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) + self.configure() self.configure_tempest_patrole(kwargs.get('role', 'admin')) - self.generate_test_list(self.verifier_repo_dir) + self.generate_test_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.error('Error with run') res = testcase.TestCase.EX_RUN_ERROR finally: self.resources.cleanup() -- cgit 1.2.3-korg