Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca70a562 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

selftests: forwarding: Introduce $ARPING 



Instead of relying on "arping" being installed everywhere under that
name, introduce a variable $ARPING like the other tools do.

Convert an existing test, mirror_gre_vlan_bridge_1q.sh to
require_command $ARPING and then invoke arping through the variable.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d9e6bde

tools/testing/selftests/net/forwarding/lib.sh

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ 
PING=${PING:=ping}

PING=${PING:=ping}

PING6=${PING6:=ping6}

PING6=${PING6:=ping6}

MZ=${MZ:=mausezahn}

MZ=${MZ:=mausezahn}

ARPING=${ARPING:=arping}

TEAMD=${TEAMD:=teamd}

TEAMD=${TEAMD:=teamd}

WAIT_TIME=${WAIT_TIME:=5}

WAIT_TIME=${WAIT_TIME:=5}

PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no}

PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no}

tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh

+4 −2
Original line number Original line Diff line number Diff line
@@ -28,6 +28,8 @@ source mirror_lib.sh 
source mirror_gre_lib.sh

source mirror_gre_lib.sh

source mirror_gre_topo_lib.sh

source mirror_gre_topo_lib.sh





require_command $ARPING



setup_prepare()

setup_prepare()

{

{

	h1=${NETIFS[p1]}

	h1=${NETIFS[p1]}
@@ -149,7 +151,7 @@ test_span_gre_forbidden_egress() 




	bridge vlan add dev $swp3 vid 555

	bridge vlan add dev $swp3 vid 555

	# Re-prime FDB

	# Re-prime FDB

	arping -I br1.555 192.0.2.130 -fqc 1

	$ARPING -I br1.555 192.0.2.130 -fqc 1

	sleep 1

	sleep 1

	quick_test_span_gre_dir $tundev ingress

	quick_test_span_gre_dir $tundev ingress
@@ -223,7 +225,7 @@ test_span_gre_fdb_roaming() 




	bridge fdb del dev $swp2 $h3mac vlan 555 master

	bridge fdb del dev $swp2 $h3mac vlan 555 master

	# Re-prime FDB

	# Re-prime FDB

	arping -I br1.555 192.0.2.130 -fqc 1

	$ARPING -I br1.555 192.0.2.130 -fqc 1

	sleep 1

	sleep 1

	quick_test_span_gre_dir $tundev ingress

	quick_test_span_gre_dir $tundev ingress