From 90d4ee087171e75d5313359ad6b6f1341e51ddc5 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Wed, 29 Aug 2018 16:23:27 +0200
Subject: JSON: Make match op mandatory, introduce 'in' operator

This special operator is required for cases where missing operator does
not lead to same results as equal operator, i.e. with bitmasks on RHS.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/py/ip6/ip6.t.json | 68 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

(limited to 'tests/py/ip6/ip6.t.json')

diff --git a/tests/py/ip6/ip6.t.json b/tests/py/ip6/ip6.t.json
index d6acaa3b..f898240f 100644
--- a/tests/py/ip6/ip6.t.json
+++ b/tests/py/ip6/ip6.t.json
@@ -8,6 +8,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "cs1"
         }
     }
@@ -39,6 +40,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "0x38"
         }
     }
@@ -70,6 +72,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     "cs0",
@@ -142,6 +145,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": 22
         }
     }
@@ -173,6 +177,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     33,
@@ -218,6 +223,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     { "range": [ 33, 55 ] }
@@ -287,6 +293,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": 22
         }
     }
@@ -318,6 +325,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "range": [ 33, 45 ]
             }
@@ -353,6 +361,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     33,
@@ -398,6 +407,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     {
@@ -439,6 +449,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     "udp",
@@ -464,6 +475,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     "esp",
@@ -519,6 +531,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "esp"
         }
     }
@@ -550,6 +563,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     { "range": [ 33, 44 ] }
@@ -589,6 +603,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "range": [ 33, 44 ]
             }
@@ -624,6 +639,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": 1
         }
     }
@@ -655,6 +671,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "range": [ 33, 45 ]
             }
@@ -690,6 +707,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     33,
@@ -735,6 +753,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "set": [
                     { "range": [ 33, 55 ] }
@@ -774,6 +793,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234:1234:1234:1234:1234"
         }
     }
@@ -789,6 +809,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "::1234:1234:1234:1234:1234:1234:1234"
         }
     }
@@ -804,6 +825,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234::1234:1234:1234:1234:1234:1234"
         }
     }
@@ -819,6 +841,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234::1234:1234:1234:1234:1234"
         }
     }
@@ -834,6 +857,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:0:1234:1234:1234:1234:1234"
         }
     }
@@ -849,6 +873,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234::1234:1234:1234:1234"
         }
     }
@@ -864,6 +889,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234:0:1234:1234:1234"
         }
     }
@@ -879,6 +905,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234:1234::1234:1234"
         }
     }
@@ -894,6 +921,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234:1234:1234:0:1234"
         }
     }
@@ -909,6 +937,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234:1234:1234:1234::"
         }
     }
@@ -924,6 +953,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "::1234:1234:1234:1234:1234:1234"
         }
     }
@@ -939,6 +969,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234::1234:1234:1234:1234:1234"
         }
     }
@@ -954,6 +985,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234::1234:1234:1234:1234"
         }
     }
@@ -969,6 +1001,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234::1234:1234:1234"
         }
     }
@@ -984,6 +1017,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234::1234:1234"
         }
     }
@@ -999,6 +1033,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234:1234::1234"
         }
     }
@@ -1014,6 +1049,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234:1234:1234::"
         }
     }
@@ -1029,6 +1065,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "::1234:1234:1234:1234:1234"
         }
     }
@@ -1044,6 +1081,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234::1234:1234:1234:1234"
         }
     }
@@ -1059,6 +1097,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234::1234:1234:1234"
         }
     }
@@ -1074,6 +1113,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234::1234:1234"
         }
     }
@@ -1089,6 +1129,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234::1234"
         }
     }
@@ -1104,6 +1145,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234:1234::"
         }
     }
@@ -1119,6 +1161,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "::1234:1234:1234:1234"
         }
     }
@@ -1134,6 +1177,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234::1234:1234:1234"
         }
     }
@@ -1149,6 +1193,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234::1234:1234"
         }
     }
@@ -1164,6 +1209,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234::1234"
         }
     }
@@ -1179,6 +1225,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234:1234::"
         }
     }
@@ -1194,6 +1241,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "::1234:1234:1234"
         }
     }
@@ -1209,6 +1257,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234::1234:1234"
         }
     }
@@ -1224,6 +1273,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234::1234"
         }
     }
@@ -1239,6 +1289,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234:1234::"
         }
     }
@@ -1254,6 +1305,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "::1234:1234"
         }
     }
@@ -1269,6 +1321,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234::1234"
         }
     }
@@ -1284,6 +1337,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234:1234::"
         }
     }
@@ -1299,6 +1353,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "::1234"
         }
     }
@@ -1314,6 +1369,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "1234::"
         }
     }
@@ -1329,6 +1385,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": {
                 "prefix": {
                     "addr": "::",
@@ -1349,6 +1406,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "::1"
         }
     },
@@ -1360,6 +1418,7 @@
                     "protocol": "ip6"
                 }
             },
+	    "op": "==",
             "right": "::2"
         }
     }
@@ -1411,6 +1470,7 @@
             "left": {
                 "meta": { "key": "iif" }
             },
+	    "op": "==",
             "right": "lo"
         }
     },
@@ -1434,6 +1494,7 @@
             "left": {
                 "meta": { "key": "iif" }
             },
+	    "op": "==",
             "right": "lo"
         }
     },
@@ -1457,6 +1518,7 @@
             "left": {
                 "meta": { "key": "iif" }
             },
+	    "op": "==",
             "right": "lo"
         }
     },
@@ -1480,6 +1542,7 @@
             "left": {
                 "meta": { "key": "iif" }
             },
+	    "op": "==",
             "right": "lo"
         }
     },
@@ -1503,6 +1566,7 @@
             "left": {
                 "meta": { "key": "iif" }
             },
+	    "op": "==",
             "right": "lo"
         }
     },
@@ -1526,6 +1590,7 @@
             "left": {
                 "meta": { "key": "iif" }
             },
+	    "op": "==",
             "right": "lo"
         }
     },
@@ -1549,6 +1614,7 @@
             "left": {
                 "meta": { "key": "iif" }
             },
+	    "op": "==",
             "right": "lo"
         }
     },
@@ -1572,6 +1638,7 @@
             "left": {
                 "meta": { "key": "iif" }
             },
+	    "op": "==",
             "right": "lo"
         }
     },
@@ -1595,6 +1662,7 @@
             "left": {
                 "meta": { "key": "iif" }
             },
+	    "op": "==",
             "right": "lo"
         }
     },
-- 
cgit v1.2.3