virtManager: Drop interface list for bridge and macvtap

Some related bits were discussed here:
https://www.redhat.com/archives/virt-tools-list/2019-June/msg00117.html

macvtap is problematic for inexperienced users so we shouldn't
be broadly advertising it, plus our device listing was incomplete
anyways.

Both bridge and macvtap device listing are largely dependent on
the libvirt virInterface APIs, which have varying degrees of
completeness across distros and are not particularly reliable to
begin with.

Drop both of these in favor of the available support for manually
specifying a device name

Signed-off-by: Cole Robinson <crobinso@redhat.com>

3 files changed, 14 insertions, 30 deletions

diff --git a/tests/uitests/addhardware.py b/tests/uitests/addhardware.py
index 8f079872..afaf5092 100644
--- a/tests/uitests/addhardware.py
+++ b/tests/uitests/addhardware.py
@@ -272,15 +272,16 @@ class AddHardware(uiutils.UITestCase):
         finish.click()
         uiutils.check_in_loop(lambda: details.active)
 
-        # macvtap selection
+        # Manual macvtap
         self._open_addhw_window(details)
         tab = self._select_hw(addhw, "Network", "network-tab")
         src.click()
-        tab.find_fuzzy("macvtap", "menu item").click()
+        tab.find_fuzzy("Macvtap device...", "menu item").click()
+        tab.find("Device name:", "text").text = "macvtapfoo7"
         finish.click()
         uiutils.check_in_loop(lambda: details.active)
 
-        # Manual bridge
+        # Manual bridge. Also trigger MAC collision
         self._open_addhw_window(details)
         tab = self._select_hw(addhw, "Network", "network-tab")
         tab.find("mac-address-enable", "check box").click()
@@ -301,18 +302,6 @@ class AddHardware(uiutils.UITestCase):
         finish.click()
         uiutils.check_in_loop(lambda: details.active)
 
-        # Manual macvtap
-        self._open_addhw_window(details)
-        tab = self._select_hw(addhw, "Network", "network-tab")
-        tab.find("MAC Address Field", "text").text = "00:11:0B:11:00:11"
-        src.click()
-        self.sleep(1)
-        self.pressKey("Home")
-        tab.find_fuzzy("Macvtap device...", "menu item").click()
-        tab.find("Device name:", "text").text = "macvtapfoo7"
-        finish.click()
-        uiutils.check_in_loop(lambda: details.active)
-
 
     def testAddGraphics(self):
         """
diff --git a/tests/uitests/details.py b/tests/uitests/details.py
index ecff59a8..3dfc70dc 100644
--- a/tests/uitests/details.py
+++ b/tests/uitests/details.py
@@ -232,11 +232,14 @@ class Details(uiutils.UITestCase):
         uiutils.check_in_loop(lambda: not appl.sensitive)
 
 
-        # Network values
+        # Network values w/ macvtap manual
         tab = self._select_hw(win, "NIC :54:32:10", "network-tab")
         src = tab.find("Network source:", "combo box")
         src.click()
-        tab.find_fuzzy("macvtap", "menu item").bring_on_screen().click()
+        self.pressKey("Home")
+        tab.find_fuzzy("Macvtap device...",
+                       "menu item").bring_on_screen().click()
+        tab.find("Device name:", "text").text = "fakedev12"
         tab.find("Device model:", "combo box").click_combo_entry()
         tab.find("rtl8139", "menu item").click()
         appl.click()
@@ -246,6 +249,7 @@ class Details(uiutils.UITestCase):
         src.click()
         tab.find_fuzzy("Bridge device...",
                        "menu item").bring_on_screen().click()
+        tab.find("Device name:", "text").text = ""
         appl.click()
         # Check validation error
         alert = self.app.root.find("vmm dialog", "alert")
@@ -255,16 +259,6 @@ class Details(uiutils.UITestCase):
         appl.click()
         uiutils.check_in_loop(lambda: not appl.sensitive)
 
-        # Manual macvtap
-        src.click()
-        self.pressKey("Home")
-        tab.find_fuzzy("Macvtap device...",
-                       "menu item").bring_on_screen().click()
-        appl.click()
-        tab.find("Device name:", "text").text = "fakedev12"
-        appl.click()
-        uiutils.check_in_loop(lambda: not appl.sensitive)
-
 
     def testDetailsEditDevices(self):
         """
diff --git a/tests/uitests/newvm.py b/tests/uitests/newvm.py
index 18192c8a..499d9188 100644
--- a/tests/uitests/newvm.py
+++ b/tests/uitests/newvm.py
@@ -493,9 +493,10 @@ class NewVM(uiutils.UITestCase):
         win.find_fuzzy("NIC", "table cell").click()
         tab = win.find("network-tab")
         win.find("XML", "page tab").click()
-        oldbrname = "brplain"
         newbrname = "BRFAKE"
-        xmleditor.text = xmleditor.text.replace(oldbrname, newbrname)
+        newx = xmleditor.text.replace("network", "bridge")
+        newx = newx.replace('bridge="default"', "bridge='%s'" % newbrname)
+        xmleditor.text = newx
         finish.click()
 
         # Finish install.
@@ -514,7 +515,7 @@ class NewVM(uiutils.UITestCase):
         win.find_fuzzy("NIC", "table cell").click()
         tab = win.find("network-tab")
         self.assertEqual(
-                tab.find("Bridge name:", "text").text, newbrname)
+                tab.find("Device name:", "text").text, newbrname)
 
         # Verify install media is handled correctly after XML customize
         win.find_fuzzy("IDE CDROM 1", "table cell").click()