adding support for limiting in image service; updating tests with fixture ids and marker support

1 files changed, 9 insertions, 0 deletions

diff --git a/nova/image/glance.py b/nova/image/glance.py
index b5f52351f..7233eb18d 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -154,6 +154,15 @@ class GlanceImageService(service.BaseImageService):
         except KeyError:
             raise exception.ImagePaginationFailed()
 
+        try:
+            kwargs['limit'] = kwargs['limit'] - len(images)
+            # break if we have reached a provided limit
+            if kwargs['limit'] <= 0:
+                return
+        except KeyError:
+            # ignore missing limit, just proceed without it
+            pass
+
         for image in self._fetch_images(fetch_func, **kwargs):
             yield image