diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-11-29 23:04:54 +0100 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-11-29 23:04:54 +0100 |
| commit | e6dde30724ac47f6abeb5eaa56a68fb9ac166397 (patch) | |
| tree | 3ed0353b2f2d4b20d01f3543a8e72a4032b23bb8 /nova/api | |
| parent | 4112e432c6a7b0e82bfc72fac0ceae8eca8bba49 (diff) | |
| download | nova-e6dde30724ac47f6abeb5eaa56a68fb9ac166397.tar.gz nova-e6dde30724ac47f6abeb5eaa56a68fb9ac166397.tar.xz nova-e6dde30724ac47f6abeb5eaa56a68fb9ac166397.zip | |
Correctly handle imageId list passed to DescribeImages API call.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 9327bf0d4..9cabd2e7d 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -994,7 +994,10 @@ class CloudController(object): return True def describe_images(self, context, image_id=None, **kwargs): - imageSet = self.image_service.index(context, image_id) + # Note: image_id is a list! + imageSet = self.image_service.index(context) + if image_id: + imageSet = filter(lambda x: x['imageId'] in image_id, imageSet) return {'imagesSet': imageSet} def deregister_image(self, context, image_id, **kwargs): |