network: rename runtest files, use 'net.' & 'net_stress.' prefix

network.sh: also print usage help. Signed-off-by: Alexey Kodanev <[email protected]>
richiejp · May 19, 2016 · a94a669 · a94a669
1 parent fddb4f3
commit a94a669
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 22 deletions.
diff --git a/runtest/network_stress.features → runtest/net.features b/runtest/network_stress.features → runtest/net.features
diff --git a/runtest/ipv6 → runtest/net.ipv6 b/runtest/ipv6 → runtest/net.ipv6
diff --git a/runtest/ipv6_lib → runtest/net.ipv6_lib b/runtest/ipv6_lib → runtest/net.ipv6_lib
diff --git a/runtest/multicast → runtest/net.multicast b/runtest/multicast → runtest/net.multicast
diff --git a/runtest/nfs → runtest/net.nfs b/runtest/nfs → runtest/net.nfs
diff --git a/runtest/rpc → runtest/net.rpc b/runtest/rpc → runtest/net.rpc
diff --git a/runtest/sctp → runtest/net.sctp b/runtest/sctp → runtest/net.sctp
diff --git a/runtest/tcp_cmds → runtest/net.tcp_cmds b/runtest/tcp_cmds → runtest/net.tcp_cmds
diff --git a/runtest/network_stress.appl → runtest/net_stress.appl b/runtest/network_stress.appl → runtest/net_stress.appl
diff --git a/runtest/network_stress.broken_ip → runtest/net_stress.broken_ip b/runtest/network_stress.broken_ip → runtest/net_stress.broken_ip
diff --git a/runtest/network_stress.interface → runtest/net_stress.interfaces b/runtest/network_stress.interface → runtest/net_stress.interfaces
diff --git a/runtest/network_stress.icmp → runtest/net_stress.ipsec_icmp b/runtest/network_stress.icmp → runtest/net_stress.ipsec_icmp
diff --git a/runtest/network_stress.tcp → runtest/net_stress.ipsec_tcp b/runtest/network_stress.tcp → runtest/net_stress.ipsec_tcp
diff --git a/runtest/network_stress.udp → runtest/net_stress.ipsec_udp b/runtest/network_stress.udp → runtest/net_stress.ipsec_udp
diff --git a/runtest/network_stress.multicast → runtest/net_stress.multicast b/runtest/network_stress.multicast → runtest/net_stress.multicast
diff --git a/runtest/network_stress.route → runtest/net_stress.route b/runtest/network_stress.route → runtest/net_stress.route
diff --git a/scenario_groups/default b/scenario_groups/default
@@ -30,5 +30,5 @@ fs_ext4
 pipes
 can
 cpuhotplug
-ipv6_lib
+net.ipv6_lib
 input
diff --git a/scenario_groups/network b/scenario_groups/network
@@ -1,4 +1,4 @@
-tcp_cmds
-multicast
-rpc
-nfs
+net.tcp_cmds
+net.multicast
+net.rpc
+net.nfs
diff --git a/testscripts/network.sh b/testscripts/network.sh
@@ -25,32 +25,62 @@ export PATH="${PATH}:${LTPROOT}/testcases/bin"
 export TCID=
 export TST_LIB_LOADED=
 
+usage()
+{
+	echo "Usage: $0 OPTIONS"
+	echo "  -6    IPv6 tests"
+	echo "  -m    multicast tests"
+	echo "  -n    NFS tests"
+	echo "  -r    RPC tests"
+	echo "  -s    SCTP tests"
+	echo "  -t    TCP/IP command tests"
+	echo "  -a    Application 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 "  -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 "  -V|v  verbose"
+	echo "  -h    print this help"
+}
+
 TEST_CASES=
 
-while getopts 6mnrstaebiTURMFf:Vv OPTION
+while getopts 6mnrstaebiTURMFf:Vvh OPTION
 do
 	case $OPTION in
-	6) TEST_CASES="$TEST_CASES ipv6 ipv6_lib";;
-	m) TEST_CASES="$TEST_CASES multicast" ;;
-	n) TEST_CASES="$TEST_CASES nfs" ;;
-	r) TEST_CASES="$TEST_CASES rpc" ;;
-	s) TEST_CASES="$TEST_CASES sctp" ;;
-	t) TEST_CASES="$TEST_CASES tcp_cmds" ;;
-	a) TEST_CASES="$TEST_CASES network_stress.appl";;
-	e) TEST_CASES="$TEST_CASES network_stress.interface";;
-	b) TEST_CASES="$TEST_CASES network_stress.broken_ip";;
-	i) TEST_CASES="$TEST_CASES network_stress.icmp";;
-	T) TEST_CASES="$TEST_CASES network_stress.tcp";;
-	U) TEST_CASES="$TEST_CASES network_stress.udp";;
-	R) TEST_CASES="$TEST_CASES network_stress.route";;
-	M) TEST_CASES="$TEST_CASES network_stress.multicast";;
-	F) TEST_CASES="$TEST_CASES network_stress.features";;
+	6) TEST_CASES="$TEST_CASES net.ipv6 net.ipv6_lib";;
+	m) TEST_CASES="$TEST_CASES net.multicast" ;;
+	n) TEST_CASES="$TEST_CASES net.nfs" ;;
+	r) TEST_CASES="$TEST_CASES net.rpc" ;;
+	s) TEST_CASES="$TEST_CASES net.sctp" ;;
+	t) TEST_CASES="$TEST_CASES net.tcp_cmds" ;;
+	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";;
+	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} ;;
 	V|v) VERBOSE="yes";;
-	*) echo "Error: invalid option..."; exit 1 ;;
+	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
+
 rm -f $CMDFILE
 
 for t in $TEST_CASES; do