openstack/python-openstackclient
Code Issues Proposed changes

Make trustee/trustor/project searchable by ID

Browse Source 
In the previous implementation, we were always including the domain
argument, which caused a lookup by name for trustee/trustor and
project. By excluding it when not necessary, we do a search by
ID in find_resources.

Change-Id: Id756aeab522b5dccb2dc6b31d137a28514b0fdf6
Closes-Bug: 1473298
This commit is contained in:
Steve Martinelli 2015-07-10 18:01:55 +00:00 committed by lin-hua-cheng
parent 37c83e6231
commit 921361b3ae
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
openstackclient/identity/v3/trust.py
View File

@ -88,35 +88,20 @@ class CreateTrust(show.ShowOne):
self.log.debug('take_action(%s)' % parsed_args) self.log.debug('take_action(%s)' % parsed_args)
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
project_domain = None
if parsed_args.project_domain:
project_domain = common.find_domain(identity_client,
parsed_args.project_domain).id
trustor_domain = None
if parsed_args.trustor_domain:
trustor_domain = common.find_domain(identity_client,
parsed_args.trustor_domain).id
trustee_domain = None
if parsed_args.trustee_domain:
trustee_domain = common.find_domain(identity_client,
parsed_args.trustee_domain).id
# NOTE(stevemar): Find the two users, project and roles that # NOTE(stevemar): Find the two users, project and roles that
# are necessary for making a trust usable, the API dictates that # are necessary for making a trust usable, the API dictates that
# trustee, project and role are optional, but that makes the trust # trustee, project and role are optional, but that makes the trust
# pointless, and trusts are immutable, so let's enforce it at the # pointless, and trusts are immutable, so let's enforce it at the
# client level. # client level.
trustor_id = utils.find_resource(identity_client.users, trustor_id = common.find_user(identity_client,
parsed_args.trustor, parsed_args.trustor,
domain_id=trustor_domain).id parsed_args.trustor_domain).id
trustee_id = utils.find_resource(identity_client.users, trustee_id = common.find_user(identity_client,
parsed_args.trustee, parsed_args.trustee,
domain_id=trustee_domain).id parsed_args.trustee_domain).id
project_id = utils.find_resource(identity_client.projects, project_id = common.find_project(identity_client,
parsed_args.project, parsed_args.project,
domain_id=project_domain).id parsed_args.project_domain).id
role_names = [] role_names = []
for role in parsed_args.role: for role in parsed_args.role: