From ef92e3f6fa0059fb19e1ce5af0b8c2ff7e113add Mon Sep 17 00:00:00 2001 From: Eli Qiao Date: Wed, 15 Jun 2016 09:31:20 +0800 Subject: [PATCH] libvirt: cleanup baselineCPU return value checking After MIN libvirt version bump to 1.2.1, baselineCPU won't return -1. Remove -1 checking. Change-Id: I3f9ffd7ff16bbdfe9071c4157a4d4b4f0dfe7e3b --- nova/tests/unit/virt/libvirt/test_host.py | 7 ------- nova/virt/libvirt/host.py | 6 +----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/nova/tests/unit/virt/libvirt/test_host.py b/nova/tests/unit/virt/libvirt/test_host.py index a4c96c170a14..90a4725b5f65 100644 --- a/nova/tests/unit/virt/libvirt/test_host.py +++ b/nova/tests/unit/virt/libvirt/test_host.py @@ -684,13 +684,6 @@ class HostTestCase(test.NoDBTestCase): self.assertRaises(fakelibvirt.libvirtError, self.host.get_capabilities) - def test_lxc_get_host_capabilities_failed(self): - with mock.patch.object(fakelibvirt.virConnect, 'baselineCPU', - return_value=-1): - caps = self.host.get_capabilities() - self.assertEqual(vconfig.LibvirtConfigCaps, type(caps)) - self.assertNotIn('aes', [x.name for x in caps.host.cpu.features]) - def test_get_capabilities_no_host_cpu_model(self): """Tests that cpu features are not retrieved when the host cpu model is not in the capabilities. diff --git a/nova/virt/libvirt/host.py b/nova/virt/libvirt/host.py index f3887e89940e..6ff04984ca88 100644 --- a/nova/virt/libvirt/host.py +++ b/nova/virt/libvirt/host.py @@ -671,11 +671,7 @@ class Host(object): features = self.get_connection().baselineCPU( [self._caps.host.cpu.to_xml()], libvirt.VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) - # FIXME(wangpan): the return value of baselineCPU should be - # None or xml string, but libvirt has a bug - # of it from 1.1.2 which is fixed in 1.2.0, - # this -1 checking should be removed later. - if features and features != -1: + if features: cpu = vconfig.LibvirtConfigCPU() cpu.parse_str(features) self._caps.host.cpu.features = cpu.features