From: Pedro Tammela <pctammela@mojatatu.com>
Date: Wed, 29 Nov 2023 22:24:23 +0000 (-0300)
Subject: selftests: tc-testing: rename concurrency.json to flower.json
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7de8b2efafeb770e3f2113d506c31be7f4c9618e;p=linux.git

selftests: tc-testing: rename concurrency.json to flower.json

All tests in this file pertain to flower, so name it appropriately

Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Link: https://lore.kernel.org/r/20231129222424.910148-4-pctammela@mojatatu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/concurrency.json b/tools/testing/selftests/tc-testing/tc-tests/filters/concurrency.json
deleted file mode 100644
index c2a433a4737e4..0000000000000
--- a/tools/testing/selftests/tc-testing/tc-tests/filters/concurrency.json
+++ /dev/null
@@ -1,177 +0,0 @@
-[
-    {
-        "id": "e41d",
-        "name": "Add 1M flower filters with 10 parallel tc instances",
-        "category": [
-            "filter",
-            "flower",
-            "concurrency"
-        ],
-        "setup": [
-            "/bin/mkdir $BATCH_DIR",
-            "$TC qdisc add dev $DEV2 ingress",
-            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 add"
-        ],
-        "cmdUnderTest": "bash -c \"find $BATCH_DIR/add* -print | xargs -n 1 -P 10 $TC -b\"",
-        "expExitCode": "0",
-        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
-        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
-        "matchCount": "1000000",
-        "teardown": [
-            "$TC qdisc del dev $DEV2 ingress",
-            "/bin/rm -rf $BATCH_DIR"
-        ]
-    },
-    {
-        "id": "6f52",
-        "name": "Delete 1M flower filters with 10 parallel tc instances",
-        "category": [
-            "filter",
-            "flower",
-            "concurrency"
-        ],
-        "setup": [
-            "/bin/mkdir $BATCH_DIR",
-            "$TC qdisc add dev $DEV2 ingress",
-            "./tdc_multibatch.py $DEV2 $BATCH_DIR 1000000 1 add",
-            "$TC -b $BATCH_DIR/add_0",
-            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 del"
-        ],
-        "cmdUnderTest": "bash -c \"find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -b\"",
-        "expExitCode": "0",
-        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
-        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
-        "matchCount": "0",
-        "teardown": [
-            "$TC qdisc del dev $DEV2 ingress",
-            "/bin/rm -rf $BATCH_DIR"
-        ]
-    },
-    {
-        "id": "c9da",
-        "name": "Replace 1M flower filters with 10 parallel tc instances",
-        "category": [
-            "filter",
-            "flower",
-            "concurrency"
-        ],
-        "setup": [
-            "/bin/mkdir $BATCH_DIR",
-            "$TC qdisc add dev $DEV2 ingress",
-            "./tdc_multibatch.py $DEV2 $BATCH_DIR 1000000 1 add",
-            "$TC -b $BATCH_DIR/add_0",
-            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 replace"
-        ],
-        "cmdUnderTest": "bash -c \"find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b\"",
-        "expExitCode": "0",
-        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
-        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
-        "matchCount": "1000000",
-        "teardown": [
-            "$TC qdisc del dev $DEV2 ingress",
-            "/bin/rm -rf $BATCH_DIR"
-        ]
-    },
-    {
-        "id": "14be",
-        "name": "Concurrently replace same range of 100k flower filters from 10 tc instances",
-        "category": [
-            "filter",
-            "flower",
-            "concurrency"
-        ],
-        "setup": [
-            "/bin/mkdir $BATCH_DIR",
-            "$TC qdisc add dev $DEV2 ingress",
-            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 1 add",
-            "$TC -b $BATCH_DIR/add_0",
-            "./tdc_multibatch.py -d $DEV2 $BATCH_DIR 100000 10 replace"
-        ],
-        "cmdUnderTest": "bash -c \"find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b\"",
-        "expExitCode": "0",
-        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
-        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
-        "matchCount": "100000",
-        "teardown": [
-            "$TC qdisc del dev $DEV2 ingress",
-            "/bin/rm -rf $BATCH_DIR"
-        ]
-    },
-    {
-        "id": "0c44",
-        "name": "Concurrently delete same range of 100k flower filters from 10 tc instances",
-        "category": [
-            "filter",
-            "flower",
-            "concurrency"
-        ],
-        "setup": [
-            "/bin/mkdir $BATCH_DIR",
-            "$TC qdisc add dev $DEV2 ingress",
-            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 1 add",
-            "$TC -b $BATCH_DIR/add_0",
-            "./tdc_multibatch.py -d $DEV2 $BATCH_DIR 100000 10 del"
-        ],
-        "cmdUnderTest": "bash -c \"find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -f -b\"",
-        "expExitCode": "123",
-        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
-        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
-        "matchCount": "0",
-        "teardown": [
-            "$TC qdisc del dev $DEV2 ingress",
-	    "/bin/rm -rf $BATCH_DIR"
-        ]
-    },
-    {
-        "id": "ab62",
-        "name": "Add and delete from same tp with 10 tc instances",
-        "category": [
-            "filter",
-            "flower",
-            "concurrency"
-        ],
-        "setup": [
-            "/bin/mkdir $BATCH_DIR",
-            "$TC qdisc add dev $DEV2 ingress",
-            "./tdc_multibatch.py -x init_ $DEV2 $BATCH_DIR 100000 5 add",
-            "bash -c \"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b\"",
-            "./tdc_multibatch.py -x par_ -a 500001 -m 5 $DEV2 $BATCH_DIR 100000 5 add",
-            "./tdc_multibatch.py -x par_ $DEV2 $BATCH_DIR 100000 5 del"
-        ],
-        "cmdUnderTest": "bash -c \"find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b\"",
-        "expExitCode": "0",
-        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
-        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
-        "matchCount": "500000",
-        "teardown": [
-            "$TC qdisc del dev $DEV2 ingress",
-            "/bin/rm -rf $BATCH_DIR"
-        ]
-    },
-    {
-        "id": "6e8f",
-        "name": "Replace and delete from same tp with 10 tc instances",
-        "category": [
-            "filter",
-            "flower",
-            "concurrency"
-        ],
-        "setup": [
-            "/bin/mkdir $BATCH_DIR",
-            "$TC qdisc add dev $DEV2 ingress",
-            "./tdc_multibatch.py -x init_ $DEV2 $BATCH_DIR 100000 10 add",
-            "bash -c \"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b\"",
-            "./tdc_multibatch.py -x par_ -a 500001 -m 5 $DEV2 $BATCH_DIR 100000 5 replace",
-            "./tdc_multibatch.py -x par_ $DEV2 $BATCH_DIR 100000 5 del"
-        ],
-        "cmdUnderTest": "bash -c \"find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b\"",
-        "expExitCode": "0",
-        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
-        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
-        "matchCount": "500000",
-        "teardown": [
-            "$TC qdisc del dev $DEV2 ingress",
-            "/bin/rm -rf $BATCH_DIR"
-        ]
-    }
-]
diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/flower.json b/tools/testing/selftests/tc-testing/tc-tests/filters/flower.json
new file mode 100644
index 0000000000000..c2a433a4737e4
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/filters/flower.json
@@ -0,0 +1,177 @@
+[
+    {
+        "id": "e41d",
+        "name": "Add 1M flower filters with 10 parallel tc instances",
+        "category": [
+            "filter",
+            "flower",
+            "concurrency"
+        ],
+        "setup": [
+            "/bin/mkdir $BATCH_DIR",
+            "$TC qdisc add dev $DEV2 ingress",
+            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 add"
+        ],
+        "cmdUnderTest": "bash -c \"find $BATCH_DIR/add* -print | xargs -n 1 -P 10 $TC -b\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
+        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
+        "matchCount": "1000000",
+        "teardown": [
+            "$TC qdisc del dev $DEV2 ingress",
+            "/bin/rm -rf $BATCH_DIR"
+        ]
+    },
+    {
+        "id": "6f52",
+        "name": "Delete 1M flower filters with 10 parallel tc instances",
+        "category": [
+            "filter",
+            "flower",
+            "concurrency"
+        ],
+        "setup": [
+            "/bin/mkdir $BATCH_DIR",
+            "$TC qdisc add dev $DEV2 ingress",
+            "./tdc_multibatch.py $DEV2 $BATCH_DIR 1000000 1 add",
+            "$TC -b $BATCH_DIR/add_0",
+            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 del"
+        ],
+        "cmdUnderTest": "bash -c \"find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -b\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
+        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
+        "matchCount": "0",
+        "teardown": [
+            "$TC qdisc del dev $DEV2 ingress",
+            "/bin/rm -rf $BATCH_DIR"
+        ]
+    },
+    {
+        "id": "c9da",
+        "name": "Replace 1M flower filters with 10 parallel tc instances",
+        "category": [
+            "filter",
+            "flower",
+            "concurrency"
+        ],
+        "setup": [
+            "/bin/mkdir $BATCH_DIR",
+            "$TC qdisc add dev $DEV2 ingress",
+            "./tdc_multibatch.py $DEV2 $BATCH_DIR 1000000 1 add",
+            "$TC -b $BATCH_DIR/add_0",
+            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 replace"
+        ],
+        "cmdUnderTest": "bash -c \"find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
+        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
+        "matchCount": "1000000",
+        "teardown": [
+            "$TC qdisc del dev $DEV2 ingress",
+            "/bin/rm -rf $BATCH_DIR"
+        ]
+    },
+    {
+        "id": "14be",
+        "name": "Concurrently replace same range of 100k flower filters from 10 tc instances",
+        "category": [
+            "filter",
+            "flower",
+            "concurrency"
+        ],
+        "setup": [
+            "/bin/mkdir $BATCH_DIR",
+            "$TC qdisc add dev $DEV2 ingress",
+            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 1 add",
+            "$TC -b $BATCH_DIR/add_0",
+            "./tdc_multibatch.py -d $DEV2 $BATCH_DIR 100000 10 replace"
+        ],
+        "cmdUnderTest": "bash -c \"find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
+        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
+        "matchCount": "100000",
+        "teardown": [
+            "$TC qdisc del dev $DEV2 ingress",
+            "/bin/rm -rf $BATCH_DIR"
+        ]
+    },
+    {
+        "id": "0c44",
+        "name": "Concurrently delete same range of 100k flower filters from 10 tc instances",
+        "category": [
+            "filter",
+            "flower",
+            "concurrency"
+        ],
+        "setup": [
+            "/bin/mkdir $BATCH_DIR",
+            "$TC qdisc add dev $DEV2 ingress",
+            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 1 add",
+            "$TC -b $BATCH_DIR/add_0",
+            "./tdc_multibatch.py -d $DEV2 $BATCH_DIR 100000 10 del"
+        ],
+        "cmdUnderTest": "bash -c \"find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -f -b\"",
+        "expExitCode": "123",
+        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
+        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
+        "matchCount": "0",
+        "teardown": [
+            "$TC qdisc del dev $DEV2 ingress",
+	    "/bin/rm -rf $BATCH_DIR"
+        ]
+    },
+    {
+        "id": "ab62",
+        "name": "Add and delete from same tp with 10 tc instances",
+        "category": [
+            "filter",
+            "flower",
+            "concurrency"
+        ],
+        "setup": [
+            "/bin/mkdir $BATCH_DIR",
+            "$TC qdisc add dev $DEV2 ingress",
+            "./tdc_multibatch.py -x init_ $DEV2 $BATCH_DIR 100000 5 add",
+            "bash -c \"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b\"",
+            "./tdc_multibatch.py -x par_ -a 500001 -m 5 $DEV2 $BATCH_DIR 100000 5 add",
+            "./tdc_multibatch.py -x par_ $DEV2 $BATCH_DIR 100000 5 del"
+        ],
+        "cmdUnderTest": "bash -c \"find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
+        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
+        "matchCount": "500000",
+        "teardown": [
+            "$TC qdisc del dev $DEV2 ingress",
+            "/bin/rm -rf $BATCH_DIR"
+        ]
+    },
+    {
+        "id": "6e8f",
+        "name": "Replace and delete from same tp with 10 tc instances",
+        "category": [
+            "filter",
+            "flower",
+            "concurrency"
+        ],
+        "setup": [
+            "/bin/mkdir $BATCH_DIR",
+            "$TC qdisc add dev $DEV2 ingress",
+            "./tdc_multibatch.py -x init_ $DEV2 $BATCH_DIR 100000 10 add",
+            "bash -c \"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b\"",
+            "./tdc_multibatch.py -x par_ -a 500001 -m 5 $DEV2 $BATCH_DIR 100000 5 replace",
+            "./tdc_multibatch.py -x par_ $DEV2 $BATCH_DIR 100000 5 del"
+        ],
+        "cmdUnderTest": "bash -c \"find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",
+        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
+        "matchCount": "500000",
+        "teardown": [
+            "$TC qdisc del dev $DEV2 ingress",
+            "/bin/rm -rf $BATCH_DIR"
+        ]
+    }
+]