Merge "libvirt: drop MIN_LIBVIRT_FSFREEZE_VERSION"

nova/tests/unit/virt/libvirt/test_driver.py

@@ -6080,13 +6080,6 @@ class LibvirtConnTestCase(test.NoDBTestCase):
             self.assertIsNone(drvr.quiesce(self.context, instance, image_meta))
             mock_fsfreeze.assert_called_once_with()
 
-    def test_quiesce_not_supported(self):
-        self.create_fake_libvirt_mock()
-        drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI())
-        instance = objects.Instance(**self.test_instance)
-        self.assertRaises(exception.InstanceQuiesceNotSupported,
-                      drvr.quiesce, self.context, instance, None)
-
     @mock.patch.object(host.Host, "has_min_version", return_value=True)
     def test_unquiesce(self, mock_has_min_version):
         self.create_fake_libvirt_mock(getLibVersion=lambda: 1002005,
@@ -17833,16 +17826,6 @@ class LibvirtVolumeSnapshotTestCase(test.NoDBTestCase):
         self.assertRaises(exception.InstanceQuiesceNotSupported,
                           self.drvr._can_quiesce, instance, image_meta)
 
-    @mock.patch.object(host.Host,
-                       'has_min_version', return_value=False)
-    def test_can_quiesce_bad_ver(self, ver):
-        self.flags(virt_type='kvm', group='libvirt')
-        instance = objects.Instance(**self.inst)
-        image_meta = {"properties": {
-            "hw_qemu_guest_agent": "yes"}}
-        self.assertRaises(exception.InstanceQuiesceNotSupported,
-                          self.drvr._can_quiesce, instance, image_meta)
-
     @mock.patch.object(host.Host,
                        'has_min_version', return_value=True)
     def test_can_quiesce_agent_not_enable(self, ver):

nova/virt/libvirt/driver.py

@@ -240,8 +240,6 @@ BAD_LIBVIRT_CPU_POLICY_VERSIONS = [(1, 2, 10)]
 # NUMA nodes, along with the ability to specify hugepage
 # sizes per guest NUMA node
 MIN_QEMU_NUMA_HUGEPAGE_VERSION = (2, 1, 0)
-# fsFreeze/fsThaw requirement
-MIN_LIBVIRT_FSFREEZE_VERSION = (1, 2, 5)
 
 # UEFI booting support
 MIN_LIBVIRT_UEFI_VERSION = (1, 2, 9)
@@ -1689,8 +1687,7 @@ class LibvirtDriver(driver.ComputeDriver):
             raise exception.InternalError(msg)
 
     def _can_quiesce(self, instance, image_meta):
-        if (CONF.libvirt.virt_type not in ('kvm', 'qemu') or
-            not self._host.has_min_version(MIN_LIBVIRT_FSFREEZE_VERSION)):
+        if CONF.libvirt.virt_type not in ('kvm', 'qemu'):
             raise exception.InstanceQuiesceNotSupported(
                 instance_id=instance.uuid)