Merge lp:~jaypipes/nova/bug760289 into lp:~hudson-openstack/nova/trunk

[Jay Pipes]

Rework GlanceImageService._translate_base() to not call BaseImageService._translate_base() otherwise the wrong class attributes are used in properties construction...

[Vish Ishaya (vishvananda)]

Launchpad is down, but this fixes the issue for me and should definitely go in to cactus imo

Vish

On Apr 13, 2011, at 3:43 PM, Jay Pipes wrote:

> image_meta = service.BaseImageService._propertify_metadata(
> + image_meta, cls.SERVICE_IMAGE_ATTRS)

[Thierry Carrez (ttx)]

From Vish during the outage:
> Launchpad is down, but this fixes the issue for me and should definitely go in to cactus imo

review: Approve

[Soren Hansen (soren)]

lgtm, too.

=== modified file 'nova/image/glance.py'
--- nova/image/glance.py	2011-04-06 19:58:57 +0000
+++ nova/image/glance.py	2011-04-13 22:42:33 +0000
@@ -186,7 +186,8 @@
         """Overriding the base translation to handle conversion to datetime
         objects
         """
-        image_meta = service.BaseImageService._translate_to_base(image_meta)
+        image_meta = service.BaseImageService._propertify_metadata(
+                        image_meta, cls.SERVICE_IMAGE_ATTRS)
         image_meta = _convert_timestamps_to_datetimes(image_meta)
         return image_meta