openstack/nova
Code Issues Proposed changes

Merge "Fix addition of CPU features when running against legacy libvirt"

Browse Source
This commit is contained in:
Jenkins
2013-01-14 20:03:52 +00:00
committed by Gerrit Code Review
parent 4142a84927 82b55c97d1
commit b097b59c37
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/test_libvirt.py
View File

@@ -904,6 +904,9 @@ class LibvirtConnTestCase(test.TestCase):
cpu.model = "Opteron_G4" cpu.model = "Opteron_G4"
cpu.vendor = "AMD" cpu.vendor = "AMD"
cpu.features.append(vconfig.LibvirtConfigGuestCPUFeature("tm2"))
cpu.features.append(vconfig.LibvirtConfigGuestCPUFeature("ht"))
caps = vconfig.LibvirtConfigCaps() caps = vconfig.LibvirtConfigCaps()
caps.host = vconfig.LibvirtConfigCapsHost() caps.host = vconfig.LibvirtConfigCapsHost()
caps.host.cpu = cpu caps.host.cpu = cpu
@@ -927,6 +930,9 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEquals(conf.cpu.mode, None) self.assertEquals(conf.cpu.mode, None)
self.assertEquals(conf.cpu.model, "Opteron_G4") self.assertEquals(conf.cpu.model, "Opteron_G4")
self.assertEquals(conf.cpu.vendor, "AMD") self.assertEquals(conf.cpu.vendor, "AMD")
self.assertEquals(len(conf.cpu.features), 2)
self.assertEquals(conf.cpu.features[0].name, "tm2")
self.assertEquals(conf.cpu.features[1].name, "ht")
def test_get_guest_cpu_config_custom_old(self): def test_get_guest_cpu_config_custom_old(self):
def get_lib_version_stub(self): def get_lib_version_stub(self):

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

@@ -1455,6 +1455,7 @@ class LibvirtDriver(driver.ComputeDriver):
for hostfeat in hostcpu.features: for hostfeat in hostcpu.features:
guestfeat = vconfig.LibvirtConfigGuestCPUFeature(hostfeat.name) guestfeat = vconfig.LibvirtConfigGuestCPUFeature(hostfeat.name)
guestfeat.policy = "require" guestfeat.policy = "require"
guestcpu.features.append(guestfeat)
return guestcpu return guestcpu