openstack/python-openstackclient
Code Issues Proposed changes

Remove marker and loop from "image list" command

Browse Source 
Since --page-size has never worked, there is no paginate logic needs
to be implemented in "image list" command. So remove the unnecessary
loop.

And also, the marker is not necessary because --marker option has not
been implemented. Will add it back when implementing --marker option.

Change-Id: I71fea1502f92f447a49697edb52e8e82f336772f
Partial-Bug: #1540988
This commit is contained in:
Tang Chen 2016-01-29 18:59:03 +08:00
parent 4b2c66447d
commit 0b6fdcbe4c
2 changed files with 5 additions and 25 deletions
openstackclient
image/v2
image.py
tests/image/v2
test_image.py

11
openstackclient/image/v2/image.py

@ -474,16 +474,7 @@ class ListImage(command.Lister):
column_headers = columns column_headers = columns
# List of image data received # List of image data received
data = [] data = image_client.api.image_list(**kwargs)
# 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: if parsed_args.property:
# NOTE(dtroyer): coerce to a list to subscript it in py3 # NOTE(dtroyer): coerce to a list to subscript it in py3

19
openstackclient/tests/image/v2/test_image.py

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