initial fudging in of swap disk

4 files changed, 35 insertions, 18 deletions

diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 4833ccb07..d9306900d 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -37,7 +37,7 @@ def stubout_instance_snapshot(stubs):
                              sr_ref=sr_ref, sharable=False)
         vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
         vdi_uuid = vdi_rec['uuid']
-        return vdi_uuid
+        return dict(primary_vdi_uuid=vdi_uuid, swap_vdi_uuid=None)
 
     stubs.Set(vm_utils.VMHelper, 'fetch_image', fake_fetch_image)
 
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 9f6cd608c..c24fc7ba6 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -408,18 +408,24 @@ class VMHelper(HelperBase):
 
         kwargs = {'params': pickle.dumps(params)}
         task = session.async_call_plugin('glance', 'download_vhd', kwargs)
-        vdi_uuid = session.wait_for_task(task, instance_id)
+        vdi_uuids = session.wait_for_task(task, instance_id)
+        primary_vdi_uuid = vdi_uuids.get('primary_vdi_uuid')
+        swap_vdi_uuid = vdi_uuids.get('swap_vdi_uuid')
 
         cls.scan_sr(session, instance_id, sr_ref)
 
         # Set the name-label to ease debugging
-        vdi_ref = session.get_xenapi().VDI.get_by_uuid(vdi_uuid)
-        name_label = get_name_label_for_image(image)
-        session.get_xenapi().VDI.set_name_label(vdi_ref, name_label)
+        primary_vdi_ref = session.get_xenapi().VDI.get_by_uuid(primary_vdi_uuid)
+        primary_name_label = get_name_label_for_image(image)
+        session.get_xenapi().VDI.set_name_label(primary_vdi_ref, primary_name_label)
 
-        LOG.debug(_("xapi 'download_vhd' returned VDI UUID %(vdi_uuid)s")
+        LOG.debug(_("xapi 'download_vhd' returned VDI UUID %(primary_vdi_uuid)s")
                   % locals())
-        return vdi_uuid
+
+	LOG.debug("=" * 100)
+        LOG.debug(rimary_vdi_uuid)
+        LOG.debug(swap_vdi_uuid)
+        return (primary_vdi_uuid, swap_vdi_uuid)
 
     @classmethod
     def _fetch_image_glance_disk(cls, session, instance_id, image, access,
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 0074444f8..4a01cac29 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -109,20 +109,20 @@ class VMOps(object):
         user = AuthManager().get_user(instance.user_id)
         project = AuthManager().get_project(instance.project_id)
         disk_image_type = VMHelper.determine_disk_image_type(instance)
-        vdi_uuid = VMHelper.fetch_image(self._session, instance.id,
-                instance.image_id, user, project, disk_image_type)
-        return vdi_uuid
+        (primary_vdi_uuid, swap_vdi_uuid) = VMHelper.fetch_image(self._session,
+                instance.id, instance.image_id, user, project, disk_image_type)
+        return (primary_vdi_uuid, swap_vdi_uuid)
 
     def spawn(self, instance, network_info=None):
-        vdi_uuid = self._create_disk(instance)
-        vm_ref = self._create_vm(instance, vdi_uuid, network_info)
+        vdi_uuid, swap_uuid = self._create_disk(instance)
+        vm_ref = self._create_vm(instance, vdi_uuid, swap_uuid, network_info)
         self._spawn(instance, vm_ref)
 
     def spawn_rescue(self, instance):
         """Spawn a rescue instance."""
         self.spawn(instance)
 
-    def _create_vm(self, instance, vdi_uuid, network_info=None):
+    def _create_vm(self, instance, vdi_uuid, swap_vdi_uuid=None, network_info=None):
         """Create VM instance."""
         instance_name = instance.name
         vm_ref = VMHelper.lookup(self._session, instance_name)
@@ -143,18 +143,20 @@ class VMOps(object):
 
         # Are we building from a pre-existing disk?
         vdi_ref = self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)
+        if swap_vdi_uuid:
+            swap_vdi_ref = self._session.call_xenapi('VDI.get_by_uuid', swap_vdi_uuid)
 
         disk_image_type = VMHelper.determine_disk_image_type(instance)
 
         kernel = None
         if instance.kernel_id:
             kernel = VMHelper.fetch_image(self._session, instance.id,
-                instance.kernel_id, user, project, ImageType.KERNEL_RAMDISK)
+                instance.kernel_id, user, project, ImageType.KERNEL_RAMDISK)[0]
 
         ramdisk = None
         if instance.ramdisk_id:
             ramdisk = VMHelper.fetch_image(self._session, instance.id,
-                instance.ramdisk_id, user, project, ImageType.KERNEL_RAMDISK)
+                instance.ramdisk_id, user, project, ImageType.KERNEL_RAMDISK)[0]
 
         use_pv_kernel = VMHelper.determine_is_pv(self._session, instance.id,
             vdi_ref, disk_image_type, instance.os_type)
@@ -163,6 +165,9 @@ class VMOps(object):
 
         VMHelper.create_vbd(session=self._session, vm_ref=vm_ref,
                 vdi_ref=vdi_ref, userdevice=0, bootable=True)
+	if swap_vdi_uuid:
+            VMHelper.create_vbd(session=self._session, vm_ref=vm_ref,
+                    vdi_ref=swap_vdi_ref, userdevice=0, bootable=False)
 
         # TODO(tr3buchet) - check to make sure we have network info, otherwise
         # create it now. This goes away once nova-multi-nic hits.
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index 4b45671ae..9d6ee78ab 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -177,8 +177,15 @@ def _fixup_vhds(sr_path, staging_path, uuid_stack):
     else:
         assert_vhd_not_hidden(base_copy_path)
 
+    # If we find a swap.vhd, go ahead and copy it into the SR
+    swap_uuid = None
+    orig_swap_path = os.path.join(staging_path, 'swap.vhd')
+    if os.path.exists(orig_swap_path):
+        swap_path, swap_uuid = rename_with_uuid(orig_swap_path)
+        move_into_sr(swap_path)
+
     move_into_sr(base_copy_path)
-    return vdi_uuid
+    return dict(primary_vdi_uuid=vdi_uuid, swap_vdi_uuid=swap_uuid)
 
 
 def _prepare_staging_area_for_upload(sr_path, staging_path, vdi_uuids):
@@ -324,8 +331,7 @@ def download_vhd(session, args):
     try:
         _download_tarball(sr_path, staging_path, image_id, glance_host,
                           glance_port)
-        vdi_uuid = _fixup_vhds(sr_path, staging_path, uuid_stack)
-        return vdi_uuid
+        return _fixup_vhds(sr_path, staging_path, uuid_stack)
     finally:
         _cleanup_staging_area(staging_path)