diff options
| author | Devin Carlen <devin.carlen@gmail.com> | 2011-02-12 20:58:22 -0800 |
|---|---|---|
| committer | Devin Carlen <devin.carlen@gmail.com> | 2011-02-12 20:58:22 -0800 |
| commit | 07bff0f397b3b6463532f709daeb7a36ed4ad5b1 (patch) | |
| tree | d92aac87831f58ecba9a7f123038ecca191c36cf /nova/api | |
| parent | 2e75026ef11dfac37f1449a54c0d6f85ff8bfca6 (diff) | |
Made a few tweaks to format of S3 service implementation
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index b16503589..cc41ed4ae 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -844,9 +844,9 @@ class CloudController(object): i['imageId'] = image.get('id') i['kernelId'] = image.get('kernel_id') i['ramdiskId'] = image.get('ramdisk_id') - i['imageLocation'] = image.get('image_location') - i['imageOwnerId'] = image.get('image_owner_id') - i['imageState'] = image.get('image_state') + i['imageOwnerId'] = image.get('owner_id') + i['imageLocation'] = image.get('location') + i['imageState'] = image.get('status') i['type'] = image.get('type') i['isPublic'] = image.get('is_public') i['architecture'] = image.get('architecture') @@ -856,7 +856,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) images = [self._format_image(context, i) for i in images] return {'imagesSet': images} |