test: use QEMU OUI for server MAC addresses

QEMU uses the OUI 52:54:00, but the server test cases use the OUI
52:54:01.

Change the server MAC addresses into the 52:54:00:42:00:xx range to have
them in the QEMU OUI range and also easy identifiable.

diff --git a/test/TEST-61-MULTINIC/server-init.sh b/test/TEST-61-MULTINIC/server-init.sh
index 997b1d1f4f7d2c97358a1aec8495d6729e02418d..d3c8a422c960d37674a527bca0d26d6ed5cf71d2 100755 (executable)
--- a/test/TEST-61-MULTINIC/server-init.sh
+++ b/test/TEST-61-MULTINIC/server-init.sh
@@ -48,12 +48,12 @@ linkup() {
     wait_for_if_link "$1" 2> /dev/null && ip link set "$1" up 2> /dev/null && wait_for_if_up "$1" 2> /dev/null
 }
 
-wait_for_if_link enx525401123456
+wait_for_if_link enx525400420001
 
 ip addr add 127.0.0.1/8 dev lo
 ip link set lo up
-ip addr add 192.168.50.1/24 dev enx525401123456
-linkup enx525401123456
+ip addr add 192.168.50.1/24 dev enx525400420001
+linkup enx525400420001
 
 : > /dev/watchdog
 modprobe af_packet

diff --git a/test/TEST-61-MULTINIC/test.sh b/test/TEST-61-MULTINIC/test.sh
index 2d827c5328b6d7b798988577a8f10e2e2db81de1..a2f5f6b11d30bd0b08419f461689fda2bc457591 100755 (executable)
--- a/test/TEST-61-MULTINIC/test.sh
+++ b/test/TEST-61-MULTINIC/test.sh
@@ -33,7 +33,7 @@ run_server() {
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
         -net socket,listen=127.0.0.1:12350 \
-        -net nic,macaddr=52:54:01:12:34:56,model=virtio \
+        -net nic,macaddr=52:54:00:42:00:01,model=virtio \
         -serial "${SERIAL:-"file:$TESTDIR/server.log"}" \
         -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=LABEL=dracut rootfstype=ext4 rw console=ttyS0,115200n81 $SERVER_DEBUG" \
         -initrd "$TESTDIR"/initramfs.server \

diff --git a/test/TEST-61-MULTINIC/wait-if-server.sh b/test/TEST-61-MULTINIC/wait-if-server.sh
index cea7259376715bde754b241a14864e122d6099e8..26d14829f1a047c1160841ec1af4568507978c42 100755 (executable)
--- a/test/TEST-61-MULTINIC/wait-if-server.sh
+++ b/test/TEST-61-MULTINIC/wait-if-server.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 . /lib/net-lib.sh
-wait_for_if_link enx525401123456
+wait_for_if_link enx525400420001

diff --git a/test/TEST-62-BONDBRIDGEVLAN/server-init.sh b/test/TEST-62-BONDBRIDGEVLAN/server-init.sh
index e4ddf3f9bff7b08baf864c3318131ef7de5b88ea..964f11082ff677691eb0b50985ddf766b91de0a6 100755 (executable)
--- a/test/TEST-62-BONDBRIDGEVLAN/server-init.sh
+++ b/test/TEST-62-BONDBRIDGEVLAN/server-init.sh
@@ -54,15 +54,15 @@ udevadm settle
 
 ip link show
 
-wait_for_if_link enx525401123456
-wait_for_if_link enx525401123457
-wait_for_if_link enx525401123458
-wait_for_if_link enx525401123459
-
-ip link set dev enx525401123456 name net1
-ip link set dev enx525401123457 name net2
-ip link set dev enx525401123458 name net3
-ip link set dev enx525401123459 name net4
+wait_for_if_link enx525400420001
+wait_for_if_link enx525400420002
+wait_for_if_link enx525400420003
+wait_for_if_link enx525400420004
+
+ip link set dev enx525400420001 name net1
+ip link set dev enx525400420002 name net2
+ip link set dev enx525400420003 name net3
+ip link set dev enx525400420004 name net4
 
 modprobe -b -q 8021q && modprobe -b -q bonding
 : > /dev/watchdog

diff --git a/test/TEST-62-BONDBRIDGEVLAN/test.sh b/test/TEST-62-BONDBRIDGEVLAN/test.sh
index bfab6269b3e0c64c435291807368938077bca253..7243f3771bf2f465e7968dc5391c9af9c07b2164 100755 (executable)
--- a/test/TEST-62-BONDBRIDGEVLAN/test.sh
+++ b/test/TEST-62-BONDBRIDGEVLAN/test.sh
@@ -52,10 +52,10 @@ run_server() {
         -netdev socket,id=n1,listen=127.0.0.1:12371 \
         -netdev socket,id=n2,listen=127.0.0.1:12372 \
         -netdev socket,id=n3,listen=127.0.0.1:12373 \
-        -device virtio-net-pci,netdev=n0,mac=52:54:01:12:34:56 \
-        -device virtio-net-pci,netdev=n1,mac=52:54:01:12:34:57 \
-        -device virtio-net-pci,netdev=n2,mac=52:54:01:12:34:58 \
-        -device virtio-net-pci,netdev=n3,mac=52:54:01:12:34:59 \
+        -device virtio-net-pci,netdev=n0,mac=52:54:00:42:00:01 \
+        -device virtio-net-pci,netdev=n1,mac=52:54:00:42:00:02 \
+        -device virtio-net-pci,netdev=n2,mac=52:54:00:42:00:03 \
+        -device virtio-net-pci,netdev=n3,mac=52:54:00:42:00:04 \
         -hda "$TESTDIR"/server.ext4 \
         -serial "${SERIAL:-"file:$TESTDIR/server.log"}" \
         -append "panic=1 oops=panic softlockup_panic=1 root=LABEL=dracut rootfstype=ext4 rw console=ttyS0,115200n81" \

diff --git a/test/TEST-62-BONDBRIDGEVLAN/wait-if-server.sh b/test/TEST-62-BONDBRIDGEVLAN/wait-if-server.sh
index 7cdb941780027a81f3ab8687da4fdff6959af443..1135225c32853b8c3d91787901c2772ab09f0fc9 100755 (executable)
--- a/test/TEST-62-BONDBRIDGEVLAN/wait-if-server.sh
+++ b/test/TEST-62-BONDBRIDGEVLAN/wait-if-server.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 . /lib/net-lib.sh
-wait_for_if_link enx525401123456
-wait_for_if_link enx525401123457
-wait_for_if_link enx525401123458
-wait_for_if_link enx525401123459
+wait_for_if_link enx525400420001
+wait_for_if_link enx525400420002
+wait_for_if_link enx525400420003
+wait_for_if_link enx525400420004