summaryrefslogtreecommitdiff
path: root/openstackclient/image/v2
diff options
context:
space:
mode:
authorTerryHowe <terrylhowe@gmail.com>2015-04-14 11:03:22 -0600
committerTerryHowe <terrylhowe@gmail.com>2015-04-20 11:23:15 -0600
commit3c7b5185ca1eb89a00c54a57bb9ef028bcb290bb (patch)
treebc47050a52909f2ab4144aac70235ded830914a7 /openstackclient/image/v2
parente60bf28ae3bdb34b65316249f0e7615048aa1f95 (diff)
downloadpython-openstackclient-3c7b5185ca1eb89a00c54a57bb9ef028bcb290bb.tar.gz
Handle the pagination for image list
Handle the paginatiion for image list. We were sorting the data here, so nothing lost for the generator. Change-Id: I2d7d4b3d5c9f650953f309c971ac53b64f6f7f77
Diffstat (limited to 'openstackclient/image/v2')
-rw-r--r--openstackclient/image/v2/image.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index afc99e85..eb82c910 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -156,7 +156,17 @@ class ListImage(lister.Lister):
columns = ("ID", "Name")
column_headers = columns
- data = image_client.api.image_list(**kwargs)
+ # List of image data received
+ data = []
+ # No pages received yet, so start the page marker at None.
+ marker = None
+ while True:
+ page = image_client.api.image_list(marker=marker, **kwargs)
+ if not page:
+ break
+ data.extend(page)
+ # Set the marker to the id of the last item we received
+ marker = page[-1]['id']
if parsed_args.property:
# NOTE(dtroyer): coerce to a list to subscript it in py3