Merge "Fix --limit option in image list sub-command"

3 files changed, 15 insertions, 4 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():
diff --git a/openstackclient/tests/unit/image/v2/test_image.py b/openstackclient/tests/unit/image/v2/test_image.py
index 087d8751..16a393df 100644
--- a/openstackclient/tests/unit/image/v2/test_image.py
+++ b/openstackclient/tests/unit/image/v2/test_image.py
@@ -787,21 +787,22 @@ class TestImageList(TestImage):
         self.assertEqual(self.datalist, tuple(data))
 
     def test_image_list_limit_option(self):
+        ret_limit = 1
         arglist = [
-            '--limit', str(1),
+            '--limit', str(ret_limit),
         ]
         verifylist = [
-            ('limit', 1),
+            ('limit', ret_limit),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
         self.api_mock.image_list.assert_called_with(
-            limit=1, marker=self._image.id
+            limit=ret_limit, marker=None
         )
 
         self.assertEqual(self.columns, columns)
-        self.assertEqual(len(self.datalist), len(tuple(data)))
+        self.assertEqual(ret_limit, len(tuple(data)))
 
     @mock.patch('osc_lib.utils.find_resource')
     def test_image_list_marker_option(self, fr_mock):
diff --git a/releasenotes/notes/bug-27882-402ced7ffe930058.yaml b/releasenotes/notes/bug-27882-402ced7ffe930058.yaml
new file mode 100644
index 00000000..6bd090aa
--- /dev/null
+++ b/releasenotes/notes/bug-27882-402ced7ffe930058.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The ``--limit`` option of the ``image list`` command was previously ignored.
+    [Bug `https://storyboard.openstack.org/#!/story/2004314`]