summaryrefslogtreecommitdiff
path: root/openstackclient/image/v2
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-20 20:35:02 +0000
committerGerrit Code Review <review@openstack.org>2015-04-20 20:35:02 +0000
commite288e0194c22daa98436acf0441d6b8fff0b1d90 (patch)
treec4e14df7c0d92bedd072dd8ddd8b4d2888fb2e89 /openstackclient/image/v2
parent32843844a3eed6b3fc78d6346baeb84a5d7068f4 (diff)
parent3c7b5185ca1eb89a00c54a57bb9ef028bcb290bb (diff)
downloadpython-openstackclient-1.1.0.tar.gz
Merge "Handle the pagination for image list"1.1.0
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