summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorWilliam Wolf <throughnothing@gmail.com>2011-06-01 10:00:15 -0400
committerWilliam Wolf <throughnothing@gmail.com>2011-06-01 10:00:15 -0400
commitb8f2f8d63608d76af41fd218dddb955bdc656354 (patch)
tree7c385de4fafc818656eb267431fb99f7e513e360 /nova/api
parent59499f125a0cdb260b6b34ee737debe9fd86cbfb (diff)
fix filtering tests
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/images.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 20e6f38ce..8afd38a4f 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -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])