From f48a2e1a68cca1ef147279b2ddf713635f494bc0 Mon Sep 17 00:00:00 2001
From: MotoKen <motokentsai@gmail.com>
Date: Wed, 1 May 2013 14:05:58 +0800
Subject: 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
---
 nova/api/ec2/cloud.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/api')

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)
-- 
cgit