Most forwarding tests invoke forwarding_enable() to enable the router and forwarding_restore() to restore the original configuration. Add a helper, adf_forwarding_enable(), which is like forwarding_enable(), but takes care of scheduling the cleanup automatically.
Convert the tests that currently use defer to schedule the cleanup. Signed-off-by: Petr Machata <[email protected]> --- Notes: CC: Alessandro Zanni <[email protected]> CC: Hangbin Liu <[email protected]> CC: David Yang <[email protected]> CC: Li Shuang <[email protected]> .../selftests/net/forwarding/bridge_fdb_local_vlan_0.sh | 4 +--- tools/testing/selftests/net/forwarding/lib.sh | 6 ++++++ .../selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh | 4 +--- tools/testing/selftests/net/forwarding/vxlan_reserved.sh | 4 +--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh b/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh index 78b6be513a2d..694de8ba97e4 100755 --- a/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh +++ b/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh @@ -95,9 +95,7 @@ setup_prepare() h3=${NETIFS[p6]} adf_vrf_prepare - - forwarding_enable - defer forwarding_restore + adf_forwarding_enable host_create "$h1" 192.0.2.1/28 2001:db8:1::1/64 host_create "$h2" 192.0.2.2/28 2001:db8:1::2/64 diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 7d506cf81a32..a9034f0bb58b 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -1023,6 +1023,12 @@ forwarding_restore() sysctl_restore net.ipv4.conf.all.forwarding } +adf_forwarding_enable() +{ + forwarding_enable + defer forwarding_restore +} + declare -A MTU_ORIG mtu_set() { diff --git a/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh b/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh index 9974a93eb850..6a570d256e07 100755 --- a/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh +++ b/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh @@ -370,9 +370,7 @@ setup_prepare() h3=${NETIFS[p6]} adf_vrf_prepare - - forwarding_enable - defer forwarding_restore + adf_forwarding_enable adf_ip_link_add "v1$h2" type veth peer name "v2$h2" adf_ip_link_add "v1$h3" type veth peer name "v2$h3" diff --git a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh index 712f3367ee5a..709845123727 100755 --- a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh +++ b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh @@ -87,9 +87,7 @@ setup_prepare() rp2=${NETIFS[p4]} adf_vrf_prepare - - forwarding_enable - defer forwarding_restore + adf_forwarding_enable h1_create switch_create -- 2.49.0
