From b399b0406ce4c55345c8f11064a5e85ef73dd8fd Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Fri, 17 Feb 2017 13:28:48 -0600 Subject: [PATCH] Remove quota set workaround for SDK <0.9.13 Change-Id: I89732c49e73ac5a789fdbe19536389f7e93ac0e6 --- openstackclient/common/quota.py | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py index d86aec58fb..fa6c576552 100644 --- a/openstackclient/common/quota.py +++ b/openstackclient/common/quota.py @@ -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):