Re: [PATCHv2 net-next 13/14] selftests/net: convert sctp_vrf.sh to run it in unique namespace

Xin Long
2023-11-30T20:57:27Z

On Wed, Nov 29, 2023 at 11:02 PM Hangbin Liu <liuhangbin@gmail.com> wrote:
>
> Here is the test result after conversion.
>
> ]# ./sctp_vrf.sh
> Testing For SCTP VRF:
> TEST 01: nobind, connect from client 1, l3mdev_accept=1, Y [PASS]
> ...
> TEST 12: bind vrf-2 & 1 in server, connect from client 1 & 2, N [PASS]
> ***v6 Tests Done***
>
> Acked-by: David Ahern <dsahern@kernel.org>
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
> ---
> tools/testing/selftests/net/sctp_vrf.sh | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/tools/testing/selftests/net/sctp_vrf.sh b/tools/testing/selftests/net/sctp_vrf.sh
> index c721e952e5f3..c854034b6aa1 100755
> --- a/tools/testing/selftests/net/sctp_vrf.sh
> +++ b/tools/testing/selftests/net/sctp_vrf.sh
> @@ -6,13 +6,11 @@
> # SERVER_NS
> # CLIENT_NS2 (veth1) <---> (veth2) -> vrf_s2
>
> -CLIENT_NS1="client-ns1"
> -CLIENT_NS2="client-ns2"
> +source lib.sh
> CLIENT_IP4="10.0.0.1"
> CLIENT_IP6="2000::1"
> CLIENT_PORT=1234
>
> -SERVER_NS="server-ns"
> SERVER_IP4="10.0.0.2"
> SERVER_IP6="2000::2"
> SERVER_PORT=1234
> @@ -20,9 +18,7 @@ SERVER_PORT=1234
> setup() {
> modprobe sctp
> modprobe sctp_diag
> - ip netns add $CLIENT_NS1
> - ip netns add $CLIENT_NS2
> - ip netns add $SERVER_NS
> + setup_ns CLIENT_NS1 CLIENT_NS2 SERVER_NS
>
> ip net exec $CLIENT_NS1 sysctl -w net.ipv6.conf.default.accept_dad=0 2>&1 >/dev/null
> ip net exec $CLIENT_NS2 sysctl -w net.ipv6.conf.default.accept_dad=0 2>&1 >/dev/null
> @@ -67,9 +63,7 @@ setup() {
>
> cleanup() {
> ip netns exec $SERVER_NS pkill sctp_hello 2>&1 >/dev/null
> - ip netns del "$CLIENT_NS1"
> - ip netns del "$CLIENT_NS2"
> - ip netns del "$SERVER_NS"
> + cleanup_ns $CLIENT_NS1 $CLIENT_NS2 $SERVER_NS
> }
>
> wait_server() {
> --
> 2.41.0
>
Reviewed-by: Xin Long <lucien.xin@gmail.com>