diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-21 19:46:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-21 19:46:16 +0000 |
| commit | 4d9d2dbd36cd28e9a5faf1e276bb33c4b52a6e49 (patch) | |
| tree | 7e5c62afec81a5a4016037edc362cf62b199a513 /openstackclient | |
| parent | 4c368d12d24155e81418b2cd30a2c187b1640efa (diff) | |
| parent | 921361b3ae538b8f4a9a4725623ccc5bb7a0d48d (diff) | |
| download | python-openstackclient-4d9d2dbd36cd28e9a5faf1e276bb33c4b52a6e49.tar.gz | |
Merge "Make trustee/trustor/project searchable by ID"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v3/trust.py | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/openstackclient/identity/v3/trust.py b/openstackclient/identity/v3/trust.py index 5104864c..2c3cf537 100644 --- a/openstackclient/identity/v3/trust.py +++ b/openstackclient/identity/v3/trust.py @@ -88,35 +88,20 @@ class CreateTrust(show.ShowOne): self.log.debug('take_action(%s)' % parsed_args) 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 # are necessary for making a trust usable, the API dictates that # trustee, project and role are optional, but that makes the trust # pointless, and trusts are immutable, so let's enforce it at the # client level. - trustor_id = utils.find_resource(identity_client.users, - parsed_args.trustor, - domain_id=trustor_domain).id - trustee_id = utils.find_resource(identity_client.users, - parsed_args.trustee, - domain_id=trustee_domain).id - project_id = utils.find_resource(identity_client.projects, + trustor_id = common.find_user(identity_client, + parsed_args.trustor, + parsed_args.trustor_domain).id + trustee_id = common.find_user(identity_client, + parsed_args.trustee, + parsed_args.trustee_domain).id + project_id = common.find_project(identity_client, parsed_args.project, - domain_id=project_domain).id + parsed_args.project_domain).id role_names = [] for role in parsed_args.role: |