Merge "Add optional parameter "user_id" and "type" to list credentials"

2 files changed, 63 insertions, 4 deletions

diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py
index 2fd00626..79ef632c 100644
--- a/openstackclient/identity/v3/credential.py
+++ b/openstackclient/identity/v3/credential.py
@@ -23,6 +23,7 @@ from osc_lib import utils
 import six
 
 from openstackclient.i18n import _
+from openstackclient.identity import common
 
 
 LOG = logging.getLogger(__name__)
@@ -43,7 +44,7 @@ class CreateCredential(command.ShowOne):
             default="cert",
             metavar='<type>',
             choices=['ec2', 'cert'],
-            help=_('New credential type'),
+            help=_('New credential type: cert, ec2'),
         )
         parser.add_argument(
             'data',
@@ -112,10 +113,40 @@ class DeleteCredential(command.Command):
 class ListCredential(command.Lister):
     _description = _("List credentials")
 
+    def get_parser(self, prog_name):
+        parser = super(ListCredential, self).get_parser(prog_name)
+        parser.add_argument(
+            '--user',
+            metavar='<user>',
+            help=_('Filter credentials by <user> (name or ID)'),
+        )
+        common.add_user_domain_option_to_parser(parser)
+        parser.add_argument(
+            '--type',
+            metavar='<type>',
+            choices=['ec2', 'cert'],
+            help=_('Filter credentials by type: cert, ec2'),
+        )
+        return parser
+
     def take_action(self, parsed_args):
+        identity_client = self.app.client_manager.identity
+
+        kwargs = {}
+        if parsed_args.user:
+            user_id = common.find_user(
+                identity_client,
+                parsed_args.user,
+                parsed_args.user_domain,
+            ).id
+            kwargs["user_id"] = user_id
+
+        if parsed_args.type:
+            kwargs["type"] = parsed_args.type
+
         columns = ('ID', 'Type', 'User ID', 'Blob', 'Project ID')
         column_headers = ('ID', 'Type', 'User ID', 'Data', 'Project ID')
-        data = self.app.client_manager.identity.credentials.list()
+        data = self.app.client_manager.identity.credentials.list(**kwargs)
         return (column_headers,
                 (utils.get_item_properties(
                     s, columns,
@@ -144,7 +175,7 @@ class SetCredential(command.Command):
             metavar='<type>',
             choices=['ec2', 'cert'],
             required=True,
-            help=_('New credential type'),
+            help=_('New credential type: cert, ec2'),
         )
         parser.add_argument(
             '--data',
diff --git a/openstackclient/tests/unit/identity/v3/test_credential.py b/openstackclient/tests/unit/identity/v3/test_credential.py
index ce0fb5ae..161f0484 100644
--- a/openstackclient/tests/unit/identity/v3/test_credential.py
+++ b/openstackclient/tests/unit/identity/v3/test_credential.py
@@ -225,12 +225,15 @@ class TestCredentialList(TestCredential):
     def setUp(self):
         super(TestCredentialList, self).setUp()
 
+        self.user = identity_fakes.FakeUser.create_one_user()
+        self.users_mock.get.return_value = self.user
+
         self.credentials_mock.list.return_value = [self.credential]
 
         # Get the command object to test
         self.cmd = credential.ListCredential(self.app, None)
 
-    def test_domain_list_no_options(self):
+    def test_credential_list_no_options(self):
         arglist = []
         verifylist = []
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -241,6 +244,31 @@ class TestCredentialList(TestCredential):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
 
+    def test_credential_list_with_options(self):
+        arglist = [
+            '--user', self.credential.user_id,
+            '--type', self.credential.type,
+        ]
+        verifylist = [
+            ('user', self.credential.user_id),
+            ('type', self.credential.type),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'user_id': self.user.id,
+            'type': self.credential.type,
+        }
+        self.users_mock.get.assert_called_with(self.credential.user_id)
+        self.credentials_mock.list.assert_called_with(
+            **kwargs
+        )
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, tuple(data))
+
 
 class TestCredentialSet(TestCredential):