Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:tsaupe:branches:Base:System:dracut-openqa-v059
dracut
TEST-60-BONDBRIDGEVLANIFCFG-adapt-for-openQA.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File TEST-60-BONDBRIDGEVLANIFCFG-adapt-for-openQA.patch of Package dracut
From c4fe9357fa81e29a645b9ce4fa9c2da2f728e8d7 Mon Sep 17 00:00:00 2001 From: Robert Richardson <robert.richardson@suse.com> Date: Wed, 13 Apr 2022 12:16:31 +0200 Subject: [PATCH] test 60 patch --- .../client-init.sh | 9 ++++--- .../server-init.sh | 17 ++++++------- test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh | 24 ++++++++++++------- .../wait-if-server.sh | 8 +++---- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh index 644308d1..8e867065 100755 --- a/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh +++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh @@ -10,11 +10,10 @@ echo "made it to the rootfs! Powering down." ( echo OK - ip -o -4 address show scope global | while read -r _ if rest; do echo "$if"; done | sort - for i in /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-*; do - echo "$i" - grep -v 'UUID=' "$i" - done + ip -o -4 address show scope global | while read -r _ if rest; do echo "$if"; done | sort + if ! $(grep -q NetworkManager /proc/cmdline); then + ip -o -4 route show all | sort + fi echo EOF ) | dd oflag=direct,dsync of=/dev/sda diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/server-init.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/server-init.sh index 5e7e56ef..3e435054 100755 --- a/test/TEST-60-BONDBRIDGEVLANIFCFG/server-init.sh +++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/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 +wait_for_if_link eth0 +wait_for_if_link eth1 +wait_for_if_link eth2 +wait_for_if_link eth3 -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 +ip link set dev eth0 name net1 +ip link set dev eth1 name net2 +ip link set dev eth2 name net3 +ip link set dev eth3 name net4 modprobe --all -b -q 8021q ipvlan macvlan : > /dev/watchdog @@ -122,6 +122,7 @@ dhcpd -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases net1 net3 #sh -i #tcpdump -i net1 # Wait forever for the VM to die +sleep 60 echo "Serving" while :; do sleep 10 diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh index 309600d4..d096ef45 100755 --- a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh +++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh @@ -15,6 +15,8 @@ TEST_DESCRIPTION="root filesystem on NFS with bridging/bonding/vlan with $USE_NE KVERSION=${KVERSION-$(uname -r)} +export basedir=/usr/lib/dracut + # Uncomment this to debug failures #DEBUGFAIL="rd.shell rd.break" #DEBUGFAIL="rd.shell rd.break rd.debug" @@ -36,7 +38,7 @@ run_server() { -hda "$TESTDIR"/server.ext3 \ -serial "${SERIAL:-"file:$TESTDIR/server.log"}" \ -watchdog i6300esb -watchdog-action poweroff \ - -append "panic=1 oops=panic softlockup_panic=1 loglevel=7 root=LABEL=dracut rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 rd.debug" \ + -append "nompath panic=1 oops=panic softlockup_panic=1 loglevel=7 root=LABEL=dracut rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 rd.debug" \ -initrd "$TESTDIR"/initramfs.server \ -pidfile "$TESTDIR"/server.pid -daemonize || return 1 chmod 644 -- "$TESTDIR"/server.pid || return 1 @@ -92,7 +94,7 @@ client_test() { -hda "$TESTDIR"/client.img \ -watchdog i6300esb -watchdog-action poweroff \ -append " - panic=1 oops=panic softlockup_panic=1 + nompath panic=1 oops=panic softlockup_panic=1 ifname=net1:52:54:00:12:34:01 ifname=net2:52:54:00:12:34:02 ifname=net3:52:54:00:12:34:03 @@ -141,9 +143,10 @@ test_run() { test_client() { if [[ $NM ]]; then - EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-* EOF ' + EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 EOF ' + NM_BOOT_PARAM="NetworkManager" else - EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" DEVICE="net1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net3.0004 # Generated by dracut initrd NAME="net3.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="net3.0004" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net3.3 # Generated by dracut initrd NAME="net3.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="net3.3" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan0001 # Generated by dracut initrd NAME="vlan0001" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.54.101" PREFIX="24" GATEWAY="192.168.54.1" TYPE=Vlan DEVICE="vlan0001" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan2 # Generated by dracut initrd NAME="vlan2" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.55.102" PREFIX="24" GATEWAY="192.168.55.1" TYPE=Vlan DEVICE="vlan2" VLAN=yes PHYSDEV="net3" EOF ' + EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 default via 192.168.55.1 dev vlan2 EOF ' fi client_test "Multiple VLAN" \ @@ -160,14 +163,16 @@ ip=192.168.56.103::192.168.56.1:24:test:net3.3:none ip=192.168.57.104::192.168.57.1:24:test:net3.0004:none rd.neednet=1 root=nfs:192.168.50.1:/nfs/client bootdev=net1 +$NM_BOOT_PARAM " \ "$EXPECT" \ || return 1 if [[ $NM ]]; then - EXPECT='bond0 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-* EOF ' + EXPECT='bond0 bond1 EOF ' + NM_BOOT_PARAM="NetworkManager" else - EXPECT='bond0 bond1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond0 # Generated by dracut initrd NAME="bond0" DEVICE="bond0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond0" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond1 # Generated by dracut initrd NAME="bond1" DEVICE="bond1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond1" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net2" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" HWADDR="52:54:00:12:34:04" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net5" EOF ' + EXPECT='bond0 bond1 default via 192.168.50.1 dev bond0 EOF ' fi client_test "Multiple Bonds" \ @@ -179,14 +184,16 @@ ip=bond0:dhcp ip=bond1:dhcp rd.neednet=1 root=nfs:192.168.50.1:/nfs/client bootdev=bond0 +$NM_BOOT_PARAM " \ "$EXPECT" \ || return 1 if [[ $NM ]]; then EXPECT='br0 br1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-* EOF ' + NM_BOOT_PARAM="NetworkManager" else - EXPECT='br0 br1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br0 # Generated by dracut initrd NAME="br0" DEVICE="br0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br0" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br1 # Generated by dracut initrd NAME="br1" DEVICE="br1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net2" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net5" EOF ' + EXPECT='br0 br1 default via 192.168.50.1 dev br0 EOF ' fi client_test "Multiple Bridges" \ @@ -198,6 +205,7 @@ ip=br0:dhcp ip=br1:dhcp rd.neednet=1 root=nfs:192.168.50.1:/nfs/client bootdev=br0 +$NM_BOOT_PARAM " \ "$EXPECT" \ || return 1 @@ -403,4 +411,4 @@ test_cleanup() { } # shellcheck disable=SC1090 -. "$testdir"/test-functions +. "$basedir"/test/test-functions diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/wait-if-server.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/wait-if-server.sh index 7cdb9417..189ddff4 100644 --- a/test/TEST-60-BONDBRIDGEVLANIFCFG/wait-if-server.sh +++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/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 eth0 +wait_for_if_link eth1 +wait_for_if_link eth2 +wait_for_if_link eth3 -- 2.37.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
