selftests: forwarding: Add $h3's clsact to mirror_topo_lib.sh

Having a clsact qdisc on $h3 is useful in several tests, and will be
useful in more tests to come. Move the registration from all the tests
that need it into the topology file itself.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/forwarding/mirror_gre.sh b/tools/testing/selftests/net/forwarding/mirror_gre.sh
index c6786d1b2b96a15d124d0c8e95b2d66a432a2244..e6fd7a18c655ff32e4f4d5ffd033acd866a70c96 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/mirror_gre.sh
+++ b/tools/testing/selftests/net/forwarding/mirror_gre.sh
@@ -72,7 +72,6 @@ test_span_gre_mac()
        RET=0
 
        mirror_install $swp1 $direction $tundev "matchall $tcflags"
-       tc qdisc add dev $h3 clsact
        tc filter add dev $h3 ingress pref 77 prot $prot \
                flower ip_proto 0x2f src_mac $swp3mac dst_mac $h3mac \
                action pass
@@ -80,7 +79,6 @@ test_span_gre_mac()
        mirror_test v$h1 192.0.2.1 192.0.2.2 $h3 77 10
 
        tc filter del dev $h3 ingress pref 77
-       tc qdisc del dev $h3 clsact
        mirror_uninstall $swp1 $direction
 
        log_test "$direction $what: envelope MAC ($tcflags)"

diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh b/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh
index e22a9e44db24530ea8df5d4d9dabae4c5f780b3f..aa29d46186a837d53fa8fb76fa4b0161563417e0 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh
+++ b/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh
@@ -73,7 +73,6 @@ test_span_gre_ttl()
        RET=0
 
        mirror_install $swp1 ingress $tundev "matchall $tcflags"
-       tc qdisc add dev $h3 clsact
        tc filter add dev $h3 ingress pref 77 prot $prot \
                flower ip_ttl 50 action pass
 
@@ -84,7 +83,6 @@ test_span_gre_ttl()
 
        ip link set dev $tundev type $type ttl 100
        tc filter del dev $h3 ingress pref 77
-       tc qdisc del dev $h3 clsact
        mirror_uninstall $swp1 ingress
 
        log_test "$what: TTL change ($tcflags)"

diff --git a/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh b/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh
index 5b7879726bfbaaed2ce5b88ce27738b24bdffc78..04979e5962e7f22897fa652207061e0bf58026bf 100644 (file)
--- a/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh
+++ b/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh
@@ -46,10 +46,12 @@ mirror_topo_h2_destroy()
 mirror_topo_h3_create()
 {
        simple_if_init $h3
+       tc qdisc add dev $h3 clsact
 }
 
 mirror_topo_h3_destroy()
 {
+       tc qdisc del dev $h3 clsact
        simple_if_fini $h3
 }