Commit b6a4fd68 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller

selftests: forwarding: Make ping timeout configurable

The current timeout (2 seconds) proved to be too low for some (emulated)
systems where we run the tests.

Make the timeout configurable and default to 5 seconds.
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3fc46fc9
...@@ -150,7 +150,7 @@ dscp_ping_test() ...@@ -150,7 +150,7 @@ dscp_ping_test()
ip vrf exec $vrf_name \ ip vrf exec $vrf_name \
${PING} -Q $dscp_10 ${sip:+-I $sip} $dip \ ${PING} -Q $dscp_10 ${sip:+-I $sip} $dip \
-c 10 -i 0.1 -w 2 &> /dev/null -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null
local -A t1s local -A t1s
eval "t1s=($(dscp_fetch_stats $dev_10 10) eval "t1s=($(dscp_fetch_stats $dev_10 10)
......
...@@ -171,7 +171,7 @@ dscp_ping_test() ...@@ -171,7 +171,7 @@ dscp_ping_test()
ip vrf exec $vrf_name \ ip vrf exec $vrf_name \
${PING} -Q $dscp ${sip:+-I $sip} $dip \ ${PING} -Q $dscp ${sip:+-I $sip} $dip \
-c 10 -i 0.1 -w 2 &> /dev/null -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null
eval "local -A dev1_t1s=($(dscp_fetch_stats $dev1 0))" eval "local -A dev1_t1s=($(dscp_fetch_stats $dev1 0))"
eval "local -A dev2_t1s=($(dscp_fetch_stats $dev2 0))" eval "local -A dev2_t1s=($(dscp_fetch_stats $dev2 0))"
......
...@@ -33,3 +33,6 @@ PAUSE_ON_CLEANUP=no ...@@ -33,3 +33,6 @@ PAUSE_ON_CLEANUP=no
NETIF_TYPE=veth NETIF_TYPE=veth
# Whether to create virtual interfaces (veth) or not # Whether to create virtual interfaces (veth) or not
NETIF_CREATE=yes NETIF_CREATE=yes
# Timeout (in seconds) before ping exits regardless of how many packets have
# been sent or received
PING_TIMEOUT=5
...@@ -17,6 +17,7 @@ NETIF_TYPE=${NETIF_TYPE:=veth} ...@@ -17,6 +17,7 @@ NETIF_TYPE=${NETIF_TYPE:=veth}
NETIF_CREATE=${NETIF_CREATE:=yes} NETIF_CREATE=${NETIF_CREATE:=yes}
MCD=${MCD:=smcrouted} MCD=${MCD:=smcrouted}
MC_CLI=${MC_CLI:=smcroutectl} MC_CLI=${MC_CLI:=smcroutectl}
PING_TIMEOUT=${PING_TIMEOUT:=5}
relative_path="${BASH_SOURCE%/*}" relative_path="${BASH_SOURCE%/*}"
if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then
...@@ -820,7 +821,8 @@ ping_do() ...@@ -820,7 +821,8 @@ ping_do()
local vrf_name local vrf_name
vrf_name=$(master_name_get $if_name) vrf_name=$(master_name_get $if_name)
ip vrf exec $vrf_name $PING $args $dip -c 10 -i 0.1 -w 2 &> /dev/null ip vrf exec $vrf_name \
$PING $args $dip -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null
} }
ping_test() ping_test()
...@@ -840,7 +842,8 @@ ping6_do() ...@@ -840,7 +842,8 @@ ping6_do()
local vrf_name local vrf_name
vrf_name=$(master_name_get $if_name) vrf_name=$(master_name_get $if_name)
ip vrf exec $vrf_name $PING6 $args $dip -c 10 -i 0.1 -w 2 &> /dev/null ip vrf exec $vrf_name \
$PING6 $args $dip -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null
} }
ping6_test() ping6_test()
......
...@@ -31,7 +31,8 @@ mirror_test() ...@@ -31,7 +31,8 @@ mirror_test()
local t0=$(tc_rule_stats_get $dev $pref) local t0=$(tc_rule_stats_get $dev $pref)
ip vrf exec $vrf_name \ ip vrf exec $vrf_name \
${PING} ${sip:+-I $sip} $dip -c 10 -i 0.1 -w 2 &> /dev/null ${PING} ${sip:+-I $sip} $dip -c 10 -i 0.1 -w $PING_TIMEOUT \
&> /dev/null
local t1=$(tc_rule_stats_get $dev $pref) local t1=$(tc_rule_stats_get $dev $pref)
local delta=$((t1 - t0)) local delta=$((t1 - t0))
# Tolerate a couple stray extra packets. # Tolerate a couple stray extra packets.
......
...@@ -170,7 +170,8 @@ ping_test_from() ...@@ -170,7 +170,8 @@ ping_test_from()
log_info "ping $dip, expected reply from $from" log_info "ping $dip, expected reply from $from"
ip vrf exec $(master_name_get $oif) \ ip vrf exec $(master_name_get $oif) \
$PING -I $oif $dip -c 10 -i 0.1 -w 2 -b 2>&1 | grep $from &> /dev/null $PING -I $oif $dip -c 10 -i 0.1 -w $PING_TIMEOUT -b 2>&1 \
| grep $from &> /dev/null
check_err_fail $fail $? check_err_fail $fail $?
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment