Commit 9846921d authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

selftests: mptcp: fix ipv6 routing setup 



MPJ ipv6 selftests currently lack per link route to the server
net. Additionally, ipv6 subflows endpoints are created without any
interface specified. The end-result is that in ipv6 self-tests
subflows are created all on the same link, leading to expected delays
and sporadic self-tests failures.

Fix the issue by adding the missing setup bits.

Fixes: 523514ed ("selftests: mptcp: add ADD_ADDR IPv6 test cases")
Reported-and-tested-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a4c0214f

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

+3 −2
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ init() 


		# let $ns2 reach any $ns1 address from any interface

		ip -net "$ns2" route add default via 10.0.$i.1 dev ns2eth$i metric 10$i

		ip -net "$ns2" route add default via dead:beef:$i::1 dev ns2eth$i metric 10$i

	done

}
@@ -1476,7 +1477,7 @@ ipv6_tests() 
	reset

	ip netns exec $ns1 ./pm_nl_ctl limits 0 1

	ip netns exec $ns2 ./pm_nl_ctl limits 0 1

	ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow

	ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 dev ns2eth3 flags subflow

	run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow

	chk_join_nr "single subflow IPv6" 1 1 1
@@ -1511,7 +1512,7 @@ ipv6_tests() 
	ip netns exec $ns1 ./pm_nl_ctl limits 0 2

	ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal

	ip netns exec $ns2 ./pm_nl_ctl limits 1 2

	ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow

	ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 dev ns2eth3 flags subflow

	run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow

	chk_join_nr "remove subflow and signal IPv6" 2 2 2

	chk_add_nr 1 1