diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-09 08:18:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-09 08:18:23 +0000 |
| commit | 70283744a04f868072edc0a31fe49a3122c4bc6e (patch) | |
| tree | af2ae769198fb329fee2582197d84b54172cbddb /openstackclient/identity/v3 | |
| parent | e8f058775eb3dbb9a159218c427d439b3dcc6012 (diff) | |
| parent | b6384886973c652c0161a9caeac6f31066edace1 (diff) | |
| download | python-openstackclient-70283744a04f868072edc0a31fe49a3122c4bc6e.tar.gz | |
Merge "Domain administrator cannot do project operations"
Diffstat (limited to 'openstackclient/identity/v3')
| -rw-r--r-- | openstackclient/identity/v3/project.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py index 00a98d19..fa935f0b 100644 --- a/openstackclient/identity/v3/project.py +++ b/openstackclient/identity/v3/project.py @@ -24,6 +24,7 @@ from cliff import show from openstackclient.common import parseractions from openstackclient.common import utils +from openstackclient.identity import common class CreateProject(show.ShowOne): @@ -73,10 +74,7 @@ class CreateProject(show.ShowOne): 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 @@ -156,10 +154,8 @@ class ListProject(lister.Lister): columns = ('ID', 'Name') kwargs = {} if parsed_args.domain: - kwargs['domain'] = utils.find_resource( - identity_client.domains, - parsed_args.domain, - ).id + domain = common.find_domain(identity_client, parsed_args.domain) + kwargs['domain'] = domain.id data = identity_client.projects.list(**kwargs) return (columns, (utils.get_item_properties( @@ -236,10 +232,8 @@ class SetProject(command.Command): if parsed_args.name: kwargs['name'] = parsed_args.name if parsed_args.domain: - kwargs['domain'] = utils.find_resource( - identity_client.domains, - parsed_args.domain, - ).id + domain = common.find_domain(identity_client, parsed_args.domain) + kwargs['domain'] = domain.id if parsed_args.description: kwargs['description'] = parsed_args.description if parsed_args.enable: |