tests: Use testsuirebr0 as the fake bridge name

It's more obvious in the output than 'eth0'
This commit is contained in:
Cole Robinson 2019-06-08 09:18:32 -04:00
parent b97003ddfc
commit f01a534cfb
66 changed files with 85 additions and 85 deletions

View File

@ -47,7 +47,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -45,7 +45,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -31,7 +31,7 @@
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="scsi" index="0" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
@ -72,7 +72,7 @@
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="scsi" index="0" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -25,7 +25,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -25,7 +25,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -25,7 +25,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -23,7 +23,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -23,7 +23,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -25,7 +25,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -25,7 +25,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -20,7 +20,7 @@
<target dev="sda" bus="sd"/>
</disk>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>

View File

@ -25,7 +25,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -38,7 +38,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000e"/>
</interface>

View File

@ -54,7 +54,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
@ -130,7 +130,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -38,7 +38,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
@ -84,7 +84,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -40,7 +40,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
@ -88,7 +88,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -16,7 +16,7 @@
<devices>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>

View File

@ -11,7 +11,7 @@
<devices>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>

View File

@ -18,7 +18,7 @@
<target dir="/"/>
</filesystem>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>

View File

@ -39,7 +39,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
@ -105,7 +105,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -41,7 +41,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
@ -109,7 +109,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -40,7 +40,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
@ -95,7 +95,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -59,7 +59,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
@ -136,7 +136,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -38,7 +38,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
@ -94,7 +94,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -48,7 +48,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
@ -112,7 +112,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -48,7 +48,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
@ -120,7 +120,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -39,7 +39,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
@ -105,7 +105,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -51,7 +51,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000e"/>
</interface>
@ -119,7 +119,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000e"/>
</interface>

View File

@ -51,7 +51,7 @@
</disk>
<controller type="usb" index="0"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
@ -119,7 +119,7 @@
</disk>
<controller type="usb" index="0"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -44,7 +44,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
@ -103,7 +103,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -11,7 +11,7 @@
<devices>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>

View File

@ -46,7 +46,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="pcnet"/>
</interface>

View File

@ -23,7 +23,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -23,7 +23,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -23,7 +23,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -49,7 +49,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000e"/>
</interface>
@ -113,7 +113,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000e"/>
</interface>

View File

@ -31,7 +31,7 @@
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -43,7 +43,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -23,7 +23,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -23,7 +23,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -30,7 +30,7 @@
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -30,7 +30,7 @@
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -22,7 +22,7 @@
<target dev="vda" bus="virtio"/>
</disk>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -22,7 +22,7 @@
<target dev="vda" bus="virtio"/>
</disk>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -172,7 +172,7 @@
<target dir="/bar/target"/>
</filesystem>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
@ -391,7 +391,7 @@
<target dir="/bar/target"/>
</filesystem>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -93,7 +93,7 @@
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -56,7 +56,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000e"/>
</interface>
@ -129,7 +129,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000e"/>
</interface>

View File

@ -36,7 +36,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -36,7 +36,7 @@
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>

View File

@ -15,7 +15,7 @@
<target dev="xvda" bus="xen"/>
</disk>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>

View File

@ -30,7 +30,7 @@
<readonly/>
</disk>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -24,7 +24,7 @@
</disk>
<controller type="xenbus" index="0" maxGrantFrames="64"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>
@ -54,7 +54,7 @@
</disk>
<controller type="xenbus" index="0" maxGrantFrames="64"/>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<console type="pty"/>

View File

@ -2,7 +2,7 @@
<on_crash>destroy</on_crash>
<devices>
+ <interface type="bridge">
+ <source bridge="eth0"/>
+ <source bridge="testsuitebr0"/>
+ <mac address="00:11:22:33:44:55"/>
+ <model type="virtio"/>
+ </interface>

View File

@ -2,7 +2,7 @@
<on_crash>destroy</on_crash>
<devices>
+ <interface type="bridge">
+ <source bridge="eth0"/>
+ <source bridge="testsuitebr0"/>
+ <mac address="00:11:22:33:44:55"/>
+ <model type="e1000"/>
+ </interface>

View File

@ -41,7 +41,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -47,7 +47,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -47,7 +47,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -42,7 +42,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -41,7 +41,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -41,7 +41,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -40,7 +40,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -46,7 +46,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -45,7 +45,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -45,7 +45,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -45,7 +45,7 @@
<master startport="4"/>
</controller>
<interface type="bridge">
<source bridge="eth0"/>
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>

View File

@ -89,7 +89,7 @@ def _default_source(conn):
if not conn.is_remote():
ret = _default_bridge()
if conn.in_testsuite():
ret = "eth0"
ret = "testsuitebr0"
if ret:
return ["bridge", ret]
return ["network", "default"]