[PATCH mptcp-next] Squash to "selftests: mptcp: add fullmesh testcases"

[PATCH mptcp-next] Squash to "selftests: mptcp: add fullmesh testcases"

[Matthieu Baerts]

To avoid using the >10 numbers for the fullmesh test cases and comments
around to make it a bit more clear this is a workaround, we can pass
'fullmesh_X' where 'X' is the number of addresses we want to add with
the 'fullmesh' flag.

If we detect that the parameter is starting with 'fullmesh_X', we add
the flag and set the corresponding variable to 'X'. Then we continue
like before.

Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---

Notes:
    to be squashed in "selftests: mptcp: add fullmesh testcases"

 .../testing/selftests/net/mptcp/mptcp_join.sh | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index cb5f9a43baa1..57370f4ab81e 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -366,14 +366,14 @@ do_transfer()
 		fi
 	fi
 
+	flags="subflow"
+	if [[ "${addr_nr_ns2}" = "fullmesh_"* ]]; then
+		flags="${flags},fullmesh"
+		addr_nr_ns2=${addr_nr_ns2:9}
+	fi
+
 	if [ $addr_nr_ns2 -gt 0 ]; then
-		if [ $addr_nr_ns2 -gt 10 ]; then
-			let add_nr_ns2=addr_nr_ns2-10
-			flags=subflow,fullmesh
-		else
-			let add_nr_ns2=addr_nr_ns2
-			flags=subflow
-		fi
+		let add_nr_ns2=addr_nr_ns2
 		counter=3
 		sleep 1
 		while [ $add_nr_ns2 -gt 0 ]; do
@@ -1724,7 +1724,7 @@ fullmesh_tests()
 	ip netns exec $ns1 ./pm_nl_ctl limits 1 3
 	ip netns exec $ns2 ./pm_nl_ctl limits 1 3
 	ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
-	run_tests $ns1 $ns2 10.0.1.1 0 0 11 slow # 11 here meams creating 1 fullmesh subflow
+	run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow
 	chk_join_nr "fullmesh test 1x1" 3 3 3
 	chk_add_nr 1 1
 
@@ -1735,7 +1735,7 @@ fullmesh_tests()
 	ip netns exec $ns1 ./pm_nl_ctl limits 2 5
 	ip netns exec $ns2 ./pm_nl_ctl limits 1 5
 	ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
-	run_tests $ns1 $ns2 10.0.1.1 0 0 12 slow # 12 here meams creating 2 fullmesh subflows
+	run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
 	chk_join_nr "fullmesh test 1x2" 5 5 5
 	chk_add_nr 1 1
 
@@ -1747,7 +1747,7 @@ fullmesh_tests()
 	ip netns exec $ns1 ./pm_nl_ctl limits 2 4
 	ip netns exec $ns2 ./pm_nl_ctl limits 1 4
 	ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
-	run_tests $ns1 $ns2 10.0.1.1 0 0 12 slow
+	run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
 	chk_join_nr "fullmesh test 1x2, limited" 4 4 4
 	chk_add_nr 1 1
 }
-- 
2.31.1

Re: [PATCH mptcp-next] Squash to "selftests: mptcp: add fullmesh testcases"

[Matthieu Baerts]

Hello,

On 04/08/2021 09:25, Matthieu Baerts wrote:
> To avoid using the >10 numbers for the fullmesh test cases and comments
> around to make it a bit more clear this is a workaround, we can pass
> 'fullmesh_X' where 'X' is the number of addresses we want to add with
> the 'fullmesh' flag.
> 
> If we detect that the parameter is starting with 'fullmesh_X', we add
> the flag and set the corresponding variable to 'X'. Then we continue
> like before.
> 
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> ---
> 
> Notes:
>     to be squashed in "selftests: mptcp: add fullmesh testcases"

I forgot to mention that we also need to update the corresponding commit
message to remove this line:

  Reuse the above 10 address numbers for the fullmesh test.

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Re: [PATCH mptcp-next] Squash to "selftests: mptcp: add fullmesh testcases"

[Geliang Tang]

Hi Matt,

Thanks for fixing this.

Acked-and-tested-by: Geliang Tang <geliangtang@xiaomi.com>

-Geliang

Matthieu Baerts <matthieu.baerts@tessares.net> 于2021年8月4日周三 下午3:36写道：
>
> Hello,
>
> On 04/08/2021 09:25, Matthieu Baerts wrote:
> > To avoid using the >10 numbers for the fullmesh test cases and comments
> > around to make it a bit more clear this is a workaround, we can pass
> > 'fullmesh_X' where 'X' is the number of addresses we want to add with
> > the 'fullmesh' flag.
> >
> > If we detect that the parameter is starting with 'fullmesh_X', we add
> > the flag and set the corresponding variable to 'X'. Then we continue
> > like before.
> >
> > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> > ---
> >
> > Notes:
> >     to be squashed in "selftests: mptcp: add fullmesh testcases"
>
> I forgot to mention that we also need to update the corresponding commit
> message to remove this line:
>
>   Reuse the above 10 address numbers for the fullmesh test.
>
> Cheers,
> Matt
> --
> Tessares | Belgium | Hybrid Access Solutions
> www.tessares.net

Re: [PATCH mptcp-next] Squash to "selftests: mptcp: add fullmesh testcases"

[Matthieu Baerts]

Hi Geliang,

On 04/08/2021 13:44, Geliang Tang wrote:
> Hi Matt,
> 
> Thanks for fixing this.
> 
> Acked-and-tested-by: Geliang Tang <geliangtang@xiaomi.com>

Thank you for the review!

- 3f64b5497607: "squashed" in "selftests: mptcp: add fullmesh testcases"
- 2b21fc8ab588: "Signed-off-by" + "Co-developed-by"
- f5fe84d6868b: tg:msg: remove mention of addr ID >10
- Results: 90dec655986b..e33e07851d84

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210804T131406
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210804T131406

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net