From 1e30a3a49a5eaf2a1e0e4b2d8f4949db9db565e7 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Sun, 24 Oct 2021 09:37:35 +0200
Subject: tests: py: Move netdev-specific tests to appropriate subdirectory

The fwd and dup statements are specific to netdev hooks, so move their
tests to the appropriate subdirectory.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/py/any/dup.t                |  7 ------
 tests/py/any/dup.t.json           | 30 -------------------------
 tests/py/any/dup.t.payload        | 14 ------------
 tests/py/any/fwd.t                |  8 -------
 tests/py/any/fwd.t.json           | 47 ---------------------------------------
 tests/py/any/fwd.t.json.output    | 27 ----------------------
 tests/py/any/fwd.t.payload        | 20 -----------------
 tests/py/netdev/dup.t             |  7 ++++++
 tests/py/netdev/dup.t.json        | 30 +++++++++++++++++++++++++
 tests/py/netdev/dup.t.payload     | 14 ++++++++++++
 tests/py/netdev/fwd.t             |  8 +++++++
 tests/py/netdev/fwd.t.json        | 47 +++++++++++++++++++++++++++++++++++++++
 tests/py/netdev/fwd.t.json.output | 27 ++++++++++++++++++++++
 tests/py/netdev/fwd.t.payload     | 20 +++++++++++++++++
 14 files changed, 153 insertions(+), 153 deletions(-)
 delete mode 100644 tests/py/any/dup.t
 delete mode 100644 tests/py/any/dup.t.json
 delete mode 100644 tests/py/any/dup.t.payload
 delete mode 100644 tests/py/any/fwd.t
 delete mode 100644 tests/py/any/fwd.t.json
 delete mode 100644 tests/py/any/fwd.t.json.output
 delete mode 100644 tests/py/any/fwd.t.payload
 create mode 100644 tests/py/netdev/dup.t
 create mode 100644 tests/py/netdev/dup.t.json
 create mode 100644 tests/py/netdev/dup.t.payload
 create mode 100644 tests/py/netdev/fwd.t
 create mode 100644 tests/py/netdev/fwd.t.json
 create mode 100644 tests/py/netdev/fwd.t.json.output
 create mode 100644 tests/py/netdev/fwd.t.payload

(limited to 'tests/py')

