diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-21 14:00:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-21 14:00:03 +0000 |
| commit | 35c308ebadc23929f96eb74ab59091b7e691f09e (patch) | |
| tree | 70e41a9c34d169c429347e03772ad1df76aefff3 /openstackclient/common | |
| parent | bc4a3f467facecdb690f3bdbad3a6bbef1996778 (diff) | |
| parent | 73809a98ed63af214ced7d3f51814ca91b122bbe (diff) | |
| download | python-openstackclient-35c308ebadc23929f96eb74ab59091b7e691f09e.tar.gz | |
Merge "Remove remaining uses of SDK Proxy.session"
Diffstat (limited to 'openstackclient/common')
| -rw-r--r-- | openstackclient/common/quota.py | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py index fa6c5765..afc6195f 100644 --- a/openstackclient/common/quota.py +++ b/openstackclient/common/quota.py @@ -18,8 +18,6 @@ import itertools import sys -from openstack import exceptions as sdk_exceptions -from openstack.network.v2 import quota as _quota from osc_lib.command import command from osc_lib import utils import six @@ -253,39 +251,7 @@ class ShowQuota(command.ShowOne): project = self._get_project(parsed_args) client = self.app.client_manager.network if parsed_args.default: - # TODO(dtroyer): Remove the top of this if block once the - # fixed SDK QuotaDefault class is the minimum - # required version. This is expected to be - # SDK release 0.9.13 - if hasattr(_quota.QuotaDefault, 'project'): - # hack 0.9.11+ - quotadef_obj = client._get_resource( - _quota.QuotaDefault, - project, - ) - quotadef_obj.base_path = quotadef_obj.base_path % { - 'project': project, - } - try: - network_quota = quotadef_obj.get( - client.session, - requires_id=False, - ) - except sdk_exceptions.NotFoundException as e: - raise sdk_exceptions.ResourceNotFound( - message="No %s found for %s" % - (_quota.QuotaDefault.__name__, project), - details=e.details, - response=e.response, - request_id=e.request_id, - url=e.url, - method=e.method, - http_status=e.http_status, - cause=e.cause, - ) - # end hack-around - else: - network_quota = client.get_quota_default(project) + network_quota = client.get_quota_default(project) else: network_quota = client.get_quota(project) return network_quota |