openstack
/
heat
Code Issues Proposed changes

Merge "Use stored properties values in actions"

This commit is contained in:
Jenkins 2017-08-29 13:56:01 +00:00 committed by Gerrit Code Review
parent cd3f84e2d1 6bc25ef0e0
commit fe02bb8eb7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
heat/engine/resource.py
View File

@ -1621,7 +1621,9 @@ class Resource(status.ResourceStatus):
exc = Exception(_('Resource %s not created yet.') % self.name)
failure = exception.ResourceFailure(exc, self, action)
raise failure
return self._do_action(action)
with self.frozen_properties():
return self._do_action(action)
else:
reason = '%s not supported for %s' % (action, self.type())
self.state_set(action, self.COMPLETE, reason)
@ -1660,7 +1662,8 @@ class Resource(status.ResourceStatus):
raise exception.ResourceFailure(exc, self, action)
LOG.info('suspending %s', self)
return self._do_action(action)
with self.frozen_properties():
return self._do_action(action)
def resume(self):
"""Return a task to resume the resource.
@ -1678,13 +1681,16 @@ class Resource(status.ResourceStatus):
exc = exception.Error(_('State %s invalid for resume')
% six.text_type(self.state))
raise exception.ResourceFailure(exc, self, action)
LOG.info('resuming %s', self)
return self._do_action(action)
with self.frozen_properties():
return self._do_action(action)
def snapshot(self):
"""Snapshot the resource and return the created data, if any."""
LOG.info('snapshotting %s', self)
return self._do_action(self.SNAPSHOT)
with self.frozen_properties():
return self._do_action(self.SNAPSHOT)
@scheduler.wrappertask
def delete_snapshot(self, data):