openstack/heat
Code Issues Proposed changes

Merge "Tidy up Stack.supports-check-action()"

Browse Source
This commit is contained in:
Jenkins 2017-03-31 02:09:00 +00:00 committed by Gerrit Code Review
commit edae9f0c45
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
heat/engine/stack.py
View File

@ -1130,21 +1130,21 @@ class Stack(collections.Mapping):
checker() checker()
def supports_check_action(self): def supports_check_action(self):
def is_supported(stack, res): def is_supported(res):
if res.has_nested() and res.nested(): if res.has_nested() and res.nested():
return res.nested().supports_check_action() return res.nested().supports_check_action()
else: else:
return hasattr(res, 'handle_%s' % self.CHECK.lower()) return hasattr(res, 'handle_%s' % res.CHECK.lower())
supported = [is_supported(self, res) all_supported = all(is_supported(res)
for res in six.itervalues(self.resources)] for res in six.itervalues(self.resources))
if not all(supported): if not all_supported:
msg = ". '%s' not fully supported (see resources)" % self.CHECK msg = ". '%s' not fully supported (see resources)" % self.CHECK
reason = self.status_reason + msg reason = self.status_reason + msg
self.state_set(self.CHECK, self.status, reason) self.state_set(self.CHECK, self.status, reason)
return all(supported) return all_supported
@profiler.trace('Stack._backup_stack', hide_args=False) @profiler.trace('Stack._backup_stack', hide_args=False)
def _backup_stack(self, create_if_missing=True): def _backup_stack(self, create_if_missing=True):