testing: Rename interfaces and bridges so they are easier to identify

This simplifies capturing traffic with Wireshark on the host as each of
the guest's interfaces is clearly identified.
The three bridges were previously numbered starting from 0, this scheme
is restored here.
This commit is contained in:
Tobias Brunner 2013-03-08 14:47:42 +01:00
parent 9525e9c506
commit 7a87381840
12 changed files with 16 additions and 5 deletions

View File

@ -38,12 +38,14 @@
<interface type='network'>
<mac address='52:54:00:9a:e2:de'/>
<source network='vnet2'/>
<target dev='alice-eth0'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
<interface type='network'>
<mac address='52:54:00:3b:0c:d7'/>
<source network='vnet1'/>
<target dev='alice-eth1'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</interface>

View File

@ -38,6 +38,7 @@
<interface type='network'>
<mac address='52:54:00:40:85:6b'/>
<source network='vnet3'/>
<target dev='bob-eth0'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>

View File

@ -38,6 +38,7 @@
<interface type='network'>
<mac address='52:54:00:ae:f1:f8'/>
<source network='vnet1'/>
<target dev='carol-eth0'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>

View File

@ -38,6 +38,7 @@
<interface type='network'>
<mac address='52:54:00:b9:15:a9'/>
<source network='vnet1'/>
<target dev='dave-eth0'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>

View File

@ -38,12 +38,14 @@
<interface type='network'>
<mac address='52:54:00:43:e3:35'/>
<source network='vnet2'/>
<target dev='moon-eth1'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</interface>
<interface type='network'>
<mac address='52:54:00:c7:b8:b0'/>
<source network='vnet1'/>
<target dev='moon-eth0'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>

View File

@ -38,12 +38,14 @@
<interface type='network'>
<mac address='52:54:00:77:43:ea'/>
<source network='vnet1'/>
<target dev='sun-eth0'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
<interface type='network'>
<mac address='52:54:00:0f:97:db'/>
<source network='vnet3'/>
<target dev='sun-eth1'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</interface>

View File

@ -38,6 +38,7 @@
<interface type='network'>
<mac address='52:54:00:69:d3:80'/>
<source network='vnet2'/>
<target dev='venus-eth0'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>

View File

@ -4,7 +4,7 @@
<forward dev='lo' mode='route'>
<interface dev='lo'/>
</forward>
<bridge name='virbr1' stp='on' delay='0' />
<bridge name='test-br0' stp='on' delay='0' />
<mac address='52:54:00:97:F9:FD'/>
<ip address='192.168.0.254' netmask='255.255.255.0'>
</ip>

View File

@ -4,7 +4,7 @@
<forward dev='lo' mode='route'>
<interface dev='lo'/>
</forward>
<bridge name='virbr2' stp='on' delay='0' />
<bridge name='test-br1' stp='on' delay='0' />
<mac address='52:54:00:05:F3:34'/>
<ip address='10.1.0.254' netmask='255.255.0.0'>
</ip>

View File

@ -4,7 +4,7 @@
<forward dev='lo' mode='route'>
<interface dev='lo'/>
</forward>
<bridge name='virbr3' stp='on' delay='0' />
<bridge name='test-br2' stp='on' delay='0' />
<mac address='52:54:00:62:4C:69'/>
<ip address='10.2.0.254' netmask='255.255.0.0'>
</ip>

View File

@ -38,6 +38,7 @@
<interface type='network'>
<mac address='52:54:00:4b:23:fa'/>
<source network='vnet1'/>
<target dev='winnetou-eth0'/>
<model type='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>

View File

@ -9,7 +9,7 @@ CONFDIR=$DIR/config/kvm
KNLSRC=$BUILDDIR/$KERNEL/arch/x86/boot/bzImage
KNLTARGET=/var/run/kvm-swan-kernel
HOSTFSTARGET=/var/run/kvm-swan-hostfs
MCASTBRS="virbr1 virbr2"
MCASTBRS="test-br0 test-br1"
echo "Starting test environment"
@ -41,7 +41,7 @@ done
for br in $MCASTBRS
do
cd /sys/devices/virtual/net/$br/brif
for vnet in `find . -name "vnet*"`
for vnet in `find . -name "*eth?"`
do
echo 2 > $vnet/multicast_router
done