openstack
/
fuel-ostf
Code Issues Proposed changes

[Ceilometer]Fix for test with events and traits 

Event with type compute.instance.update was removed in Mitaka,
so we should use another event type
(For example compute.instance.create.start)
Closes-bug:#1566756

Change-Id: I0d2d0ed559b0c3bc4ada48a9ad315cdb653fd6f1
This commit is contained in:
Artem 2016-04-06 12:44:14 +03:00 committed by Artem Minasyan
parent 6f71614a0b
commit 577d50bbb2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuel_health/tests/sanity/test_sanity_ceilometer.py
View File

@ -40,8 +40,8 @@ class CeilometerApiTests(ceilometermanager.CeilometerBaseTest):
1, fail_msg, 'getting list of meters', q)
fail_msg = 'Failed to get list of alarms.'
self.verify(60, self.aodh_client.alarm.list,
2, fail_msg, 'getting list of alarms', 'threshold')
self.verify(60, self.ceilometer_client.alarms.list,
2, fail_msg, 'getting list of alarms')
fail_msg = 'Failed to get list of resources.'
an_hour_ago = (datetime.datetime.now() -

9
fuel_health/tests/tests_platform/test_ceilometer.py
View File

@ -252,7 +252,7 @@ class CeilometerApiPlatformTests(ceilometermanager.CeilometerBaseTest):
Deployment tags: Ceilometer
"""
event_type = 'compute.instance.update'
event_type = 'compute.instance.create.start'
self.check_image_exists()
private_net_id, _ = self.create_network_resources()
@ -283,11 +283,8 @@ class CeilometerApiPlatformTests(ceilometermanager.CeilometerBaseTest):
'list.'.format(event_type=event_type))
msg = ('searching event with "{event_type}" type in event type '
'list'.format(event_type=event_type))
an_hour_ago = (datetime.datetime.now() -
datetime.timedelta(hours=1)).isoformat()
query = [
{'field': 'event_type', 'op': 'eq', 'value': event_type},
{'field': 'start_timestamp', 'op': 'gt', 'value': an_hour_ago}]
query = [{'field': 'event_type', 'op': 'eq', 'value': event_type}]
events_list = self.verify(60, self.ceilometer_client.events.list, 4,
fail_msg, msg, query, limit=1000)