diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-06-01 14:58:17 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-06-01 14:58:17 -0400 |
| commit | 15257606e5346f0bf9a67145e5d4df7ba57c386a (patch) | |
| tree | d60db931f3002f8dc92a5fbf6abe3af0f60af568 | |
| parent | 82f3c16304ab881326b84f59bccfd74b676f9796 (diff) | |
touch ups
| -rw-r--r-- | nova/image/glance.py | 12 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_common.py | 3 | ||||
| -rw-r--r-- | nova/tests/integrated/test_servers.py | 9 |
3 files changed, 13 insertions, 11 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index 06f546027..61308431d 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -64,9 +64,9 @@ class GlanceImageService(service.BaseImageService): # `get_images` here because we need `is_public` and `properties` # included so we can filter by user filtered = [] - image_metas = self.client.get_images_detailed(marker=marker, - limit=limit, - filters=filters) + image_metas = self.client.get_images_detailed(filters=filters, + marker=marker, + limit=limit) for image_meta in image_metas: if self._is_image_available(context, image_meta): meta_subset = utils.subset_dict(image_meta, ('id', 'name')) @@ -76,9 +76,9 @@ class GlanceImageService(service.BaseImageService): def detail(self, context, filters=None, marker=None, limit=None): """Calls out to Glance for a list of detailed image information.""" filtered = [] - image_metas = self.client.get_images_detailed(marker=marker, - limit=limit, - filters=filters) + image_metas = self.client.get_images_detailed(filters=filters, + marker=marker, + limit=limit) for image_meta in image_metas: if self._is_image_available(context, image_meta): base_image_meta = self._translate_to_base(image_meta) diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py index 55142ffe1..c4a6e3ebf 100644 --- a/nova/tests/api/openstack/test_common.py +++ b/nova/tests/api/openstack/test_common.py @@ -24,8 +24,7 @@ import webob.exc from webob import Request from nova import test -from nova.api.openstack.common import limited -from nova.api.openstack.common import get_pagination_params +from nova.api.openstack.common import limited, get_pagination_params class LimiterTest(test.TestCase): diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py index 35c6bb34f..fcb517cf5 100644 --- a/nova/tests/integrated/test_servers.py +++ b/nova/tests/integrated/test_servers.py @@ -194,7 +194,8 @@ class ServersTest(integrated_helpers._IntegratedTestBase): post = {} post['rebuild'] = { "imageRef": "https://localhost/v1.1/32278/images/2", - "name": "blah"} + "name": "blah", + } self.api.post_server_action(created_server_id, post) LOG.debug("rebuilt server: %s" % created_server) @@ -223,7 +224,8 @@ class ServersTest(integrated_helpers._IntegratedTestBase): post = {} post['rebuild'] = { "imageRef": "https://localhost/v1.1/32278/images/2", - "name": "blah"} + "name": "blah", + } metadata = {} for i in range(30): @@ -265,7 +267,8 @@ class ServersTest(integrated_helpers._IntegratedTestBase): post = {} post['rebuild'] = { "imageRef": "https://localhost/v1.1/32278/images/2", - "name": "blah"} + "name": "blah", + } metadata = {} post['rebuild']['metadata'] = metadata |