From 1300ced209f7382ed476503d6d27eacf7af49625 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 16 Nov 2012 15:50:03 +0100 Subject: [PATCH] RPC API: Get rid of event_create call Nothing is using this. Change-Id: Id97ce0af1e176463b92288022765f80e1b5152ed Signed-off-by: Zane Bitter --- heat/engine/rpcapi.py | 5 ----- heat/engine/service.py | 27 --------------------------- heat/tests/test_rpcapi.py | 8 -------- 3 files changed, 40 deletions(-) diff --git a/heat/engine/rpcapi.py b/heat/engine/rpcapi.py index 764d32fc..92254b27 100644 --- a/heat/engine/rpcapi.py +++ b/heat/engine/rpcapi.py @@ -207,11 +207,6 @@ class EngineAPI(heat.openstack.common.rpc.proxy.RpcProxy): resource_name=resource_name, metadata=metadata), topic=_engine_topic(self.topic, ctxt, None)) - def event_create(self, ctxt, event): - return self.call(ctxt, self.make_msg('event_create', - event=event), - topic=_engine_topic(self.topic, ctxt, None)) - def create_watch_data(self, ctxt, watch_name, stats_data): ''' This could be used by CloudWatch and WaitConditions diff --git a/heat/engine/service.py b/heat/engine/service.py index fcac3341..0e9638b3 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -286,33 +286,6 @@ class EngineService(service.Service): return {'events': [api.format_event(context, e) for e in events]} - def event_create(self, context, event): - stack_name = event['stack'] - resource_name = event['resource'] - stack = db_api.stack_get_by_name(context, stack_name) - resource = db_api.resource_get_by_name_and_stack(context, - resource_name, - stack.id) - if not resource: - return ['Unknown resource', None] - new_event = { - 'name': event['message'], - 'resource_status_reason': event['reason'], - 'StackId': stack.id, - 'LogicalResourceId': resource.name, - 'PhysicalResourceId': None, - 'ResourceType': event['resource_type'], - 'ResourceProperties': {}, - } - try: - result = db_api.event_create(context, new_event) - new_event['id'] = result.id - return [None, new_event] - except Exception as ex: - logger.warn('db error %s' % str(ex)) - msg = 'Error creating event' - return [msg, None] - def describe_stack_resource(self, context, stack_identity, resource_name): s = self._get_stack(context, stack_identity) diff --git a/heat/tests/test_rpcapi.py b/heat/tests/test_rpcapi.py index 4e354d1d..5112c5c9 100644 --- a/heat/tests/test_rpcapi.py +++ b/heat/tests/test_rpcapi.py @@ -143,14 +143,6 @@ class EngineRpcAPITestCase(unittest.TestCase): resource_name='LogicalResourceId', metadata={u'wordpress': []}) - def test_event_create(self): - self._test_engine_api('event_create', 'call', - event={ - 'stack': 'wordpress', - 'resource': 'LogicalResourceId', - 'message': 'Foo', - 'reason': 'Bar'}) - def test_create_watch_data(self): self._test_engine_api('create_watch_data', 'call', watch_name='watch1', -- 2.45.2