openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "Remove quota set workaround for SDK <0.9.13"

This commit is contained in:
Jenkins 2017-02-19 16:58:01 +00:00 committed by Gerrit Code Review
parent 74a35fb005 b399b0406c
commit 98d5641ac5
1 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openstackclient/common/quota.py
View File

@ -182,36 +182,9 @@ class SetQuota(command.Command):
project,
**volume_kwargs)
if network_kwargs:
if hasattr(_quota.Quota, 'allow_get'):
# TODO(huanxuan): Remove this block once the fixed
# SDK Quota class is the minimum required version.
# This is expected to be SDK release 0.9.13
res = network_client._get_resource(
_quota.Quota, project, **network_kwargs)
if any([res._body.dirty, res._header.dirty]):
request = res._prepare_request(prepend_key=True)
# remove the id in the body
if 'id' in request.body[res.resource_key]:
del request.body[res.resource_key]['id']
if res.patch_update:
response = network_client.session.patch(
request.uri,
endpoint_filter=res.service,
json=request.body,
headers=request.headers
)
else:
response = network_client.session.put(
request.uri,
endpoint_filter=res.service,
json=request.body,
headers=request.headers
)
res._translate_response(response, has_body=True)
else:
network_client.update_quota(
project,
**network_kwargs)
network_client.update_quota(
project,
**network_kwargs)
class ShowQuota(command.ShowOne):