openstack/nova
Code Issues Proposed changes

Merge "libvirt: pci detach devices should use dev.address"

Browse Source
This commit is contained in:
Jenkins
2016-04-04 17:38:28 +00:00
committed by Gerrit Code Review
parent 98c4111331 871368bc65
commit ce5f9c609f
2 changed files with 57 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1318,9 +1318,12 @@ class LibvirtConnTestCase(test.NoDBTestCase):
self.assertRaises(exception.PciDeviceDetachFailed, self.assertRaises(exception.PciDeviceDetachFailed,
drvr._detach_pci_devices, None, pci_devices) drvr._detach_pci_devices, None, pci_devices)
def test_detach_pci_devices(self): @mock.patch.object(host.Host,
'has_min_version', return_value=True)
@mock.patch.object(nova.virt.libvirt.guest.Guest, 'get_xml_desc')
def test_detach_pci_devices(self, mocked_get_xml_desc, *args):
fake_domXML1 =\ fake_domXML1_with_pci = (
"""<domain> <devices> """<domain> <devices>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/> <driver name='qemu' type='qcow2' cache='none'/>
@@ -1332,84 +1335,68 @@ class LibvirtConnTestCase(test.NoDBTestCase):
</disk> </disk>
<hostdev mode="subsystem" type="pci" managed="yes"> <hostdev mode="subsystem" type="pci" managed="yes">
<source> <source>
<address function="0x1" slot="0x10" domain="0x0000" <address function="0x1" slot="0x10" domain="0x0001"
bus="0x04"/> bus="0x04"/>
</source> </source>
</hostdev></devices></domain>""" </hostdev></devices></domain>""")
pci_devices = [dict(hypervisor_name='xxx', fake_domXML1_without_pci = (
id='id1', """<domain> <devices>
instance_uuid='uuid', <disk type='file' device='disk'>
address="0001:04:10:1")] <driver name='qemu' type='qcow2' cache='none'/>
<source file='xxx'/>
<target dev='vda' bus='virtio'/>
<alias name='virtio-disk0'/>
<address type='pci' domain='0x0001' bus='0x00'
slot='0x04' function='0x0'/>
</disk></devices></domain>""")
pci_device_info = {'compute_node_id': 1,
'instance_uuid': 'uuid',
'address': '0001:04:10.1'}
pci_device = objects.PciDevice(**pci_device_info)
pci_devices = [pci_device]
mocked_get_xml_desc.return_value = fake_domXML1_without_pci
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True) drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
self.mox.StubOutWithMock(host.Host, dom = fakelibvirt.Domain(
'has_min_version') drvr._get_connection(), fake_domXML1_with_pci, False)
host.Host.has_min_version = lambda x, y: True guest = libvirt_guest.Guest(dom)
self.mox.StubOutWithMock(libvirt_driver.LibvirtDriver,
'_get_guest_pci_device')
class FakeDev(object):
def to_xml(self):
pass
libvirt_driver.LibvirtDriver._get_guest_pci_device =\
lambda x, y: FakeDev()
class FakeDomain(object):
def detachDeviceFlags(self, xml, flags):
pci_devices[0]['hypervisor_name'] = 'marked'
pass
def XMLDesc(self, flags):
return fake_domXML1
guest = libvirt_guest.Guest(FakeDomain())
drvr._detach_pci_devices(guest, pci_devices) drvr._detach_pci_devices(guest, pci_devices)
self.assertEqual(pci_devices[0]['hypervisor_name'], 'marked')
def test_detach_pci_devices_timeout(self): @mock.patch.object(host.Host,
'has_min_version', return_value=True)
@mock.patch.object(nova.virt.libvirt.guest.Guest, 'get_xml_desc')
def test_detach_pci_devices_timeout(self, mocked_get_xml_desc, *args):
fake_domXML1 =\ fake_domXML1_with_pci = (
"""<domain> """<domain> <devices>
<devices> <disk type='file' device='disk'>
<hostdev mode="subsystem" type="pci" managed="yes"> <driver name='qemu' type='qcow2' cache='none'/>
<source> <source file='xxx'/>
<address function="0x1" slot="0x10" domain="0x0000" bus="0x04"/> <target dev='vda' bus='virtio'/>
</source> <alias name='virtio-disk0'/>
</hostdev> <address type='pci' domain='0x0000' bus='0x00'
</devices> slot='0x04' function='0x0'/>
</domain>""" </disk>
<hostdev mode="subsystem" type="pci" managed="yes">
<source>
<address function="0x1" slot="0x10" domain="0x0001"
bus="0x04"/>
</source>
</hostdev></devices></domain>""")
pci_devices = [dict(hypervisor_name='xxx', pci_device_info = {'compute_node_id': 1,
id='id1', 'instance_uuid': 'uuid',
instance_uuid='uuid', 'address': '0001:04:10.1'}
address="0000:04:10:1")] pci_device = objects.PciDevice(**pci_device_info)
pci_devices = [pci_device]
mocked_get_xml_desc.return_value = fake_domXML1_with_pci
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True) drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
self.mox.StubOutWithMock(host.Host, dom = fakelibvirt.Domain(
'has_min_version') drvr._get_connection(), fake_domXML1_with_pci, False)
host.Host.has_min_version = lambda x, y: True guest = libvirt_guest.Guest(dom)
self.mox.StubOutWithMock(libvirt_driver.LibvirtDriver,
'_get_guest_pci_device')
class FakeDev(object):
def to_xml(self):
pass
libvirt_driver.LibvirtDriver._get_guest_pci_device =\
lambda x, y: FakeDev()
class FakeDomain(object):
def detachDeviceFlags(self, xml, flags):
pass
def XMLDesc(self, flags):
return fake_domXML1
guest = libvirt_guest.Guest(FakeDomain())
self.assertRaises(exception.PciDeviceDetachFailed, self.assertRaises(exception.PciDeviceDetachFailed,
drvr._detach_pci_devices, guest, pci_devices) drvr._detach_pci_devices, guest, pci_devices)

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

@@ -3341,7 +3341,7 @@ class LibvirtDriver(driver.ComputeDriver):
for hdev in [d for d in guest_config.devices for hdev in [d for d in guest_config.devices
if isinstance(d, vconfig.LibvirtConfigGuestHostdevPCI)]: if isinstance(d, vconfig.LibvirtConfigGuestHostdevPCI)]:
hdbsf = [hdev.domain, hdev.bus, hdev.slot, hdev.function] hdbsf = [hdev.domain, hdev.bus, hdev.slot, hdev.function]
dbsf = pci_utils.parse_address(dev['address']) dbsf = pci_utils.parse_address(dev.address)
if [int(x, 16) for x in hdbsf] ==\ if [int(x, 16) for x in hdbsf] ==\
[int(x, 16) for x in dbsf]: [int(x, 16) for x in dbsf]:
raise exception.PciDeviceDetachFailed(reason= raise exception.PciDeviceDetachFailed(reason=