Merge lp:~soren/nova/lp681600 into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Fix DescribeImages EC2 API call.

Reluctantly not including unit tests. I've filed bug #682888 about it. I think this is important enough to get fixed that we can defer the tests for a few days.

Fix DescribeImages EC2 API call.

Reluctantly not including unit tests. I've filed bug #682888 about it. I think this is important enough to get fixed that we can defer the tests for a few days.

[Jay Pipes (jaypipes)]

would be good to rename imageSet to images (for pylint naming). But other than that, looks good to me. :)

review: Approve

[Soren Hansen (soren)]

2010/11/30 Jay Pipes <email address hidden>:
> would be good to rename imageSet to images (for pylint naming).  But other than that, looks good to me. :)

Your wish is my command.

--
Soren Hansen
Ubuntu Developer    http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/

[lp:~soren/nova/lp681600]

427. By Soren Hansen on 2010-11-30

Rename imageSet variable to images.

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2010-11-18 21:27:52 +0000
+++ nova/api/ec2/cloud.py	2010-11-30 08:22:28 +0000
@@ -994,8 +994,11 @@
         return True
 
     def describe_images(self, context, image_id=None, **kwargs):
-        imageSet = self.image_service.index(context, image_id)
-        return {'imagesSet': imageSet}
+        # Note: image_id is a list!
+        images = self.image_service.index(context)
+        if image_id:
+            images = filter(lambda x: x['imageId'] in image_id, images)
+        return {'imagesSet': images}
 
     def deregister_image(self, context, image_id, **kwargs):
         self.image_service.deregister(context, image_id)