Merge "libvirt: drop MIN_QEMU_PPC64_VERSION"
This commit is contained in:
commit
c1be39eaca
|
@ -915,14 +915,9 @@ class LibvirtConnTestCase(test.NoDBTestCase):
|
||||||
return_value=versionutils.convert_version_to_int(
|
return_value=versionutils.convert_version_to_int(
|
||||||
libvirt_driver.MIN_LIBVIRT_OTHER_ARCH.get(
|
libvirt_driver.MIN_LIBVIRT_OTHER_ARCH.get(
|
||||||
fields.Architecture.PPC64)) - 1)
|
fields.Architecture.PPC64)) - 1)
|
||||||
@mock.patch.object(fakelibvirt.Connection, 'getVersion',
|
|
||||||
return_value=versionutils.convert_version_to_int(
|
|
||||||
libvirt_driver.MIN_QEMU_OTHER_ARCH.get(
|
|
||||||
fields.Architecture.PPC64)))
|
|
||||||
@mock.patch.object(fields.Architecture, "from_host",
|
@mock.patch.object(fields.Architecture, "from_host",
|
||||||
return_value=fields.Architecture.PPC64)
|
return_value=fields.Architecture.PPC64)
|
||||||
def test_min_version_ppc_old_libvirt(self, mock_libv, mock_qemu,
|
def test_min_version_ppc_old_libvirt(self, mock_libv, mock_arch):
|
||||||
mock_arch):
|
|
||||||
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
|
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
|
||||||
self.assertRaises(exception.NovaException,
|
self.assertRaises(exception.NovaException,
|
||||||
drvr.init_host,
|
drvr.init_host,
|
||||||
|
@ -932,30 +927,9 @@ class LibvirtConnTestCase(test.NoDBTestCase):
|
||||||
return_value=versionutils.convert_version_to_int(
|
return_value=versionutils.convert_version_to_int(
|
||||||
libvirt_driver.MIN_LIBVIRT_OTHER_ARCH.get(
|
libvirt_driver.MIN_LIBVIRT_OTHER_ARCH.get(
|
||||||
fields.Architecture.PPC64)))
|
fields.Architecture.PPC64)))
|
||||||
@mock.patch.object(fakelibvirt.Connection, 'getVersion',
|
|
||||||
return_value=versionutils.convert_version_to_int(
|
|
||||||
libvirt_driver.MIN_QEMU_OTHER_ARCH.get(
|
|
||||||
fields.Architecture.PPC64)) - 1)
|
|
||||||
@mock.patch.object(fields.Architecture, "from_host",
|
@mock.patch.object(fields.Architecture, "from_host",
|
||||||
return_value=fields.Architecture.PPC64)
|
return_value=fields.Architecture.PPC64)
|
||||||
def test_min_version_ppc_old_qemu(self, mock_libv, mock_qemu,
|
def test_min_version_ppc_ok(self, mock_libv, mock_arch):
|
||||||
mock_arch):
|
|
||||||
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
|
|
||||||
self.assertRaises(exception.NovaException,
|
|
||||||
drvr.init_host,
|
|
||||||
"dummyhost")
|
|
||||||
|
|
||||||
@mock.patch.object(fakelibvirt.Connection, 'getLibVersion',
|
|
||||||
return_value=versionutils.convert_version_to_int(
|
|
||||||
libvirt_driver.MIN_LIBVIRT_OTHER_ARCH.get(
|
|
||||||
fields.Architecture.PPC64)))
|
|
||||||
@mock.patch.object(fakelibvirt.Connection, 'getVersion',
|
|
||||||
return_value=versionutils.convert_version_to_int(
|
|
||||||
libvirt_driver.MIN_QEMU_OTHER_ARCH.get(
|
|
||||||
fields.Architecture.PPC64)))
|
|
||||||
@mock.patch.object(fields.Architecture, "from_host",
|
|
||||||
return_value=fields.Architecture.PPC64)
|
|
||||||
def test_min_version_ppc_ok(self, mock_libv, mock_qemu, mock_arch):
|
|
||||||
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
|
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
|
||||||
drvr.init_host("dummyhost")
|
drvr.init_host("dummyhost")
|
||||||
|
|
||||||
|
|
|
@ -266,7 +266,6 @@ MIN_QEMU_VIRTLOGD = (2, 7, 0)
|
||||||
# NOTE(rfolco): Same levels for Libvirt/Qemu on Big Endian and Little
|
# NOTE(rfolco): Same levels for Libvirt/Qemu on Big Endian and Little
|
||||||
# Endian giving the nuance around guest vs host architectures
|
# Endian giving the nuance around guest vs host architectures
|
||||||
MIN_LIBVIRT_KVM_PPC64_VERSION = (1, 2, 12)
|
MIN_LIBVIRT_KVM_PPC64_VERSION = (1, 2, 12)
|
||||||
MIN_QEMU_PPC64_VERSION = (2, 1, 0)
|
|
||||||
|
|
||||||
# Names of the types that do not get compressed during migration
|
# Names of the types that do not get compressed during migration
|
||||||
NO_COMPRESSION_TYPES = ('qcow2',)
|
NO_COMPRESSION_TYPES = ('qcow2',)
|
||||||
|
@ -297,9 +296,6 @@ MIN_LIBVIRT_OTHER_ARCH = {
|
||||||
MIN_QEMU_OTHER_ARCH = {
|
MIN_QEMU_OTHER_ARCH = {
|
||||||
fields.Architecture.S390: MIN_QEMU_S390_VERSION,
|
fields.Architecture.S390: MIN_QEMU_S390_VERSION,
|
||||||
fields.Architecture.S390X: MIN_QEMU_S390_VERSION,
|
fields.Architecture.S390X: MIN_QEMU_S390_VERSION,
|
||||||
fields.Architecture.PPC: MIN_QEMU_PPC64_VERSION,
|
|
||||||
fields.Architecture.PPC64: MIN_QEMU_PPC64_VERSION,
|
|
||||||
fields.Architecture.PPC64LE: MIN_QEMU_PPC64_VERSION,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# perf events support
|
# perf events support
|
||||||
|
@ -536,15 +532,23 @@ class LibvirtDriver(driver.ComputeDriver):
|
||||||
not self._host.has_min_version(
|
not self._host.has_min_version(
|
||||||
MIN_LIBVIRT_OTHER_ARCH.get(kvm_arch),
|
MIN_LIBVIRT_OTHER_ARCH.get(kvm_arch),
|
||||||
MIN_QEMU_OTHER_ARCH.get(kvm_arch))):
|
MIN_QEMU_OTHER_ARCH.get(kvm_arch))):
|
||||||
|
if MIN_QEMU_OTHER_ARCH.get(kvm_arch):
|
||||||
|
raise exception.InternalError(
|
||||||
|
_('Running Nova with qemu/kvm virt_type on %(arch)s '
|
||||||
|
'requires libvirt version %(libvirt_ver)s and '
|
||||||
|
'qemu version %(qemu_ver)s, or greater') %
|
||||||
|
{'arch': kvm_arch,
|
||||||
|
'libvirt_ver': self._version_to_string(
|
||||||
|
MIN_LIBVIRT_OTHER_ARCH.get(kvm_arch)),
|
||||||
|
'qemu_ver': self._version_to_string(
|
||||||
|
MIN_QEMU_OTHER_ARCH.get(kvm_arch))})
|
||||||
|
# no qemu version in the error message
|
||||||
raise exception.InternalError(
|
raise exception.InternalError(
|
||||||
_('Running Nova with qemu/kvm virt_type on %(arch)s '
|
_('Running Nova with qemu/kvm virt_type on %(arch)s '
|
||||||
'requires libvirt version %(libvirt_ver)s and '
|
'requires libvirt version %(libvirt_ver)s or greater') %
|
||||||
'qemu version %(qemu_ver)s, or greater') %
|
|
||||||
{'arch': kvm_arch,
|
{'arch': kvm_arch,
|
||||||
'libvirt_ver': self._version_to_string(
|
'libvirt_ver': self._version_to_string(
|
||||||
MIN_LIBVIRT_OTHER_ARCH.get(kvm_arch)),
|
MIN_LIBVIRT_OTHER_ARCH.get(kvm_arch))})
|
||||||
'qemu_ver': self._version_to_string(
|
|
||||||
MIN_QEMU_OTHER_ARCH.get(kvm_arch))})
|
|
||||||
|
|
||||||
def _prepare_migration_flags(self):
|
def _prepare_migration_flags(self):
|
||||||
migration_flags = 0
|
migration_flags = 0
|
||||||
|
|
Loading…
Reference in New Issue