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

Commit ae0783b1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tc-testing-updates' 



Lucas Bates says:

====================
tc-testing: Test suite updates

This patch series is a roundup of changes to the tc-testing
suite:

 - Add test cases for police and mirred modules and some coverage
   in already-submitted test categories
 - Break the test case files down into more user-friendly sizes
 - Bug fix to the tdc.py script's handling of the -l argument

v2: fix the lack of final newlines in two new files (thanks David)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6eda447e 7f6661a7

tools/testing/selftests/tc-testing/tc-tests/actions/tests.json→tools/testing/selftests/tc-testing/tc-tests/actions/gact.json

+469 −0
Original line number Diff line number Diff line
@@ -245,6 +245,27 @@ 
            "$TC actions flush action gact"

        ]

    },

    {

        "id": "3edf",

        "name": "Flush gact actions",

        "category": [

            "actions",

            "gact"

        ],

        "setup": [

            "$TC actions add action reclassify index 101",

            "$TC actions add action reclassify index 102",

            "$TC actions add action reclassify index 103",

            "$TC actions add action reclassify index 104",

            "$TC actions add action reclassify index 105"

        ],

        "cmdUnderTest": "$TC actions flush action gact",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action gact",

        "matchPattern": "action order [0-9]*: gact action reclassify",

        "matchCount": "0",

        "teardown": []

    },

    {

        "id": "63ec",

        "name": "Delete pass action",
@@ -394,673 +415,6 @@ 
            "$TC actions flush action gact"

        ]

    },

    {

        "id": "5124",

        "name": "Add mirred mirror to egress action",

        "category": [

            "actions",

            "mirred"

        ],

        "setup": [

            [

                "$TC actions flush action mirred",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action mirred egress mirror index 1 dev lo",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action mirred",

        "matchPattern": "action order [0-9]*: mirred \\(Egress Mirror to device lo\\).*index 1 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action mirred"

        ]

    },

    {

        "id": "6fb4",

        "name": "Add mirred redirect to egress action",

        "category": [

            "actions",

            "mirred"

        ],

        "setup": [

            [

                "$TC actions flush action mirred",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action mirred egress redirect index 2 dev lo action pipe",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action mirred",

        "matchPattern": "action order [0-9]*: mirred \\(Egress Redirect to device lo\\).*index 2 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action mirred"

        ]

    },

    {

        "id": "ba38",

        "name": "Get mirred actions",

        "category": [

            "actions",

            "mirred"

        ],

        "setup": [

            [

                "$TC actions flush action mirred",

                0,

                1,

                255

            ],

            "$TC actions add action mirred egress mirror index 1 dev lo",

            "$TC actions add action mirred egress redirect index 2 dev lo"

        ],

        "cmdUnderTest": "$TC actions show action mirred",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action mirred",

        "matchPattern": "[Mirror|Redirect] to device lo",

        "matchCount": "2",

        "teardown": [

            "$TC actions flush action mirred"

        ]

    },

    {

        "id": "d7c0",

        "name": "Add invalid mirred direction",

        "category": [

            "actions",

            "mirred"

        ],

        "setup": [

            [

                "$TC actions flush action mirred",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action mirred inbound mirror index 20 dev lo",

        "expExitCode": "255",

        "verifyCmd": "$TC actions list action mirred",

        "matchPattern": "action order [0-9]*: mirred \\(.*to device lo\\).*index 20 ref",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action mirred"

        ]

    },

    {

        "id": "e213",

        "name": "Add invalid mirred action",

        "category": [

            "actions",

            "mirred"

        ],

        "setup": [

            [

                "$TC actions flush action mirred",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action mirred egress remirror index 20 dev lo",

        "expExitCode": "255",

        "verifyCmd": "$TC actions list action mirred",

        "matchPattern": "action order [0-9]*: mirred \\(Egress.*to device lo\\).*index 20 ref",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action mirred"

        ]

    },

    {

        "id": "2d89",

        "name": "Add mirred action with invalid device",

        "category": [

            "actions",

            "mirred"

        ],

        "setup": [

            [

                "$TC actions flush action mirred",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action mirred egress mirror index 20 dev eltoh",

        "expExitCode": "255",

        "verifyCmd": "$TC actions list action mirred",

        "matchPattern": "action order [0-9]*: mirred \\(.*to device eltoh\\).*index 20 ref",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action mirred"

        ]

    },

    {

        "id": "300b",

        "name": "Add mirred action with duplicate index",

        "category": [

            "actions",

            "mirred"

        ],

        "setup": [

            [

                "$TC actions flush action mirred",

                0,

                1,

                255

            ],

            "$TC actions add action mirred egress redirect index 15 dev lo"

        ],

        "cmdUnderTest": "$TC actions add action mirred egress mirror index 15 dev lo",

        "expExitCode": "255",

        "verifyCmd": "$TC actions list action mirred",

        "matchPattern": "action order [0-9]*: mirred \\(.*to device lo\\).*index 15 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action mirred"

        ]

    },

    {

        "id": "a70e",

        "name": "Delete mirred mirror action",

        "category": [

            "actions",

            "mirred"

        ],

        "setup": [

            [

                "$TC actions flush action mirred",

                0,

                1,

                255

            ],

            "$TC actions add action mirred egress mirror index 5 dev lo"

        ],

        "cmdUnderTest": "$TC actions del action mirred index 5",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action mirred",

        "matchPattern": "action order [0-9]*: mirred \\(Egress Mirror to device lo\\).*index 5 ref",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action mirred"

        ]

    },

    {

        "id": "3fb3",

        "name": "Delete mirred redirect action",

        "category": [

            "actions",

            "mirred"

        ],

        "setup": [

            [

                "$TC actions flush action mirred",

                0,

                1,

                255

            ],

            "$TC actions add action mirred egress redirect index 5 dev lo"

        ],

        "cmdUnderTest": "$TC actions del action mirred index 5",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action mirred",

        "matchPattern": "action order [0-9]*: mirred \\(Egress Redirect to device lo\\).*index 5 ref",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action mirred"

        ]

    },

    {

        "id": "b078",

        "name": "Add simple action",

        "category": [

            "actions",

            "simple"

        ],

        "setup": [

            [

                "$TC actions flush action simple",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action simple sdata \"A triumph\" index 60",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action simple",

        "matchPattern": "action order [0-9]*: Simple <A triumph>.*index 60 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action simple"

        ]

    },

    {

        "id": "6d4c",

        "name": "Add simple action with duplicate index",

        "category": [

            "actions",

            "simple"

        ],

        "setup": [

            [

                "$TC actions flush action simple",

                0,

                1,

                255

            ],

            "$TC actions add action simple sdata \"Aruba\" index 4"

        ],

        "cmdUnderTest": "$TC actions add action simple sdata \"Jamaica\" index 4",

        "expExitCode": "255",

        "verifyCmd": "$TC actions list action simple",

        "matchPattern": "action order [0-9]*: Simple <Jamaica>.*ref",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action simple"

        ]

    },

    {

        "id": "2542",

        "name": "List simple actions",

        "category": [

            "actions",

            "simple"

        ],

        "setup": [

            [

                "$TC actions flush action simple",

                0,

                1,

                255

            ],

            "$TC actions add action simple sdata \"Rock\"",

            "$TC actions add action simple sdata \"Paper\"",

            "$TC actions add action simple sdata \"Scissors\" index 98"

        ],

        "cmdUnderTest": "$TC actions list action simple",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action simple",

        "matchPattern": "action order [0-9]*: Simple <[A-Z][a-z]*>",

        "matchCount": "3",

        "teardown": [

            "$TC actions flush action simple"

        ]

    },

    {

        "id": "ea67",

        "name": "Delete simple action",

        "category": [

            "actions",

            "simple"

        ],

        "setup": [

            [

                "$TC actions flush action simple",

                0,

                1,

                255

            ],

            "$TC actions add action simple sdata \"Blinkenlights\" index 1"

        ],

        "cmdUnderTest": "$TC actions delete action simple index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action simple",

        "matchPattern": "action order [0-9]*: Simple <Blinkenlights>.*index 1 ref",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action simple"

        ]

    },

    {

        "id": "8ff1",

        "name": "Flush simple actions",

        "category": [

            "actions",

            "simple"

        ],

        "setup": [

            [

                "$TC actions flush action simple",

                0,

                1,

                255

            ],

            "$TC actions add action simple sdata \"Kirk\"",

            "$TC actions add action simple sdata \"Spock\" index 50",

            "$TC actions add action simple sdata \"McCoy\" index 9"

        ],

        "cmdUnderTest": "$TC actions flush action simple",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action simple",

        "matchPattern": "action order [0-9]*: Simple <[A-Z][a-z]*>",

        "matchCount": "0",

        "teardown": [

            ""

        ]

    },

    {

        "id": "6236",

        "name": "Add skbedit action with valid mark",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit mark 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit mark 1",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "407b",

        "name": "Add skbedit action with invalid mark",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit mark 666777888999",

        "expExitCode": "255",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit mark",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "081d",

        "name": "Add skbedit action with priority",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit prio 99",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit priority :99",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "cc37",

        "name": "Add skbedit action with invalid priority",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit prio foo",

        "expExitCode": "255",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit priority",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "3c95",

        "name": "Add skbedit action with queue_mapping",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit queue_mapping 909",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit queue_mapping 909",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "985c",

        "name": "Add skbedit action with invalid queue_mapping",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit queue_mapping 67000",

        "expExitCode": "255",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit queue_mapping",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "224f",

        "name": "Add skbedit action with ptype host",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit ptype host",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit ptype host",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "d1a3",

        "name": "Add skbedit action with ptype otherhost",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit ptype otherhost",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit ptype otherhost",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "b9c6",

        "name": "Add skbedit action with invalid ptype",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit ptype openair",

        "expExitCode": "255",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit ptype openair",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "5172",

        "name": "List skbedit actions",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ],

            "$TC actions add action skbedit ptype otherhost",

            "$TC actions add action skbedit ptype broadcast",

            "$TC actions add action skbedit mark 59",

            "$TC actions add action skbedit mark 409"

        ],

        "cmdUnderTest": "$TC actions list action skbedit",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit",

        "matchCount": "4",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "a6d6",

        "name": "Add skbedit action with index",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ]

        ],

        "cmdUnderTest": "$TC actions add action skbedit mark 808 index 4040404040",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "index 4040404040",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "38f3",

        "name": "Delete skbedit action",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            [

                "$TC actions flush action skbedit",

                0,

                1,

                255

            ],

            "$TC actions add action skbedit mark 42 index 9009"

        ],

        "cmdUnderTest": "$TC actions del action skbedit index 9009",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit mark 42",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "ce97",

        "name": "Flush skbedit actions",

        "category": [

            "actions",

            "skbedit"

        ],

        "setup": [

            "$TC actions add action skbedit mark 500",

            "$TC actions add action skbedit mark 501",

            "$TC actions add action skbedit mark 502",

            "$TC actions add action skbedit mark 503",

            "$TC actions add action skbedit mark 504",

            "$TC actions add action skbedit mark 505",

            "$TC actions add action skbedit mark 506"

        ],

        "cmdUnderTest": "$TC actions flush action skbedit",

        "expExitCode": "0",

        "verifyCmd": "$TC actions list action skbedit",

        "matchPattern": "action order [0-9]*:  skbedit",

        "matchCount": "0",

        "teardown": [

            "$TC actions flush action skbedit"

        ]

    },

    {

        "id": "f02c",

        "name": "Replace gact action",
@@ -1111,55 +465,5 @@ 
        "teardown": [

            "$TC actions flush action gact"

        ]

    },

    {

        "id": "a568",

        "name": "Add action with ife type",

        "category": [

            "actions",

            "ife"

        ],

        "setup": [

            [

                "$TC actions flush action ife",

                0,

                1,

                255

            ],

            "$TC actions add action ife encode type 0xDEAD index 1"

        ],

        "cmdUnderTest": "$TC actions get action ife index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action ife index 1",

        "matchPattern": "type 0xDEAD",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action ife"

        ]

    },

    {

        "id": "b983",

        "name": "Add action without ife type",

        "category": [

            "actions",

            "ife"

        ],

        "setup": [

            [

                "$TC actions flush action ife",

                0,

                1,

                255

            ],

            "$TC actions add action ife encode index 1"

        ],

        "cmdUnderTest": "$TC actions get action ife index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action ife index 1",

        "matchPattern": "type 0xED3E",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action ife"

        ]

    }

]

