Commit 171a4871 authored by David Ahern's avatar David Ahern Committed by David S. Miller

selftests: fib_tests: Use an alias for ip command

Replace 'ip -netns testns' with the alias IP. Shortens the line lengths
and makes running the commands manually a bit easier.
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1893ff20
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
ret=0 ret=0
PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no} PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no}
IP="ip -netns testns"
log_test() log_test()
{ {
...@@ -32,19 +33,19 @@ setup() ...@@ -32,19 +33,19 @@ setup()
{ {
set -e set -e
ip netns add testns ip netns add testns
ip -netns testns link set dev lo up $IP link set dev lo up
ip -netns testns link add dummy0 type dummy $IP link add dummy0 type dummy
ip -netns testns link set dev dummy0 up $IP link set dev dummy0 up
ip -netns testns address add 198.51.100.1/24 dev dummy0 $IP address add 198.51.100.1/24 dev dummy0
ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0 $IP -6 address add 2001:db8:1::1/64 dev dummy0
set +e set +e
} }
cleanup() cleanup()
{ {
ip -netns testns link del dev dummy0 &> /dev/null $IP link del dev dummy0 &> /dev/null
ip netns del testns ip netns del testns
} }
...@@ -56,19 +57,19 @@ fib_unreg_unicast_test() ...@@ -56,19 +57,19 @@ fib_unreg_unicast_test()
setup setup
echo " Start point" echo " Start point"
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null $IP route get fibmatch 198.51.100.2 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null $IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
set -e set -e
ip -netns testns link del dev dummy0 $IP link del dev dummy0
set +e set +e
echo " Nexthop device deleted" echo " Nexthop device deleted"
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null $IP route get fibmatch 198.51.100.2 &> /dev/null
log_test $? 2 "IPv4 fibmatch - no route" log_test $? 2 "IPv4 fibmatch - no route"
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null $IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
log_test $? 2 "IPv6 fibmatch - no route" log_test $? 2 "IPv6 fibmatch - no route"
cleanup cleanup
...@@ -83,43 +84,43 @@ fib_unreg_multipath_test() ...@@ -83,43 +84,43 @@ fib_unreg_multipath_test()
setup setup
set -e set -e
ip -netns testns link add dummy1 type dummy $IP link add dummy1 type dummy
ip -netns testns link set dev dummy1 up $IP link set dev dummy1 up
ip -netns testns address add 192.0.2.1/24 dev dummy1 $IP address add 192.0.2.1/24 dev dummy1
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1 $IP -6 address add 2001:db8:2::1/64 dev dummy1
ip -netns testns route add 203.0.113.0/24 \ $IP route add 203.0.113.0/24 \
nexthop via 198.51.100.2 dev dummy0 \ nexthop via 198.51.100.2 dev dummy0 \
nexthop via 192.0.2.2 dev dummy1 nexthop via 192.0.2.2 dev dummy1
ip -netns testns -6 route add 2001:db8:3::/64 \ $IP -6 route add 2001:db8:3::/64 \
nexthop via 2001:db8:1::2 dev dummy0 \ nexthop via 2001:db8:1::2 dev dummy0 \
nexthop via 2001:db8:2::2 dev dummy1 nexthop via 2001:db8:2::2 dev dummy1
set +e set +e
echo " Start point" echo " Start point"
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null $IP route get fibmatch 203.0.113.1 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null $IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
set -e set -e
ip -netns testns link del dev dummy0 $IP link del dev dummy0
set +e set +e
echo " One nexthop device deleted" echo " One nexthop device deleted"
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null $IP route get fibmatch 203.0.113.1 &> /dev/null
log_test $? 2 "IPv4 - multipath route removed on delete" log_test $? 2 "IPv4 - multipath route removed on delete"
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null $IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
# In IPv6 we do not flush the entire multipath route. # In IPv6 we do not flush the entire multipath route.
log_test $? 0 "IPv6 - multipath down to single path" log_test $? 0 "IPv6 - multipath down to single path"
set -e set -e
ip -netns testns link del dev dummy1 $IP link del dev dummy1
set +e set +e
echo " Second nexthop device deleted" echo " Second nexthop device deleted"
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null $IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
log_test $? 2 "IPv6 - no route" log_test $? 2 "IPv6 - no route"
cleanup cleanup
...@@ -139,19 +140,19 @@ fib_down_unicast_test() ...@@ -139,19 +140,19 @@ fib_down_unicast_test()
setup setup
echo " Start point" echo " Start point"
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null $IP route get fibmatch 198.51.100.2 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null $IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
set -e set -e
ip -netns testns link set dev dummy0 down $IP link set dev dummy0 down
set +e set +e
echo " Route deleted on down" echo " Route deleted on down"
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null $IP route get fibmatch 198.51.100.2 &> /dev/null
log_test $? 2 "IPv4 fibmatch" log_test $? 2 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null $IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
log_test $? 2 "IPv6 fibmatch" log_test $? 2 "IPv6 fibmatch"
cleanup cleanup
...@@ -162,31 +163,31 @@ fib_down_multipath_test_do() ...@@ -162,31 +163,31 @@ fib_down_multipath_test_do()
local down_dev=$1 local down_dev=$1
local up_dev=$2 local up_dev=$2
ip -netns testns route get fibmatch 203.0.113.1 \ $IP route get fibmatch 203.0.113.1 \
oif $down_dev &> /dev/null oif $down_dev &> /dev/null
log_test $? 2 "IPv4 fibmatch on down device" log_test $? 2 "IPv4 fibmatch on down device"
ip -netns testns -6 route get fibmatch 2001:db8:3::1 \ $IP -6 route get fibmatch 2001:db8:3::1 \
oif $down_dev &> /dev/null oif $down_dev &> /dev/null
log_test $? 2 "IPv6 fibmatch on down device" log_test $? 2 "IPv6 fibmatch on down device"
ip -netns testns route get fibmatch 203.0.113.1 \ $IP route get fibmatch 203.0.113.1 \
oif $up_dev &> /dev/null oif $up_dev &> /dev/null
log_test $? 0 "IPv4 fibmatch on up device" log_test $? 0 "IPv4 fibmatch on up device"
ip -netns testns -6 route get fibmatch 2001:db8:3::1 \ $IP -6 route get fibmatch 2001:db8:3::1 \
oif $up_dev &> /dev/null oif $up_dev &> /dev/null
log_test $? 0 "IPv6 fibmatch on up device" log_test $? 0 "IPv6 fibmatch on up device"
ip -netns testns route get fibmatch 203.0.113.1 | \ $IP route get fibmatch 203.0.113.1 | \
grep $down_dev | grep -q "dead linkdown" grep $down_dev | grep -q "dead linkdown"
log_test $? 0 "IPv4 flags on down device" log_test $? 0 "IPv4 flags on down device"
ip -netns testns -6 route get fibmatch 2001:db8:3::1 | \ $IP -6 route get fibmatch 2001:db8:3::1 | \
grep $down_dev | grep -q "dead linkdown" grep $down_dev | grep -q "dead linkdown"
log_test $? 0 "IPv6 flags on down device" log_test $? 0 "IPv6 flags on down device"
ip -netns testns route get fibmatch 203.0.113.1 | \ $IP route get fibmatch 203.0.113.1 | \
grep $up_dev | grep -q "dead linkdown" grep $up_dev | grep -q "dead linkdown"
log_test $? 1 "IPv4 flags on up device" log_test $? 1 "IPv4 flags on up device"
ip -netns testns -6 route get fibmatch 2001:db8:3::1 | \ $IP -6 route get fibmatch 2001:db8:3::1 | \
grep $up_dev | grep -q "dead linkdown" grep $up_dev | grep -q "dead linkdown"
log_test $? 1 "IPv6 flags on up device" log_test $? 1 "IPv6 flags on up device"
} }
...@@ -199,53 +200,53 @@ fib_down_multipath_test() ...@@ -199,53 +200,53 @@ fib_down_multipath_test()
setup setup
set -e set -e
ip -netns testns link add dummy1 type dummy $IP link add dummy1 type dummy
ip -netns testns link set dev dummy1 up $IP link set dev dummy1 up
ip -netns testns address add 192.0.2.1/24 dev dummy1 $IP address add 192.0.2.1/24 dev dummy1
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1 $IP -6 address add 2001:db8:2::1/64 dev dummy1
ip -netns testns route add 203.0.113.0/24 \ $IP route add 203.0.113.0/24 \
nexthop via 198.51.100.2 dev dummy0 \ nexthop via 198.51.100.2 dev dummy0 \
nexthop via 192.0.2.2 dev dummy1 nexthop via 192.0.2.2 dev dummy1
ip -netns testns -6 route add 2001:db8:3::/64 \ $IP -6 route add 2001:db8:3::/64 \
nexthop via 2001:db8:1::2 dev dummy0 \ nexthop via 2001:db8:1::2 dev dummy0 \
nexthop via 2001:db8:2::2 dev dummy1 nexthop via 2001:db8:2::2 dev dummy1
set +e set +e
echo " Verify start point" echo " Verify start point"
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null $IP route get fibmatch 203.0.113.1 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null $IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
set -e set -e
ip -netns testns link set dev dummy0 down $IP link set dev dummy0 down
set +e set +e
echo " One device down, one up" echo " One device down, one up"
fib_down_multipath_test_do "dummy0" "dummy1" fib_down_multipath_test_do "dummy0" "dummy1"
set -e set -e
ip -netns testns link set dev dummy0 up $IP link set dev dummy0 up
ip -netns testns link set dev dummy1 down $IP link set dev dummy1 down
set +e set +e
echo " Other device down and up" echo " Other device down and up"
fib_down_multipath_test_do "dummy1" "dummy0" fib_down_multipath_test_do "dummy1" "dummy0"
set -e set -e
ip -netns testns link set dev dummy0 down $IP link set dev dummy0 down
set +e set +e
echo " Both devices down" echo " Both devices down"
ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null $IP route get fibmatch 203.0.113.1 &> /dev/null
log_test $? 2 "IPv4 fibmatch" log_test $? 2 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null $IP -6 route get fibmatch 2001:db8:3::1 &> /dev/null
log_test $? 2 "IPv6 fibmatch" log_test $? 2 "IPv6 fibmatch"
ip -netns testns link del dev dummy1 $IP link del dev dummy1
cleanup cleanup
} }
...@@ -264,55 +265,55 @@ fib_carrier_local_test() ...@@ -264,55 +265,55 @@ fib_carrier_local_test()
setup setup
set -e set -e
ip -netns testns link set dev dummy0 carrier on $IP link set dev dummy0 carrier on
set +e set +e
echo " Start point" echo " Start point"
ip -netns testns route get fibmatch 198.51.100.1 &> /dev/null $IP route get fibmatch 198.51.100.1 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:1::1 &> /dev/null $IP -6 route get fibmatch 2001:db8:1::1 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
ip -netns testns route get fibmatch 198.51.100.1 | \ $IP route get fibmatch 198.51.100.1 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 1 "IPv4 - no linkdown flag" log_test $? 1 "IPv4 - no linkdown flag"
ip -netns testns -6 route get fibmatch 2001:db8:1::1 | \ $IP -6 route get fibmatch 2001:db8:1::1 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 1 "IPv6 - no linkdown flag" log_test $? 1 "IPv6 - no linkdown flag"
set -e set -e
ip -netns testns link set dev dummy0 carrier off $IP link set dev dummy0 carrier off
sleep 1 sleep 1
set +e set +e
echo " Carrier off on nexthop" echo " Carrier off on nexthop"
ip -netns testns route get fibmatch 198.51.100.1 &> /dev/null $IP route get fibmatch 198.51.100.1 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:1::1 &> /dev/null $IP -6 route get fibmatch 2001:db8:1::1 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
ip -netns testns route get fibmatch 198.51.100.1 | \ $IP route get fibmatch 198.51.100.1 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 1 "IPv4 - linkdown flag set" log_test $? 1 "IPv4 - linkdown flag set"
ip -netns testns -6 route get fibmatch 2001:db8:1::1 | \ $IP -6 route get fibmatch 2001:db8:1::1 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 1 "IPv6 - linkdown flag set" log_test $? 1 "IPv6 - linkdown flag set"
set -e set -e
ip -netns testns address add 192.0.2.1/24 dev dummy0 $IP address add 192.0.2.1/24 dev dummy0
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0 $IP -6 address add 2001:db8:2::1/64 dev dummy0
set +e set +e
echo " Route to local address with carrier down" echo " Route to local address with carrier down"
ip -netns testns route get fibmatch 192.0.2.1 &> /dev/null $IP route get fibmatch 192.0.2.1 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:2::1 &> /dev/null $IP -6 route get fibmatch 2001:db8:2::1 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
ip -netns testns route get fibmatch 192.0.2.1 | \ $IP route get fibmatch 192.0.2.1 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 1 "IPv4 linkdown flag set" log_test $? 1 "IPv4 linkdown flag set"
ip -netns testns -6 route get fibmatch 2001:db8:2::1 | \ $IP -6 route get fibmatch 2001:db8:2::1 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 1 "IPv6 linkdown flag set" log_test $? 1 "IPv6 linkdown flag set"
...@@ -329,54 +330,54 @@ fib_carrier_unicast_test() ...@@ -329,54 +330,54 @@ fib_carrier_unicast_test()
setup setup
set -e set -e
ip -netns testns link set dev dummy0 carrier on $IP link set dev dummy0 carrier on
set +e set +e
echo " Start point" echo " Start point"
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null $IP route get fibmatch 198.51.100.2 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null $IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
ip -netns testns route get fibmatch 198.51.100.2 | \ $IP route get fibmatch 198.51.100.2 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 1 "IPv4 no linkdown flag" log_test $? 1 "IPv4 no linkdown flag"
ip -netns testns -6 route get fibmatch 2001:db8:1::2 | \ $IP -6 route get fibmatch 2001:db8:1::2 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 1 "IPv6 no linkdown flag" log_test $? 1 "IPv6 no linkdown flag"
set -e set -e
ip -netns testns link set dev dummy0 carrier off $IP link set dev dummy0 carrier off
set +e set +e
echo " Carrier down" echo " Carrier down"
ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null $IP route get fibmatch 198.51.100.2 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null $IP -6 route get fibmatch 2001:db8:1::2 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
ip -netns testns route get fibmatch 198.51.100.2 | \ $IP route get fibmatch 198.51.100.2 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 0 "IPv4 linkdown flag set" log_test $? 0 "IPv4 linkdown flag set"
ip -netns testns -6 route get fibmatch 2001:db8:1::2 | \ $IP -6 route get fibmatch 2001:db8:1::2 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 0 "IPv6 linkdown flag set" log_test $? 0 "IPv6 linkdown flag set"
set -e set -e
ip -netns testns address add 192.0.2.1/24 dev dummy0 $IP address add 192.0.2.1/24 dev dummy0
ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0 $IP -6 address add 2001:db8:2::1/64 dev dummy0
set +e set +e
echo " Second address added with carrier down" echo " Second address added with carrier down"
ip -netns testns route get fibmatch 192.0.2.2 &> /dev/null $IP route get fibmatch 192.0.2.2 &> /dev/null
log_test $? 0 "IPv4 fibmatch" log_test $? 0 "IPv4 fibmatch"
ip -netns testns -6 route get fibmatch 2001:db8:2::2 &> /dev/null $IP -6 route get fibmatch 2001:db8:2::2 &> /dev/null
log_test $? 0 "IPv6 fibmatch" log_test $? 0 "IPv6 fibmatch"
ip -netns testns route get fibmatch 192.0.2.2 | \ $IP route get fibmatch 192.0.2.2 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 0 "IPv4 linkdown flag set" log_test $? 0 "IPv4 linkdown flag set"
ip -netns testns -6 route get fibmatch 2001:db8:2::2 | \ $IP -6 route get fibmatch 2001:db8:2::2 | \
grep -q "linkdown" grep -q "linkdown"
log_test $? 0 "IPv6 linkdown flag set" log_test $? 0 "IPv6 linkdown flag set"
......
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