diff --git a/instances/utils.py b/instances/utils.py
index 4f846530..247383ab 100644
--- a/instances/utils.py
+++ b/instances/utils.py
@@ -156,7 +156,6 @@ def migrate_instance(
user,
live=False,
unsafe=False,
- xml_del=False,
offline=False,
autoconverge=False,
compress=False,
@@ -188,7 +187,6 @@ def migrate_instance(
instance.name,
live,
unsafe,
- xml_del,
offline,
autoconverge,
compress,
diff --git a/instances/views.py b/instances/views.py
index 27fb334a..fee05f44 100755
--- a/instances/views.py
+++ b/instances/views.py
@@ -657,7 +657,6 @@ def migrate(request, pk):
compute_id = request.POST.get("compute_id", "")
live = request.POST.get("live_migrate", False)
unsafe = request.POST.get("unsafe_migrate", False)
- xml_del = request.POST.get("xml_delete", False)
offline = request.POST.get("offline_migrate", False)
autoconverge = request.POST.get("autoconverge", False)
compress = request.POST.get("compress", False)
@@ -675,7 +674,6 @@ def migrate(request, pk):
request.user,
live,
unsafe,
- xml_del,
offline,
autoconverge,
compress,
@@ -1878,7 +1876,7 @@ def clone(request, pk):
new_compute = Compute.objects.order_by("?").first()
if new_compute != instance.compute:
utils.migrate_instance(
- new_compute, new_instance, request.user, xml_del=True, offline=True
+ new_compute, new_instance, request.user, offline=True
)
return redirect(reverse("instances:instance", args=[new_instance.id]))
diff --git a/vrtManager/instance.py b/vrtManager/instance.py
index 1cb9c11d..34961fd1 100644
--- a/vrtManager/instance.py
+++ b/vrtManager/instance.py
@@ -113,13 +113,14 @@ class wvmInstances(wvmConnect):
name,
live,
unsafe,
- undefine,
offline,
autoconverge=False,
compress=False,
postcopy=False,
):
- flags = VIR_MIGRATE_PERSIST_DEST
+ # The source definition always goes: one left behind points at the
+ # same (shared) disks as the migrated VM and could be started again.
+ flags = VIR_MIGRATE_PERSIST_DEST | VIR_MIGRATE_UNDEFINE_SOURCE
if live and conn.get_status() != 5:
flags |= VIR_MIGRATE_LIVE
if unsafe and conn.get_status() == 1:
@@ -132,8 +133,6 @@ class wvmInstances(wvmConnect):
flags |= VIR_MIGRATE_COMPRESSED
if not offline and postcopy and conn.get_status() == 1:
flags |= VIR_MIGRATE_POSTCOPY
- if undefine:
- flags |= VIR_MIGRATE_UNDEFINE_SOURCE
dom = conn.instance
diff --git a/vrtManager/test_migration.py b/vrtManager/test_migration.py
new file mode 100644
index 00000000..50e9f942
--- /dev/null
+++ b/vrtManager/test_migration.py
@@ -0,0 +1,52 @@
+"""Migration flags: the source definition never stays behind."""
+
+import unittest
+
+import libvirt
+from django.conf import settings
+
+if not settings.configured:
+ settings.configure(MAC_OUI="52:54:10")
+
+from vrtManager.instance import wvmInstances
+
+
+class FakeDomain:
+ def __init__(self):
+ self.calls = []
+
+ def migrate(self, dconn, flags, dname, uri, bandwidth):
+ self.calls.append((flags, uri))
+
+
+class FakeSource:
+ def __init__(self, state):
+ self.state = state
+ self.instance = FakeDomain()
+
+ def get_status(self):
+ return self.state
+
+ def get_arch(self):
+ return "x86_64"
+
+ def get_dom_emulator(self):
+ return "/usr/bin/qemu-system-x86_64"
+
+
+def destination():
+ dest = wvmInstances.__new__(wvmInstances)
+ dest.wvm = object()
+ dest.get_emulator = lambda arch: "/usr/bin/qemu-system-x86_64"
+ return dest
+
+
+class MigrationFlagsTestCase(unittest.TestCase):
+ def test_the_source_definition_is_always_removed(self):
+ for state, live, offline in ((1, True, False), (5, False, True)):
+ with self.subTest(state=state):
+ source = FakeSource(state)
+ destination().moveto(source, "vm", live=live, unsafe=False, offline=offline)
+ flags = source.instance.calls[0][0]
+ self.assertTrue(flags & libvirt.VIR_MIGRATE_UNDEFINE_SOURCE)
+ self.assertTrue(flags & libvirt.VIR_MIGRATE_PERSIST_DEST)