fib_tests: Add tests for invalid metric on route

Add ipv4 and ipv6 test cases with an invalid metrics option causing
ip_metrics_convert to fail. Tests clean up path during route add.

Also, add nodad to to ipv6 address add. When running ipv6_route_metrics
directly seeing an occasional failure on the "Using route with mtu metric"
test case.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
index 491332713dd96be57917b6c08237a86cae639147..802b4af187297a7c8f2ddf1e086877b35cd41687 100755 (executable)
--- a/tools/testing/selftests/net/fib_tests.sh
+++ b/tools/testing/selftests/net/fib_tests.sh
@@ -711,14 +711,14 @@ route_setup()
        ip -netns ns2 li add dummy1 type dummy
        ip -netns ns2 li set dummy1 up
 
-       $IP -6 addr add 2001:db8:101::1/64 dev veth1
-       $IP -6 addr add 2001:db8:103::1/64 dev veth3
+       $IP -6 addr add 2001:db8:101::1/64 dev veth1 nodad
+       $IP -6 addr add 2001:db8:103::1/64 dev veth3 nodad
        $IP addr add 172.16.101.1/24 dev veth1
        $IP addr add 172.16.103.1/24 dev veth3
 
-       ip -netns ns2 -6 addr add 2001:db8:101::2/64 dev veth2
-       ip -netns ns2 -6 addr add 2001:db8:103::2/64 dev veth4
-       ip -netns ns2 -6 addr add 2001:db8:104::1/64 dev dummy1
+       ip -netns ns2 -6 addr add 2001:db8:101::2/64 dev veth2 nodad
+       ip -netns ns2 -6 addr add 2001:db8:103::2/64 dev veth4 nodad
+       ip -netns ns2 -6 addr add 2001:db8:104::1/64 dev dummy1 nodad
 
        ip -netns ns2 addr add 172.16.101.2/24 dev veth2
        ip -netns ns2 addr add 172.16.103.2/24 dev veth4
@@ -1043,6 +1043,9 @@ ipv6_route_metrics_test()
        run_cmd "ip netns exec ns1 ping6 -w1 -c1 -s 1500 2001:db8:104::1"
        log_test $? 0 "Using route with mtu metric"
 
+       run_cmd "$IP -6 ro add 2001:db8:114::/64 via  2001:db8:101::2  congctl lock foo"
+       log_test $? 2 "Invalid metric (fails metric_convert)"
+
        route_cleanup
 }
 
@@ -1432,6 +1435,9 @@ ipv4_route_metrics_test()
        run_cmd "ip netns exec ns1 ping -w1 -c1 -s 1500 172.16.104.1"
        log_test $? 0 "Using route with mtu metric"
 
+       run_cmd "$IP ro add 172.16.111.0/24 via 172.16.101.2 congctl lock foo"
+       log_test $? 2 "Invalid metric (fails metric_convert)"
+
        route_cleanup
 }