Commit b213a4c6 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by Paolo Abeni
Browse files

Revert "selftests/tc-testing: Add tests for restrictions on netem duplication" 



This reverts commit ecdec65e.

The tests added were related to check_netem_in_tree() which was
just reverted in the previous patch.

Reviewed-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Link: https://patch.msgid.link/20260525122556.973584-4-jhs@mojatatu.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent eda0b7f2

tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json

+3 −2
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ 
            "$TC qdisc add dev $DUMMY parent 1:1 handle 2:0 netem duplicate 100%",

            "$TC filter add dev $DUMMY parent 1:0 protocol ip prio 1 u32 match ip dst 10.10.10.1/32 flowid 1:1",

            "$TC class add dev $DUMMY parent 1:0 classid 1:2 hfsc ls m2 10Mbit",

            "$TC qdisc add dev $DUMMY parent 1:2 handle 3:0 netem duplicate 100%",

            "$TC filter add dev $DUMMY parent 1:0 protocol ip prio 2 u32 match ip dst 10.10.10.2/32 flowid 1:2",

            "ping -c 1 10.10.10.1 -I$DUMMY > /dev/null || true",

            "$TC filter del dev $DUMMY parent 1:0 protocol ip prio 1",
@@ -714,8 +715,8 @@ 
            {

                "kind": "hfsc",

                "handle": "1:",

                "bytes": 294,

                "packets": 3

                "bytes": 392,

                "packets": 4

            }

        ],

        "matchCount": "1",

tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json

+0 −81
Original line number Diff line number Diff line
@@ -336,86 +336,5 @@ 
        "teardown": [

            "$TC qdisc del dev $DUMMY handle 1: root"

        ]

    },

    {

        "id": "d34d",

        "name": "NETEM test qdisc duplication restriction in qdisc tree in netem_change root",

        "category": ["qdisc", "netem"],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DUMMY root handle 1: netem limit 1",

            "$TC qdisc add dev $DUMMY parent 1: handle 2: netem limit 1"

        ],

        "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: netem duplicate 50%",

        "expExitCode": "2",

        "verifyCmd": "$TC -s qdisc show dev $DUMMY",

        "matchPattern": "qdisc netem",

        "matchCount": "2",

        "teardown": [

            "$TC qdisc del dev $DUMMY handle 1:0 root"

        ]

    },

    {

        "id": "b33f",

        "name": "NETEM test qdisc duplication restriction in qdisc tree in netem_change non-root",

        "category": ["qdisc", "netem"],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DUMMY root handle 1: netem limit 1",

            "$TC qdisc add dev $DUMMY parent 1: handle 2: netem limit 1"

        ],

        "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 2: netem duplicate 50%",

        "expExitCode": "2",

        "verifyCmd": "$TC -s qdisc show dev $DUMMY",

        "matchPattern": "qdisc netem",

        "matchCount": "2",

        "teardown": [

            "$TC qdisc del dev $DUMMY handle 1:0 root"

        ]

    },

    {

        "id": "cafe",

        "name": "NETEM test qdisc duplication restriction in qdisc tree",

        "category": ["qdisc", "netem"],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DUMMY root handle 1: netem limit 1 duplicate 100%"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DUMMY parent 1: handle 2: netem duplicate 100%",

        "expExitCode": "2",

        "verifyCmd": "$TC -s qdisc show dev $DUMMY",

        "matchPattern": "qdisc netem",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DUMMY handle 1:0 root"

        ]

    },

    {

        "id": "1337",

        "name": "NETEM test qdisc duplication restriction in qdisc tree across branches",

        "category": ["qdisc", "netem"],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DUMMY parent root handle 1:0 hfsc",

            "$TC class add dev $DUMMY parent 1:0 classid 1:1 hfsc rt m2 10Mbit",

            "$TC qdisc add dev $DUMMY parent 1:1 handle 2:0 netem",

            "$TC class add dev $DUMMY parent 1:0 classid 1:2 hfsc rt m2 10Mbit"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DUMMY parent 1:2 handle 3:0 netem duplicate 100%",

        "expExitCode": "2",

        "verifyCmd": "$TC -s qdisc show dev $DUMMY",

        "matchPattern": "qdisc netem",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DUMMY handle 1:0 root"

        ]

    }

]