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, 15 insertions, 7 deletions

diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index e4eb7526..73bb7f13 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -23,6 +23,7 @@ from cliff import lister
 from cliff import show
 
 from openstackclient.common import utils
+from openstackclient.identity import common
 
 
 class CreateUser(show.ShowOne):
@@ -364,17 +365,24 @@ class ShowUser(show.ShowOne):
             metavar='<user>',
             help='User to display (name or ID)',
         )
+        parser.add_argument(
+            '--domain',
+            metavar='<domain>',
+            help='Domain where user 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
 
-        user = utils.find_resource(
-            identity_client.users,
-            parsed_args.user,
-        )
+        if parsed_args.domain:
+            domain = common.find_domain(identity_client, parsed_args.domain)
+            user = utils.find_resource(identity_client.users,
+                                       parsed_args.user,
+                                       domain_id=domain.id)
+        else:
+            user = utils.find_resource(identity_client.users,
+                                       parsed_args.user)
 
-        info = {}
-        info.update(user._info)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(six.iteritems(user._info)))