提交 36b4c0ad 编写于 作者: D David Ahern 提交者: David S. Miller

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: NDavid Ahern <dsahern@gmail.com>
Reviewed-by: NIdo Schimmel <idosch@mellanox.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 993d337c
...@@ -160,10 +160,11 @@ router2_destroy() ...@@ -160,10 +160,11 @@ router2_destroy()
multipath_eval() multipath_eval()
{ {
local weight_rp12=$1 local desc="$1"
local weight_rp13=$2 local weight_rp12=$2
local packets_rp12=$3 local weight_rp13=$3
local packets_rp13=$4 local packets_rp12=$4
local packets_rp13=$5
local weights_ratio packets_ratio diff local weights_ratio packets_ratio diff
RET=0 RET=0
...@@ -192,14 +193,15 @@ multipath_eval() ...@@ -192,14 +193,15 @@ multipath_eval()
test "$(echo "$diff / $weights_ratio > 0.1" | bc -l)" -eq 0 test "$(echo "$diff / $weights_ratio > 0.1" | bc -l)" -eq 0
check_err $? "Too large discrepancy between expected and measured ratios" 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" log_info "Expected ratio $weights_ratio Measured ratio $packets_ratio"
} }
multipath4_test() multipath4_test()
{ {
local weight_rp12=$1 local desc="$1"
local weight_rp13=$2 local weight_rp12=$2
local weight_rp13=$3
local t0_rp12 t0_rp13 t1_rp12 t1_rp13 local t0_rp12 t0_rp13 t1_rp12 t1_rp13
local packets_rp12 packets_rp13 local packets_rp12 packets_rp13
local hash_policy local hash_policy
...@@ -224,7 +226,7 @@ multipath4_test() ...@@ -224,7 +226,7 @@ multipath4_test()
let "packets_rp12 = $t1_rp12 - $t0_rp12" let "packets_rp12 = $t1_rp12 - $t0_rp12"
let "packets_rp13 = $t1_rp13 - $t0_rp13" 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. # Restore settings.
ip route replace 198.51.100.0/24 vrf vrf-r1 \ ip route replace 198.51.100.0/24 vrf vrf-r1 \
...@@ -235,8 +237,9 @@ multipath4_test() ...@@ -235,8 +237,9 @@ multipath4_test()
multipath6_test() multipath6_test()
{ {
local weight_rp12=$1 local desc="$1"
local weight_rp13=$2 local weight_rp12=$2
local weight_rp13=$3
local t0_rp12 t0_rp13 t1_rp12 t1_rp13 local t0_rp12 t0_rp13 t1_rp12 t1_rp13
local packets_rp12 packets_rp13 local packets_rp12 packets_rp13
...@@ -257,7 +260,7 @@ multipath6_test() ...@@ -257,7 +260,7 @@ multipath6_test()
let "packets_rp12 = $t1_rp12 - $t0_rp12" let "packets_rp12 = $t1_rp12 - $t0_rp12"
let "packets_rp13 = $t1_rp13 - $t0_rp13" 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 \ ip route replace 2001:db8:2::/64 vrf vrf-r1 \
nexthop via fe80:2::22 dev $rp12 \ nexthop via fe80:2::22 dev $rp12 \
...@@ -267,14 +270,14 @@ multipath6_test() ...@@ -267,14 +270,14 @@ multipath6_test()
multipath_test() multipath_test()
{ {
log_info "Running IPv4 multipath tests" log_info "Running IPv4 multipath tests"
multipath4_test 1 1 multipath4_test "ECMP" 1 1
multipath4_test 2 1 multipath4_test "Weighted MP 2:1" 2 1
multipath4_test 11 45 multipath4_test "Weighted MP 11:45" 11 45
log_info "Running IPv6 multipath tests" log_info "Running IPv6 multipath tests"
multipath6_test 1 1 multipath6_test "ECMP" 1 1
multipath6_test 2 1 multipath6_test "Weighted MP 2:1" 2 1
multipath6_test 11 45 multipath6_test "Weighted MP 11:45" 11 45
} }
setup_prepare() setup_prepare()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册