Commit 3188309c authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

selftests: mptcp: netlink: add 'limits' helpers 



The output format of 'ip mptcp limits' command is much different from
that of 'pm_nl_ctl limits' command.

This patch adds format_limits() helper to format the outputs of these
two commands to hide the difference. get_limits() has been added to show
the limits.

Use these two helpers in pm_netlink.sh to replace all 'pm_nl_ctl limits'
commands and outputs.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29aa32fe

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

+25 −7
Original line number Diff line number Diff line
@@ -46,6 +46,26 @@ trap cleanup EXIT 


mptcp_lib_ns_init ns1



format_limits() {

	local accept="${1}"

	local subflows="${2}"



	if mptcp_lib_is_ip_mptcp; then

		# with a space at the end

		printf "add_addr_accepted %d subflows %d \n" "${accept}" "${subflows}"

	else

		printf "accept %d\nsubflows %d\n" "${accept}" "${subflows}"

	fi

}



get_limits() {

	if mptcp_lib_is_ip_mptcp; then

		ip -n "${ns1}" mptcp limits

	else

		ip netns exec "${ns1}" ./pm_nl_ctl limits

	fi

}



check()

{

	local cmd="$1"
@@ -69,10 +89,9 @@ check() 


check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "defaults addr list"



default_limits="$(ip netns exec $ns1 ./pm_nl_ctl limits)"

default_limits="$(get_limits)"

if mptcp_lib_expect_all_features; then

	check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0

subflows 2" "defaults limits"

	check "get_limits" "$(format_limits 0 2)" "defaults limits"

fi



ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1
@@ -120,14 +139,13 @@ ip netns exec $ns1 ./pm_nl_ctl flush 
check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "flush addrs"



ip netns exec $ns1 ./pm_nl_ctl limits 9 1 2>/dev/null

check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "rcv addrs above hard limit"

check "get_limits" "${default_limits}" "rcv addrs above hard limit"



ip netns exec $ns1 ./pm_nl_ctl limits 1 9 2>/dev/null

check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "subflows above hard limit"

check "get_limits" "${default_limits}" "subflows above hard limit"



ip netns exec $ns1 ./pm_nl_ctl limits 8 8

check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 8

subflows 8" "set limits"

check "get_limits" "$(format_limits 8 8)" "set limits"



ip netns exec $ns1 ./pm_nl_ctl flush

ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1