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.

diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml
index 87a96000345c8aa2bd1c512ce858bbfbc1692ede..620ce511673258a3dbeffbb97e4df9b414118c3c 100644 (file)
--- a/testing/config/kvm/alice.xml
+++ b/testing/config/kvm/alice.xml
@@ -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>

diff --git a/testing/config/kvm/bob.xml b/testing/config/kvm/bob.xml
index abd30dfef748d3f7715a2bd9b5fafd7e71e20701..caa1631cf040e30eaabf4ea26d93fc91272ee7f0 100644 (file)
--- a/testing/config/kvm/bob.xml
+++ b/testing/config/kvm/bob.xml
@@ -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>

diff --git a/testing/config/kvm/carol.xml b/testing/config/kvm/carol.xml
index b288922321892ff88406c9fc274d36de9c57d231..8f768ff5c5edd0d9685c0950ffd29cc2cfbe31bf 100644 (file)
--- a/testing/config/kvm/carol.xml
+++ b/testing/config/kvm/carol.xml
@@ -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>

diff --git a/testing/config/kvm/dave.xml b/testing/config/kvm/dave.xml
index 880c992b0fb8c5a5ebadbbc94182250cc2245082..3ae1da021e2d17db967c41921dab06e576d0ed40 100644 (file)
--- a/testing/config/kvm/dave.xml
+++ b/testing/config/kvm/dave.xml
@@ -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>

diff --git a/testing/config/kvm/moon.xml b/testing/config/kvm/moon.xml
index 3ef3e6ec88f5574495f1b41c0311ba3ab3bf75f2..975e3cec61bcbcc02a4333a4332d1acb1ca6961f 100644 (file)
--- a/testing/config/kvm/moon.xml
+++ b/testing/config/kvm/moon.xml
@@ -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>

diff --git a/testing/config/kvm/sun.xml b/testing/config/kvm/sun.xml
index c80ce1210dadd6a7cd459eebef9f256767b82503..9d05027f9bda001acb6590a683d468c646a751fb 100644 (file)
--- a/testing/config/kvm/sun.xml
+++ b/testing/config/kvm/sun.xml
@@ -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>

diff --git a/testing/config/kvm/venus.xml b/testing/config/kvm/venus.xml
index d1e5fbca90d7c31eb5a052d61df28cb14d69bde2..7a65ace750f8bc9ae40ef72079179b2eb31ef720 100644 (file)
--- a/testing/config/kvm/venus.xml
+++ b/testing/config/kvm/venus.xml
@@ -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>

diff --git a/testing/config/kvm/vnet1.xml b/testing/config/kvm/vnet1.xml
index f9d979be1f6cc39c5461d487094577c5eb8f4409..94097ab6f0caba1093044dd9f32ceb4d041ee17d 100644 (file)
--- a/testing/config/kvm/vnet1.xml
+++ b/testing/config/kvm/vnet1.xml
@@ -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>

diff --git a/testing/config/kvm/vnet2.xml b/testing/config/kvm/vnet2.xml
index 7d125bfc60e669d743a27a8ad0a068cb01237c70..b21e7ed1fc32969c478be9bdf26891f222ebf101 100644 (file)
--- a/testing/config/kvm/vnet2.xml
+++ b/testing/config/kvm/vnet2.xml
@@ -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>

diff --git a/testing/config/kvm/vnet3.xml b/testing/config/kvm/vnet3.xml
index 1da06c4487de3081c739fe365cc2603d107ccac8..f46d9ec0935d7388b5dd532a8a8d12eb9e00f55b 100644 (file)
--- a/testing/config/kvm/vnet3.xml
+++ b/testing/config/kvm/vnet3.xml
@@ -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>

diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml
index ffba7da31b99637da63447b281c5980491278ca1..9410c73b86e0bbb610185b8fc9a0d58a569c56b5 100644 (file)
--- a/testing/config/kvm/winnetou.xml
+++ b/testing/config/kvm/winnetou.xml
@@ -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>

diff --git a/testing/start-testing b/testing/start-testing
index db582cfd77c02d070110c6b3e0513b402cf7d721..46aa4a2cb93a16c7bcb8e78a9e877fd8052acaf6 100755 (executable)
--- a/testing/start-testing
+++ b/testing/start-testing
@@ -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