From 381354babab58688458b2a6cdc463eb0a0fee461 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Mon, 28 Mar 2011 13:11:45 +0100 Subject: addressed reviewers' concerns --- nova/virt/xenapi/vm_utils.py | 18 ++++++++++++------ nova/virt/xenapi_conn.py | 7 +++---- 2 files changed, 15 insertions(+), 10 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 8abd19c3c..bcf2a9962 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -466,17 +466,23 @@ class VMHelper(HelperBase): vdi_size += MBR_SIZE_BYTES name_label = get_name_label_for_image(image) - vdi_ref = cls.create_vdi(session, sr_ref, name_label, - vdi_size, False) + vdi_ref = cls.create_vdi(session, + sr_ref, + name_label, + vdi_size, + False) # from this point we have a VDI on Xen host # if anything goes wrong, we need to remember its uuid try: filename = None vdi_uuid = session.get_xenapi().VDI.get_uuid(vdi_ref) - with_vdi_attached_here(session, vdi_ref, False, - lambda dev: - _stream_disk(dev, image_type, - virtual_size, image_file)) + with_vdi_attached_here(session, + vdi_ref, + False, + lambda dev: _stream_disk(dev, + image_type, + virtual_size, + image_file)) if image_type in (ImageType.KERNEL, ImageType.RAMDISK): # we need to invoke a plugin for copying VDI's # content into proper path diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py index c7e94c508..191498916 100644 --- a/nova/virt/xenapi_conn.py +++ b/nova/virt/xenapi_conn.py @@ -367,10 +367,9 @@ class XenAPISession(object): try: name = self._session.xenapi.task.get_name_label(task) status = self._session.xenapi.task.get_status(task) - action = dict( - action=name[0:255], # Ensure action is never > 255 - instance_id=id and int(id) or None, - error=None) + action = dict(action=name[0:255], + instance_id=id and int(id) or None, + error=None) if status == "pending": return elif status == "success": -- cgit