Re: [PATCH mptcp-next v4 3/9] selftests: mptcp: add get_endpoint helper

[Matthieu Baerts <matttbe@kernel.org>]

Hi Geliang,

On 19/03/2024 08:16, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> The output formats of 'ip mptcp' commands are much different from that
> of 'pm_nl_ctl' commands. This patch adds a new helper format_endpoints()
> to format the outputs of 'ip mptcp' and 'pm_nl_ctl' with 'endpoints'
> arguments to hide these differences.
> 
> All endpoints are showed in show_endpoints(). Here add another helper
> named get_endpoint() to show a specofic endpoint identified by the given

s/specofic/specific

> address ID.
> 
> Usage:
> 	All endpoints - show_endpoints $ns
> 	One endpoint - get_endpoint $ns $id

It is a bit confusing, you didn't add 'show_endpoints', maybe you are
talking about 'pm_nl_show_endpoints' from mptcp_join.sh? But there is
nothing about mptcp_lib_pm_nl_format_endpoints().

> 
> Use these two helpers in mptcp_join.sh and pm_netlink.sh to replace all
> 'pm_nl_ctl get' commands and outputs of 'pm_nl_ctl dump/get'.

(...)

> diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
> index ca01d949fad8..ceb8f272c69d 100644
> --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
> @@ -520,3 +520,37 @@ mptcp_lib_set_ip_mptcp() {
>  mptcp_lib_is_ip_mptcp() {
>  	[ "${MPTCP_LIB_IP_MPTCP}" = "1" ]
>  }
> +
> +# format: <id>,<ip>,<flags>,<dev>
> +mptcp_lib_pm_nl_format_endpoints() {
> +	local entry id ip flags dev port
> +
> +	for entry in "${@}"; do
> +		IFS=, read -r id ip flags dev port <<< "${entry}"
> +		if mptcp_lib_is_ip_mptcp; then
> +			echo -n "${ip}"
> +			[ -n "${port}" ] && echo -n " port ${port}"
> +			echo -n " id ${id}"
> +			[ -n "${flags}" ] && echo -n " ${flags}"
> +			[ -n "${dev}" ] && echo -n " dev ${dev}"
> +			echo " " # always a space at the end
> +		else
> +			echo -n "id ${id}"
> +			echo -n " flags ${flags//" "/","}"
> +			[ -n "${dev}" ] && echo -n " dev ${dev}"
> +			echo -n " ${ip}"
> +			[ -n "${port}" ] && echo " ${port}" || echo ""

detail: maybe easier to read with:

  [ -n "${port}" ] && echo -n " ${port}"
  echo

> +		fi
> +	done
> +}
> +
> +mptcp_lib_pm_nl_get_endpoint() {
> +	local ns=${1}
> +	local id=${2}
> +
> +	if mptcp_lib_is_ip_mptcp; then
> +		ip -n "${ns}" mptcp endpoint show id "${id}"
> +	else
> +		ip netns exec "${ns}" ./pm_nl_ctl get "${id}"
> +	fi
> +}
Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.