diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-26 09:45:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-26 09:45:41 +0000 |
| commit | 7ed7eb74b052d675803d738b92f134154c624063 (patch) | |
| tree | 382b2ab3c98e1ee6385a7ba1ab4de6dadf834a17 | |
| parent | 87b7c6685c8fa745a2999c00c8e136a82c9fa486 (diff) | |
| parent | bbf9d1de06e9991acd968fceee899a8df3776d60 (diff) | |
| download | nova-7ed7eb74b052d675803d738b92f134154c624063.tar.gz | |
Merge "libvirt: Provide VIR_MIGRATE_PARAM_PERSIST_XML during live migration" into stable/ussuri
| -rw-r--r-- | nova/tests/unit/virt/libvirt/test_driver.py | 8 | ||||
| -rw-r--r-- | nova/tests/unit/virt/libvirt/test_guest.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/guest.py | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index b416641d36..99ce85a870 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -11196,6 +11196,7 @@ class LibvirtConnTestCase(test.NoDBTestCase, 'migrate_disks': disk_paths, 'bandwidth': _bandwidth, 'destination_xml': target_xml, + 'persistent_xml': target_xml, } # start test @@ -11303,7 +11304,8 @@ class LibvirtConnTestCase(test.NoDBTestCase, 'migrate_disks': disk_paths, 'migrate_uri': 'tcp://127.0.0.2', 'bandwidth': CONF.libvirt.live_migration_bandwidth, - 'destination_xml': target_xml + 'destination_xml': target_xml, + 'persistent_xml': target_xml, } # Start test @@ -11462,6 +11464,7 @@ class LibvirtConnTestCase(test.NoDBTestCase, 'migrate_uri': 'tcp://127.0.0.2', 'bandwidth': CONF.libvirt.live_migration_bandwidth, 'destination_xml': target_xml, + 'persistent_xml': target_xml, } # start test @@ -11813,6 +11816,7 @@ class LibvirtConnTestCase(test.NoDBTestCase, 'migrate_disks': ['vda', 'vdb'], 'bandwidth': CONF.libvirt.live_migration_bandwidth, 'destination_xml': target_xml, + 'persistent_xml': target_xml, } # start test @@ -11939,6 +11943,7 @@ class LibvirtConnTestCase(test.NoDBTestCase, 'migrate_disks': device_names, 'bandwidth': CONF.libvirt.live_migration_bandwidth, 'destination_xml': '<xml/>', + 'persistent_xml': '<xml/>', } if not params['migrate_disks']: del params['migrate_disks'] @@ -12078,6 +12083,7 @@ class LibvirtConnTestCase(test.NoDBTestCase, 'migrate_disks': disk_paths, 'bandwidth': CONF.libvirt.live_migration_bandwidth, 'destination_xml': '<xml/>', + 'persistent_xml': '<xml/>', } # Prepare mocks diff --git a/nova/tests/unit/virt/libvirt/test_guest.py b/nova/tests/unit/virt/libvirt/test_guest.py index 55642c66f6..51899b730b 100644 --- a/nova/tests/unit/virt/libvirt/test_guest.py +++ b/nova/tests/unit/virt/libvirt/test_guest.py @@ -682,6 +682,7 @@ class GuestTestCase(test.NoDBTestCase): 'an-uri', flags=1, params={'migrate_uri': 'dest-uri', 'migrate_disks': 'disk1', 'destination_xml': '</xml>', + 'persistent_xml': '</xml>', 'bandwidth': 2}) @testtools.skipIf(not six.PY2, 'libvirt python3 bindings accept unicode') @@ -699,6 +700,7 @@ class GuestTestCase(test.NoDBTestCase): 'migrate_disks': ['disk1', 'disk2'], 'destination_xml': expect_dest_xml, + 'persistent_xml': expect_dest_xml, 'bandwidth': 2}) def test_abort_job(self): diff --git a/nova/virt/libvirt/guest.py b/nova/virt/libvirt/guest.py index 0d485eb86d..4659324730 100644 --- a/nova/virt/libvirt/guest.py +++ b/nova/virt/libvirt/guest.py @@ -638,6 +638,7 @@ class Guest(object): if destination_xml: params['destination_xml'] = destination_xml + params['persistent_xml'] = destination_xml if migrate_disks: params['migrate_disks'] = migrate_disks if migrate_uri: |