summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ahern <dsahern@gmail.com>2018-03-01 13:49:33 -0800
committerDavid S. Miller <davem@davemloft.net>2018-03-01 21:19:02 -0500
commit36b4c0adad2662464a5a392b592311524bd3a854 (patch)
tree89e52e16148b1a625f7f471322c4dfbc93b35668
parent993d337c242e292dca89de4558dd8ebfc216fc83 (diff)
selftests: forwarding: Add description to the multipath tests
Add a better description to the summary for multipath tests. e.g., INFO: Running IPv6 multipath tests TEST: ECMP [PASS] INFO: Expected ratio 1.00 Measured ratio 1.02 TEST: Weighted MP 2:1 [PASS] INFO: Expected ratio 2.00 Measured ratio 2.02 TEST: Weighted MP 11:45 [PASS] INFO: Expected ratio 4.09 Measured ratio 4.03 Signed-off-by: David Ahern <dsahern@gmail.com> Reviewed-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rwxr-xr-xtools/testing/selftests/net/forwarding/router_multipath.sh37
1 files changed, 20 insertions, 17 deletions
diff --git a/tools/testing/selftests/net/forwarding/router_multipath.sh b/tools/testing/selftests/net/forwarding/router_multipath.sh
index 745fb40bfa44..55595305a604 100755
--- a/tools/testing/selftests/net/forwarding/router_multipath.sh
+++ b/tools/testing/selftests/net/forwarding/router_multipath.sh
@@ -160,10 +160,11 @@ router2_destroy()
multipath_eval()
{
- local weight_rp12=$1
- local weight_rp13=$2
- local packets_rp12=$3
- local packets_rp13=$4
+ local desc="$1"
+ local weight_rp12=$2
+ local weight_rp13=$3
+ local packets_rp12=$4
+ local packets_rp13=$5
local weights_ratio packets_ratio diff
RET=0
@@ -192,14 +193,15 @@ multipath_eval()
test "$(echo "$diff / $weights_ratio > 0.1" | bc -l)" -eq 0
check_err $? "Too large discrepancy between expected and measured ratios"
- log_test "Multipath"
+ log_test "$desc"
log_info "Expected ratio $weights_ratio Measured ratio $packets_ratio"
}
multipath4_test()
{
- local weight_rp12=$1
- local weight_rp13=$2
+ local desc="$1"
+ local weight_rp12=$2
+ local weight_rp13=$3
local t0_rp12 t0_rp13 t1_rp12 t1_rp13
local packets_rp12 packets_rp13
local hash_policy
@@ -224,7 +226,7 @@ multipath4_test()
let "packets_rp12 = $t1_rp12 - $t0_rp12"
let "packets_rp13 = $t1_rp13 - $t0_rp13"
- multipath_eval $weight_rp12 $weight_rp13 $packets_rp12 $packets_rp13
+ multipath_eval "$desc" $weight_rp12 $weight_rp13 $packets_rp12 $packets_rp13
# Restore settings.
ip route replace 198.51.100.0/24 vrf vrf-r1 \
@@ -235,8 +237,9 @@ multipath4_test()
multipath6_test()
{
- local weight_rp12=$1
- local weight_rp13=$2
+ local desc="$1"
+ local weight_rp12=$2
+ local weight_rp13=$3
local t0_rp12 t0_rp13 t1_rp12 t1_rp13
local packets_rp12 packets_rp13
@@ -257,7 +260,7 @@ multipath6_test()
let "packets_rp12 = $t1_rp12 - $t0_rp12"
let "packets_rp13 = $t1_rp13 - $t0_rp13"
- multipath_eval $weight_rp12 $weight_rp13 $packets_rp12 $packets_rp13
+ multipath_eval "$desc" $weight_rp12 $weight_rp13 $packets_rp12 $packets_rp13
ip route replace 2001:db8:2::/64 vrf vrf-r1 \
nexthop via fe80:2::22 dev $rp12 \
@@ -267,14 +270,14 @@ multipath6_test()
multipath_test()
{
log_info "Running IPv4 multipath tests"
- multipath4_test 1 1
- multipath4_test 2 1
- multipath4_test 11 45
+ multipath4_test "ECMP" 1 1
+ multipath4_test "Weighted MP 2:1" 2 1
+ multipath4_test "Weighted MP 11:45" 11 45
log_info "Running IPv6 multipath tests"
- multipath6_test 1 1
- multipath6_test 2 1
- multipath6_test 11 45
+ multipath6_test "ECMP" 1 1
+ multipath6_test "Weighted MP 2:1" 2 1
+ multipath6_test "Weighted MP 11:45" 11 45
}
setup_prepare()