openstack/python-glanceclient
Code Issues Proposed changes

Revert 02116565d3

Browse Source 
A patch slipped in that modified the default image list limit in a
backwards-incompatible way. This change reverts that patch, but
preserves some of the formatting improvements.

Change-Id: I17ae5024896ca7b1064be66b9e47653e953771d6
This commit is contained in:
Mark J. Washenberger
2013-08-08 22:31:40 -07:00
parent 5cdbcdf3fc
commit eb47b55dbd
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glanceclient/v1/images.py
View File

@@ -31,7 +31,7 @@ UPDATE_PARAMS = ('name', 'disk_format', 'container_format', 'min_disk',
CREATE_PARAMS = UPDATE_PARAMS + ('id', 'store') CREATE_PARAMS = UPDATE_PARAMS + ('id', 'store')
DEFAULT_PAGE_SIZE = 100 DEFAULT_PAGE_SIZE = 20
SORT_DIR_VALUES = ('asc', 'desc') SORT_DIR_VALUES = ('asc', 'desc')
SORT_KEY_VALUES = ('name', 'status', 'container_format', 'disk_format', SORT_KEY_VALUES = ('name', 'status', 'container_format', 'disk_format',

2
glanceclient/v2/images.py
View File

@@ -20,7 +20,7 @@ import warlock
from glanceclient.common import utils from glanceclient.common import utils
from glanceclient.openstack.common import strutils from glanceclient.openstack.common import strutils
DEFAULT_PAGE_SIZE = 100 DEFAULT_PAGE_SIZE = 20
class Controller(object): class Controller(object):

25
tests/v1/test_images.py
View File

@@ -51,7 +51,7 @@ fixtures = {
), ),
), ),
}, },
'/v1/images/detail?limit=%d' % images.DEFAULT_PAGE_SIZE: { '/v1/images/detail?limit=20': {
'GET': ( 'GET': (
{}, {},
{'images': [ {'images': [
@@ -158,7 +158,7 @@ fixtures = {
]}, ]},
), ),
}, },
'/v1/images/detail?marker=a&limit=%d' % images.DEFAULT_PAGE_SIZE: { '/v1/images/detail?marker=a&limit=20': {
'GET': ( 'GET': (
{}, {},
{'images': [ {'images': [
@@ -228,7 +228,7 @@ fixtures = {
]}, ]},
), ),
}, },
'/v1/images/detail?limit=%d&name=foo' % images.DEFAULT_PAGE_SIZE: { '/v1/images/detail?limit=20&name=foo': {
'GET': ( 'GET': (
{}, {},
{'images': [ {'images': [
@@ -245,7 +245,7 @@ fixtures = {
]}, ]},
), ),
}, },
'/v1/images/detail?property-ping=pong&limit=%d' % images.DEFAULT_PAGE_SIZE: '/v1/images/detail?property-ping=pong&limit=20':
{ {
'GET': ( 'GET': (
{}, {},
@@ -258,7 +258,7 @@ fixtures = {
]}, ]},
), ),
}, },
'/v1/images/detail?sort_dir=desc&limit=%d' % images.DEFAULT_PAGE_SIZE: { '/v1/images/detail?sort_dir=desc&limit=20': {
'GET': ( 'GET': (
{}, {},
{'images': [ {'images': [
@@ -275,7 +275,7 @@ fixtures = {
]}, ]},
), ),
}, },
'/v1/images/detail?sort_key=name&limit=%d' % images.DEFAULT_PAGE_SIZE: { '/v1/images/detail?sort_key=name&limit=20': {
'GET': ( 'GET': (
{}, {},
{'images': [ {'images': [
@@ -398,34 +398,31 @@ class ImageManagerTest(testtools.TestCase):
def test_list_with_marker(self): def test_list_with_marker(self):
list(self.mgr.list(marker='a')) list(self.mgr.list(marker='a'))
url = '/v1/images/detail?marker=a&limit=%d' % images.DEFAULT_PAGE_SIZE url = '/v1/images/detail?marker=a&limit=20'
expect = [('GET', url, {}, None)] expect = [('GET', url, {}, None)]
self.assertEqual(self.api.calls, expect) self.assertEqual(self.api.calls, expect)
def test_list_with_filter(self): def test_list_with_filter(self):
list(self.mgr.list(filters={'name': "foo"})) list(self.mgr.list(filters={'name': "foo"}))
url = '/v1/images/detail?limit=%d&name=foo' % images.DEFAULT_PAGE_SIZE url = '/v1/images/detail?limit=20&name=foo'
expect = [('GET', url, {}, None)] expect = [('GET', url, {}, None)]
self.assertEqual(self.api.calls, expect) self.assertEqual(self.api.calls, expect)
def test_list_with_property_filters(self): def test_list_with_property_filters(self):
list(self.mgr.list(filters={'properties': {'ping': 'pong'}})) list(self.mgr.list(filters={'properties': {'ping': 'pong'}}))
url = '/v1/images/detail?property-ping=pong&limit=%d' % \ url = '/v1/images/detail?property-ping=pong&limit=20'
images.DEFAULT_PAGE_SIZE
expect = [('GET', url, {}, None)] expect = [('GET', url, {}, None)]
self.assertEqual(self.api.calls, expect) self.assertEqual(self.api.calls, expect)
def test_list_with_sort_dir(self): def test_list_with_sort_dir(self):
list(self.mgr.list(sort_dir='desc')) list(self.mgr.list(sort_dir='desc'))
url = '/v1/images/detail?sort_dir=desc&limit=%d' % \ url = '/v1/images/detail?sort_dir=desc&limit=20'
images.DEFAULT_PAGE_SIZE
expect = [('GET', url, {}, None)] expect = [('GET', url, {}, None)]
self.assertEqual(self.api.calls, expect) self.assertEqual(self.api.calls, expect)
def test_list_with_sort_key(self): def test_list_with_sort_key(self):
list(self.mgr.list(sort_key='name')) list(self.mgr.list(sort_key='name'))
url = '/v1/images/detail?sort_key=name&limit=%d' % \ url = '/v1/images/detail?sort_key=name&limit=20'
images.DEFAULT_PAGE_SIZE
expect = [('GET', url, {}, None)] expect = [('GET', url, {}, None)]
self.assertEqual(self.api.calls, expect) self.assertEqual(self.api.calls, expect)