openstack
/
nova
Code Issues Proposed changes

Merge "Fix exception when vcpu_pin_set is set to """

This commit is contained in:
Jenkins 2016-10-14 13:23:46 +00:00 committed by Gerrit Code Review
parent 84df91ddc4 8b199c6dff
commit 9d085b2194
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -5907,6 +5907,16 @@ class LibvirtConnTestCase(test.NoDBTestCase):
self.assertEqual(uuids[3], vm4.UUIDString())
mock_list.assert_called_with(only_guests=True, only_running=False)
@mock.patch('nova.virt.libvirt.host.Host.get_online_cpus',
return_value=None)
@mock.patch('nova.virt.libvirt.host.Host.get_cpu_count',
return_value=4)
def test_get_host_vcpus_is_empty(self, get_cpu_count, get_online_cpus):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
self.flags(vcpu_pin_set="")
vcpus = drvr._get_vcpu_total()
self.assertEqual(4, vcpus)
@mock.patch('nova.virt.libvirt.host.Host.get_online_cpus')
def test_get_host_vcpus(self, get_online_cpus):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)

2
nova/virt/libvirt/driver.py
View File

@ -4888,7 +4888,7 @@ class LibvirtDriver(driver.ComputeDriver):
"function is not implemented for this platform. "))
return 0
if CONF.vcpu_pin_set is None:
if not CONF.vcpu_pin_set:
return total_pcpus
available_ids = hardware.get_vcpu_pin_set()