<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix"><tt>On 21.07.2017 7:04, Petr Vorel
wrote:</tt><tt><br>
</tt></div>
<blockquote cite="mid:20170721040407.868-9-pvorel@suse.cz"
type="cite">
<pre wrap="">* Fix test for netns based testing (route4-change-if requires to have
manually set another pair of interfaces).
* Remove rsh dependency.
* Create shell library route4-lib.sh (route IPv4 specific) to reduce
duplicity in tests. Library uses test_stress_net.sh (and therefore test_net.sh).
* Stop using TST_COUNT, simplify TCID
* Cleanup code, fix typos, update doc.
Signed-off-by: Petr Vorel <a class="moz-txt-link-rfc2396E" href="mailto:pvorel@suse.cz"><pvorel@suse.cz></a>
---
testcases/network/stress/ns-tools/initialize_if | 3 -
.../network/stress/ns-tools/test_net_stress.sh | 9 +-
testcases/network/stress/route/00_Descriptions.txt | 23 +-
testcases/network/stress/route/route4-change-dst | 283 ++---------------
testcases/network/stress/route/route4-change-gw | 302 ++----------------
testcases/network/stress/route/route4-change-if | 336 +++------------------
testcases/network/stress/route/route4-ifdown | 283 ++++-------------
testcases/network/stress/route/route4-lib.sh | 206 +++++++++++++
testcases/network/stress/route/route4-redirect | 220 +++-----------
testcases/network/stress/route/route4-rmmod | 314 +++++--------------
testcases/network/stress/route/route6-change-dst | 2 +-
11 files changed, 480 insertions(+), 1501 deletions(-)
create mode 100644 testcases/network/stress/route/route4-lib.sh
diff --git a/testcases/network/stress/ns-tools/initialize_if b/testcases/network/stress/ns-tools/initialize_if
index d64203e4c..23bf68bc0 100644
--- a/testcases/network/stress/ns-tools/initialize_if
+++ b/testcases/network/stress/ns-tools/initialize_if
@@ -69,9 +69,6 @@ fi
# Define the interface name
ifname=`get_ifname $host_type $link_num` || exit 1
-# Initialize the specified interface
-command="ifconfig $ifname down mtu 1500 ; ip route flush dev $ifname ; ip addr flush dev $ifname ; ifconfig $ifname up"
-</pre>
</blockquote>
<tt><br>
</tt><tt>Again, why?</tt><tt><br>
</tt><tt><br>
</tt>
<blockquote cite="mid:20170721040407.868-9-pvorel@suse.cz"
type="cite">
<pre wrap=""> if [ $host_type = lhost ]; then
( ifconfig $ifname down && \
ip link set mtu 1500 dev $ifname && \
diff --git a/testcases/network/stress/ns-tools/test_net_stress.sh b/testcases/network/stress/ns-tools/test_net_stress.sh
index 5ab3304db..d112286bd 100644
--- a/testcases/network/stress/ns-tools/test_net_stress.sh
+++ b/testcases/network/stress/ns-tools/test_net_stress.sh
@@ -31,7 +31,6 @@ export TCID="${TCID:-$(basename $0)}"
# Netmask of for the tested network
IPV4_NETMASK="255.255.255.0"
IPV4_NETMASK_NUM=24
-IPV4_BROADCAST=${IPV4_NET16_UNUSED}.0.255
# Prefix of the Multicast Address
MCAST_IPV4_ADDR_PREFIX="224.10"
@@ -64,16 +63,16 @@ netstress_cleanup()
}
</pre>
</blockquote>
...<br>
<blockquote cite="mid:20170721040407.868-9-pvorel@suse.cz"
type="cite">
<pre wrap="">
- if [ $? -ne 0 ]; then
- tst_resm TFAIL "Failed to down/up the interface"
- return 1
- fi
+ manipulate_route $cmd_name_route 'add' $dst_network $IPV4_NETMASK_NUM $IPV4_NETMASK $RHOST_IPV4_UNUSED $lhost_ifname
- cnt=`expr $cnt + 1`
- done
+ check_connectivity_interval $cnt false $lhost_ifname $RHOST_IPV4_UNUSED
- tst_resm TPASS "Test is finished correctly."
- return 0
-}
+ # Down then up the interface
+ sh -c "$cmd_iface_down"</pre>
</blockquote>
<br>
Can be just $cmd_iface_down, or better ROD/EXPECT_PASS.<br>
<br>
<blockquote cite="mid:20170721040407.868-9-pvorel@suse.cz"
type="cite">
<pre wrap="">+ if [ $? -ne 0 ]; then
+ tst_resm TFAIL "failed to down/up the interface"
+ return
+ fi
+ cnt=$(($cnt + 1))
+ done
-#-----------------------------------------------------------------------
-#
-# Main
-#
-# Exit Value:
-# The number of the failure
-#
-#-----------------------------------------------------------------------
+ tst_resm TPASS "test is finished correctly"
+}
-RC=0
do_setup
-test_body 1 || RC=`expr $RC + 1` # Case of route command
-test_body 2 || RC=`expr $RC + 1` # Case of ip command
-do_cleanup
+test_body 'rt_cmd'
+test_body 'ip_cmd'
-exit $RC
+tst_exit
diff --git a/testcases/network/stress/route/route4-lib.sh b/testcases/network/stress/route/route4-lib.sh
new file mode 100644
index 000000000..1f0047f68
--- /dev/null
+++ b/testcases/network/stress/route/route4-lib.sh
@@ -0,0 +1,206 @@
+#!/bin/sh
+# Copyright (c) International Business Machines Corp., 2006
+# Copyright (c) 2017 Petr Vorel <a class="moz-txt-link-rfc2396E" href="mailto:pvorel@suse.cz"><pvorel@suse.cz></a>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <a class="moz-txt-link-rfc2396E" href="http://www.gnu.org/licenses/"><http://www.gnu.org/licenses/></a>.
+#
+# Setup script for route4-* tests.
+#
+# More information about network parameters can be found
+# in the following document: testcases/network/stress/README
+#
+# Author: Petr Vorel <a class="moz-txt-link-rfc2396E" href="mailto:pvorel@suse.cz"><pvorel@suse.cz></a>
+
+. test_net_stress.sh
+
+tst_check_cmds ip pgrep route
+
+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
+
+# The destination network
+# NOTE: DST_NETWORK expects NETMASK IPV4_NETMASK_NUM=24
+DST_NETWORK="${IPV4_NET16_UNUSED}.${OCTET_3_IPV4_UNUSED}"
+DST_HOST=5
+DST_PORT=7
+
+route_cleanup()
+{
+ netstress_cleanup
+ restore_ipaddr
+ restore_ipaddr rhost
+}
+
+route_ns_udpsender_cleanup()
+{
+ stop_ns_udpsender
+ restore_ipaddr
+ restore_ipaddr rhost
+}
+
+route_setup()
+{
+ netstress_setup
+ tst_check_cmds route
+ route_cleanup
+}
+
+manipulate_route()
+{
+ local cmd_name=$1
+ local task=$2
+ local network=$3
+ local prefix=$4
+ local netmask=$5
+ local gateway=$6
+ local ifname=$7
+
+ [ "$task" = "add" ] || [ "$task" = "del" ] || \
+ [ "$cmd_name" = "ip" -a "$task" = "append" ] || tst_brkm TBROK "wrong task: '$task'"
+
+ [ "$cmd_name" = "ip" -a "$task" = "add" ] && task="append"
+ if [ "$cmd_name" = "ip" ]; then
+ ROD "$cmd_name route $task $network/$prefix via $gateway dev $ifname"
+ else
+ ROD "$cmd_name $task -net $network netmask $netmask gw $gateway dev $ifname"
+ fi
+}
+
+# Load the route with UDP traffic.
+run_ns_udpsender()
+{
+ local dst_addr=$1
+ local run_in_background=$2
+ local udp_size="${3:-1472}"
+ local params="-o"
+
+ if [ "$run_in_background" = true ]; then
+ # daemon is already running
+ pgrep -x ns-udpsender > /dev/null && return 0
+ params="-b"
+ fi
+
+ ROD ns-udpsender -f 4 -D $dst_addr -p $DST_PORT -s $udp_size $params
+}
+
+stop_ns_udpsender()
+{
+ local type="${1:-lhost}"
+ kill_daemon ns-udpsender $type
+}
+
+get_cmd()
+{
+ local cmd_type=$1
+
+ case $cmd_type in
+ rt_cmd) echo 'route' ;;
+ ip_cmd) echo 'ip' ;;
+ *) tst_brkm TBROK "Unknown test parameter '$cmd_type'"
+ esac
+}
+
+route_test_change()
+{
+ local test_field=$1
+ local cmd_type=$2
+
+ local rhost_ip="$RHOST_IPV4_UNUSED"
+ local lhost_ifname=$(tst_iface)
+ local rhost_part_first=$RHOST_IPV4_HOST_TOP
+ local rhost_part_last=$RHOST_IPV4_HOST_LAST
+ local cnt=0
+ local link_num=0
+ local first_route_net=${DST_NETWORK}.0
+ local cmd_name="$(get_cmd $cmd_type)"
+ local gateway="$rhost_ip"
+ local dst_addr dst_network dst_network_postfix gateway2 lhost_ifname2 rhost_part test_field_name
+
+ case $test_field in
+ dst) test_field_name='destination' ;;
+ gw) test_field_name='gateway' ;;
+ if) test_field_name='interface' ;;
+ *) tst_brkm TBROK "Unknown test parameter '$test_field'"
+ esac
+
+ tst_resm TINFO "the $test_field_name of an IPv4 route is changed by '$cmd_name' command $NS_TIMES times"
+
+ if [ "$test_field" = "if" ]; then
+ while [ $link_num -lt $LINK_TOTAL ]; do
+ rhost_ip="${IPV4_NET16_UNUSED}.${link_num}.${OCTET_4_RHOST_IPV4_HOST_UNUSED}"
+ check_connectivity $(tst_iface lhost $link_num) $rhost_ip
+ link_num=$(($link_num + 1))
+ done
+ link_num=0
+ lhost_ifname="$(tst_iface lhost $link_num)"
+ gateway="${IPV4_NET16_UNUSED}.${link_num}.${RHOST_IPV4_HOST}"
+ else
+ if [ "$test_field" = "gw" ]; then
+ rhost_ip="${IPV4_NET16_UNUSED}.${OCTET_3_IPV4_UNUSED}.$RHOST_IPV4_HOST_TOP"
+ rhost_part=$rhost_part_first
+ gateway="${IPV4_NET16_UNUSED}.${OCTET_3_IPV4_UNUSED}.${rhost_part}"
+ fi
+ tst_add_ipaddr_stress
+ check_connectivity $(tst_iface) $rhost_ip
+ fi
+
+ if [ "$test_field" != "dst" ]; then
+ dst_addr=${DST_NETWORK}.${DST_HOST}
+ dst_network=$first_route_net
+
+ tst_resm TINFO "adding first route"
+ ROD manipulate_route $cmd_name 'add' $first_route_net $IPV4_NETMASK_NUM $IPV4_NETMASK $gateway $lhost_ifname</pre>
</blockquote>
<tt><br>
</tt><tt>Without 'ROD', in the new library it won't work with script
functions, besides you have ROD on every command in that function
already.</tt><tt><br>
</tt><tt><br>
</tt>
<blockquote cite="mid:20170721040407.868-9-pvorel@suse.cz"
type="cite">
<pre wrap="">+ fi
+
+ while [ $cnt -lt $NS_TIMES ]; do
+ lhost_ifname2="$lhost_ifname"
+ gateway2="$gateway"
+
+ make_background_tcp_traffic $LHOST_IPV4_UNUSED
+
+ if [ "$test_field" = "dst" ]; then
+ dst_network_postfix="$(($cnt % 255))"
+ dst_addr="${IPV4_NET16_UNUSED}.${dst_network_postfix}.${DST_HOST}"
+ dst_network="${IPV4_NET16_UNUSED}.${dst_network_postfix}.0"
+ elif [ "$test_field" = "gw" ]; then
+ pre_rhost_part=$rhost_part
+ rhost_part=$(($rhost_part + 1))
+ [ $rhost_part -gt $rhost_part_last ] && rhost_part=$rhost_part_first
+ gateway="${IPV4_NET16_UNUSED}.${OCTET_3_IPV4_UNUSED}.${rhost_part}"
+ gateway2="${IPV4_NET16_UNUSED}.${OCTET_3_IPV4_UNUSED}.${pre_rhost_part}"
+ elif [ "$test_field" = "if" ]; then
+ link_num=$(($link_num + 1))
+ [ $link_num -ge $LINK_TOTAL ] && link_num=0
+ lhost_ifname="$(tst_iface lhost $link_num)"
+ gateway="${IPV4_NET16_UNUSED}.${link_num}.${RHOST_IPV4_HOST}"
+ rhost_ip="${IPV4_NET16_UNUSED}.${link_num}.${OCTET_4_RHOST_IPV4_HOST_UNUSED}"
+ fi
+
+ manipulate_route $cmd_name 'add' $dst_network $IPV4_NETMASK_NUM $IPV4_NETMASK $gateway $lhost_ifname</pre>
</blockquote>
<br>
<tt>Looking at the original test-case, after new route added, the<br>
test tries</tt><tt> </tt><tt>to send a single UDP datagram in
order to load it.<br>
But now all the tests have a background traffic on that<br>
interface and route not used, correct?</tt><tt><br>
</tt><tt><br>
</tt>
<blockquote cite="mid:20170721040407.868-9-pvorel@suse.cz"
type="cite">
<pre wrap="">+ manipulate_route $cmd_name 'del' $dst_network $IPV4_NETMASK_NUM $IPV4_NETMASK $gateway2 $lhost_ifname2
+
+ check_connectivity_interval $cnt false $lhost_ifname $rhost_ip || return
+
+ cnt=$(($cnt + 1))
+ done
+
+ if [ "$test_field" != "dst" ]; then
+ ROD manipulate_route $cmd_name del $first_route_net $IPV4_NETMASK_NUM $IPV4_NETMASK $gateway $lhost_ifname
+ fi
+
+ if [ "$test_field" != "if" ]; then
+ restore_ipaddr
+ fi
+
+ tst_resm TPASS "test is finished correctly"
+}
diff --git a/testcases/network/stress/route/route4-redirect b/testcases/network/stress/route/route4-redirect
index 9eb8a4624..714e0af25 100644
--- a/testcases/network/stress/route/route4-redirect
+++ b/testcases/network/stress/route/route4-redirect
@@ -1,212 +1,72 @@
#!/bin/sh
-
-################################################################################
-## ##
-## Copyright (c) International Business Machines Corp., 2006 ##
-## ##
-## This program is free software; you can redistribute it and#or modify ##
-## it under the terms of the GNU General Public License as published by ##
-## the Free Software Foundation; either version 2 of the License, or ##
-## (at your option) any later version. ##
-## ##
-## This program is distributed in the hope that it will be useful, but ##
-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
-## for more details. ##
-## ##
-## You should have received a copy of the GNU General Public License ##
-## along with this program; if not, write to the Free Software ##
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
-## ##
-## ##
-################################################################################
+# Copyright (c) International Business Machines Corp., 2006
+# Copyright (c) 2017 Petr Vorel <a class="moz-txt-link-rfc2396E" href="mailto:pvorel@suse.cz"><pvorel@suse.cz></a>
#
-# File:
-# route4-redirect
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
#
-# Description:
-# Verify the kernel is not crashed when the IPv4 route is modified by
-# ICMP Redirects frequently
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# Setup:
-# See ltp-yyyymmdd/testcases/network/stress/README
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <a class="moz-txt-link-rfc2396E" href="http://www.gnu.org/licenses/"><http://www.gnu.org/licenses/></a>.
#
-# Author:
-# Mitsuru Chinen <a class="moz-txt-link-rfc2396E" href="mailto:mitch@jp.ibm.com"><mitch@jp.ibm.com></a>
+# Verify the kernel is not crashed when the IPv4 route is modified by
+# ICMP Redirects frequently.
#
-# History:
-# Apr 07 2006 - Created (Mitsuru Chinen)
+# Setup: testcases/network/stress/README
#
-#-----------------------------------------------------------------------
-# Uncomment line below for debug output.
-#trace_logic=${trace_logic:-"set -x"}
-$trace_logic
+# Author: Mitsuru Chinen <a class="moz-txt-link-rfc2396E" href="mailto:mitch@jp.ibm.com"><mitch@jp.ibm.com></a>
-# The test case ID, the test case count and the total number of test case
-TCID=route4-redirect01
TST_TOTAL=1
-TST_COUNT=1
-export TCID
-export TST_COUNT
-export TST_TOTAL
-
-# Test description
-tst_resm TINFO "Verify the kernel is not crashed when the IPv4 route is modified by ICMP Redirects frequently"
-
-# Make sure the value of LTPROOT
-LTPROOT=${LTPROOT:-`(cd ../../../.. ; pwd)`}
-export LTPROOT
-
-# Check the environmanet variable
-. check_envval || exit $TST_TOTAL
-
-# The number of times where route is changed
-NS_TIMES=${NS_TIMES:-10000}
-
-# The number of the test link where tests run
-LINK_NUM=${LINK_NUM:-0}
-
-# Network portion of the IPv4 address
-IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
-
-# Netmask of for the tested network
-IPV4_NETMASK_NUM=24
-# Broadcast address of the tested network
-IPV4_BROADCAST=${IPV4_NETWORK}.255
+. route4-lib.sh
-# Host portion of the IPv4 address
-LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"1"} # src
-RHOST_IPV4_HOST="2" # gateway
+TST_CLEANUP="do_cleanup"
-# The destination network
-DST_NETWORK="10.10.0" # destination network would be 10.10.0.0/24
-DST_HOST="5"
-DST_PORT="7"
+SYSFS_ACCEPT_REDIRECTS=
+SYSFS_SECURE_REDIRECTS=
-
-#-----------------------------------------------------------------------
-#
-# NAME:
-# do_cleanup
-#
-# DESCRIPTION:
-# Recover the tested interfaces
-#
-#-----------------------------------------------------------------------
do_cleanup()
{
- # Kill the redirector utility
- $LTP_RSH $RHOST killall -SIGHUP ns-icmp_redirector >/dev/null 2>&1
-
- # Initialize the interfaces
- initialize_if lhost ${LINK_NUM}
- initialize_if rhost ${LINK_NUM}
+ route_ns_udpsender_cleanup
+ kill_daemon ns-icmp_redirector remote
+ [ -n "$SYSFS_ACCEPT_REDIRECTS" ] && sysctl -qw net.ipv4.conf.$(tst_iface).accept_redirects=$SYSFS_ACCEPT_REDIRECTS
+ [ -n "$SYSFS_SECURE_REDIRECTS" ] && sysctl -qw net.ipv4.conf.$(tst_iface).secure_redirects=$SYSFS_SECURE_REDIRECTS
}
-
-#-----------------------------------------------------------------------
-#
-# NAME:
-# do_setup
-#
-# DESCRIPTION:
-# Set the initial route and start icmp redirect on the remote host
-#
-# SET VALUES:
-# rhost_ipv4addr - IPv4 Address of the remote host
-# lhost_ifname - Interface name of the local host
-# rhost_ifname - Interface name of the remote host
-#
-#-----------------------------------------------------------------------
do_setup()
{
- # Make sure to clean up
- do_cleanup
-
- # Get the Interface name of local host
- lhost_ifname=`get_ifname lhost ${LINK_NUM}`
- if [ $? -ne 0 ]; then
- tst_resm TBROK "Failed to get the interface name at the local host"
- exit $TST_TOTAL
- fi
-
- # Get the Interface name of remote host
- rhost_ifname=`get_ifname rhost ${LINK_NUM}`
- if [ $? -ne 0 ]; then
- tst_resm TBROK "Failed to get the interface name at the remote host"
- exit $TST_TOTAL
- fi
+ route_setup
- # Remove the link-local address of the remote host
- sleep 3
- $LTP_RSH $RHOST "ip addr flush dev $rhost_ifname" > /dev/null
+ SYSFS_ACCEPT_REDIRECTS=$(sysctl -b net.ipv4.conf.$(tst_iface).accept_redirects)
+ SYSFS_SECURE_REDIRECTS=$(sysctl -b net.ipv4.conf.$(tst_iface).secure_redirects)
- # Assign IPv4 address to the interface of the local host
- set_ipv4addr lhost ${LINK_NUM} ${IPV4_NETWORK} ${LHOST_IPV4_HOST}
- if [ $? -ne 0 ]; then
- tst_resm TBROK "Failed to assign an IPv4 address at the local host"
- return 1
- fi
+ tst_add_ipaddr_stress
- # Add route to the initial gateway
- route add -net ${DST_NETWORK}.0 netmask 255.255.255.0 gw ${IPV4_NETWORK}.${RHOST_IPV4_HOST} dev $lhost_ifname
+ tst_resm TINFO "add route to the initial gateway"
+ ROD manipulate_route "route" "add" ${DST_NETWORK}.0 $IPV4_NETMASK_NUM $IPV4_NETMASK $RHOST_IPV4_UNUSED $(tst_iface)
- # Make sure the sysctl value is set for accepting the redirect
- sysctl -w net.ipv4.conf.${lhost_ifname}.accept_redirects=1 >/dev/null
- sysctl -w net.ipv4.conf.${lhost_ifname}.secure_redirects=0 >/dev/null
-
- # Run the redirector utility at the remote host
- ret=`$LTP_RSH $RHOST "${LTPROOT}/testcases/bin/ns-icmp_redirector -I $rhost_ifname -b ; "'echo $?'`
- if [ $ret -ne 0 ]; then
- tst_resm TBROK "Failed to run icmp redirector at the remote host"
- exit $TST_TOTAL
- fi
+ # Run the redirector utility at the remote host
+ tst_rhost_run -s -c "ns-icmp_redirector -I $(tst_iface rhost) -b"
}
-
-
-#-----------------------------------------------------------------------
-#
-# FUNCTION:
-# test_body
-#
-# DESCRIPTION:
-# main code of the test
-#
-# Arguments:
-# None
-#
-#-----------------------------------------------------------------------
test_body()
{
- # Loop for changing the route
- cnt=0
- while [ $cnt -lt $NS_TIMES ]; do
- ns-udpsender -f 4 -D ${DST_NETWORK}.${DST_HOST} -p $DST_PORT -o -s 8
- if [ $? -ne 0 ]; then
- tst_resm TBROK "Failed to run udp packet sender"
- return 1
- fi
- cnt=`expr $cnt + 1`
- done
+ local cnt=0
+ while [ $cnt -lt $NS_TIMES ]; do
+ run_ns_udpsender ${DST_NETWORK}.${DST_HOST} no 8
+ cnt=$(($cnt + 1))
+ done
- tst_resm TPASS "Test is finished correctly."
- return 0
+ tst_resm TPASS "test is finished correctly"
}
-
-#-----------------------------------------------------------------------
-#
-# Main
-#
-# Exit Value:
-# The number of the failure
-#
-#-----------------------------------------------------------------------
-RC=0
do_setup
-test_body || RC=`expr $RC + 1`
-do_cleanup
+test_body
-exit $RC
+tst_exit
diff --git a/testcases/network/stress/route/route4-rmmod b/testcases/network/stress/route/route4-rmmod
index 36c8c970d..70a6e3745 100644
--- a/testcases/network/stress/route/route4-rmmod
+++ b/testcases/network/stress/route/route4-rmmod
@@ -1,280 +1,104 @@
#!/bin/sh
-
-################################################################################
-## ##
-## Copyright (c) International Business Machines Corp., 2006 ##
-## ##
-## This program is free software; you can redistribute it and#or modify ##
-## it under the terms of the GNU General Public License as published by ##
-## the Free Software Foundation; either version 2 of the License, or ##
-## (at your option) any later version. ##
-## ##
-## This program is distributed in the hope that it will be useful, but ##
-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
-## for more details. ##
-## ##
-## You should have received a copy of the GNU General Public License ##
-## along with this program; if not, write to the Free Software ##
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
-## ##
-## ##
-################################################################################
-#
-# File:
-# route4-rmmod
+# Copyright (c) International Business Machines Corp., 2006
+# Copyright (c) 2017 Petr Vorel <a class="moz-txt-link-rfc2396E" href="mailto:pvorel@suse.cz"><pvorel@suse.cz></a>
#
-# Description:
-# Verify the kernel is not crashed when IPv4 route is add then it is deleted
-# by the removing network driver
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
#
-# Setup:
-# See ltp-yyyymmdd/testcases/network/stress/README
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# Author:
-# Mitsuru Chinen <a class="moz-txt-link-rfc2396E" href="mailto:mitch@jp.ibm.com"><mitch@jp.ibm.com></a>
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <a class="moz-txt-link-rfc2396E" href="http://www.gnu.org/licenses/"><http://www.gnu.org/licenses/></a>.
#
-# History:
-# Apr 8 2006 - Created (Mitsuru Chinen)
+# Setup: testcases/network/stress/README
#
-#-----------------------------------------------------------------------
-# Uncomment line below for debug output.
-#trace_logic=${trace_logic:-"set -x"}
-$trace_logic
-
-# Make sure the value of LTPROOT
-LTPROOT=${LTPROOT:-`(cd ../../../../ ; pwd)`}
-export LTPROOT
+# Author: Mitsuru Chinen <a class="moz-txt-link-rfc2396E" href="mailto:mitch@jp.ibm.com"><mitch@jp.ibm.com></a>
-# Total number of the test case
TST_TOTAL=2
-export TST_TOTAL
-
-# Default of the test case ID and the test case count
-TCID=route4-rmmod
-TST_COUNT=0
-export TCID
-export TST_COUNT
-
-# Check the environmanet variable
-. check_envval || exit $TST_TOTAL
-
-# The number of times where IPv4 route is add/delete
-NS_TIMES=${NS_TIMES:-10000}
-
-# The number of the test link where tests run
-LINK_NUM=${LINK_NUM:-0}
-
-# Network portion of the IPv4 address
-IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
-
-# Netmask of for the tested network
-IPV4_NETMASK="255.255.255.0"
-IPV4_NETMASK_NUM=24
-
-# Broadcast address of the tested network
-IPV4_BROADCAST=${IPV4_NETWORK}.255
-
-# Host portion of the IPv4 address
-LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"} # src
-RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"} # gateway
-# The destination network
-DST_NETWORK="10.10.10" # destination network would be 10.10.10.0/24
-DST_HOST="5"
-DST_PORT="7"
+. route4-lib.sh
+TST_CLEANUP="do_cleanup"
-#-----------------------------------------------------------------------
-#
-# NAME:
-# do_cleanup
-#
-# DESCRIPTION:
-# Recover the tested interfaces
-#
-#-----------------------------------------------------------------------
do_cleanup()
{
- # Make sure to load the network driver
- if [ x${lhost_module} != x ]; then
- modprobe $lhost_module
- fi
-
- # Initialize the interfaces
- initialize_if lhost ${LINK_NUM}
- initialize_if rhost ${LINK_NUM}
+ if [ -n "${lhost_module}" ]; then
+ modprobe $lhost_module
+ tst_sleep 100ms
+ fi
+ netstress_cleanup
+ restore_ipaddr
}
-#-----------------------------------------------------------------------
-#
-# NAME:
-# do_setup
-#
-# DESCRIPTION:
-# Make a IPv4 connectivity
-#
-#-----------------------------------------------------------------------
do_setup()
{
- # Check the local host has ethtool utility
- which ethtool >/dev/null
- if [ $? -ne 0 ]; then
- tst_resm TBROK "This test case requires ethtool utility"
- exit $TST_TOTAL
- fi
-
- # Make sure to clean up
- do_cleanup
-
- # Set IPv4 address to the interfaces of the remote host
- set_ipv4addr rhost ${LINK_NUM} ${IPV4_NETWORK} ${RHOST_IPV4_HOST}
- if [ $? -ne 0 ]; then
- tst_resm TBROK "Failed to add an IPv4 address the remote host"
- exit $TST_TOTAL
- fi
- rhost_ipv4addr="${IPV4_NETWORK}.${RHOST_IPV4_HOST}"
-
- # Assign IPv4 address to the interface of the local host
- set_ipv4addr lhost ${LINK_NUM} ${IPV4_NETWORK} ${LHOST_IPV4_HOST}
- if [ $? -ne 0 ]; then
- tst_resm TBROK "Failed to assign an IPv4 address at the local host"
- return 1
- fi
- lhost_ipv4addr="${IPV4_NETWORK}.${LHOST_IPV4_HOST}"
-
- # Get the Interface names
- lhost_ifname=`get_ifname lhost ${LINK_NUM}`
- if [ $? -ne 0 ]; then
- tst_resm TBROK "Failed to get the interface name at the local host"
- exit $TST_TOTAL
- fi
-
- rhost_ifname=`get_ifname rhost ${LINK_NUM}`
- if [ $? -ne 0 ]; then
- tst_resm TBROK "Failed to get the interface name at the remote host"
- exit $TST_TOTAL
- fi
-
- # Get the module name of the interface at the local host
- lhost_module=`ethtool -i $lhost_ifname | grep driver | sed "s/driver:[[:blank:]]*//"`
-
- # Chack the other active interface uses the same driver
- for ifname in `ifconfig | grep ^eth | awk '{ print $1}'`; do
- if [ $lhost_ifname = $ifname ]; then
- continue
- fi
-
- module=`ethtool -i $ifname | grep driver | sed "s/driver:[[:blank:]]*//"`
- if [ $lhost_module = $module ]; then
- tst_resm TBROK "An active interface $ifname uses the same network deriver $module with the test intreface."
- exit $TST_TOTAL
- fi
- done
-
- # Set the variables for destination network
- dst_addr=${DST_NETWORK}.${DST_HOST}
- dst_network=${DST_NETWORK}.0
+ route_setup
+ tst_check_cmds ethtool
+
+ tst_add_ipaddr_stress</pre>
</blockquote>
<br>
tst_add_ipaddr_stress() should be after all the checks. Also I doubt
that we need to add a new address in every test. Could you check
again if we really need it?<br>
<br>
<blockquote cite="mid:20170721040407.868-9-pvorel@suse.cz"
type="cite">
<pre wrap="">+
+ # Get the module name of the interface at the local host
+ lhost_module=$(ethtool -i $(tst_iface) | grep driver | sed "s/driver:[[:blank:]]*//")
+
+ # Check the other active interface uses the same driver
+ for ifname in $(ifconfig | grep ^eth | awk '{ print $1}'); do
+ if [ "$(tst_iface)" = "$ifname" ]; then
+ continue
+ fi
+
+ module=$(ethtool -i $ifname | grep driver | sed "s/driver:[[:blank:]]*//")
+ if [ $lhost_module = $module ]; then
+ tst_resm TBROK "an active interface '$ifname' uses the same network driver '$module' with the test intreface"
+ return
+ fi
+ done
}
-
-#-----------------------------------------------------------------------
-#
-# FUNCTION:
-# test_body
-#
-# DESCRIPTION:
-# main code of the test
-#
-# Arguments:
-# $1: define the test type
-# 1 - route command case
-# 2 - ip command case
-#
-#-----------------------------------------------------------------------
test_body()
{
- test_type=$1
+ local cmd_type=$1
+ local cmd_name="$(get_cmd $cmd_type)"
+ local dst_addr=${DST_NETWORK}.${DST_HOST}
+ local dst_network=${DST_NETWORK}.0
+ local cnt=0
- TCID=route4-rmmod0${test_type}
- TST_COUNT=$test_type
+ tst_resm TINFO "IPv4 route is added by '$cmd_name' command and then deleted by removing network driver $NS_TIMES times"
- case $test_type in
- 1)
- tst_resm TINFO "Verify the kernel is not crashed when IPv4 route is add by route command then it is deleted by removing network driver in $NS_TIMES times"
- ;;
- 2)
- tst_resm TINFO "Verify the kernel is not crashed when IPv4 route is add by ip command then it is deleted by removing network driver in $NS_TIMES times"
- ;;
- *)
- tst_resm TBROK "unspecified case"
- return 1
- ;;
- esac
+ while [ $cnt -lt $NS_TIMES ]; do
+ make_background_tcp_traffic $LHOST_IPV4_UNUSED
- # Start the loop
- cnt=0
- while [ $cnt -lt $NS_TIMES ]; do
- # Check the connectivity to the gateway
- check_icmpv4_connectivity $lhost_ifname $rhost_ipv4addr
- if [ $? -ne 0 ]; then
- tst_resm TBROK "Test Link $LINK_NUM is somthing wrong."
- return 1
- fi
+ check_connectivity_interval $cnt false $(tst_iface) $RHOST_IPV4_UNUSED || return
- # Add the route
- case $test_type in
- 1)
- route add -net $dst_network netmask 255.255.255.0 gw $rhost_ipv4addr dev $lhost_ifname
- ;;
- 2)
- ip route add ${dst_network}/24 via $rhost_ipv4addr dev $lhost_ifname
- ;;
- esac
- if [ $? -ne 0 ]; then
- tst_resm TFAIL "Failed to add the route to ${dst_network}/24"
- return 1
- fi
+ # Add the route
+ ROD manipulate_route $cmd_name 'add' $dst_network $IPV4_NETMASK_NUM $IPV4_NETMASK $RHOST_IPV4_UNUSED $(tst_iface)
- # Load the route with UDP datagram
- ns-udpsender -f 4 -D $dst_addr -p $DST_PORT -o -s 1472
- if [ $? -ne 0 ]; then
- tst_resm TFAIL "Failed to run a UDP datagram sender"
- return 1
- fi
+ # Remove and reload the network driver
+ rmmod $lhost_module && modprobe $lhost_module</pre>
</blockquote>
<br>
ROD modprobe -r $module<br>
ROD modprobe $module<br>
<br>
<blockquote cite="mid:20170721040407.868-9-pvorel@suse.cz"
type="cite">
<pre wrap="">+ if [ $? -ne 0 ]; then
+ tst_resm TFAIL "failed to unload/reload the network driver '$lhost_module'"
+ return
+ fi
+ tst_sleep 100ms</pre>
</blockquote>
<br>
Are you sure we need sleep here?<br>
<br>
<blockquote cite="mid:20170721040407.868-9-pvorel@suse.cz"
type="cite">
<pre wrap="">
- # Remove and reload the network driver
- rmmod $lhost_module && modprobe $lhost_module
- if [ $? -ne 0 ]; then
- tst_resm TFAIL "Failed to unload/reload the network driver"
- return 1
- fi
+ # If we use netns we need to reset it as unloading kernel module breaks it
+ reset_ltp_netspace
- # Make sure to assing the IPv4 address
- set_ipv4addr lhost ${LINK_NUM} ${IPV4_NETWORK} ${LHOST_IPV4_HOST} >/dev/null 2>&1
+ tst_add_ipaddr_stress
- cnt=`expr $cnt + 1`
- done
+ cnt=$(($cnt + 1))
+ done
- tst_resm TPASS "Test is finished correctly."
- return 0
+ tst_resm TPASS "test is finished correctly"
}
-
-#-----------------------------------------------------------------------
-#
-# Main
-#
-# Exit Value:
-# The number of the failure
-#
-#-----------------------------------------------------------------------
-
-RC=0
do_setup
-test_body 1 || RC=`expr $RC + 1` # Case of route command
-test_body 2 || RC=`expr $RC + 1` # Case of ip command
-do_cleanup
+test_body 'rt_cmd'
+test_body 'ip_cmd'
-exit $RC
+tst_exit
diff --git a/testcases/network/stress/route/route6-change-dst b/testcases/network/stress/route/route6-change-dst
index 33e89e985..649f0cc00 100644
--- a/testcases/network/stress/route/route6-change-dst
+++ b/testcases/network/stress/route/route6-change-dst
@@ -242,7 +242,7 @@ test_body()
;;
esac
if [ $? -ne 0 ]; then
- tst_resm TFAIL "Cannot delte the route to ${ADDDEL_ROUTE}"
+ tst_resm TFAIL "Cannot delete the route to ${ADDDEL_ROUTE}"
return 1
fi
</pre>
</blockquote>
<br>
<tt>Thanks,</tt><br>
<tt>Alexey</tt><br>
<br>
</body>
</html>