diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-08 23:25:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-08 23:25:16 +0000 |
| commit | ba66cdfcfac323ada3c2689bed001fc9c1a2869d (patch) | |
| tree | f42db53f8a113bd01a92f0b6c9123473dca68f37 /openstackclient/image | |
| parent | a71cb02ce94c83a692faec5ec46ded0793b0bd5e (diff) | |
| parent | aaf73cbf6d51a4a3b25cc0a5f1b7c5fb0d462c57 (diff) | |
| download | python-openstackclient-ba66cdfcfac323ada3c2689bed001fc9c1a2869d.tar.gz | |
Merge "Fix --limit option in image list sub-command"
Diffstat (limited to 'openstackclient/image')
| -rw-r--r-- | openstackclient/image/v2/image.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py index 223e55c9..3efde808 100644 --- a/openstackclient/image/v2/image.py +++ b/openstackclient/image/v2/image.py @@ -643,6 +643,9 @@ class ListImage(command.Lister): # List of image data received data = [] + limit = None + if 'limit' in kwargs: + limit = kwargs['limit'] if 'marker' in kwargs: data = image_client.api.image_list(**kwargs) else: @@ -655,6 +658,8 @@ class ListImage(command.Lister): data.extend(page) # Set the marker to the id of the last item we received marker = page[-1]['id'] + if limit: + break if parsed_args.property: for attr, value in parsed_args.property.items(): |