moved imageId change to s3 client

1 files changed, 10 insertions, 1 deletions

diff --git a/nova/image/s3.py b/nova/image/s3.py
index 7b04aa072..62d4d0e63 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -65,12 +65,21 @@ class S3ImageService(service.BaseImageService):
                                  'image_id': image_id}))
         return image_id
 
+    def _fix_image_id(images):
+        """S3 has imageId but OpenStack wants id"""
+        for image in images:
+            if 'imageId' in image:
+                image_id = image['imageId']
+                del image['imageId']
+                image['id'] = image_id
+        return images
+
     def index(self, context):
         """Return a list of all images that a user can see."""
         response = self._conn(context).make_request(
             method='GET',
             bucket='_images')
-        return json.loads(response.read())
+        return _fix_image_id(json.loads(response.read()))
 
     def show(self, context, image_id):
         """return a image object if the context has permissions"""