merge

3 files changed, 12 insertions, 8 deletions

diff --git a/nova/image/glance.py b/nova/image/glance.py
index e084ed8ae..09b2240ab 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -58,25 +58,27 @@ class GlanceImageService(service.BaseImageService):
         else:
             self.client = client
 
-    def index(self, context, marker=None, limit=None):
+    def index(self, context, marker=None, limit=None, filters=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`
         # included so we can filter by user
         filtered = []
-        image_metas = self.client.get_images_detailed(
-            marker=marker, limit=limit)
+        image_metas = self.client.get_images_detailed(marker=marker,
+                                                      limit=limit,
+                                                      filters=filters)
         for image_meta in image_metas:
             if self._is_image_available(context, image_meta):
                 meta_subset = utils.subset_dict(image_meta, ('id', 'name'))
                 filtered.append(meta_subset)
         return filtered
 
-    def detail(self, context, marker=None, limit=None):
+    def detail(self, context, marker=None, limit=None, filters=None):
         """Calls out to Glance for a list of detailed image information."""
         filtered = []
-        image_metas = self.client.get_images_detailed(
-            marker=marker, limit=limit)
+        image_metas = self.client.get_images_detailed(marker=marker,
+                                                      limit=limit,
+                                                      filters=filters)
         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/image/local.py b/nova/image/local.py
index f320cc60c..c7dee4573 100644
--- a/nova/image/local.py
+++ b/nova/image/local.py
@@ -64,6 +64,7 @@ class LocalImageService(service.BaseImageService):
         return images
 
     def index(self, context, filters=None, marker=None, limit=None):
+        # TODO(blamar): Make use of filters, marker, and limit
         filtered = []
         image_metas = self.detail(context)
         for image_meta in image_metas:
@@ -72,6 +73,7 @@ class LocalImageService(service.BaseImageService):
         return filtered
 
     def detail(self, context, filters=None, marker=None, limit=None):
+        # TODO(blamar): Make use of filters, marker, and limit
         images = []
         for image_id in self._ids():
             try:
diff --git a/nova/image/service.py b/nova/image/service.py
index ab6749049..5361cfc89 100644
--- a/nova/image/service.py
+++ b/nova/image/service.py
@@ -46,7 +46,7 @@ class BaseImageService(object):
     # the ImageService subclass
     SERVICE_IMAGE_ATTRS = []
 
-    def index(self, context):
+    def index(self, context, *args, **kwargs):
         """List images.
 
         :returns: a sequence of mappings with the following signature
@@ -55,7 +55,7 @@ class BaseImageService(object):
         """
         raise NotImplementedError
 
-    def detail(self, context):
+    def detail(self, context, *args, **kwargs):
         """Detailed information about an images.
 
         :returns: a sequence of mappings with the following signature