diff options
| -rw-r--r-- | docker/healthcheck/testcases.yaml | 2 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 29 | ||||
| -rw-r--r-- | setup.cfg | 1 |
4 files changed, 16 insertions, 18 deletions
diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index 53e5a6cd5..7b6b2a108 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -177,6 +177,6 @@ tiers: dependencies: - DASHBOARD_URL: '^(?!\s*$).+' run: - name: tempest_horizon + name: tempest_common args: mode: '^tempest.scenario.test_dashboard_basic_ops.' diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 818fb185e..3c71807cc 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -177,7 +177,7 @@ tiers: dependencies: - DASHBOARD_URL: '^(?!\s*$).+' run: - name: tempest_horizon + name: tempest_common args: mode: '^tempest.scenario.test_dashboard_basic_ops.' diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 2645e6f19..60c117dea 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -582,6 +582,19 @@ class TempestCommon(singlevm.VmReady2): with open(self.conf_file, 'w') as config_file: rconfig.write(config_file) + def update_dashboard_section(self): + """Update dashboard section in tempest.conf""" + rconfig = configparser.RawConfigParser() + rconfig.read(self.conf_file) + if env.get('DASHBOARD_URL'): + if not rconfig.has_section('dashboard'): + rconfig.add_section('dashboard') + rconfig.set('dashboard', 'dashboard_url', env.get('DASHBOARD_URL')) + else: + rconfig.set('service_available', 'horizon', False) + with open(self.conf_file, 'w') as config_file: + rconfig.write(config_file) + def configure(self, **kwargs): # pylint: disable=unused-argument """ Create all openstack resources for tempest-based testcases and write @@ -624,6 +637,7 @@ class TempestCommon(singlevm.VmReady2): self.update_compute_section() self.update_validation_section() self.update_scenario_section() + self.update_dashboard_section() self.backup_tempest_config(self.conf_file, self.res_dir) def run(self, **kwargs): @@ -682,21 +696,6 @@ class TempestCommon(singlevm.VmReady2): return super(TempestCommon, self).is_successful() -class TempestHorizon(TempestCommon): - """Tempest Horizon testcase implementation class.""" - - def configure(self, **kwargs): - super(TempestHorizon, self).configure(**kwargs) - rconfig = configparser.RawConfigParser() - rconfig.read(self.conf_file) - if not rconfig.has_section('dashboard'): - rconfig.add_section('dashboard') - rconfig.set('dashboard', 'dashboard_url', env.get('DASHBOARD_URL')) - with open(self.conf_file, 'w') as config_file: - rconfig.write(config_file) - self.backup_tempest_config(self.conf_file, self.res_dir) - - class TempestHeat(TempestCommon): """Tempest Heat testcase implementation class.""" @@ -26,7 +26,6 @@ xtesting.testcase = cinder_test = functest.opnfv_tests.openstack.cinder.cinder_test:CinderCheck odl = functest.opnfv_tests.sdn.odl.odl:ODLTests tempest_common = functest.opnfv_tests.openstack.tempest.tempest:TempestCommon - tempest_horizon = functest.opnfv_tests.openstack.tempest.tempest:TempestHorizon tempest_heat = functest.opnfv_tests.openstack.tempest.tempest:TempestHeat rally_sanity = functest.opnfv_tests.openstack.rally.rally:RallySanity refstack = functest.opnfv_tests.openstack.refstack.refstack:Refstack |