Skip to content

Commit

Permalink
selftests: Drop 'pref medium' in route checks
Browse files Browse the repository at this point in the history
The 'pref medium' attribute was moved in iproute2 to be near the prefix
which is where it applies versus after the last nexthop. The nexthop
tests were updated to drop the string from route checking, but it crept
in again with the compat tests.

Fixes: 4dddb5b ("selftests: net: add new testcases for nexthop API compat mode sysctl")
Signed-off-by: David Ahern <[email protected]>
Cc: Roopa Prabhu <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
dsahern authored and davem330 committed May 17, 2020
1 parent 2f6ca95 commit eb68267
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/testing/selftests/net/fib_nexthops.sh
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@ ipv6_compat_mode()
log_test $? 0 "IPv6 compat mode on - route add notification"

# route dump should contain expanded nexthops
check_route6 "2001:db8:101::1" "2001:db8:101::1 nhid 122 metric 1024 pref medium nexthop via 2001:db8:91::2 dev veth1 weight 1 nexthop via 2001:db8:91::3 dev veth1 weight 1"
check_route6 "2001:db8:101::1" "2001:db8:101::1 nhid 122 metric 1024 nexthop via 2001:db8:91::2 dev veth1 weight 1 nexthop via 2001:db8:91::3 dev veth1 weight 1"
log_test $? 0 "IPv6 compat mode on - route dump"

# change in nexthop group should generate route notification
Expand All @@ -992,7 +992,7 @@ ipv6_compat_mode()
log_test $? 0 "IPv6 compat mode off - route add notification"

# route dump should not contain expanded nexthops
check_route6 "2001:db8:101::1" "2001:db8:101::1 nhid 122 metric 1024 pref medium"
check_route6 "2001:db8:101::1" "2001:db8:101::1 nhid 122 metric 1024"
log_test $? 0 "IPv6 compat mode off - route dump"

# change in nexthop group should not generate route notification
Expand Down

0 comments on commit eb68267

Please sign in to comment.