From e59a5fee47fdfdaaa262d333b3642de4b4caa57d Mon Sep 17 00:00:00 2001 From: Kashyap Chamarthy Date: Mon, 25 Nov 2019 15:09:06 +0100 Subject: [PATCH] libvirt: Remove MIN_QEMU_FILE_BACKED_DISCARD_VERSION MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The updated minimum required QEMU (2.11) for "Ussuri" satisfy the version requirement; this was done in Change-Id: Ia18e9be4d (22c1916b49 — libvirt: Bump MIN_{LIBVIRT,QEMU}_VERSION for "Ussuri", 2019-11-19). Drop the version constant MIN_QEMU_FILE_BACKED_DISCARD_VERSION and now-needless compatibility code; adjust/remove tests. Change-Id: Id80fd1f68c0bb3b2d3af6e139b3d163acaef081d Signed-off-by: Kashyap Chamarthy --- nova/tests/unit/virt/libvirt/test_driver.py | 52 +++------------------ nova/virt/libvirt/driver.py | 8 ++-- 2 files changed, 9 insertions(+), 51 deletions(-) diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index c08c6048d06a..bc89dcfa9ae9 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -3129,48 +3129,26 @@ class LibvirtConnTestCase(test.NoDBTestCase, self.assertTrue(result.filesource) self.assertTrue(result.allocateimmediate) - @mock.patch.object(fakelibvirt.Connection, 'getVersion') @mock.patch.object(fakelibvirt.Connection, 'getLibVersion') def test_get_guest_memory_backing_config_file_backed_discard(self, - mock_lib_version, mock_version): + mock_lib_version): self.flags(file_backed_memory=1024, group='libvirt') mock_lib_version.return_value = versionutils.convert_version_to_int( libvirt_driver.MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION) - mock_version.return_value = versionutils.convert_version_to_int( - libvirt_driver.MIN_QEMU_FILE_BACKED_DISCARD_VERSION) result = self._test_get_guest_memory_backing_config( None, None, None ) self.assertTrue(result.discard) - @mock.patch.object(fakelibvirt.Connection, 'getVersion') @mock.patch.object(fakelibvirt.Connection, 'getLibVersion') def test_get_guest_memory_backing_config_file_backed_discard_libvirt(self, - mock_lib_version, mock_version): + mock_lib_version): self.flags(file_backed_memory=1024, group='libvirt') mock_lib_version.return_value = versionutils.convert_version_to_int( libvirt_driver.MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION) - 1 - mock_version.return_value = versionutils.convert_version_to_int( - libvirt_driver.MIN_QEMU_FILE_BACKED_DISCARD_VERSION) - - result = self._test_get_guest_memory_backing_config( - None, None, None - ) - self.assertFalse(result.discard) - - @mock.patch.object(fakelibvirt.Connection, 'getVersion') - @mock.patch.object(fakelibvirt.Connection, 'getLibVersion') - def test_get_guest_memory_backing_config_file_backed_discard_qemu(self, - mock_lib_version, mock_version): - self.flags(file_backed_memory=1024, group='libvirt') - - mock_lib_version.return_value = versionutils.convert_version_to_int( - libvirt_driver.MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION) - mock_version.return_value = versionutils.convert_version_to_int( - libvirt_driver.MIN_QEMU_FILE_BACKED_DISCARD_VERSION) - 1 result = self._test_get_guest_memory_backing_config( None, None, None @@ -10152,19 +10130,17 @@ class LibvirtConnTestCase(test.NoDBTestCase, self.assertTrue(return_value.dst_wants_file_backed_memory) - @mock.patch.object(fakelibvirt.Connection, 'getVersion') @mock.patch.object(fakelibvirt.Connection, 'getLibVersion') @mock.patch.object(libvirt_driver.LibvirtDriver, '_create_shared_storage_test_file') @mock.patch.object(fakelibvirt.Connection, 'compareCPU') def _test_check_can_live_migrate_dest_file_backed_discard( - self, libvirt_version, qemu_version, mock_cpu, mock_test_file, - mock_lib_version, mock_version): + self, libvirt_version, mock_cpu, mock_test_file, + mock_lib_version): self.flags(file_backed_memory=1024, group='libvirt') mock_lib_version.return_value = libvirt_version - mock_version.return_value = qemu_version instance_ref = objects.Instance(**self.test_instance) instance_ref.vcpu_model = test_vcpu_model.fake_vcpumodel @@ -10189,11 +10165,9 @@ class LibvirtConnTestCase(test.NoDBTestCase, def test_check_can_live_migrate_dest_file_backed_discard(self): libvirt_version = versionutils.convert_version_to_int( libvirt_driver.MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION) - qemu_version = versionutils.convert_version_to_int( - libvirt_driver.MIN_QEMU_FILE_BACKED_DISCARD_VERSION) data = self._test_check_can_live_migrate_dest_file_backed_discard( - libvirt_version, qemu_version) + libvirt_version) self.assertTrue(data.dst_wants_file_backed_memory) self.assertTrue(data.file_backed_memory_discard) @@ -10201,23 +10175,9 @@ class LibvirtConnTestCase(test.NoDBTestCase, def test_check_can_live_migrate_dest_file_backed_discard_bad_libvirt(self): libvirt_version = versionutils.convert_version_to_int( libvirt_driver.MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION) - 1 - qemu_version = versionutils.convert_version_to_int( - libvirt_driver.MIN_QEMU_FILE_BACKED_DISCARD_VERSION) data = self._test_check_can_live_migrate_dest_file_backed_discard( - libvirt_version, qemu_version) - - self.assertTrue(data.dst_wants_file_backed_memory) - self.assertFalse(data.file_backed_memory_discard) - - def test_check_can_live_migrate_dest_file_backed_discard_bad_qemu(self): - libvirt_version = versionutils.convert_version_to_int( - libvirt_driver.MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION) - qemu_version = versionutils.convert_version_to_int( - libvirt_driver.MIN_QEMU_FILE_BACKED_DISCARD_VERSION) - 1 - - data = self._test_check_can_live_migrate_dest_file_backed_discard( - libvirt_version, qemu_version) + libvirt_version) self.assertTrue(data.dst_wants_file_backed_memory) self.assertFalse(data.file_backed_memory_discard) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index df7244aee7a0..deab97769788 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -269,7 +269,6 @@ MIN_LIBVIRT_FILE_BACKED_VERSION = (4, 0, 0) MIN_QEMU_FILE_BACKED_VERSION = (2, 6, 0) MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION = (4, 4, 0) -MIN_QEMU_FILE_BACKED_DISCARD_VERSION = (2, 10, 0) MIN_LIBVIRT_NATIVE_TLS_VERSION = (4, 4, 0) MIN_QEMU_NATIVE_TLS_VERSION = (2, 11, 0) @@ -5174,8 +5173,7 @@ class LibvirtDriver(driver.ComputeDriver): membacking.sharedaccess = True membacking.allocateimmediate = True if self._host.has_min_version( - MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION, - MIN_QEMU_FILE_BACKED_DISCARD_VERSION): + MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION): membacking.discard = True if self._sev_enabled(flavor, image_meta): if not membacking: @@ -7971,8 +7969,8 @@ class LibvirtDriver(driver.ComputeDriver): data.disk_available_mb = disk_available_mb data.dst_wants_file_backed_memory = CONF.libvirt.file_backed_memory > 0 data.file_backed_memory_discard = (CONF.libvirt.file_backed_memory and - self._host.has_min_version(MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION, - MIN_QEMU_FILE_BACKED_DISCARD_VERSION)) + self._host.has_min_version( + MIN_LIBVIRT_FILE_BACKED_DISCARD_VERSION)) # TODO(artom) Set to indicate that the destination (us) can perform a # NUMA-aware live migration. NUMA-aware live migration will become