Fix 'domain' filter not work well in some commands

The 'domain' filter not work well in commands 'project show',
'user show' and 'user set'.

Depends-On: I490900d6249f01654d4cba43bddd3e7af7928a84
Closes-Bug: #1704097
Change-Id: Ib4f47cbaba27eb56c4a41d187fee74a995e62dc7

1 files changed, 37 insertions, 1 deletions

diff --git a/openstackclient/tests/unit/identity/v3/test_user.py b/openstackclient/tests/unit/identity/v3/test_user.py
index 2ce66e94..96f50766 100644
--- a/openstackclient/tests/unit/identity/v3/test_user.py
+++ b/openstackclient/tests/unit/identity/v3/test_user.py
@@ -19,6 +19,7 @@ import mock
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient.identity import common
 from openstackclient.identity.v3 import user
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
@@ -1091,7 +1092,7 @@ class TestUserShow(TestUser):
         self.app.client_manager.identity.tokens.get_token_data.return_value = \
             {'token':
              {'user':
-              {'domain': {},
+              {'domain': {'id': self.user.domain_id},
                'id': self.user.id,
                'name': self.user.name,
                }
@@ -1126,3 +1127,38 @@ class TestUserShow(TestUser):
             self.user.name,
         )
         self.assertEqual(datalist, data)
+
+    def test_user_show_with_domain(self):
+        user = identity_fakes.FakeUser.create_one_user(
+            {"name": self.user.name})
+        identity_client = self.app.client_manager.identity
+
+        arglist = [
+            "--domain", self.user.domain_id,
+            user.name,
+        ]
+        verifylist = [
+            ('domain', self.user.domain_id),
+            ('user', user.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        user_str = common._get_token_resource(identity_client, 'user',
+                                              parsed_args.user,
+                                              parsed_args.domain)
+        self.assertEqual(self.user.id, user_str)
+
+        arglist = [
+            "--domain", user.domain_id,
+            user.name,
+        ]
+        verifylist = [
+            ('domain', user.domain_id),
+            ('user', user.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        user_str = common._get_token_resource(identity_client, 'user',
+                                              parsed_args.user,
+                                              parsed_args.domain)
+        self.assertEqual(user.name, user_str)