selftests: mlxsw: qos_dscp_router: Convert from lldptool to dcb

Set up DSCP prioritization through the iproute2 dcb tool, which is easier
to understand and manage.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Danielle Ratson <danieller@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh
index 4cb2aa6..f6c23f8 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh
@@ -94,16 +94,6 @@ h2_destroy()
        simple_if_fini $h2 192.0.2.18/28
 }
 
-dscp_map()
-{
-       local base=$1; shift
-       local prio
-
-       for prio in {0..7}; do
-               echo app=$prio,5,$((base + prio))
-       done
-}
-
 switch_create()
 {
        simple_if_init $swp1 192.0.2.2/28
@@ -112,17 +102,14 @@ switch_create()
        tc qdisc add dev $swp1 clsact
        tc qdisc add dev $swp2 clsact
 
-       lldptool -T -i $swp1 -V APP $(dscp_map 0) >/dev/null
-       lldptool -T -i $swp2 -V APP $(dscp_map 0) >/dev/null
-       lldpad_app_wait_set $swp1
-       lldpad_app_wait_set $swp2
+       dcb app add dev $swp1 dscp-prio 0:0 1:1 2:2 3:3 4:4 5:5 6:6 7:7
+       dcb app add dev $swp2 dscp-prio 0:0 1:1 2:2 3:3 4:4 5:5 6:6 7:7
 }
 
 switch_destroy()
 {
-       lldptool -T -i $swp2 -V APP -d $(dscp_map 0) >/dev/null
-       lldptool -T -i $swp1 -V APP -d $(dscp_map 0) >/dev/null
-       lldpad_app_wait_del
+       dcb app del dev $swp2 dscp-prio 0:0 1:1 2:2 3:3 4:4 5:5 6:6 7:7
+       dcb app del dev $swp1 dscp-prio 0:0 1:1 2:2 3:3 4:4 5:5 6:6 7:7
 
        tc qdisc del dev $swp2 clsact
        tc qdisc del dev $swp1 clsact
@@ -265,13 +252,11 @@ test_dscp_leftover()
 {
        echo "Test that last removed DSCP rule is deconfigured correctly"
 
-       lldptool -T -i $swp2 -V APP -d $(dscp_map 0) >/dev/null
-       lldpad_app_wait_del
+       dcb app del dev $swp2 dscp-prio 0:0 1:1 2:2 3:3 4:4 5:5 6:6 7:7
 
        __test_update 0 zero
 
-       lldptool -T -i $swp2 -V APP $(dscp_map 0) >/dev/null
-       lldpad_app_wait_set $swp2
+       dcb app add dev $swp2 dscp-prio 0:0 1:1 2:2 3:3 4:4 5:5 6:6 7:7
 }
 
 trap cleanup EXIT