From 56263647b0288160c6b015c3bf335c517e8ede08 Mon Sep 17 00:00:00 2001 From: Thomas Herve Date: Tue, 8 Dec 2015 10:20:11 +0100 Subject: [PATCH] Fix event filtering in event-show The event-show API was broken recently by not filtering with the given event ID. This fixes the issue. Change-Id: I0a37b27049986ad2ed8c19a18861f897c739e64d Closes-Bug: #1523807 --- heat/api/openstack/v1/events.py | 2 +- heat/tests/api/openstack_v1/test_events.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/heat/api/openstack/v1/events.py b/heat/api/openstack/v1/events.py index f43d0c2229..289643832a 100644 --- a/heat/api/openstack/v1/events.py +++ b/heat/api/openstack/v1/events.py @@ -143,7 +143,7 @@ class EventController(object): def show(self, req, identity, resource_name, event_id): """Gets detailed information for an event.""" - filters = {"resource_name": resource_name} + filters = {"resource_name": resource_name, "uuid": event_id} events = self._event_list(req, identity, filters=filters, detail=True) if not events: raise exc.HTTPNotFound(_('No event %s found') % event_id) diff --git a/heat/tests/api/openstack_v1/test_events.py b/heat/tests/api/openstack_v1/test_events.py index b9b151d3b3..6a86f1bcfe 100644 --- a/heat/tests/api/openstack_v1/test_events.py +++ b/heat/tests/api/openstack_v1/test_events.py @@ -469,7 +469,8 @@ class EventControllerTest(tools.ControllerTest, common.HeatTestCase): kwargs = {'stack_identity': stack_identity, 'limit': None, 'sort_keys': None, 'marker': None, - 'sort_dir': None, 'filters': {'resource_name': res_name}} + 'sort_dir': None, + 'filters': {'resource_name': res_name, 'uuid': event_id}} engine_resp = [ { @@ -535,7 +536,8 @@ class EventControllerTest(tools.ControllerTest, common.HeatTestCase): kwargs = {'stack_identity': stack_identity, 'limit': None, 'sort_keys': None, 'marker': None, - 'sort_dir': None, 'filters': {'resource_name': res_name}} + 'sort_dir': None, + 'filters': {'resource_name': res_name, 'uuid': '42'}} engine_resp = [] self.m.StubOutWithMock(rpc_client.EngineClient, 'call') @@ -563,7 +565,8 @@ class EventControllerTest(tools.ControllerTest, common.HeatTestCase): kwargs = {'stack_identity': stack_identity, 'limit': None, 'sort_keys': None, 'marker': None, - 'sort_dir': None, 'filters': {'resource_name': res_name}} + 'sort_dir': None, + 'filters': {'resource_name': res_name, 'uuid': '42'}} error = heat_exc.EntityNotFound(entity='Stack', name='a') self.m.StubOutWithMock(rpc_client.EngineClient, 'call')