Add transfer pagination

Author: petrutlucian94

coriolisclient/base.py

@@ -167,7 +167,7 @@ def __init__(self, client):
 
     @wrap_unauthorized_exception
     def _list(self, url, response_key=None, obj_class=None, json=None,
-              values_key='values', query: dict | list | None=None):
+              values_key='values', query: dict | list | None = None):
         """List the collection.
         :param url: a partial URL, e.g., '/servers'
         :param response_key: the key to be looked up in response dictionary,

coriolisclient/cli/deployments.py

@@ -281,15 +281,15 @@ def get_parser(self, prog_name):
             help='Maximum number of executions to retrieve.')
         parser.add_argument(
             '--sort',
-            help='Comma-separated list of sort keys and directions in the form '
-           'of <key>[:<asc|desc>]. The direction defaults to descending if '
-           'not specified.')
+            help='Comma-separated list of sort keys and directions in the '
+                 'form of <key>[:<asc|desc>]. The direction defaults to '
+                 'descending if not specified.')
         return parser
 
     def take_action(self, args):
         obj_list = self.app.client_manager.coriolis.deployments.list(
             marker=args.marker,
             limit=args.limit,
-            sort_keys=sort_keys,
-            sort_dirs=sort_dirs)
+            sort_keys=args.sort_keys,
+            sort_dirs=args.sort_dirs)
         return DeploymentFormatter().list_objects(obj_list)

coriolisclient/cli/transfer_executions.py

@@ -189,17 +189,17 @@ def get_parser(self, prog_name):
             help='Maximum number of executions to retrieve.')
         parser.add_argument(
             '--sort',
-            help='Comma-separated list of sort keys and directions in the form '
-           'of <key>[:<asc|desc>]. The direction defaults to descending if '
-           'not specified.')
+            help='Comma-separated list of sort keys and directions in the '
+                 'form of <key>[:<asc|desc>]. The direction defaults to '
+                 'descending if not specified.')
         return parser
 
     def take_action(self, args):
-        sort_keys, sort_dirs = cli_utils.parse_sort_args(arg.sort)
+        sort_keys, sort_dirs = cli_utils.parse_sort_args(args.sort)
         obj_list = self.app.client_manager.coriolis.transfer_executions.list(
             args.transfer,
             marker=args.marker,
             limit=args.limit,
-            sort_keys=sort_keys,
-            sort_dirs=sort_dirs)
+            sort_keys=args.sort_keys,
+            sort_dirs=args.sort_dirs)
         return TransferExecutionFormatter().list_objects(obj_list)

coriolisclient/cli/transfers.py

@@ -320,10 +320,25 @@ class ListTransfer(lister.Lister):
 
     def get_parser(self, prog_name):
         parser = super(ListTransfer, self).get_parser(prog_name)
+        parser.add_argument(
+            '--marker',
+            help='The id of the last retrieved execution.')
+        parser.add_argument(
+            '--limit', type=int,
+            help='Maximum number of executions to retrieve.')
+        parser.add_argument(
+            '--sort',
+            help='Comma-separated list of sort keys and directions in the '
+                 'form of <key>[:<asc|desc>]. The direction defaults to '
+                 'descending if not specified.')
         return parser
 
     def take_action(self, args):
-        obj_list = self.app.client_manager.coriolis.transfers.list()
+        obj_list = self.app.client_manager.coriolis.transfers.list(
+            marker=args.marker,
+            limit=args.limit,
+            sort_keys=args.sort_keys,
+            sort_dirs=args.sort_dirs)
         return TransferFormatter().list_objects(obj_list)
 
 

coriolisclient/v1/transfers.py

@@ -47,11 +47,25 @@ class TransferManager(base.BaseManager):
     def __init__(self, api):
         super(TransferManager, self).__init__(api)
 
-    def list(self, detail=False):
+    def list(self, detail=False, marker=None, limit=None,
+             sort_keys=None, sort_dirs=None):
+        # List of key-value tuples.
+        query = []
+        if marker is not None:
+            query.append(("marker", marker))
+        if limit is not None:
+            query.append(("limit", limit))
+        if sort_keys is not None:
+            query.extend(('sort_key', sort_key)
+                         for sort_key in sort_keys)
+        if sort_dirs is not None:
+            query.extend(('sort_dir', sort_dir)
+                         for sort_dir in sort_dirs)
+
         path = "/transfers"
         if detail:
             path = "%s/detail" % path
-        return self._list(path, 'transfers')
+        return self._list(path, 'transfers', query=query)
 
     def get(self, transfer):
         return self._get('/transfers/%s' % base.getid(transfer), 'transfer')