[LTP] [PATCH v2 1/4] Remove testscripts/network.sh

[Petr Vorel]

Script was using ltp-pan (already removed), kirk should now be used.

Fixes: 5e5fd4a1ae ("pan: Remove")
Reported-by: Steffen Jaeckel <sjaeckel@suse.de>
Acked-by: Andrea Cervesato <andrea.cervesato@suse.com>
Acked-by: Avinesh Kumar <avinesh.kumar@suse.com>
Acked-by: Jan Stancek <jstancek@redhat.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Changes v1->v2:
* Remove network.sh from doc, mention kirk.

 testcases/network/README.md |  12 ++--
 testscripts/network.sh      | 118 ------------------------------------
 2 files changed, 7 insertions(+), 123 deletions(-)
 delete mode 100755 testscripts/network.sh

diff --git a/testcases/network/README.md b/testcases/network/README.md
index 2a8bd3d33c..d6f7ae03b0 100644
--- a/testcases/network/README.md
+++ b/testcases/network/README.md
@@ -54,14 +54,16 @@ export LTPROOT="/opt/ltp"; export PATH="$LTPROOT/testcases/bin:$PATH"
 ```
 
 ## Running the tests
-The network tests are executed by running the network.sh script:
+
+To run the network testcases, use the official LTP executor kirk:
+https://github.com/linux-test-project/kirk.
+
+To pass environment variables use `--env` with list of key=value separated by `:`
 
 ```sh
-TEST_VARS ./network.sh OPTIONS
+kirk --run-suite net.features \
+     --env 'VIRT_PERF_THRESHOLD=180:LTP_NET_FEATURES_IGNORE_PERFORMANCE_FAILURE=1'
 ```
-Where
-* `TEST_VARS` - non-default network parameters
-* `OPTIONS` - test group(s), use `-h` to see available ones.
 
 Default values for all LTP network parameters are set in `testcases/lib/tst_net.sh`.
 Network stress parameters are documented in `testcases/network/stress/README`.
diff --git a/testscripts/network.sh b/testscripts/network.sh
deleted file mode 100755
index afe9c7a977..0000000000
--- a/testscripts/network.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (c) Linux Test Project, 2013-2019
-
-cd $(dirname $0)
-export LTPROOT=${LTPROOT:-"$PWD"}
-echo $LTPROOT | grep -q testscripts
-if [ $? -eq 0 ]; then
-	cd ..
-	export LTPROOT=${PWD}
-fi
-
-export TMPDIR=/tmp/netpan-$$
-mkdir -p $TMPDIR
-CMDFILE=${TMPDIR}/network.tests
-VERBOSE="no"
-NO_KMSG=
-QUIET_MODE=
-TEST_CASES=
-
-export PATH="${PATH}:${LTPROOT}/testcases/bin"
-
-usage()
-{
-	echo "Usage: $0 OPTIONS"
-	echo "  -6    IPv6 tests"
-	echo "  -m    multicast tests"
-	echo "  -n    NFS tests"
-	echo "  -s    SCTP tests"
-	echo "  -t    TCP/IP command tests"
-	echo "  -c    RPC and TI-RPC tests"
-	echo "  -d    TS-RPC tests"
-	echo "  -a    Application stress tests (HTTP, SSH, DNS)"
-	echo "  -e    Interface stress tests"
-	echo "  -b    Stress tests with malformed ICMP packets"
-	echo "  -i    IPsec ICMP stress tests"
-	echo "  -T    IPsec TCP stress tests"
-	echo "  -U    IPsec UDP stress tests"
-	echo "  -D    IPsec DCCP stress tests"
-	echo "  -S    IPsec SCTP stress tests"
-	echo "  -R    route stress tests"
-	echo "  -M    multicast stress tests"
-	echo "  -F    network features tests (TFO, vxlan, etc.)"
-	echo "  -f x  where x is a runtest file"
-	echo "  -q    quiet mode (this implies not logging start of test"
-	echo "        in kernel log)"
-	echo "  -Q    don't log start of test in kernel log"
-	echo "  -V|v  verbose"
-	echo "  -h    print this help"
-}
-
-while getopts 6mnrstaebcdiTUDSRMFf:qQVvh OPTION
-do
-	case $OPTION in
-	6) TEST_CASES="$TEST_CASES net.ipv6 net.ipv6_lib";;
-	m) TEST_CASES="$TEST_CASES net.multicast";;
-	n) TEST_CASES="$TEST_CASES net.nfs";;
-	s) TEST_CASES="$TEST_CASES net.sctp";;
-	t) TEST_CASES="$TEST_CASES net.tcp_cmds";;
-	c) TEST_CASES="$TEST_CASES net.rpc_tests";;
-	d) TEST_CASES="$TEST_CASES net.tirpc_tests";;
-	a) TEST_CASES="$TEST_CASES net_stress.appl";;
-	e) TEST_CASES="$TEST_CASES net_stress.interface";;
-	b) TEST_CASES="$TEST_CASES net_stress.broken_ip";;
-	i) TEST_CASES="$TEST_CASES net_stress.ipsec_icmp";;
-	T) TEST_CASES="$TEST_CASES net_stress.ipsec_tcp";;
-	U) TEST_CASES="$TEST_CASES net_stress.ipsec_udp";;
-	D) TEST_CASES="$TEST_CASES net_stress.ipsec_dccp";;
-	S) TEST_CASES="$TEST_CASES net_stress.ipsec_sctp";;
-	R) TEST_CASES="$TEST_CASES net_stress.route";;
-	M) TEST_CASES="$TEST_CASES net_stress.multicast";;
-	F) TEST_CASES="$TEST_CASES net.features";;
-	f) TEST_CASES=${OPTARG};;
-	q) QUIET_MODE="-q";;
-	Q) NO_KMSG="-Q";;
-	V|v) VERBOSE="yes";;
-	h) usage; exit 0;;
-	*) echo "Error: invalid option..."; usage; exit 1;;
-	esac
-done
-
-if [ "$OPTIND" -eq 1 ]; then
-	echo "Error: option is required"
-	usage
-	exit 1
-fi
-shift $(($OPTIND - 1))
-
-rm -f $CMDFILE
-
-for t in $TEST_CASES; do
-	cat  ${LTPROOT}/runtest/$t >> $CMDFILE
-done
-
-cd $TMPDIR
-
-cmd="${LTPROOT}/bin/ltp-pan $QUIET_MODE $NO_KMSG -e -l /tmp/netpan.log -S -a ltpnet -n ltpnet -f $CMDFILE"
-
-if [ ${VERBOSE} = "yes" ]; then
-	echo "Network parameters:"
-	echo " - ${LHOST_IFACES} local interface (MAC address: ${LHOST_HWADDRS})"
-	echo " - ${RHOST_IFACES} remote interface (MAC address: ${RHOST_HWADDRS})"
-
-	cat $CMDFILE
-	${LTPROOT}/ver_linux
-	echo ""
-	echo $cmd
-fi
-
-$cmd
-
-if [ $? -eq "0" ]; then
-	echo ltp-pan reported PASS
-else
-	echo ltp-pan reported FAIL
-fi
-
-rm -rf $TMPDIR
-- 
2.55.0