Merge "Remove marker and loop from "image list" command"

Author: Jenkins

openstackclient/image/v2/image.py

@@ -474,16 +474,7 @@ def take_action(self, parsed_args):
             column_headers = columns
 
         # 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']
+        data = image_client.api.image_list(**kwargs)
 
         if parsed_args.property:
             # NOTE(dtroyer): coerce to a list to subscript it in py3

openstackclient/tests/image/v2/test_image.py

@@ -498,9 +498,7 @@ def test_image_list_no_options(self):
 
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
-        self.api_mock.image_list.assert_called_with(
-            marker=image_fakes.image_id,
-        )
+        self.api_mock.image_list.assert_called_with()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, tuple(data))
@@ -521,7 +519,6 @@ def test_image_list_public_option(self):
         columns, data = self.cmd.take_action(parsed_args)
         self.api_mock.image_list.assert_called_with(
             public=True,
-            marker=image_fakes.image_id,
         )
 
         self.assertEqual(self.columns, columns)
@@ -543,7 +540,6 @@ def test_image_list_private_option(self):
         columns, data = self.cmd.take_action(parsed_args)
         self.api_mock.image_list.assert_called_with(
             private=True,
-            marker=image_fakes.image_id,
         )
 
         self.assertEqual(self.columns, columns)
@@ -565,7 +561,6 @@ def test_image_list_shared_option(self):
         columns, data = self.cmd.take_action(parsed_args)
         self.api_mock.image_list.assert_called_with(
             shared=True,
-            marker=image_fakes.image_id,
         )
 
         self.assertEqual(self.columns, columns)
@@ -582,9 +577,7 @@ def test_image_list_long_option(self):
 
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
-        self.api_mock.image_list.assert_called_with(
-            marker=image_fakes.image_id,
-        )
+        self.api_mock.image_list.assert_called_with()
 
         collist = (
             'ID',
@@ -630,9 +623,7 @@ def test_image_list_property_option(self, sf_mock):
 
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
-        self.api_mock.image_list.assert_called_with(
-            marker=image_fakes.image_id,
-        )
+        self.api_mock.image_list.assert_called_with()
         sf_mock.assert_called_with(
             [image_fakes.IMAGE],
             attr='a',
@@ -655,9 +646,7 @@ def test_image_list_sort_option(self, si_mock):
 
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
-        self.api_mock.image_list.assert_called_with(
-            marker=image_fakes.image_id,
-        )
+        self.api_mock.image_list.assert_called_with()
         si_mock.assert_called_with(
             [image_fakes.IMAGE],
             'name:asc'