diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2014-10-07 16:30:56 -0700 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2014-10-09 13:29:21 -0700 |
| commit | f0c57e17c9a4b5bbe2f072a4eacefce3bcf30d45 (patch) | |
| tree | 7a7c7f92ab7ac8731a717a001f596c7e34d577c6 /openstackclient/identity/v3/group.py | |
| parent | 364071a90bfe9dcec1d02a349c33dc8422fc14f3 (diff) | |
| download | python-openstackclient-f0c57e17c9a4b5bbe2f072a4eacefce3bcf30d45.tar.gz | |
Allow --domain to be used for identity commands without lookup
Performing create, list, or set operations for users, groups, and projects
with the --domain option attempts to look up the domain for name to ID
conversion. In the case of an environment using Keystone domains, it is
desired to allow a domain admin to perform these operations for objects in
their domain without allowing them to list or show domains. The current
behavior prevents the domain admin from performing these operations since
they will be forbidden to perform the underlying list_domains operation.
This patch makes the domain lookup error a soft failure, and falls back
to using the passed in domain argument directly as a domain ID in the
request that it sends to Keystone.
Change-Id: I5139097f8cedc53693f6f71297518917ac72e50a
Closes-Bug: #1378565
Diffstat (limited to 'openstackclient/identity/v3/group.py')
| -rw-r--r-- | openstackclient/identity/v3/group.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py index fdb9501a..bdb4e029 100644 --- a/openstackclient/identity/v3/group.py +++ b/openstackclient/identity/v3/group.py @@ -129,8 +129,8 @@ class CreateGroup(show.ShowOne): self.log.debug('take_action(%s)', parsed_args) identity_client = self.app.client_manager.identity if parsed_args.domain: - domain = utils.find_resource(identity_client.domains, - parsed_args.domain).id + domain = common.find_domain(identity_client, + parsed_args.domain).id else: domain = None group = identity_client.groups.create( @@ -174,7 +174,7 @@ class ListGroup(lister.Lister): parser.add_argument( '--domain', metavar='<domain>', - help='Filter group list by <domain>', + help='Filter group list by <domain> (name or ID)', ) parser.add_argument( '--user', @@ -194,10 +194,8 @@ class ListGroup(lister.Lister): identity_client = self.app.client_manager.identity if parsed_args.domain: - domain = utils.find_resource( - identity_client.domains, - parsed_args.domain, - ).id + domain = common.find_domain(identity_client, + parsed_args.domain).id else: domain = None @@ -301,10 +299,8 @@ class SetGroup(command.Command): if parsed_args.description: kwargs['description'] = parsed_args.description if parsed_args.domain: - domain = utils.find_resource( - identity_client.domains, parsed_args.domain).id - kwargs['domain'] = domain - + kwargs['domain'] = common.find_domain(identity_client, + parsed_args.domain).id if not len(kwargs): sys.stderr.write("Group not updated, no arguments present") return |