diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-25 17:41:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-25 17:41:46 +0000 |
| commit | f67ebce530d13c8da4ad32556d93095ab0ff0392 (patch) | |
| tree | ef8d21c3b990a8c3e58b5d6e65954607f1a4d99d | |
| parent | 80a9779601dfd84d4566f66bac5ea34d557afa65 (diff) | |
| parent | 925776565e2ab6bf39e9ad4a2ab98dd7f1ce988d (diff) | |
| download | python-openstackclient-f67ebce530d13c8da4ad32556d93095ab0ff0392.tar.gz | |
Merge "wrong values in openstack quota show command"3.12.0
| -rw-r--r-- | openstackclient/common/quota.py | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py index 0d5cb9be..282ea428 100644 --- a/openstackclient/common/quota.py +++ b/openstackclient/common/quota.py @@ -444,20 +444,30 @@ class ShowQuota(command.ShowOne): project = utils.find_resource( identity_client.projects, parsed_args.project, - ).id + ) + project_id = project.id + project_name = project.name elif self.app.client_manager.auth_ref: # Get the project from the current auth - project = self.app.client_manager.auth_ref.project_id + project = self.app.client_manager.auth_ref + project_id = project.project_id + project_name = project.project_name else: project = None - return project + project_id = None + project_name = None + project_info = {} + project_info['id'] = project_id + project_info['name'] = project_name + return project_info def get_compute_volume_quota(self, client, parsed_args): try: if parsed_args.quota_class: quota = client.quota_classes.get(parsed_args.project) else: - project = self._get_project(parsed_args) + project_info = self._get_project(parsed_args) + project = project_info['id'] if parsed_args.default: quota = client.quotas.defaults(project) else: @@ -473,7 +483,8 @@ class ShowQuota(command.ShowOne): if parsed_args.quota_class: return {} if self.app.client_manager.is_network_endpoint_enabled(): - project = self._get_project(parsed_args) + project_info = self._get_project(parsed_args) + project = project_info['id'] client = self.app.client_manager.network if parsed_args.default: network_quota = client.get_quota_default(project) @@ -523,5 +534,10 @@ class ShowQuota(command.ShowOne): # Handle project ID special as it only appears in output if 'id' in info: info['project'] = info.pop('id') + if 'project_id' in info: + del info['project_id'] + project_info = self._get_project(parsed_args) + project_name = project_info['name'] + info['project_name'] = project_name return zip(*sorted(six.iteritems(info))) |