Commit d53f23fe authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by David S. Miller
Browse files

selftests: hsr: Reorder the testsuite. 



Move the code and group into functions so it will be easier to extend
the test to HSRv1 so that both versions are covered.

Move the ping/test part into do_complete_ping_test() and the interface
setup into setup_hsr_interfaces().

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c3ce539

tools/testing/selftests/net/hsr/hsr_ping.sh

+132 −123
Original line number Diff line number Diff line
@@ -41,61 +41,6 @@ cleanup() 
	done

}



ip -Version > /dev/null 2>&1

if [ $? -ne 0 ];then

	echo "SKIP: Could not run test without ip tool"

	exit $ksft_skip

fi



trap cleanup EXIT



for i in "$ns1" "$ns2" "$ns3" ;do

	ip netns add $i || exit $ksft_skip

	ip -net $i link set lo up

done



echo "INFO: preparing interfaces."

# Three HSR nodes. Each node has one link to each of its neighbour, two links in total.

#

#    ns1eth1 ----- ns2eth1

#      hsr1         hsr2

#    ns1eth2       ns2eth2

#       |            |

#    ns3eth1      ns3eth2

#           \    /

#            hsr3

#

# Interfaces

ip link add ns1eth1 netns "$ns1" type veth peer name ns2eth1 netns "$ns2"

ip link add ns1eth2 netns "$ns1" type veth peer name ns3eth1 netns "$ns3"

ip link add ns3eth2 netns "$ns3" type veth peer name ns2eth2 netns "$ns2"



# HSRv0.

ip -net "$ns1" link add name hsr1 type hsr slave1 ns1eth1 slave2 ns1eth2 supervision 45 version 0 proto 0

ip -net "$ns2" link add name hsr2 type hsr slave1 ns2eth1 slave2 ns2eth2 supervision 45 version 0 proto 0

ip -net "$ns3" link add name hsr3 type hsr slave1 ns3eth1 slave2 ns3eth2 supervision 45 version 0 proto 0



# IP for HSR

ip -net "$ns1" addr add 100.64.0.1/24 dev hsr1

ip -net "$ns1" addr add dead:beef:1::1/64 dev hsr1 nodad

ip -net "$ns2" addr add 100.64.0.2/24 dev hsr2

ip -net "$ns2" addr add dead:beef:1::2/64 dev hsr2 nodad

ip -net "$ns3" addr add 100.64.0.3/24 dev hsr3

ip -net "$ns3" addr add dead:beef:1::3/64 dev hsr3 nodad



# All Links up

ip -net "$ns1" link set ns1eth1 up

ip -net "$ns1" link set ns1eth2 up

ip -net "$ns1" link set hsr1 up



ip -net "$ns2" link set ns2eth1 up

ip -net "$ns2" link set ns2eth2 up

ip -net "$ns2" link set hsr2 up



ip -net "$ns3" link set ns3eth1 up

ip -net "$ns3" link set ns3eth2 up

ip -net "$ns3" link set hsr3 up



# $1: IP address

is_v6()

{
@@ -164,7 +109,8 @@ stop_if_error() 
	fi

}





do_complete_ping_test()

{

	echo "INFO: Initial validation ping."

	# Each node has to be able each one.

	do_ping "$ns1" 100.64.0.2
@@ -253,4 +199,67 @@ do_ping_long "$ns3" 100.64.0.2 
	stop_if_error "Failed with delay and packetloss."



	echo "INFO: All good."

}



setup_hsr_interfaces()

{

	echo "INFO: preparing interfaces."

# Three HSR nodes. Each node has one link to each of its neighbour, two links in total.

#

#    ns1eth1 ----- ns2eth1

#      hsr1         hsr2

#    ns1eth2       ns2eth2

#       |            |

#    ns3eth1      ns3eth2

#           \    /

#            hsr3

#

	# Interfaces

	ip link add ns1eth1 netns "$ns1" type veth peer name ns2eth1 netns "$ns2"

	ip link add ns1eth2 netns "$ns1" type veth peer name ns3eth1 netns "$ns3"

	ip link add ns3eth2 netns "$ns3" type veth peer name ns2eth2 netns "$ns2"



	# HSRv0.

	ip -net "$ns1" link add name hsr1 type hsr slave1 ns1eth1 slave2 ns1eth2 supervision 45 version 0 proto 0

	ip -net "$ns2" link add name hsr2 type hsr slave1 ns2eth1 slave2 ns2eth2 supervision 45 version 0 proto 0

	ip -net "$ns3" link add name hsr3 type hsr slave1 ns3eth1 slave2 ns3eth2 supervision 45 version 0 proto 0



	# IP for HSR

	ip -net "$ns1" addr add 100.64.0.1/24 dev hsr1

	ip -net "$ns1" addr add dead:beef:1::1/64 dev hsr1 nodad

	ip -net "$ns2" addr add 100.64.0.2/24 dev hsr2

	ip -net "$ns2" addr add dead:beef:1::2/64 dev hsr2 nodad

	ip -net "$ns3" addr add 100.64.0.3/24 dev hsr3

	ip -net "$ns3" addr add dead:beef:1::3/64 dev hsr3 nodad



	# All Links up

	ip -net "$ns1" link set ns1eth1 up

	ip -net "$ns1" link set ns1eth2 up

	ip -net "$ns1" link set hsr1 up



	ip -net "$ns2" link set ns2eth1 up

	ip -net "$ns2" link set ns2eth2 up

	ip -net "$ns2" link set hsr2 up



	ip -net "$ns3" link set ns3eth1 up

	ip -net "$ns3" link set ns3eth2 up

	ip -net "$ns3" link set hsr3 up

}



ip -Version > /dev/null 2>&1

if [ $? -ne 0 ];then

	echo "SKIP: Could not run test without ip tool"

	exit $ksft_skip

fi



trap cleanup EXIT



for i in "$ns1" "$ns2" "$ns3" ;do

	ip netns add $i || exit $ksft_skip

	ip -net $i link set lo up

done



setup_hsr_interfaces

do_complete_ping_test



exit $ret