openstack
/
heat
Code Issues Proposed changes

Do not pass rich objects in Swift Container 

from handle_delete to check_delete_complete, pass initial number of
Swift objects in the container instead (or None)

Change-Id: Idad1c4bee325f5483a598cd596fe04f4d0bb8cea
Partial-Bug: #1393268
This commit is contained in:
Pavlo Shchelokovskyy 2015-05-25 19:51:51 +03:00
parent bf669cbf13
commit 9de1645928
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