From 577d50bbb2c701ae89832d660a8cc60bfe23f6a2 Mon Sep 17 00:00:00 2001 From: Artem Date: Wed, 6 Apr 2016 12:44:14 +0300 Subject: [PATCH] [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 --- fuel_health/tests/sanity/test_sanity_ceilometer.py | 4 ++-- fuel_health/tests/tests_platform/test_ceilometer.py | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/fuel_health/tests/sanity/test_sanity_ceilometer.py b/fuel_health/tests/sanity/test_sanity_ceilometer.py index 18257b9a..826d7329 100644 --- a/fuel_health/tests/sanity/test_sanity_ceilometer.py +++ b/fuel_health/tests/sanity/test_sanity_ceilometer.py @@ -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() - diff --git a/fuel_health/tests/tests_platform/test_ceilometer.py b/fuel_health/tests/tests_platform/test_ceilometer.py index fb097eed..9c584b44 100644 --- a/fuel_health/tests/tests_platform/test_ceilometer.py +++ b/fuel_health/tests/tests_platform/test_ceilometer.py @@ -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)