tools/testing/selftests/tc-testing/tc-tests/actions/ife.json

0 → 100644
+52 −0
Original line number Diff line number Diff line 
[

    {

        "id": "a568",

        "name": "Add action with ife type",

        "category": [

            "actions",

            "ife"

        ],

        "setup": [

            [

                "$TC actions flush action ife",

                0,

                1,

                255

            ],

            "$TC actions add action ife encode type 0xDEAD index 1"

        ],

        "cmdUnderTest": "$TC actions get action ife index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action ife index 1",

        "matchPattern": "type 0xDEAD",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action ife"

        ]

    },

    {

        "id": "b983",

        "name": "Add action without ife type",

        "category": [

            "actions",

            "ife"

        ],

        "setup": [

            [

                "$TC actions flush action ife",

                0,

                1,

                255

            ],

            "$TC actions add action ife encode index 1"

        ],

        "cmdUnderTest": "$TC actions get action ife index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action ife index 1",

        "matchPattern": "type 0xED3E",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action ife"

        ]

    }

]

tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json

0 → 100644
+223 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/tc-testing/tc-tests/actions/police.json

0 → 100644
+527 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/tc-testing/tc-tests/actions/simple.json

0 → 100644
+130 −0

File added.

Preview size limit exceeded, changes collapsed.