Merge lp:~dan-prince/nova/bug719093 into lp:~hudson-openstack/nova/trunk

[Dan Prince]

Fixes issues when running euca-run-instances and euca-describe-image-attribute against the latest nova/trunk EC2 API.

I noticed this late this afternoon and saw some IRC traffic with other users hitting the issue as well.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Christian Berendt (berendt)]

I applied the patch to bzr revision 669 in it's working fine here...

[Soren Hansen (soren)]

Excellent, thanks!

review: Approve

[Rick Harris (rconradharris)]

I know this has already been merged but I have a question about:

 - kernel_id = image.get('kernelId', None)
23 + kernel_id = image.get('kernel_id', None)
24 if ramdisk_id is None:
25 - ramdisk_id = image.get('ramdiskId', None)
26 + ramdisk_id = image.get('ramdisk_id', None)

Unfortunately 'kernelId' and 'ramdiskId' are specific to the S3ImageService, so this change will break when used with the GlanceImageService. Instead, the S3ImageService, like all ImageServices, should be exposing only the 'base attribute names': 'ramdisk_id' instead of 'ramdiskId'.

S3ImageService has a method called `map_s3_to_base` which should have done the job here. Could you elaborate more on the specific error relating to these fields?

             image = self.image_service.show(context, image_id)
8 + image = self._format_image(context,
9 + self.image_service.show(context,
10 + image_id))

Calls show() twice. The first `image = self.image_...` assignment can go away.

[Dan Prince (dan-prince)]

Hey Rick.

On your first point. This change was actually fixed what you just wrote. The S3ImageServer now uses 'kernel_id' and 'ramdisk_id' and this change makes it possible to once again create instances when using S3/EC2.

--

On your second point: Good catch on the duplication show calls. I'll fix this in my branch where I'm making it possible to use S3ImageService with the Openstack API. If you interested in that you can follow #709355.

Dan

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2011-02-14 10:56:10 +0000
+++ nova/api/ec2/cloud.py	2011-02-15 01:01:30 +0000
@@ -883,6 +883,9 @@
                                      % attribute)
         try:
             image = self.image_service.show(context, image_id)
+            image = self._format_image(context,
+                                       self.image_service.show(context,
+                                                               image_id))
         except IndexError:
             raise exception.ApiError(_('invalid id: %s') % image_id)
         result = {'image_id': image_id, 'launchPermission': []}

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-01-27 18:48:00 +0000
+++ nova/compute/api.py	2011-02-15 01:01:30 +0000
@@ -103,9 +103,9 @@
         if not is_vpn:
             image = self.image_service.show(context, image_id)
             if kernel_id is None:
-                kernel_id = image.get('kernelId', None)
+                kernel_id = image.get('kernel_id', None)
             if ramdisk_id is None:
-                ramdisk_id = image.get('ramdiskId', None)
+                ramdisk_id = image.get('ramdisk_id', None)
             # No kernel and ramdisk for raw images
             if kernel_id == str(FLAGS.null_kernel):
                 kernel_id = None

=== modified file 'nova/image/s3.py'
--- nova/image/s3.py	2011-02-13 19:55:50 +0000
+++ nova/image/s3.py	2011-02-15 01:01:30 +0000
@@ -94,7 +94,7 @@
         if FLAGS.connection_type == 'fake':
             return {'imageId': 'bar'}
         result = self.index(context)
-        result = [i for i in result if i['imageId'] == image_id]
+        result = [i for i in result if i['id'] == image_id]
         if not result:
             raise exception.NotFound(_('Image %s could not be found')
                                      % image_id)