openstack
/
heat
Code Issues Proposed changes

Merge "Do not pass rich objects in Swift Container"

This commit is contained in:
Jenkins 2015-05-27 04:15:48 +00:00 committed by Gerrit Code Review
parent 316e798523 9de1645928
commit c72be2b296
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources/openstack/swift/swift.py
View File

@ -191,12 +191,15 @@ class SwiftContainer(resource.Resource):
'id': self.resource_id,
'prop': self.PURGE_ON_DELETE}
raise exception.ResourceActionNotSupported(action=msg)
# objects is either None (container is gone already) or (empty) list
if objects is not None:
objects = len(objects)
return objects
def check_delete_complete(self, objects):
if objects is None: # resource was not created or is gone already
return True
if objects: # an (empty) list from the first invocation
if objects: # integer >=0 from the first invocation
objs = self._get_objects()
if objs is None:
return True # container is gone already