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

saharaclient/api/base.py

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

saharaclient/api/clusters.py

@@ -211,7 +211,7 @@ class ClusterManagerV2(ClusterManagerV1):
     def force_delete(self, cluster_id):
         """Force Delete a Cluster."""
         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