openstack/vitrage
Code Issues Proposed changes

fix the client attribute for alarms

Browse Source 
there is no alarms attribute for client only alarm

Change-Id: Iaefdc8508b58d0321585a6e490647e93d9d77937
This commit is contained in:
Eyal 2017-02-14 17:29:48 +02:00
parent 77fc3bb90d
commit 0eabe8afbc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vitrage_tempest_tests/tests/api/alarms/test_alarms.py
View File

@ -42,7 +42,7 @@ class TestAlarms(BaseAlarmsTest):
self._create_ceilometer_alarm(resource_id=instances[0].id, self._create_ceilometer_alarm(resource_id=instances[0].id,
name='tempest_aodh_test') name='tempest_aodh_test')
api_alarms = self.vitrage_client.alarms.list(vitrage_id=None) api_alarms = self.vitrage_client.alarm.list(vitrage_id=None)
cli_alarms = utils.run_vitrage_command( cli_alarms = utils.run_vitrage_command(
'vitrage alarm list', self.conf) 'vitrage alarm list', self.conf)
self._compare_alarms_lists( self._compare_alarms_lists(

2
vitrage_tempest_tests/tests/api/rca/base.py
View File

@ -48,7 +48,7 @@ class BaseRcaTest(BaseAlarmsTest):
self._create_ceilometer_alarm(resource_id=resource_id, self._create_ceilometer_alarm(resource_id=resource_id,
name=alarm_name, unic=unic) name=alarm_name, unic=unic)
list_alarms = self.vitrage_client.alarms.list(vitrage_id=None) list_alarms = self.vitrage_client.alarm.list(vitrage_id=None)
expected_alarm = self._filter_list_by_pairs_parameters( expected_alarm = self._filter_list_by_pairs_parameters(
list_alarms, ['resource_id', VProps.TYPE], list_alarms, ['resource_id', VProps.TYPE],
[resource_id, AODH_DATASOURCE]) [resource_id, AODH_DATASOURCE])

4
vitrage_tempest_tests/tests/api/rca/test_rca.py
View File

@ -103,7 +103,7 @@ class TestRca(BaseRcaTest):
self._create_alarm( self._create_alarm(
resource_id=self._get_hostname(), resource_id=self._get_hostname(),
alarm_name=RCA_ALARM_NAME) alarm_name=RCA_ALARM_NAME)
api_alarms = self.vitrage_client.alarms.list(vitrage_id=None) api_alarms = self.vitrage_client.alarm.list(vitrage_id=None)
self._validate_deduce_alarms(alarms=api_alarms, self._validate_deduce_alarms(alarms=api_alarms,
instances=instances) instances=instances)
@ -153,7 +153,7 @@ class TestRca(BaseRcaTest):
self._create_alarm( self._create_alarm(
resource_id=self._get_hostname(), resource_id=self._get_hostname(),
alarm_name=RCA_ALARM_NAME) alarm_name=RCA_ALARM_NAME)
vitrage_alarms = self.vitrage_client.alarms.list(vitrage_id=None) vitrage_alarms = self.vitrage_client.alarm.list(vitrage_id=None)
ceilometer_alarms = self.ceilometer_client.alarms.list() ceilometer_alarms = self.ceilometer_client.alarms.list()
self._validate_notifier(alarms=ceilometer_alarms, self._validate_notifier(alarms=ceilometer_alarms,