openstack/python-openstackclient
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-02-03 11:34:18 +00:00 committed by Gerrit Code Review
commit 34e4e1ac3e
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
# 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

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

@ -498,9 +498,7 @@ class TestImageList(TestImage):
# 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 @@ class TestImageList(TestImage):
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 @@ class TestImageList(TestImage):
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 @@ class TestImageList(TestImage):
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 @@ class TestImageList(TestImage):
# 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 @@ class TestImageList(TestImage):
# 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 @@ class TestImageList(TestImage):
# 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'