NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

devices: interface: Rework default_source functions slightly

Browse Source 
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2020-01-25 19:03:28 -05:00
parent 66e1eb7324
commit 9a72df3128
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
virtinst/devices/interface.py
View File

@ -62,7 +62,7 @@ def _default_route():
return None # pragma: no cover return None # pragma: no cover
def _default_bridge(): def _host_default_bridge():
dev = _default_route() dev = _default_route()
if not dev: if not dev:
return None # pragma: no cover return None # pragma: no cover
@ -85,14 +85,14 @@ def _default_bridge():
return None return None
def _default_source(conn): def _default_bridge(conn):
if not conn.is_remote(): if conn.is_remote():
ret = _default_bridge() return None
if conn.in_testsuite():
ret = "testsuitebr0" ret = _host_default_bridge()
if ret: if conn.in_testsuite():
return ["bridge", ret] ret = "testsuitebr0"
return ["network", "default"] return ret
class _VirtualPort(XMLBuilder): class _VirtualPort(XMLBuilder):
@ -236,10 +236,18 @@ class DeviceInterface(Device):
self.is_conflict_net(self.conn, self.macaddr) self.is_conflict_net(self.conn, self.macaddr)
def set_default_source(self): def set_default_source(self):
if (self.conn.is_qemu_session() or self.conn.is_test()): if self.conn.is_qemu_session() or self.conn.is_test():
self.type = self.TYPE_USER self.type = self.TYPE_USER
else: return
self.type, self.source = _default_source(self.conn)
nettype = DeviceInterface.TYPE_BRIDGE
source = _default_bridge(self.conn)
if not source:
nettype = DeviceInterface.TYPE_VIRTUAL
source = "default"
self.type = nettype
self.source = source
################## ##################
@ -270,8 +278,6 @@ class DeviceInterface(Device):
if not self.macaddr: if not self.macaddr:
self.macaddr = self.generate_mac(self.conn) self.macaddr = self.generate_mac(self.conn)
if self.type == self.TYPE_BRIDGE and not self.bridge: if self.type == self.TYPE_BRIDGE and not self.bridge:
srctype, br = _default_source(self.conn) self.bridge = _default_bridge(self.conn)
if srctype == self.TYPE_BRIDGE:
self.bridge = br
if not self.model: if not self.model:
self.model = self.default_model(guest) self.model = self.default_model(guest)