Keypairs list - add user_id filter (#30)

Author: saydamir

selvpcclient/__init__.py

@@ -1 +1 @@
-__version__ = "2.0"
+__version__ = "2.1"

selvpcclient/commands/keypair.py

@@ -97,11 +97,20 @@ def get_parser(self, prog_name):
                               default=False,
                               action='store_true',
                               )
+        optional.add_argument('-u',
+                              '--user',
+                              metavar='USER_ID',
+                              dest='user_id',
+                              required=False,
+                              default=None,
+                              )
         return parser
 
     @handle_http_error
     def take_action(self, parsed_args):
-        result = self.app.context["client"].keypairs.list()
+        result = self.app.context["client"].keypairs.list(
+            user_id=parsed_args.user_id
+        )
         if parsed_args.show_key or parsed_args.show_short_key:
             self.columns.append("public_key")
         if parsed_args.show_short_key and not parsed_args.show_key:

selvpcclient/resources/keypairs.py

@@ -19,14 +19,18 @@ class KeyPairManager(base.Manager):
     """Manager class for manipulating keypairs."""
     resource_class = KeyPair
 
-    def list(self, return_raw=False):
+    def list(self, return_raw=False, user_id=None):
         """Get list of all keypairs for domain.
 
         :param return_raw: flag to force returning raw JSON instead of
                 Python object of self.resource_class
+        :param string user_id: optional filter of keypairs by User id.
         :rtype: list of :class:`Keypair`
         """
-        return self._list('/keypairs', 'keypairs', return_raw=return_raw)
+        url = '/keypairs'
+        if user_id:
+            url = url + '?user_id={}'.format(user_id)
+        return self._list(url, 'keypairs', return_raw=return_raw)
 
     @process_pair_params
     def add(self, keypair, return_raw=False):

tests/cli/test_keypairs.py

@@ -14,6 +14,17 @@ def test_keypair_list():
     assert len(output) == 2
 
 
+def test_keypair_list_filter():
+    client = make_client(return_value=answers.KEYPAIR_LIST)
+
+    args = ["keypair list",
+            "--user", "88ad5569d8c64f828ac3d2efa4e552dd"]
+
+    output = run_cmd(args, client, json_output=True)
+
+    assert len(output) == 2
+
+
 def test_keypair_add():
     client = make_client(return_value=answers.KEYPAIR_ADD)