openstack/python-openstackclient
Code Issues Proposed changes

wrong values in openstack quota show command

Browse Source 
"openstack quota show" shows wrong value in field project
and project_id. project UUID is shown in field project.
and project is coming as None.

Corrected it.

Change-Id: I237e49858feab14ec5e5bc6d8cb79c9f6f5ea9c0
Closes-Bug: #1679906
This commit is contained in:
nidhimittalhada 2017-06-16 17:24:06 +05:30
parent e889ba1524
commit 925776565e
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openstackclient/common/quota.py
View File

@ -444,20 +444,30 @@ class ShowQuota(command.ShowOne):
project = utils.find_resource( project = utils.find_resource(
identity_client.projects, identity_client.projects,
parsed_args.project, parsed_args.project,
).id )
project_id = project.id
project_name = project.name
elif self.app.client_manager.auth_ref: elif self.app.client_manager.auth_ref:
# Get the project from the current auth # 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: else:
project = None 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): def get_compute_volume_quota(self, client, parsed_args):
try: try:
if parsed_args.quota_class: if parsed_args.quota_class:
quota = client.quota_classes.get(parsed_args.project) quota = client.quota_classes.get(parsed_args.project)
else: else:
project = self._get_project(parsed_args) project_info = self._get_project(parsed_args)
project = project_info['id']
if parsed_args.default: if parsed_args.default:
quota = client.quotas.defaults(project) quota = client.quotas.defaults(project)
else: else:
@ -473,7 +483,8 @@ class ShowQuota(command.ShowOne):
if parsed_args.quota_class: if parsed_args.quota_class:
return {} return {}
if self.app.client_manager.is_network_endpoint_enabled(): 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 client = self.app.client_manager.network
if parsed_args.default: if parsed_args.default:
network_quota = client.get_quota_default(project) 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 # Handle project ID special as it only appears in output
if 'id' in info: if 'id' in info:
info['project'] = info.pop('id') 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))) return zip(*sorted(six.iteritems(info)))