Skip to content

Commit f265d31

Browse files
Geliang Tangkuba-moo
authored andcommitted
selftests: mptcp: lib: use setup/cleanup_ns helpers
This patch includes lib.sh into mptcp_lib.sh, uses setup_ns helper defined in lib.sh to set up namespaces in mptcp_lib_ns_init(), and uses cleanup_ns to delete namespaces in mptcp_lib_ns_exit(). Signed-off-by: Geliang Tang <[email protected]> Reviewed-by: Matthieu Baerts (NGI0) <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://lore.kernel.org/r/20240607-upstream-net-next-20240607-selftests-mptcp-net-lib-v1-5-e36986faac94@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
1 parent f8a2d2f commit f265d31

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

tools/testing/selftests/net/mptcp/mptcp_lib.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#! /bin/bash
22
# SPDX-License-Identifier: GPL-2.0
33

4+
. "$(dirname "${0}")/../lib.sh"
5+
46
readonly KSFT_PASS=0
57
readonly KSFT_FAIL=1
68
readonly KSFT_SKIP=4
@@ -438,27 +440,24 @@ mptcp_lib_check_tools() {
438440
}
439441

440442
mptcp_lib_ns_init() {
441-
local sec rndh
442-
443-
sec=$(date +%s)
444-
rndh=$(printf %x "${sec}")-$(mktemp -u XXXXXX)
443+
if ! setup_ns ${@}; then
444+
mptcp_lib_pr_fail "Failed to setup namespace ${@}"
445+
exit ${KSFT_FAIL}
446+
fi
445447

446448
local netns
447449
for netns in "${@}"; do
448-
eval "${netns}=${netns}-${rndh}"
449-
450-
ip netns add "${!netns}" || exit ${KSFT_SKIP}
451-
ip -net "${!netns}" link set lo up
452450
ip netns exec "${!netns}" sysctl -q net.mptcp.enabled=1
453451
ip netns exec "${!netns}" sysctl -q net.ipv4.conf.all.rp_filter=0
454452
ip netns exec "${!netns}" sysctl -q net.ipv4.conf.default.rp_filter=0
455453
done
456454
}
457455

458456
mptcp_lib_ns_exit() {
457+
cleanup_ns "${@}"
458+
459459
local netns
460460
for netns in "${@}"; do
461-
ip netns del "${netns}"
462461
rm -f /tmp/"${netns}".{nstat,out}
463462
done
464463
}

0 commit comments

Comments
 (0)