openstack
/
congress-tempest-plugin
Code Issues Proposed changes

Merge "Use 'aodh' for aodh service availability"

This commit is contained in:
Zuul 2018-02-02 02:21:12 +00:00 committed by Gerrit Code Review
parent ce247df2dd e58b0eb52d
commit f57c2332c7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
congress_tempest_plugin/tests/scenario/congress_datasources/test_aodh.py
View File

@ -29,7 +29,7 @@ class TestAodhDriver(manager_congress.ScenarioPolicyBase):
@classmethod
def skip_checks(cls):
super(TestAodhDriver, cls).skip_checks()
if not getattr(CONF.service_available, 'aodh_plugin', False):
if not getattr(CONF.service_available, 'aodh', False):
msg = ("%s skipped as aodh is not available" %
cls.__class__.__name__)
raise cls.skipException(msg)

2
congress_tempest_plugin/tests/scenario/manager_congress.py
View File

@ -68,7 +68,7 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
auth_prov, "network", CONF.identity.region)
# Get alarms client
if getattr(CONF.service_available, 'aodh_plugin', False):
if getattr(CONF.service_available, 'aodh', False):
import telemetry_tempest_plugin.aodh.service.client as alarm_client
cls.os_admin.alarms_client = (
alarm_client.AlarmingClient(