openstack/heat
Code Issues Proposed changes

Merge "Pass stack to thread in resource_signal"

Browse Source
This commit is contained in:
Jenkins 2015-05-15 16:41:24 +00:00 committed by Gerrit Code Review
commit 54f1ad927e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/service.py
View File

@ -1173,8 +1173,7 @@ class EngineService(service.Service):
implementation.
'''
def _resource_signal(rsrc, details):
stack = rsrc.stack
def _resource_signal(stack, rsrc, details):
LOG.debug("signaling resource %s:%s" % (stack.name, rsrc.name))
rsrc.signal(details)
@ -1199,11 +1198,11 @@ class EngineService(service.Service):
rsrc = stack[resource_name]
if callable(rsrc.signal):
if sync_call:
_resource_signal(rsrc, details)
_resource_signal(stack, rsrc, details)
return rsrc.metadata_get()
else:
self.thread_group_mgr.start(stack.id, _resource_signal,
rsrc, details)
stack, rsrc, details)
@context.request_context
def find_physical_resource(self, cnxt, physical_resource_id):

1
heat/tests/test_engine_service.py
View File

@ -2935,6 +2935,7 @@ class StackServiceTest(common.HeatTestCase):
self.eng.thread_group_mgr.groups[stack.id] = tools.DummyThreadGroup()
self.m.StubOutWithMock(self.eng.thread_group_mgr, 'start')
self.eng.thread_group_mgr.start(stack.id,
mox.IgnoreArg(),
mox.IgnoreArg(),
mox.IgnoreArg(),
mox.IgnoreArg()).AndReturn(None)