tests/py: Move tcpopt.t to any/ directory

Merge tcpopt.t files in ip, ip6 and inet into a common one, they were
just marignally different.

Signed-off-by: Phil Sutter <phil@nwl.cc>

4 files changed, 0 insertions, 650 deletions

diff --git a/tests/py/ip6/tcpopt.t b/tests/py/ip6/tcpopt.t
deleted file mode 100644
index 497f69fc..00000000
--- a/tests/py/ip6/tcpopt.t
+++ /dev/null
@@ -1,37 +0,0 @@
-:input;type filter hook input priority 0
-*ip6;test-ip6;input
-
-tcp option eol kind 1;ok
-tcp option noop kind 1;ok
-tcp option maxseg kind 1;ok
-tcp option maxseg length 1;ok
-tcp option maxseg size 1;ok
-tcp option window kind 1;ok
-tcp option window length 1;ok
-tcp option window count 1;ok
-tcp option sack-permitted kind 1;ok
-tcp option sack-permitted length 1;ok
-tcp option sack kind 1;ok
-tcp option sack length 1;ok
-tcp option sack left 1;ok
-tcp option sack0 left 1;ok;tcp option sack left 1
-tcp option sack1 left 1;ok
-tcp option sack2 left 1;ok
-tcp option sack3 left 1;ok
-tcp option sack right 1;ok
-tcp option sack0 right 1;ok;tcp option sack right 1
-tcp option sack1 right 1;ok
-tcp option sack2 right 1;ok
-tcp option sack3 right 1;ok
-tcp option timestamp kind 1;ok
-tcp option timestamp length 1;ok
-tcp option timestamp tsval 1;ok
-tcp option timestamp tsecr 1;ok
-
-tcp option foobar;fail
-tcp option foo bar;fail
-tcp option eol left;fail
-tcp option eol left 1;fail
-tcp option eol left 1;fail
-tcp option sack window;fail
-tcp option sack window 1;fail
diff --git a/tests/py/ip6/tcpopt.t.json b/tests/py/ip6/tcpopt.t.json
deleted file mode 100644
index d573dd1c..00000000
--- a/tests/py/ip6/tcpopt.t.json
+++ /dev/null
@@ -1,416 +0,0 @@
-# tcp option eol kind 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "kind",
-                    "name": "eol"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option noop kind 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "kind",
-                    "name": "noop"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option maxseg kind 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "kind",
-                    "name": "maxseg"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option maxseg length 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "length",
-                    "name": "maxseg"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option maxseg size 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "size",
-                    "name": "maxseg"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option window kind 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "kind",
-                    "name": "window"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option window length 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "length",
-                    "name": "window"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option window count 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "count",
-                    "name": "window"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack-permitted kind 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "kind",
-                    "name": "sack-permitted"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack-permitted length 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "length",
-                    "name": "sack-permitted"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack kind 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "kind",
-                    "name": "sack"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack length 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "length",
-                    "name": "sack"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack left 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "left",
-                    "name": "sack"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack0 left 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "left",
-                    "name": "sack"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack1 left 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "left",
-                    "name": "sack1"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack2 left 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "left",
-                    "name": "sack2"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack3 left 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "left",
-                    "name": "sack3"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack right 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "right",
-                    "name": "sack"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack0 right 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "right",
-                    "name": "sack0"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack1 right 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "right",
-                    "name": "sack1"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack2 right 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "right",
-                    "name": "sack2"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option sack3 right 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "right",
-                    "name": "sack3"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option timestamp kind 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "kind",
-                    "name": "timestamp"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option timestamp length 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "length",
-                    "name": "timestamp"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option timestamp tsval 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "tsval",
-                    "name": "timestamp"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
-# tcp option timestamp tsecr 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "tsecr",
-                    "name": "timestamp"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
diff --git a/tests/py/ip6/tcpopt.t.json.output b/tests/py/ip6/tcpopt.t.json.output
deleted file mode 100644
index 81dd8ad8..00000000
--- a/tests/py/ip6/tcpopt.t.json.output
+++ /dev/null
@@ -1,16 +0,0 @@
-# tcp option sack0 right 1
-[
-    {
-        "match": {
-            "left": {
-                "tcp option": {
-                    "field": "right",
-                    "name": "sack"
-                }
-            },
-	    "op": "==",
-            "right": 1
-        }
-    }
-]
-
diff --git a/tests/py/ip6/tcpopt.t.payload b/tests/py/ip6/tcpopt.t.payload
deleted file mode 100644
index 4b189197..00000000
--- a/tests/py/ip6/tcpopt.t.payload
+++ /dev/null
@@ -1,181 +0,0 @@
-# tcp option eol kind 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 0 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option noop kind 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option maxseg kind 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 2 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option maxseg length 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 2 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option maxseg size 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 2b @ 2 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00000100 ]
-
-# tcp option window kind 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 3 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option window length 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 3 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option window count 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 3 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option sack-permitted kind 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option sack-permitted length 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option sack kind 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 5 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option sack length 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 5 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option sack left 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack0 left 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack1 left 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 10 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack2 left 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 18 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack3 left 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 26 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack right 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack0 right 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack1 right 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 14 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack2 right 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 22 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option sack3 right 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 5 + 30 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option timestamp kind 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 8 + 0 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option timestamp length 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 1b @ 8 + 1 => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# tcp option timestamp tsval 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 8 + 2 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]
-
-# tcp option timestamp tsecr 1
-ip6 test-ip input
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ exthdr load tcpopt 4b @ 8 + 6 => reg 1 ]
-  [ cmp eq reg 1 0x01000000 ]