From 7bc025c855bcfe575ef69d82f5339b6d1c66ea41 Mon Sep 17 00:00:00 2001 From: Todd Willey 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(-) 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 From 7460924a798e4b2821077bbc054859b74c28d66c Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Thu, 27 Jan 2011 00:13:09 -0800 Subject: more instanceId => id fixes --- nova/api/ec2/cloud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 22b8c19cb..23d510c71 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -843,7 +843,7 @@ class CloudController(object): # Note: image_id is a list! images = self.image_service.index(context) if image_id: - images = filter(lambda x: x['imageId'] in image_id, images) + images = filter(lambda x: x['id'] in image_id, images) return {'imagesSet': images} def deregister_image(self, context, image_id, **kwargs): -- cgit From 504118b849962f85626be2631e195f6bda29f4d6 Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Thu, 27 Jan 2011 00:30:24 -0800 Subject: I have a feeling if we try to migrate from imageId to id we'll be tracking it down a while. --- nova/api/ec2/cloud.py | 2 +- nova/image/s3.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 23d510c71..22b8c19cb 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -843,7 +843,7 @@ class CloudController(object): # Note: image_id is a list! images = self.image_service.index(context) if image_id: - images = filter(lambda x: x['id'] in image_id, images) + images = filter(lambda x: x['imageId'] in image_id, images) return {'imagesSet': images} def deregister_image(self, context, image_id, **kwargs): diff --git a/nova/image/s3.py b/nova/image/s3.py index d453c468b..08a40f191 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -69,9 +69,7 @@ class S3ImageService(service.BaseImageService): """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 + image['id'] = image['imageId'] return images def index(self, context): @@ -84,9 +82,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 {'id': 'bar'} + return {'imageId': 'bar'} result = self.index(context) - result = [i for i in result if i['id'] == image_id] + result = [i for i in result if i['imageId'] == image_id] if not result: raise exception.NotFound(_('Image %s could not be found') % image_id) -- cgit