summaryrefslogtreecommitdiffstats
path: root/nova/image
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-26 23:40:44 -0800
committerTodd Willey <todd@ansolabs.com>2011-01-26 23:40:44 -0800
commit7bc025c855bcfe575ef69d82f5339b6d1c66ea41 (patch)
treefdcb3c483a82e973fc96d77ac071729fa7a7a6c2 /nova/image
parentaf67241089ec9e078cadf4e6d7c2c93b4b352315 (diff)
downloadnova-7bc025c855bcfe575ef69d82f5339b6d1c66ea41.tar.gz
nova-7bc025c855bcfe575ef69d82f5339b6d1c66ea41.tar.xz
nova-7bc025c855bcfe575ef69d82f5339b6d1c66ea41.zip
Fix regression in imageId => id field rename in s3 image service.
Diffstat (limited to 'nova/image')
-rw-r--r--nova/image/s3.py4
1 files changed, 2 insertions, 2 deletions
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)