Skip to content

Commit 9257765

Browse files
committed
wrong values in openstack quota show command
"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
1 parent e889ba1 commit 9257765

1 file changed

Lines changed: 21 additions & 5 deletions

File tree

openstackclient/common/quota.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -444,20 +444,30 @@ def _get_project(self, parsed_args):
444444
project = utils.find_resource(
445445
identity_client.projects,
446446
parsed_args.project,
447-
).id
447+
)
448+
project_id = project.id
449+
project_name = project.name
448450
elif self.app.client_manager.auth_ref:
449451
# Get the project from the current auth
450-
project = self.app.client_manager.auth_ref.project_id
452+
project = self.app.client_manager.auth_ref
453+
project_id = project.project_id
454+
project_name = project.project_name
451455
else:
452456
project = None
453-
return project
457+
project_id = None
458+
project_name = None
459+
project_info = {}
460+
project_info['id'] = project_id
461+
project_info['name'] = project_name
462+
return project_info
454463

455464
def get_compute_volume_quota(self, client, parsed_args):
456465
try:
457466
if parsed_args.quota_class:
458467
quota = client.quota_classes.get(parsed_args.project)
459468
else:
460-
project = self._get_project(parsed_args)
469+
project_info = self._get_project(parsed_args)
470+
project = project_info['id']
461471
if parsed_args.default:
462472
quota = client.quotas.defaults(project)
463473
else:
@@ -473,7 +483,8 @@ def get_network_quota(self, parsed_args):
473483
if parsed_args.quota_class:
474484
return {}
475485
if self.app.client_manager.is_network_endpoint_enabled():
476-
project = self._get_project(parsed_args)
486+
project_info = self._get_project(parsed_args)
487+
project = project_info['id']
477488
client = self.app.client_manager.network
478489
if parsed_args.default:
479490
network_quota = client.get_quota_default(project)
@@ -523,5 +534,10 @@ def take_action(self, parsed_args):
523534
# Handle project ID special as it only appears in output
524535
if 'id' in info:
525536
info['project'] = info.pop('id')
537+
if 'project_id' in info:
538+
del info['project_id']
539+
project_info = self._get_project(parsed_args)
540+
project_name = project_info['name']
541+
info['project_name'] = project_name
526542

527543
return zip(*sorted(six.iteritems(info)))

0 commit comments

Comments
 (0)