selftests: net: local_termination: refactor macvlan creation/deletion

This will be used in other subtests as well; make new macvlan_create()
and macvlan_destroy() functions.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/forwarding/local_termination.sh b/tools/testing/selftests/net/forwarding/local_termination.sh
index 4b364cdf3ef0cfe25388485297d46a7152ccbfaf..36f3d577d0be8927d8b7d72a098368fec298ef2e 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/local_termination.sh
+++ b/tools/testing/selftests/net/forwarding/local_termination.sh
@@ -247,19 +247,29 @@ bridge_destroy()
        ip link del br0
 }
 
-standalone()
+macvlan_create()
 {
-       h1_create
-       h2_create
+       local lower=$1
 
-       ip link add link $h2 name macvlan0 type macvlan mode private
+       ip link add link $lower name macvlan0 type macvlan mode private
        ip link set macvlan0 address $MACVLAN_ADDR
        ip link set macvlan0 up
+}
 
-       run_test $h2
-
+macvlan_destroy()
+{
        ip link del macvlan0
+}
+
+standalone()
+{
+       h1_create
+       h2_create
+       macvlan_create $h2
+
+       run_test $h2
 
+       macvlan_destroy
        h2_destroy
        h1_destroy
 }
@@ -268,15 +278,11 @@ bridge()
 {
        h1_create
        bridge_create
-
-       ip link add link br0 name macvlan0 type macvlan mode private
-       ip link set macvlan0 address $MACVLAN_ADDR
-       ip link set macvlan0 up
+       macvlan_create br0
 
        run_test br0
 
-       ip link del macvlan0
-
+       macvlan_destroy
        bridge_destroy
        h1_destroy
 }