openstack/python-saharaclient
Code Issues Proposed changes

Merge "Support of the improved force-delete in client"

Browse Source
This commit is contained in:
Zuul
2018-06-13 21:51:22 +00:00
committed by Gerrit Code Review
parent 680d62b7ea 35ac83ae06
commit 9670f4b8d8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
saharaclient/api/base.py
View File

@@ -213,9 +213,12 @@ class ResourceManager(object):
else: else:
resp = self.api.delete(url) resp = self.api.delete(url)
if resp.status_code != 204: if resp.status_code not in [200, 204]:
self._raise_api_exception(resp) self._raise_api_exception(resp)
if resp.status_code == 200:
return get_json(resp)
def _plurify_resource_name(self): def _plurify_resource_name(self):
return self.resource_class.resource_name + 's' return self.resource_class.resource_name + 's'

2
saharaclient/api/clusters.py
View File

@@ -211,7 +211,7 @@ class ClusterManagerV2(ClusterManagerV1):
def force_delete(self, cluster_id): def force_delete(self, cluster_id):
"""Force Delete a Cluster.""" """Force Delete a Cluster."""
data = {'force': True} data = {'force': True}
self._delete('/clusters/%s' % cluster_id, data) return self._delete('/clusters/%s' % cluster_id, data)
# NOTE(jfreud): keep this around for backwards compatibility # NOTE(jfreud): keep this around for backwards compatibility