openstack
/
heat
Code Issues Proposed changes

Merge "Convergence: Fix stack status_reason"

This commit is contained in:
Jenkins 2015-07-02 08:31:22 +00:00 committed by Gerrit Code Review
parent e6ecedca1a afe920e0ce
commit df3845afbf
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/engine/worker.py
View File

@ -178,8 +178,9 @@ class WorkerService(service.Service):
current_traversal, current_traversal,
data, is_update) data, is_update)
return return
except exception.ResourceFailure as e: except exception.ResourceFailure as ex:
reason = six.text_type(e) reason = 'Resource %s failed: %s' % (stack.action,
six.text_type(ex))
self._handle_resource_failure( self._handle_resource_failure(
cnxt, stack.id, current_traversal, reason) cnxt, stack.id, current_traversal, reason)
return return
@ -195,8 +196,9 @@ class WorkerService(service.Service):
current_traversal, current_traversal,
data, is_update) data, is_update)
return return
except exception.ResourceFailure as e: except exception.ResourceFailure as ex:
reason = six.text_type(e) reason = 'Resource %s failed: %s' % (stack.action,
six.text_type(ex))
self._handle_resource_failure( self._handle_resource_failure(
cnxt, stack.id, current_traversal, reason) cnxt, stack.id, current_traversal, reason)
return return

6
heat/tests/test_engine_worker.py
View File

@ -203,7 +203,8 @@ class CheckWorkflowUpdateTest(common.HeatTestCase):
self.is_update) self.is_update)
s = self.stack.load(self.ctx, stack_id=self.stack.id) s = self.stack.load(self.ctx, stack_id=self.stack.id)
self.assertEqual((s.UPDATE, s.FAILED), (s.action, s.status)) self.assertEqual((s.UPDATE, s.FAILED), (s.action, s.status))
self.assertEqual(u'ResourceNotAvailable: resources.A: The Resource (A)' self.assertEqual('Resource UPDATE failed: '
'ResourceNotAvailable: resources.A: The Resource (A)'
' is not available.', s.status_reason) ' is not available.', s.status_reason)
def test_resource_cleanup_failure_sets_stack_state_as_failed( def test_resource_cleanup_failure_sets_stack_state_as_failed(
@ -220,7 +221,8 @@ class CheckWorkflowUpdateTest(common.HeatTestCase):
self.is_update) self.is_update)
s = self.stack.load(self.ctx, stack_id=self.stack.id) s = self.stack.load(self.ctx, stack_id=self.stack.id)
self.assertEqual((s.UPDATE, s.FAILED), (s.action, s.status)) self.assertEqual((s.UPDATE, s.FAILED), (s.action, s.status))
self.assertEqual(u'ResourceNotAvailable: resources.A: The Resource (A)' self.assertEqual('Resource UPDATE failed: '
'ResourceNotAvailable: resources.A: The Resource (A)'
' is not available.', s.status_reason) ' is not available.', s.status_reason)
def test_resource_update_failure_triggers_rollback_if_enabled( def test_resource_update_failure_triggers_rollback_if_enabled(