openstack
/
nova
Code Issues Proposed changes

Merge "Include all network devices in nova diagnostics" into stable/rocky

This commit is contained in:
Zuul 2019-06-13 19:38:49 +00:00 committed by Gerrit Code Review
parent 0622563137 19ca8bcc22
commit 66c455dc0f
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15972,6 +15972,10 @@ class LibvirtConnTestCase(test.NoDBTestCase,
<model type="virtio"/>
<target dev="br0"/>
</interface>
<interface type='hostdev' managed='yes'>
<mac address="54:56:00:a6:40:40"/>
<driver name='vfio'/>
</interface>
</devices>
</domain>
"""
@ -16064,6 +16068,9 @@ class LibvirtConnTestCase(test.NoDBTestCase,
tx_errors=0,
tx_octets=0,
tx_packets=0)
expected.add_nic(mac_address='54:56:00:a6:40:40')
self.assertDiagnosticsEqual(expected, actual)
@mock.patch.object(host.Host, "list_instance_domains")

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

@ -8648,28 +8648,37 @@ class LibvirtDriver(driver.ComputeDriver):
errors_count=stats[4])
except libvirt.libvirtError:
pass
for interface in dom_io["ifaces"]:
for interface in xml_doc.findall('./devices/interface'):
mac_address = interface.find('mac').get('address')
target = interface.find('./target')
# add nic that has no target (therefore no stats)
if target is None:
diags.add_nic(mac_address=mac_address)
continue
# add nic with stats
dev = target.get('dev')
try:
# interfaceStats might launch an exception if the method
# is not supported by the underlying hypervisor being
# used by libvirt
stats = domain.interfaceStats(interface)
diags.add_nic(rx_octets=stats[0],
rx_errors=stats[2],
rx_drop=stats[3],
rx_packets=stats[1],
tx_octets=stats[4],
tx_errors=stats[6],
tx_drop=stats[7],
tx_packets=stats[5])
if dev:
# interfaceStats might launch an exception if the
# method is not supported by the underlying hypervisor
# being used by libvirt
stats = domain.interfaceStats(dev)
diags.add_nic(mac_address=mac_address,
rx_octets=stats[0],
rx_errors=stats[2],
rx_drop=stats[3],
rx_packets=stats[1],
tx_octets=stats[4],
tx_errors=stats[6],
tx_drop=stats[7],
tx_packets=stats[5])
except libvirt.libvirtError:
pass
# Update mac addresses of interface if stats have been reported
if diags.nic_details:
nodes = xml_doc.findall('./devices/interface/mac')
for index, node in enumerate(nodes):
diags.nic_details[index].mac_address = node.get('address')
return diags
@staticmethod