summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-05-26 20:21:40 +0000
committerChris Behrens <cbehrens@codestud.com>2011-05-26 20:21:40 +0000
commitfc27a0ac4f907282a669e2c9f3e128890907f236 (patch)
treeb6850ba069b0bd00bab443debb0956e33af009a9
parent9e22f51c80cc5f7f5ea60b5b8bb779779a19667c (diff)
add a comment when calling glance:download_vhd so it's clear what is returned
-rw-r--r--nova/virt/xenapi/vm_utils.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index bee9742a4..06ee8ee9b 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -417,6 +417,10 @@ class VMHelper(HelperBase):
kwargs = {'params': pickle.dumps(params)}
task = session.async_call_plugin('glance', 'download_vhd', kwargs)
result = session.wait_for_task(task, instance_id)
+ # 'download_vhd' will return a json encoded string containing
+ # a list of dictionaries describing VDIs. The dictionary will
+ # contain 'vdi_type' and 'vdi_uuid' keys. 'vdi_type' can be
+ # 'os' or 'swap' right now.
vdis = json.loads(result)
for vdi in vdis:
LOG.debug(_("xapi 'download_vhd' returned VDI of "