KeyError: 'imageId' when creating instance with EC2/S3

[Dan Prince]

I'm getting the following exception in nova-api.log when trying to create images with EC2 API and S3:

2011-02-15 00:21:14,591 ERROR nova.api [V1FK9F30-DM3KU99GGL7 admin admin] Unexpected error raised: 'imageId'
(nova.api): TRACE: Traceback (most recent call last):
(nova.api): TRACE: File "/usr/lib/pymodules/python2.6/nova/api/ec2/__init__.py", line 316, in __call__
(nova.api): TRACE: result = api_request.invoke(context)
(nova.api): TRACE: File "/usr/lib/pymodules/python2.6/nova/api/ec2/apirequest.py", line 128, in invoke
(nova.api): TRACE: result = method(context, **args)
(nova.api): TRACE: File "/usr/lib/pymodules/python2.6/nova/api/ec2/cloud.py", line 800, in run_instances
(nova.api): TRACE: 'AvailabilityZone'))
(nova.api): TRACE: File "/usr/lib/pymodules/python2.6/nova/compute/api.py", line 104, in create
(nova.api): TRACE: image = self.image_service.show(context, image_id)
(nova.api): TRACE: File "/usr/lib/pymodules/python2.6/nova/image/s3.py", line 97, in show
(nova.api): TRACE: result = [i for i in result if i['imageId'] == image_id]
(nova.api): TRACE: KeyError: 'imageId'
(nova.api): TRACE:

[Dan Prince (dan-prince)]

The following patch seems to resolve the issue. Branch to follow.