openstack/nova
Code Issues Proposed changes

fix filtering tests

Browse Source
This commit is contained in:
William Wolf
2011-06-01 10:00:15 -04:00
parent 59499f125a
commit b8f2f8d636
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/api/openstack/images.py
View File

@@ -181,8 +181,10 @@ class ControllerV11(Controller):
:param req: `wsgi.Request` object
"""
context = req.environ['nova.context']
filters = self._get_filters(req)
(marker, limit) = common.get_pagination_params(req)
images = self._image_service.index(context, marker, limit)
images = self._image_service.index(
context, filters=filters, marker=marker, limit=limit)
builder = self.get_builder(req).build
return dict(images=[builder(image, detail=False) for image in images])
@@ -192,7 +194,9 @@ class ControllerV11(Controller):
:param req: `wsgi.Request` object.
"""
context = req.environ['nova.context']
filters = self._get_filters(req)
(marker, limit) = common.get_pagination_params(req)
images = self._image_service.detail(context, marker, limit)
images = self._image_service.detail(
context, filters=filters, marker=marker, limit=limit)
builder = self.get_builder(req).build
return dict(images=[builder(image, detail=True) for image in images])

4
nova/image/glance.py
View File

@@ -58,7 +58,7 @@ class GlanceImageService(service.BaseImageService):
else:
self.client = client
def index(self, context, marker=None, limit=None, filters=None):
def index(self, context, filters=None, marker=None, limit=None):
"""Calls out to Glance for a list of images available."""
# NOTE(sirp): We need to use `get_images_detailed` and not
# `get_images` here because we need `is_public` and `properties`
@@ -73,7 +73,7 @@ class GlanceImageService(service.BaseImageService):
filtered.append(meta_subset)
return filtered
def detail(self, context, marker=None, limit=None, filters=None):
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,

30
nova/tests/api/openstack/test_images.py
View File

@@ -826,7 +826,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {'name': 'testname'}
image_service.index(context, filters).AndReturn([])
image_service.index(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images?name=testname')
@@ -840,7 +841,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {'status': 'ACTIVE'}
image_service.index(context, filters).AndReturn([])
image_service.index(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images?status=ACTIVE')
@@ -854,7 +856,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {'property-test': '3'}
image_service.index(context, filters).AndReturn([])
image_service.index(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images?property-test=3')
@@ -868,7 +871,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {'status': 'ACTIVE'}
image_service.index(context, filters).AndReturn([])
image_service.index(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images?status=ACTIVE&UNSUPPORTEDFILTER=testname')
@@ -882,7 +886,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {}
image_service.index(context, filters).AndReturn([])
image_service.index(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images')
@@ -896,7 +901,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {'name': 'testname'}
image_service.detail(context, filters).AndReturn([])
image_service.detail(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images/detail?name=testname')
@@ -910,7 +916,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {'status': 'ACTIVE'}
image_service.detail(context, filters).AndReturn([])
image_service.detail(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images/detail?status=ACTIVE')
@@ -924,7 +931,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {'property-test': '3'}
image_service.detail(context, filters).AndReturn([])
image_service.detail(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images/detail?property-test=3')
@@ -938,7 +946,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {'status': 'ACTIVE'}
image_service.detail(context, filters).AndReturn([])
image_service.detail(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images/detail?status=ACTIVE&UNSUPPORTEDFILTER=testname')
@@ -952,7 +961,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
image_service = mocker.CreateMockAnything()
context = object()
filters = {}
image_service.detail(context, filters).AndReturn([])
image_service.detail(
context, filters=filters, marker=0, limit=0).AndReturn([])
mocker.ReplayAll()
request = webob.Request.blank(
'/v1.1/images/detail')