util: Remove old default_bridge, rename default_bridge2

tests/__init__.py

@@ -23,7 +23,7 @@ from tests import utils
 
 # Force certain helpers to return consistent values
 virtinst.util.is_blktap_capable = lambda: False
-virtinst.util.default_bridge2 = lambda ignore1: ["bridge", "eth0"]
+virtinst.util.default_bridge = lambda ignore1: ["bridge", "eth0"]
 virtinst.Guest._open_uri = lambda ignore1, ignore2: None
 
 # Setup logging

tests/clitest.py

@@ -1381,7 +1381,7 @@ def build_cmd_list():
 
 newidx = 0
 curtest = 0
-old_bridge = virtinst.util.default_bridge2
+old_bridge = virtinst.util.default_bridge
 
 def setup():
     """
@@ -1396,7 +1396,7 @@ def setup():
     os.system("chmod 444 %s" % ro_img)
     os.system("chmod 555 %s" % ro_dir)
 
-    virtinst.util.default_bridge2 = lambda ignore: None
+    virtinst.util.default_bridge = lambda ignore: None
 
 
 def cleanup():
@@ -1407,7 +1407,7 @@ def cleanup():
         os.system("chmod 777 %s > /dev/null 2>&1" % i)
         os.system("rm -rf %s > /dev/null 2>&1" % i)
 
-    virtinst.util.default_bridge2 = old_bridge
+    virtinst.util.default_bridge = old_bridge
 
 class CLITests(unittest.TestCase):
     def __init__(self, *args, **kwargs):

tests/xmlconfig.py

@@ -922,11 +922,11 @@ class TestXMLConfig(unittest.TestCase):
             i = utils.make_pxe_installer()
             g = utils.get_basic_fullyvirt_guest(installer=i)
             util = getattr(virtinst, "util")
-            origfunc = util.default_bridge2
+            origfunc = util.default_bridge
 
             def newbridge(ignore_conn):
                 return ["bridge", "br0"]
-            util.default_bridge2 = newbridge
+            util.default_bridge = newbridge
 
             dev1 = virtinst.VirtualNetworkInterface(conn=g.conn)
             dev1.macaddr = "22:22:33:44:55:66"
@@ -950,7 +950,7 @@ class TestXMLConfig(unittest.TestCase):
             self._compare(g, None, False)
         finally:
             if util and origfunc:
-                util.default_bridge2 = origfunc
+                util.default_bridge = origfunc
 
     def testCpustrToTuple(self):
         conn = utils.get_conn()

virtinst/VirtualNetworkInterface.py

@@ -180,7 +180,7 @@ class VirtualNetworkInterface(VirtualDevice.VirtualDevice):
         ret = self._default_bridge
         if ret is None:
             ret = False
-            default = util.default_bridge2(self.conn)
+            default = util.default_bridge(self.conn)
             if default:
                 ret = default[1]
 

virtinst/util.py

@@ -361,7 +361,7 @@ def default_nic():
 
     return dev
 
-def default_bridge2(conn=None):
+def default_bridge(conn=None):
     if platform.system() == 'SunOS':
         return ["bridge", default_nic()]
 
@@ -559,18 +559,8 @@ def default_route(nic=None):
     return None
 
 
-def default_bridge():
-    ret = default_bridge2(None)
-    if not ret:
-        # Maintain this behavior for back compat
-        ret = "xenbr0"
-    else:
-        ret = ret[1]
-
-    return ret
-
 def default_network(conn):
-    ret = default_bridge2(conn)
+    ret = default_bridge(conn)
     if not ret:
         # FIXME: Check that this exists
         ret = ["network", "default"]