Add domain parameters to user show for Identity V3

Update `user show` for Identity V3 to account for a domain argument,
in doing so, also update `find resource` to be more flexible by
allowing **kwargs.
Also update `group show` and `project show` since they follow the
same logic as a user within a group.

Change-Id: Ib828e4dbeb0bd31164396069ce8a64c873179779
Closes-Bug: #1378165

1 files changed, 17 insertions, 6 deletions

diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index fa935f0b..ec8e5a3b 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -264,15 +264,26 @@ class ShowProject(show.ShowOne):
         parser.add_argument(
             'project',
             metavar='<project>',
-            help='Name or ID of project to display')
+            help='Name or ID of project to display',
+        )
+        parser.add_argument(
+            '--domain',
+            metavar='<domain>',
+            help='Domain where project resides (name or ID)',
+        )
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)', parsed_args)
         identity_client = self.app.client_manager.identity
-        project = utils.find_resource(identity_client.projects,
-                                      parsed_args.project)
 
-        info = {}
-        info.update(project._info)
-        return zip(*sorted(six.iteritems(info)))
+        if parsed_args.domain:
+            domain = common.find_domain(identity_client, parsed_args.domain)
+            project = utils.find_resource(identity_client.projects,
+                                          parsed_args.project,
+                                          domain_id=domain.id)
+        else:
+            project = utils.find_resource(identity_client.projects,
+                                          parsed_args.project)
+
+        return zip(*sorted(six.iteritems(project._info)))