diff --git a/tests/py/any/dup.t b/tests/py/any/dup.t
deleted file mode 100644
index 181b4195..00000000
--- a/tests/py/any/dup.t
+++ /dev/null
@@ -1,7 +0,0 @@
-:ingress;type filter hook ingress device lo priority 0
-
-*netdev;test-netdev;ingress
-
-dup to "lo";ok
-dup to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"};ok
-
diff --git a/tests/py/any/dup.t.json b/tests/py/any/dup.t.json
deleted file mode 100644
index dc56f649..00000000
--- a/tests/py/any/dup.t.json
+++ /dev/null
@@ -1,30 +0,0 @@
-# dup to "lo"
-[
-    {
-        "dup": {
-            "addr": "lo"
-        }
-    }
-]
-
-# dup to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
-[
-    {
-        "dup": {
-            "addr": {
-                "map": {
-                    "key": {
-                        "meta": { "key": "mark" }
-                    },
-                    "data": {
-                        "set": [
-                            [ 1, "lo" ],
-                            [ 2, "lo" ]
-                        ]
-                    }
-                }
-            }
-        }
-    }
-]
-
diff --git a/tests/py/any/dup.t.payload b/tests/py/any/dup.t.payload
deleted file mode 100644
index 51ff782c..00000000
--- a/tests/py/any/dup.t.payload
+++ /dev/null
@@ -1,14 +0,0 @@
-# dup to "lo"
-netdev test-netdev ingress 
-  [ immediate reg 1 0x00000001 ]
-  [ dup sreg_dev 1 ]
-
-# dup to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
-__map%d test-netdev b
-__map%d test-netdev 0
-	element 00000001  : 00000001 0 [end]	element 00000002  : 00000001 0 [end]
-netdev test-netdev ingress 
-  [ meta load mark => reg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ dup sreg_dev 1 ]
-
diff --git a/tests/py/any/fwd.t b/tests/py/any/fwd.t
deleted file mode 100644
index 2e34d55a..00000000
--- a/tests/py/any/fwd.t
+++ /dev/null
@@ -1,8 +0,0 @@
-:ingress;type filter hook ingress device lo priority 0
-
-*netdev;test-netdev;ingress
-
-fwd to "lo";ok
-fwd to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"};ok
-
-fwd ip to 192.168.2.200 device "lo";ok
diff --git a/tests/py/any/fwd.t.json b/tests/py/any/fwd.t.json
deleted file mode 100644
index 583606c0..00000000
--- a/tests/py/any/fwd.t.json
+++ /dev/null
@@ -1,47 +0,0 @@
-# fwd to "lo"
-[
-    {
-        "fwd": {
-            "dev": "lo"
-	}
-    }
-]
-
-# fwd to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
-[
-    {
-        "fwd": {
-            "dev": {
-                "map": {
-                    "key": {
-                        "meta": { "key": "mark" }
-                    },
-                    "data": {
-                        "set": [
-                            [
-                                "0x00000001",
-                                "lo"
-                            ],
-                            [
-                                "0x00000002",
-                                "lo"
-                            ]
-                        ]
-                    }
-                }
-            }
-        }
-    }
-]
-
-# fwd ip to 192.168.2.200 device "lo"
-[
-    {
-        "fwd": {
-            "addr": "192.168.2.200",
-            "dev": "lo",
-            "family": "ip"
-        }
-    }
-]
-
diff --git a/tests/py/any/fwd.t.json.output b/tests/py/any/fwd.t.json.output
deleted file mode 100644
index 8433e492..00000000
--- a/tests/py/any/fwd.t.json.output
+++ /dev/null
@@ -1,27 +0,0 @@
-# fwd to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
-[
-    {
-        "fwd": {
-            "dev": {
-                "map": {
-                    "key": {
-                        "meta": { "key": "mark" }
-                    },
-                    "data": {
-                        "set": [
-                            [
-                                1,
-                                "lo"
-                            ],
-                            [
-                                2,
-                                "lo"
-                            ]
-                        ]
-                    }
-                }
-            }
-        }
-    }
-]
-
diff --git a/tests/py/any/fwd.t.payload b/tests/py/any/fwd.t.payload
deleted file mode 100644
index f03077a6..00000000
--- a/tests/py/any/fwd.t.payload
+++ /dev/null
@@ -1,20 +0,0 @@
-# fwd to "lo"
-netdev test-netdev ingress 
-  [ immediate reg 1 0x00000001 ]
-  [ fwd sreg_dev 1 ]
-
-# fwd to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
-__map%d test-netdev b
-__map%d test-netdev 0
-	element 00000001  : 00000001 0 [end]	element 00000002  : 00000001 0 [end]
-netdev test-netdev ingress 
-  [ meta load mark => reg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ fwd sreg_dev 1 ]
-
-# fwd ip to 192.168.2.200 device "lo"
-netdev test-netdev ingress 
-  [ immediate reg 1 0x00000001 ]
-  [ immediate reg 2 0xc802a8c0 ]
-  [ fwd sreg_dev 1 sreg_addr 2 nfproto 2 ]
-
diff --git a/tests/py/netdev/dup.t b/tests/py/netdev/dup.t
new file mode 100644
index 00000000..181b4195
--- /dev/null
+++ b/tests/py/netdev/dup.t
@@ -0,0 +1,7 @@
+:ingress;type filter hook ingress device lo priority 0
+
+*netdev;test-netdev;ingress
+
+dup to "lo";ok
+dup to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"};ok
+
diff --git a/tests/py/netdev/dup.t.json b/tests/py/netdev/dup.t.json
new file mode 100644
index 00000000..dc56f649
--- /dev/null
+++ b/tests/py/netdev/dup.t.json
@@ -0,0 +1,30 @@
+# dup to "lo"
+[
+    {
+        "dup": {
+            "addr": "lo"
+        }
+    }
+]
+
+# dup to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
+[
+    {
+        "dup": {
+            "addr": {
+                "map": {
+                    "key": {
+                        "meta": { "key": "mark" }
+                    },
+                    "data": {
+                        "set": [
+                            [ 1, "lo" ],
+                            [ 2, "lo" ]
+                        ]
+                    }
+                }
+            }
+        }
+    }
+]
+
diff --git a/tests/py/netdev/dup.t.payload b/tests/py/netdev/dup.t.payload
new file mode 100644
index 00000000..51ff782c
--- /dev/null
+++ b/tests/py/netdev/dup.t.payload
@@ -0,0 +1,14 @@
+# dup to "lo"
+netdev test-netdev ingress 
+  [ immediate reg 1 0x00000001 ]
+  [ dup sreg_dev 1 ]
+
+# dup to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
+__map%d test-netdev b
+__map%d test-netdev 0
+	element 00000001  : 00000001 0 [end]	element 00000002  : 00000001 0 [end]
+netdev test-netdev ingress 
+  [ meta load mark => reg 1 ]
+  [ lookup reg 1 set __map%d dreg 1 ]
+  [ dup sreg_dev 1 ]
+
diff --git a/tests/py/netdev/fwd.t b/tests/py/netdev/fwd.t
new file mode 100644
index 00000000..2e34d55a
--- /dev/null
+++ b/tests/py/netdev/fwd.t
@@ -0,0 +1,8 @@
+:ingress;type filter hook ingress device lo priority 0
+
+*netdev;test-netdev;ingress
+
+fwd to "lo";ok
+fwd to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"};ok
+
+fwd ip to 192.168.2.200 device "lo";ok
diff --git a/tests/py/netdev/fwd.t.json b/tests/py/netdev/fwd.t.json
new file mode 100644
index 00000000..583606c0
--- /dev/null
+++ b/tests/py/netdev/fwd.t.json
@@ -0,0 +1,47 @@
+# fwd to "lo"
+[
+    {
+        "fwd": {
+            "dev": "lo"
+	}
+    }
+]
+
+# fwd to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
+[
+    {
+        "fwd": {
+            "dev": {
+                "map": {
+                    "key": {
+                        "meta": { "key": "mark" }
+                    },
+                    "data": {
+                        "set": [
+                            [
+                                "0x00000001",
+                                "lo"
+                            ],
+                            [
+                                "0x00000002",
+                                "lo"
+                            ]
+                        ]
+                    }
+                }
+            }
+        }
+    }
+]
+
+# fwd ip to 192.168.2.200 device "lo"
+[
+    {
+        "fwd": {
+            "addr": "192.168.2.200",
+            "dev": "lo",
+            "family": "ip"
+        }
+    }
+]
+
diff --git a/tests/py/netdev/fwd.t.json.output b/tests/py/netdev/fwd.t.json.output
new file mode 100644
index 00000000..8433e492
--- /dev/null
+++ b/tests/py/netdev/fwd.t.json.output
@@ -0,0 +1,27 @@
+# fwd to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
+[
+    {
+        "fwd": {
+            "dev": {
+                "map": {
+                    "key": {
+                        "meta": { "key": "mark" }
+                    },
+                    "data": {
+                        "set": [
+                            [
+                                1,
+                                "lo"
+                            ],
+                            [
+                                2,
+                                "lo"
+                            ]
+                        ]
+                    }
+                }
+            }
+        }
+    }
+]
+
diff --git a/tests/py/netdev/fwd.t.payload b/tests/py/netdev/fwd.t.payload
new file mode 100644
index 00000000..f03077a6
--- /dev/null
+++ b/tests/py/netdev/fwd.t.payload
@@ -0,0 +1,20 @@
+# fwd to "lo"
+netdev test-netdev ingress 
+  [ immediate reg 1 0x00000001 ]
+  [ fwd sreg_dev 1 ]
+
+# fwd to meta mark map { 0x00000001 : "lo", 0x00000002 : "lo"}
+__map%d test-netdev b
+__map%d test-netdev 0
+	element 00000001  : 00000001 0 [end]	element 00000002  : 00000001 0 [end]
+netdev test-netdev ingress 
+  [ meta load mark => reg 1 ]
+  [ lookup reg 1 set __map%d dreg 1 ]
+  [ fwd sreg_dev 1 ]
+
+# fwd ip to 192.168.2.200 device "lo"
+netdev test-netdev ingress 
+  [ immediate reg 1 0x00000001 ]
+  [ immediate reg 2 0xc802a8c0 ]
+  [ fwd sreg_dev 1 sreg_addr 2 nfproto 2 ]
+
-- 
cgit v1.2.3