Skip to content

Commit

Permalink
Merge branch 'tc-testing-updates'
Browse files Browse the repository at this point in the history 
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: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Oct 15, 2017
2 parents 6eda447 + 7f6661a commit ae0783b
Show file tree
Hide file tree
Showing 9 changed files with 2,097 additions and 1,169 deletions.
469 changes: 469 additions & 0 deletions tools/testing/selftests/tc-testing/tc-tests/actions/gact.json
View file

Large diffs are not rendered by default.

52 changes: 52 additions & 0 deletions tools/testing/selftests/tc-testing/tc-tests/actions/ife.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
[
{
"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"
]
}
]
223 changes: 223 additions & 0 deletions tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
[
{
"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"
]
}
]
Loading

0 comments on commit ae0783b

Please sign in to comment.