diff options
| author | MotoKen <motokentsai@gmail.com> | 2013-05-01 14:05:58 +0800 |
|---|---|---|
| committer | MotoKen <motokentsai@gmail.com> | 2013-05-01 16:02:53 +0800 |
| commit | f48a2e1a68cca1ef147279b2ddf713635f494bc0 (patch) | |
| tree | 730f41138a3a382dccc192d16b40580e95fc7fa9 /nova/api | |
| parent | dccbcc84a922d16eb230491e2a4d486fdb19b40f (diff) | |
| download | nova-f48a2e1a68cca1ef147279b2ddf713635f494bc0.tar.gz nova-f48a2e1a68cca1ef147279b2ddf713635f494bc0.tar.xz nova-f48a2e1a68cca1ef147279b2ddf713635f494bc0.zip | |
Fix EC2 instance bdm response
Make the bdm response respect Amazon EC2 spec:
* use ec2 volume id instead of uuid
* use volume attach_status instead of status
References:
http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-ItemType-EbsInstanceBlockDeviceMappingResponseType.html
Resolves bug 1165973.
Change-Id: Ib68397b79f63e01e92ed4bebbc245ba5e0a3ad11
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 4b779e26f..da319bc8b 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1072,10 +1072,10 @@ class CloudController(object): vol = self.volume_api.get(context, volume_id) LOG.debug(_("vol = %s\n"), vol) # TODO(yamahata): volume attach time - ebs = {'volumeId': volume_id, + ebs = {'volumeId': ec2utils.id_to_ec2_vol_id(volume_id), 'deleteOnTermination': bdm['delete_on_termination'], 'attachTime': vol['attach_time'] or '', - 'status': vol['status'], } + 'status': vol['attach_status'], } res = {'deviceName': bdm['device_name'], 'ebs': ebs, } mapping.append(res) |