openstack
/
heat
Code Issues Proposed changes

Change the event status to SIGNAL_COMPLETE 

This looks weird as it is the only one with lower casing.

Change-Id: Icbd4919020ad1cf066dfd609564d88d962746c6a
Closes-bug: 1418306
This commit is contained in:
Angus Salkeld 2015-02-06 09:14:55 +10:00
parent 5d47a413a8
commit 29dd42e923
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resource.py
View File

@ -1081,7 +1081,7 @@ class Resource(object):
reason_string = "Signal: %s" % signal_result
else:
reason_string = get_string_details()
self._add_event('signal', self.status, reason_string)
self._add_event('SIGNAL', self.status, reason_string)
except Exception as ex:
LOG.exception(_LE('signal %(name)s : %(msg)s')
% {'name': six.text_type(self), 'msg': ex})

10
heat/tests/test_signal.py
View File

@ -267,13 +267,13 @@ class SignalTest(common.HeatTestCase):
self.m.StubOutWithMock(generic_resource.SignalResource,
'_add_event')
generic_resource.SignalResource._add_event(
'signal', 'COMPLETE', ceilo_expected).AndReturn(None)
'SIGNAL', 'COMPLETE', ceilo_expected).AndReturn(None)
generic_resource.SignalResource._add_event(
'signal', 'COMPLETE', watch_expected).AndReturn(None)
'SIGNAL', 'COMPLETE', watch_expected).AndReturn(None)
generic_resource.SignalResource._add_event(
'signal', 'COMPLETE', str_expected).AndReturn(None)
'SIGNAL', 'COMPLETE', str_expected).AndReturn(None)
generic_resource.SignalResource._add_event(
'signal', 'COMPLETE', none_expected).AndReturn(None)
'SIGNAL', 'COMPLETE', none_expected).AndReturn(None)
self.m.ReplayAll()
@ -301,7 +301,7 @@ class SignalTest(common.HeatTestCase):
self.m.StubOutWithMock(generic_resource.SignalResource,
'_add_event')
generic_resource.SignalResource._add_event(
'signal', 'COMPLETE', 'Signal: %s' % ret_expected).AndReturn(None)
'SIGNAL', 'COMPLETE', 'Signal: %s' % ret_expected).AndReturn(None)
self.m.ReplayAll()
rsrc.signal(details=signal_details)