[net-next PATCH v6 2/5] test: hsr: Remove script code already implemented in lib.sh

Lukasz Majewski posted 5 patches 1 year, 9 months ago
[net-next PATCH v6 2/5] test: hsr: Remove script code already implemented in lib.sh
Posted by Lukasz Majewski 1 year, 9 months ago
Some parts (like netns creation and cleanup) of hsr_ping.sh script are
already implemented in ../lib.sh common script, so can be replaced by it.

Signed-off-by: Lukasz Majewski <lukma@denx.de>

---
Changes for v6:
- New patch
---
 tools/testing/selftests/net/hsr/hsr_ping.sh | 28 +++------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/tools/testing/selftests/net/hsr/hsr_ping.sh b/tools/testing/selftests/net/hsr/hsr_ping.sh
index 1c6457e54625..bd7c4b8f07b8 100755
--- a/tools/testing/selftests/net/hsr/hsr_ping.sh
+++ b/tools/testing/selftests/net/hsr/hsr_ping.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
+source ../lib.sh
 ret=0
 ksft_skip=4
 ipv6=true
@@ -27,19 +28,7 @@ while getopts "$optstring" option;do
 esac
 done
 
-sec=$(date +%s)
-rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
-ns1="ns1-$rndh"
-ns2="ns2-$rndh"
-ns3="ns3-$rndh"
-
-cleanup()
-{
-	local netns
-	for netns in "$ns1" "$ns2" "$ns3" ;do
-		ip netns del $netns
-	done
-}
+setup_ns ns1 ns2 ns3
 
 # $1: IP address
 is_v6()
@@ -254,21 +243,10 @@ if [ $? -ne 0 ];then
 	exit $ksft_skip
 fi
 
-trap cleanup EXIT
-
-for i in "$ns1" "$ns2" "$ns3" ;do
-	ip netns add $i || exit $ksft_skip
-	ip -net $i link set lo up
-done
+trap cleanup_all_ns EXIT
 
 setup_hsr_interfaces 0
 do_complete_ping_test
-cleanup
-
-for i in "$ns1" "$ns2" "$ns3" ;do
-	ip netns add $i || exit $ksft_skip
-	ip -net $i link set lo up
-done
 
 setup_hsr_interfaces 1
 do_complete_ping_test
-- 
2.20.1