diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-09 17:38:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-09 17:38:15 +0000 |
| commit | 1c76c70d71345193d34bada3c6299027a6a2fe23 (patch) | |
| tree | 266c9ebcd66bbf9c79e17f55fb996cc5aecf61ae /openstackclient/identity | |
| parent | 46d1df0adf00862a4b9ff21925836539a0e2f98f (diff) | |
| parent | 4679a4c1933da0b94efb5d3d453d119801289a97 (diff) | |
| download | python-openstackclient-1c76c70d71345193d34bada3c6299027a6a2fe23.tar.gz | |
Merge "Fix --parents and --children options in project show"
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v3/project.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py index 12197cdd..43eca2b5 100644 --- a/openstackclient/identity/v3/project.py +++ b/openstackclient/identity/v3/project.py @@ -336,13 +336,18 @@ class ShowProject(command.ShowOne): project = utils.find_resource( identity_client.projects, project_str, - domain_id=domain.id, - parents_as_list=parsed_args.parents, - subtree_as_list=parsed_args.children) + domain_id=domain.id) else: project = utils.find_resource( identity_client.projects, - project_str, + project_str) + + if parsed_args.parents or parsed_args.children: + # NOTE(RuiChen): utils.find_resource() can't pass kwargs, + # if id query hit the result at first, so call + # identity manager.get() with kwargs directly. + project = identity_client.projects.get( + project.id, parents_as_list=parsed_args.parents, subtree_as_list=parsed_args.children) |