From a590d086ff5e6fdb0fbe88dd27a9bbe619e4fa85 Mon Sep 17 00:00:00 2001
From: Rick Harris <rconradharris@gmail.com>
Date: Wed, 27 Jun 2012 22:15:59 +0000
Subject: [PATCH] Swap VDI now uses correct name label.

Fixes bug 1018596

Change-Id: I788a762e3d3362c04c7d6986808d13f77d9c5a5e
---
 nova/virt/xenapi/vm_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 64a479fe1f1..24ecaaeb0b2 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -322,7 +322,7 @@ def create_vdi(session, sr_ref, info, disk_type, virtual_size,
     # hence information about instance may or may not be present
     otherconf = {}
     if not isinstance(info, basestring):
-        name_label = info['display_name']
+        name_label = info['name']
         otherconf = {'nova_instance_uuid': info['uuid'],
                      'nova_disk_type': disk_type}
     else: