diff --git a/openstack/object_store/v1/_proxy.py b/openstack/object_store/v1/_proxy.py index 61bec6831..f9d74e7e4 100644 --- a/openstack/object_store/v1/_proxy.py +++ b/openstack/object_store/v1/_proxy.py @@ -1148,11 +1148,12 @@ class Proxy(proxy.Proxy): except exceptions.SDKException: pass else: - bulk_delete = caps.swift.get("bulk_delete", {}) - is_bulk_delete_supported = bulk_delete is not None - bulk_delete_max_per_request = bulk_delete.get( - "max_deletes_per_request", 100 - ) + bulk_delete = caps.get("bulk_delete") + if bulk_delete is not None: + is_bulk_delete_supported = True + bulk_delete_max_per_request = bulk_delete.get( + "max_deletes_per_request", 10000 + ) elements = [] for cont in self.containers(): diff --git a/openstack/object_store/v1/info.py b/openstack/object_store/v1/info.py index f3999ad0a..c82ba6470 100644 --- a/openstack/object_store/v1/info.py +++ b/openstack/object_store/v1/info.py @@ -27,6 +27,7 @@ class Info(resource.Resource): ) # Properties + bulk_delete = resource.Body("bulk_delete", type=dict) swift = resource.Body("swift", type=dict) slo = resource.Body("slo", type=dict) staticweb = resource.Body("staticweb", type=dict)