Skip to content

L
linux
Commit 55df3e97 authored by Roman Mashak's avatar Roman Mashak Committed by David S. Miller
Browse files
Options

tc-testing: updated mirred and vlan with more tests 

Added extra test cases for different control actions (reclassify, pipe
etc.), cookies, max values & exceeding maximum, and replace existing
actions unit tests.
Signed-off-by: default avatarRoman Mashak <mrv@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2f42a128
Hide whitespace changes
Inline Side-by-side
Showing with 324 additions and 20 deletions
tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json
View file @ 55df3e97
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
}, },
{ {
"id": "8b69", "id": "8b69",
"name": "Add mirred mirror action with maximum index", "name": "Add mirred mirror action with index at 32-bit maximum",
"category": [ "category": [
"actions", "actions",
"mirred" "mirred"
...@@ -362,6 +362,28 @@ ...@@ -362,6 +362,28 @@
"$TC actions flush action mirred" "$TC actions flush action mirred"
] ]
}, },
{
"id": "3f66",
"name": "Add mirred mirror action with index exceeding 32-bit maximum",
"category": [
"actions",
"mirred"
],
"setup": [
[
"$TC actions flush action mirred",
0,
1,
255
]
],
"cmdUnderTest": "$TC actions add action mirred ingress mirror dev lo pipe index 429496729555",
"expExitCode": "255",
"verifyCmd": "$TC actions get action mirred index 429496729555",
"matchPattern": "action order [0-9]*: mirred \\(Ingress Mirror to device lo\\) pipe.*index 429496729555",
"matchCount": "0",
"teardown": []
},
{ {
"id": "a70e", "id": "a70e",
"name": "Delete mirred mirror action", "name": "Delete mirred mirror action",
......
tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json
View file @ 55df3e97
[ [
{ {
"id": "6f5a", "id": "6f5a",
"name": "Add vlan pop action", "name": "Add vlan pop action with pipe opcode",
"category": [ "category": [
"actions", "actions",
"vlan" "vlan"
...@@ -14,18 +14,18 @@ ...@@ -14,18 +14,18 @@
255 255
] ]
], ],
"cmdUnderTest": "$TC actions add action vlan pop index 8", "cmdUnderTest": "$TC actions add action vlan pop pipe index 8",
"expExitCode": "0", "expExitCode": "0",
"verifyCmd": "$TC actions list action vlan", "verifyCmd": "$TC actions list action vlan",
"matchPattern": "action order [0-9]+: vlan.*pop.*index 8 ref", "matchPattern": "action order [0-9]+: vlan.*pop.*pipe.*index 8 ref",
"matchCount": "1", "matchCount": "1",
"teardown": [ "teardown": [
"$TC actions flush action vlan" "$TC actions flush action vlan"
] ]
}, },
{ {
"id": "ee6f", "id": "df35",
"name": "Add vlan pop action with large index", "name": "Add vlan pop action with pass opcode",
"category": [ "category": [
"actions", "actions",
"vlan" "vlan"
...@@ -38,10 +38,82 @@ ...@@ -38,10 +38,82 @@
255 255
] ]
], ],
"cmdUnderTest": "$TC actions add action vlan pop index 4294967295", "cmdUnderTest": "$TC actions add action vlan pop pass index 8",
"expExitCode": "0", "expExitCode": "0",
"verifyCmd": "$TC actions list action vlan", "verifyCmd": "$TC actions get action vlan index 8",
"matchPattern": "action order [0-9]+: vlan.*pop.*index 4294967295 ref", "matchPattern": "action order [0-9]+: vlan.*pop.*pass.*index 8 ref",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{
"id": "b0d4",
"name": "Add vlan pop action with drop opcode",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
]
],
"cmdUnderTest": "$TC actions add action vlan pop drop index 8",
"expExitCode": "0",
"verifyCmd": "$TC actions get action vlan index 8",
"matchPattern": "action order [0-9]+: vlan.*pop.*drop.*index 8 ref",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{
"id": "95ee",
"name": "Add vlan pop action with reclassify opcode",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
]
],
"cmdUnderTest": "$TC actions add action vlan pop reclassify index 8",
"expExitCode": "0",
"verifyCmd": "$TC actions get action vlan index 8",
"matchPattern": "action order [0-9]+: vlan.*pop.*reclassify.*index 8 ref",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{
"id": "0283",
"name": "Add vlan pop action with continue opcode",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
]
],
"cmdUnderTest": "$TC actions add action vlan pop continue index 8",
"expExitCode": "0",
"verifyCmd": "$TC actions get action vlan index 8",
"matchPattern": "action order [0-9]+: vlan.*pop.*continue.*index 8 ref",
"matchCount": "1", "matchCount": "1",
"teardown": [ "teardown": [
"$TC actions flush action vlan" "$TC actions flush action vlan"
...@@ -95,6 +167,74 @@ ...@@ -95,6 +167,74 @@
"$TC actions flush action vlan" "$TC actions flush action vlan"
] ]
}, },
{
"id": "a178",
"name": "Add vlan pop action with invalid opcode",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
]
],
"cmdUnderTest": "$TC actions add action vlan pop foo index 8",
"expExitCode": "255",
"verifyCmd": "$TC actions list action vlan",
"matchPattern": "action order [0-9]+: vlan.*pop.*foo.*index 8 ref",
"matchCount": "0",
"teardown": []
},
{
"id": "ee6f",
"name": "Add vlan pop action with index at 32-bit maximum",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
]
],
"cmdUnderTest": "$TC actions add action vlan pop index 4294967295",
"expExitCode": "0",
"verifyCmd": "$TC actions list action vlan",
"matchPattern": "action order [0-9]+: vlan.*pop.*index 4294967295 ref",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{
"id": "0dfa",
"name": "Add vlan pop action with index exceeding 32-bit maximum",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
]
],
"cmdUnderTest": "$TC actions add action vlan pop reclassify index 429496729599",
"expExitCode": "255",
"verifyCmd": "$TC actions get action vlan index 429496729599",
"matchPattern": "action order [0-9]+: vlan.*pop.reclassify.*index 429496729599",
"matchCount": "0",
"teardown": []
},
{ {
"id": "2b91", "id": "2b91",
"name": "Add vlan invalid action", "name": "Add vlan invalid action",
...@@ -115,13 +255,11 @@ ...@@ -115,13 +255,11 @@
"verifyCmd": "$TC actions list action vlan", "verifyCmd": "$TC actions list action vlan",
"matchPattern": "action order [0-9]+: vlan.*bad_mode", "matchPattern": "action order [0-9]+: vlan.*bad_mode",
"matchCount": "0", "matchCount": "0",
"teardown": [ "teardown": []
"$TC actions flush action vlan"
]
}, },
{ {
"id": "57fc", "id": "57fc",
"name": "Add vlan action with invalid protocol type", "name": "Add vlan push action with invalid protocol type",
"category": [ "category": [
"actions", "actions",
"vlan" "vlan"
...@@ -139,9 +277,7 @@ ...@@ -139,9 +277,7 @@
"verifyCmd": "$TC actions list action vlan", "verifyCmd": "$TC actions list action vlan",
"matchPattern": "action order [0-9]+: vlan.*push", "matchPattern": "action order [0-9]+: vlan.*push",
"matchCount": "0", "matchCount": "0",
"teardown": [ "teardown": []
"$TC actions flush action vlan"
]
}, },
{ {
"id": "3989", "id": "3989",
...@@ -215,6 +351,30 @@ ...@@ -215,6 +351,30 @@
"$TC actions flush action vlan" "$TC actions flush action vlan"
] ]
}, },
{
"id": "1f4b",
"name": "Add vlan push action with maximum 12-bit vlan ID",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
]
],
"cmdUnderTest": "$TC actions add action vlan push id 4094 index 1",
"expExitCode": "0",
"verifyCmd": "$TC actions get action vlan index 1",
"matchPattern": "action order [0-9]+: vlan.*push id 4094.*protocol 802.1Q.*priority 0.*index 1 ref",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{ {
"id": "1f7b", "id": "1f7b",
"name": "Add vlan push action with invalid vlan ID", "name": "Add vlan push action with invalid vlan ID",
...@@ -239,6 +399,30 @@ ...@@ -239,6 +399,30 @@
"$TC actions flush action vlan" "$TC actions flush action vlan"
] ]
}, },
{
"id": "fe40",
"name": "Add vlan push action with maximum 3-bit IEEE 802.1p priority",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
]
],
"cmdUnderTest": "$TC actions add action vlan push id 4 priority 7 reclassify index 1",
"expExitCode": "0",
"verifyCmd": "$TC actions get action vlan index 1",
"matchPattern": "action order [0-9]+: vlan.*push id 4.*protocol 802.1Q.*priority 7.*reclassify.*index 1 ref",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{ {
"id": "5d02", "id": "5d02",
"name": "Add vlan push action with invalid IEEE 802.1p priority", "name": "Add vlan push action with invalid IEEE 802.1p priority",
...@@ -259,9 +443,7 @@ ...@@ -259,9 +443,7 @@
"verifyCmd": "$TC actions list action vlan", "verifyCmd": "$TC actions list action vlan",
"matchPattern": "action order [0-9]+: vlan.*push id 5.*index 1 ref", "matchPattern": "action order [0-9]+: vlan.*push id 5.*index 1 ref",
"matchCount": "0", "matchCount": "0",
"teardown": [ "teardown": []
"$TC actions flush action vlan"
]
}, },
{ {
"id": "6812", "id": "6812",
...@@ -311,6 +493,106 @@ ...@@ -311,6 +493,106 @@
"$TC actions flush action vlan" "$TC actions flush action vlan"
] ]
}, },
{
"id": "3deb",
"name": "Replace existing vlan push action with new ID",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
],
"$TC actions add action vlan push id 500 pipe index 12"
],
"cmdUnderTest": "$TC actions replace action vlan push id 700 pipe index 12",
"expExitCode": "0",
"verifyCmd": "$TC actions get action vlan index 12",
"matchPattern": "action order [0-9]+: vlan.*push id 700 protocol 802.1Q priority 0 pipe.*index 12 ref",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{
"id": "9e76",
"name": "Replace existing vlan push action with new protocol",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
],
"$TC actions add action vlan push id 1 protocol 802.1Q pipe index 1"
],
"cmdUnderTest": "$TC actions replace action vlan push id 1 protocol 802.1ad pipe index 1",
"expExitCode": "0",
"verifyCmd": "$TC actions get action vlan index 1",
"matchPattern": "action order [0-9]+: vlan.*push id 1 protocol 802.1ad priority 0 pipe.*index 1 ref",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{
"id": "ede4",
"name": "Replace existing vlan push action with new priority",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
],
"$TC actions add action vlan push id 1 protocol 802.1Q priority 3 reclassify index 1"
],
"cmdUnderTest": "$TC actions replace action vlan push id 1 priority 4 reclassify index 1",
"expExitCode": "0",
"verifyCmd": "$TC actions get action vlan index 1",
"matchPattern": "action order [0-9]+: vlan.*push id 1 protocol 802.1Q priority 4 reclassify.*index 1 ref",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{
"id": "d413",
"name": "Replace existing vlan pop action with new cookie",
"category": [
"actions",
"vlan"
],
"setup": [
[
"$TC actions flush action vlan",
0,
1,
255
],
"$TC actions add action vlan pop continue index 1 cookie 22334455"
],
"cmdUnderTest": "$TC actions replace action vlan pop continue index 1 cookie a1b1c2d1",
"expExitCode": "0",
"verifyCmd": "$TC actions get action vlan index 1",
"matchPattern": "action order [0-9]+: vlan.*pop continue.*index 1 ref.*cookie a1b1c2d1",
"matchCount": "1",
"teardown": [
"$TC actions flush action vlan"
]
},
{ {
"id": "83a4", "id": "83a4",
"name": "Delete vlan pop action", "name": "Delete vlan pop action",
...@@ -385,7 +667,7 @@ ...@@ -385,7 +667,7 @@
}, },
{ {
"id": "1d78", "id": "1d78",
"name": "Add vlan action with cookie", "name": "Add vlan push action with cookie",
"category": [ "category": [
"actions", "actions",
"vlan" "vlan"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7