From 7bc025c855bcfe575ef69d82f5339b6d1c66ea41 Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Wed, 26 Jan 2011 23:40:44 -0800
Subject: Fix regression in imageId => id field rename in s3 image service.

---
 nova/image/s3.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/image')

diff --git a/nova/image/s3.py b/nova/image/s3.py
index c60b215a0..d453c468b 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -84,9 +84,9 @@ class S3ImageService(service.BaseImageService):
     def show(self, context, image_id):
         """return a image object if the context has permissions"""
         if FLAGS.connection_type == 'fake':
-            return {'imageId': 'bar'}
+            return {'id': '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)
-- 
cgit