shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-26 08:55:13 +03:00
Code Issues Projects Releases Wiki Activity

nodedev: Fold NetDevice into NodeDevice

Browse Source
This commit is contained in:
Cole Robinson 2019-06-05 15:11:31 -04:00
parent 966b0b5a6b
commit ca804c5b5e
2 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/nodedev.py
View File

@ -67,22 +67,16 @@ class TestNodeDev(unittest.TestCase):
dev = NodeDevice.parse(self.conn, funky_chars_xml)
self.assertEqual(dev.name, "L3B2616")
self.assertEqual(dev.device_type, "LENOVO")
self.assertEqual(dev.pretty_name(), dev.name)
def testNetDevice1(self):
def testNetDevice(self):
devname = "net_00_1c_25_10_b1_e4"
vals = {"name": "net_00_1c_25_10_b1_e4", "parent": "pci_8086_1049",
"device_type": NodeDevice.CAPABILITY_TYPE_NET,
"interface": "eth0", "address": "00:1c:25:10:b1:e4",
"capability_type": "80203"}
self._testCompare(devname, vals)
def testNetDevice2(self):
devname = "net_00_1c_bf_04_29_a4"
vals = {"name": "net_00_1c_bf_04_29_a4", "parent": "pci_8086_4227",
"device_type": NodeDevice.CAPABILITY_TYPE_NET,
"interface": "wlan0", "address": "00:1c:bf:04:29:a4",
"capability_type": "80211"}
self._testCompare(devname, vals)
dev = self._nodeDevFromName(devname)
self.assertEqual(dev.name, devname)
self.assertEqual(dev.parent, "pci_8086_1049")
self.assertEqual(dev.device_type, "net")
self.assertEqual(dev.interface, "eth0")
self.assertEqual(dev.pretty_name(), "Interface eth0")
def testPCIDevice1(self):
devname = "pci_1180_592"

33
virtinst/nodedev.py
View File

@ -109,6 +109,10 @@ class NodeDevice(XMLBuilder):
return self.devnodes[0]
return None
def compare_to_hostdev(self, hostdev):
ignore = hostdev
return False
def pretty_name(self):
"""
Use device information to attempt to print a human readable device
@ -116,24 +120,19 @@ class NodeDevice(XMLBuilder):
:returns: Device description string
"""
return self.name
def compare_to_hostdev(self, hostdev):
ignore = hostdev
return False
ret = self.name
if self.device_type == "net":
if self.interface:
ret = _("Interface %s") % self.interface
return ret
class NetDevice(NodeDevice):
##################
# XML properties #
##################
# type='net' options
interface = XMLProperty("./capability/interface")
address = XMLProperty("./capability/address")
capability_type = XMLProperty("./capability/capability/@type")
def pretty_name(self):
desc = self.name
if self.interface:
desc = _("Interface %s") % self.interface
return desc
class PCIDevice(NodeDevice):
@ -374,9 +373,7 @@ def _AddressStringToNodedev(conn, addrstr):
def _typeToDeviceClass(t):
if t == NodeDevice.CAPABILITY_TYPE_NET:
return NetDevice
elif t == NodeDevice.CAPABILITY_TYPE_PCI:
if t == NodeDevice.CAPABILITY_TYPE_PCI:
return PCIDevice
elif t == NodeDevice.CAPABILITY_TYPE_USBDEV:
return USBDevice