diff --git a/tests/__init__.py b/tests/__init__.py index 189b43fd..d6077f35 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -38,7 +38,7 @@ from tests import utils # Force certain helpers to return consistent values virtinst.util.is_blktap_capable = lambda ignore: False -virtinst.util.default_bridge = lambda ignore1: ["bridge", "eth0"] +virtinst.util.default_bridge = lambda ignore1: "eth0" # Setup logging rootLogger = logging.getLogger() diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py index 663e9b11..ecde98ab 100644 --- a/tests/xmlconfig.py +++ b/tests/xmlconfig.py @@ -966,7 +966,7 @@ class TestXMLConfig(unittest.TestCase): origfunc = util.default_bridge def newbridge(ignore_conn): - return ["bridge", "bzz0"] + return "bzz0" util.default_bridge = newbridge dev1 = virtinst.VirtualNetworkInterface(utils.get_conn()) diff --git a/virtinst/deviceinterface.py b/virtinst/deviceinterface.py index 571aa5a3..a7846664 100644 --- a/virtinst/deviceinterface.py +++ b/virtinst/deviceinterface.py @@ -148,7 +148,7 @@ class VirtualNetworkInterface(VirtualDevice): ret = False default = util.default_bridge(self.conn) if default: - ret = default[1] + ret = default self._default_bridge = ret return ret or None diff --git a/virtinst/util.py b/virtinst/util.py index f1b7efa8..a29d730a 100644 --- a/virtinst/util.py +++ b/virtinst/util.py @@ -226,7 +226,7 @@ def default_bridge(conn): # New style peth0 == phys dev, eth0 == bridge, eth0 == default route if os.path.exists("/sys/class/net/%s/bridge" % dev): - return ["bridge", dev] + return dev # Old style, peth0 == phys dev, eth0 == netloop, xenbr0 == bridge, # vif0.0 == netloop enslaved, eth0 == default route @@ -238,7 +238,7 @@ def default_bridge(conn): if (defn >= 0 and os.path.exists("/sys/class/net/peth%d/brport" % defn) and os.path.exists("/sys/class/net/xenbr%d/bridge" % defn)): - return ["bridge", "xenbr%d" % defn] + return "xenbr%d" return None @@ -311,11 +311,11 @@ def default_route(): def default_network(conn): ret = default_bridge(conn) - if not ret: - # FIXME: Check that this exists - ret = ["network", "default"] + if ret: + return ["bridge", ret] - return ret + # FIXME: Check that this exists + return ["network", "default"] def is_blktap_capable(conn):