diff options
| author | jaypipes@gmail.com <> | 2010-10-19 16:09:12 -0400 |
|---|---|---|
| committer | jaypipes@gmail.com <> | 2010-10-19 16:09:12 -0400 |
| commit | 112992d5372a64b07de5188af6c2c0753981a3d6 (patch) | |
| tree | d24979062fe8d55cef46ed4cac275ddb50fd83a1 /nova/api | |
| parent | 3fdced0a19315732fec0ead200604e396f06823c (diff) | |
Remember to call limited() on detail() in image controller.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/images.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py index 5f2d71dc2..5ccf659f7 100644 --- a/nova/api/openstack/images.py +++ b/nova/api/openstack/images.py @@ -49,13 +49,14 @@ class Controller(wsgi.Controller): def detail(self, req): """Return all public images in detail.""" try: - data = self._service.detail() + images = self._service.detail() + images = nova.api.openstack.limited(images, req) except NotImplementedError: # Emulate detail() using repeated calls to show() images = self._service.index() images = nova.api.openstack.limited(images, req) - data = [self._service.show(i['id']) for i in images] - return dict(images=data) + images = [self._service.show(i['id']) for i in images] + return dict(images=images) def show(self, req, id): """Return data about the given image id.""" |