diff options
Diffstat (limited to 'tests')
86 files changed, 1114 insertions, 1128 deletions
diff --git a/tests/py/any/rawpayload.t.json b/tests/py/any/rawpayload.t.json index bfb7c967..9c513cba 100644 --- a/tests/py/any/rawpayload.t.json +++ b/tests/py/any/rawpayload.t.json @@ -20,7 +20,6 @@ "payload": { "base": "th", "len": 16, - "name": "raw", "offset": 16 } }, @@ -49,8 +48,7 @@ "payload": { "base": "th", "len": 16, - "offset": 16, - "name": "raw" + "offset": 16 } }, "right": { @@ -72,7 +70,6 @@ "payload": { "base": "nh", "len": 8, - "name": "raw", "offset": 8 } }, @@ -89,7 +86,6 @@ "payload": { "base": "nh", "len": 16, - "name": "raw", "offset": 8 } }, @@ -106,7 +102,6 @@ "payload": { "base": "ll", "len": 1, - "name": "raw", "offset": 0 } }, @@ -125,7 +120,6 @@ "payload": { "base": "ll", "len": 8, - "name": "raw", "offset": 0 } }, @@ -146,7 +140,6 @@ "payload": { "base": "ll", "len": 128, - "name": "raw", "offset": 0 } }, diff --git a/tests/py/any/rawpayload.t.json.output b/tests/py/any/rawpayload.t.json.output index b423005f..699d9ece 100644 --- a/tests/py/any/rawpayload.t.json.output +++ b/tests/py/any/rawpayload.t.json.output @@ -20,7 +20,6 @@ "payload": { "base": "th", "len": 16, - "name": "raw", "offset": 16 } }, @@ -42,7 +41,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -66,7 +65,6 @@ "payload": { "base": "ll", "len": 8, - "name": "raw", "offset": 0 } }, @@ -89,7 +87,6 @@ "payload": { "base": "ll", "len": 8, - "name": "raw", "offset": 0 } }, diff --git a/tests/py/arp/arp.t.json b/tests/py/arp/arp.t.json index 4fd98d19..49f5c2ca 100644 --- a/tests/py/arp/arp.t.json +++ b/tests/py/arp/arp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "right": 1 @@ -20,7 +20,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "right": 22 @@ -51,7 +51,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -67,7 +67,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -84,7 +84,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -102,7 +102,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -124,7 +124,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -147,7 +147,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -166,7 +166,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -186,7 +186,7 @@ "left": { "payload": { "field": "ptype", - "name": "arp" + "protocol": "arp" } }, "right": "0x0800" @@ -201,7 +201,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "right": 22 @@ -216,7 +216,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -232,7 +232,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -249,7 +249,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -267,7 +267,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -289,7 +289,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -312,7 +312,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -331,7 +331,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -351,7 +351,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "right": 22 @@ -366,7 +366,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -382,7 +382,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -399,7 +399,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -417,7 +417,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -439,7 +439,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -462,7 +462,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -481,7 +481,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -501,7 +501,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -526,7 +526,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -552,7 +552,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": "request" @@ -567,7 +567,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": "reply" @@ -582,7 +582,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": "rrequest" @@ -597,7 +597,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": "rreply" @@ -612,7 +612,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": "inrequest" @@ -627,7 +627,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": "inreply" @@ -642,7 +642,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": "nak" @@ -657,7 +657,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": "reply" @@ -672,7 +672,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -688,7 +688,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -704,7 +704,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -720,7 +720,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -736,7 +736,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -752,7 +752,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -768,7 +768,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -784,7 +784,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -808,7 +808,7 @@ "left": { "payload": { "field": "ptype", - "name": "arp" + "protocol": "arp" } }, "right": "0x0800" @@ -819,7 +819,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "right": 1 @@ -830,7 +830,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "right": 6 @@ -841,7 +841,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "right": 4 @@ -853,7 +853,6 @@ "payload": { "base": "nh", "len": 32, - "name": "raw", "offset": 192 } }, @@ -866,7 +865,6 @@ "payload": { "base": "nh", "len": 48, - "name": "raw", "offset": 144 } }, diff --git a/tests/py/arp/arp.t.json.output b/tests/py/arp/arp.t.json.output index 0b60c445..295d05fa 100644 --- a/tests/py/arp/arp.t.json.output +++ b/tests/py/arp/arp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "ptype", - "name": "arp" + "protocol": "arp" } }, "right": "ip" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "right": { @@ -45,7 +45,7 @@ "left": { "payload": { "field": "operation", - "name": "arp" + "protocol": "arp" } }, "op": "!=", @@ -79,7 +79,7 @@ "left": { "payload": { "field": "htype", - "name": "arp" + "protocol": "arp" } }, "right": 1 @@ -90,7 +90,7 @@ "left": { "payload": { "field": "ptype", - "name": "arp" + "protocol": "arp" } }, "right": "ip" @@ -101,7 +101,7 @@ "left": { "payload": { "field": "hlen", - "name": "arp" + "protocol": "arp" } }, "right": 6 @@ -112,7 +112,7 @@ "left": { "payload": { "field": "plen", - "name": "arp" + "protocol": "arp" } }, "right": 4 @@ -124,7 +124,6 @@ "payload": { "base": "nh", "len": 32, - "name": "raw", "offset": 192 } }, @@ -137,7 +136,6 @@ "payload": { "base": "nh", "len": 48, - "name": "raw", "offset": 144 } }, diff --git a/tests/py/bridge/ether.t.json b/tests/py/bridge/ether.t.json index 6efa7c66..136a22ca 100644 --- a/tests/py/bridge/ether.t.json +++ b/tests/py/bridge/ether.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -24,7 +24,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -35,7 +35,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -53,7 +53,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -64,7 +64,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -75,7 +75,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -90,7 +90,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -101,7 +101,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -112,7 +112,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -127,7 +127,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -138,7 +138,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -156,7 +156,7 @@ "left": { "payload": { "field": "daddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:01:02:03:04:05" @@ -167,7 +167,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "ff:fe:dc:ba:98:76" diff --git a/tests/py/bridge/ether.t.json.output b/tests/py/bridge/ether.t.json.output index f68748cb..1c3cb8dc 100644 --- a/tests/py/bridge/ether.t.json.output +++ b/tests/py/bridge/ether.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -27,7 +27,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -45,7 +45,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -56,7 +56,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -67,7 +67,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" diff --git a/tests/py/bridge/icmpX.t.json b/tests/py/bridge/icmpX.t.json index 77638825..830bb799 100644 --- a/tests/py/bridge/icmpX.t.json +++ b/tests/py/bridge/icmpX.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "icmp" @@ -16,7 +16,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -31,7 +31,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -46,7 +46,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": "icmpv6" @@ -57,7 +57,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -72,7 +72,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" diff --git a/tests/py/bridge/icmpX.t.json.output b/tests/py/bridge/icmpX.t.json.output index e2695750..ecfaa62f 100644 --- a/tests/py/bridge/icmpX.t.json.output +++ b/tests/py/bridge/icmpX.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 1 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -31,7 +31,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": 58 @@ -42,7 +42,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" diff --git a/tests/py/bridge/reject.t.json b/tests/py/bridge/reject.t.json index d4750f4d..0ced129c 100644 --- a/tests/py/bridge/reject.t.json +++ b/tests/py/bridge/reject.t.json @@ -123,7 +123,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -150,7 +150,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -168,7 +168,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip6" diff --git a/tests/py/bridge/reject.t.json.output b/tests/py/bridge/reject.t.json.output index 602af9c1..a83feabc 100644 --- a/tests/py/bridge/reject.t.json.output +++ b/tests/py/bridge/reject.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -26,7 +26,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -47,7 +47,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -68,7 +68,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -86,7 +86,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -107,7 +107,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -128,7 +128,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -149,7 +149,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip6" @@ -170,7 +170,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip6" @@ -191,7 +191,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip6" @@ -212,7 +212,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip6" @@ -238,7 +238,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 diff --git a/tests/py/bridge/vlan.t.json b/tests/py/bridge/vlan.t.json index b57deca7..7facb61b 100644 --- a/tests/py/bridge/vlan.t.json +++ b/tests/py/bridge/vlan.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -20,7 +20,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 0 @@ -35,7 +35,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -46,7 +46,7 @@ "left": { "payload": { "field": "cfi", - "name": "vlan" + "protocol": "vlan" } }, "right": 0 @@ -61,7 +61,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -72,7 +72,7 @@ "left": { "payload": { "field": "cfi", - "name": "vlan" + "protocol": "vlan" } }, "op": "!=", @@ -88,7 +88,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -99,7 +99,7 @@ "left": { "payload": { "field": "cfi", - "name": "vlan" + "protocol": "vlan" } }, "right": 1 @@ -114,7 +114,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -125,7 +125,7 @@ "left": { "payload": { "field": "cfi", - "name": "vlan" + "protocol": "vlan" } }, "right": 1 @@ -136,7 +136,7 @@ "left": { "payload": { "field": "pcp", - "name": "vlan" + "protocol": "vlan" } }, "right": 7 @@ -151,7 +151,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -162,7 +162,7 @@ "left": { "payload": { "field": "cfi", - "name": "vlan" + "protocol": "vlan" } }, "right": 1 @@ -173,7 +173,7 @@ "left": { "payload": { "field": "pcp", - "name": "vlan" + "protocol": "vlan" } }, "right": 3 @@ -188,7 +188,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -203,7 +203,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 0 @@ -218,7 +218,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -229,7 +229,7 @@ "left": { "payload": { "field": "cfi", - "name": "vlan" + "protocol": "vlan" } }, "right": 0 @@ -244,7 +244,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -255,7 +255,7 @@ "left": { "payload": { "field": "cfi", - "name": "vlan" + "protocol": "vlan" } }, "right": 1 @@ -270,7 +270,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 4094 @@ -281,7 +281,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -296,7 +296,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 1 @@ -307,7 +307,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "10.0.0.1" @@ -322,7 +322,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 1 @@ -333,7 +333,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -353,7 +353,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 1 @@ -364,7 +364,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -380,7 +380,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -395,7 +395,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": 1 @@ -406,7 +406,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -422,7 +422,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -437,7 +437,7 @@ "left": { "payload": { "field": "id", - "name": "vlan" + "protocol": "vlan" } }, "right": { @@ -456,7 +456,7 @@ "left": { "payload": { "field": "pcp", - "name": "vlan" + "protocol": "vlan" } }, "right": { diff --git a/tests/py/inet/ah.t.json b/tests/py/inet/ah.t.json index 4489f2d3..4f3fd743 100644 --- a/tests/py/inet/ah.t.json +++ b/tests/py/inet/ah.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -22,7 +22,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -40,7 +40,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -59,7 +59,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -79,7 +79,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -100,7 +100,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -122,7 +122,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "right": 22 @@ -137,7 +137,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -153,7 +153,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -170,7 +170,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -188,7 +188,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -208,7 +208,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -229,7 +229,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -248,7 +248,7 @@ "left": { "payload": { "field": "reserved", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -268,7 +268,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "right": 111 @@ -283,7 +283,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -299,7 +299,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -316,7 +316,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -334,7 +334,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -354,7 +354,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -375,7 +375,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -394,7 +394,7 @@ "left": { "payload": { "field": "spi", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -414,7 +414,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "right": 123 @@ -429,7 +429,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -445,7 +445,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -466,7 +466,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -488,7 +488,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -507,7 +507,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "op": "!=", @@ -527,7 +527,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "right": { @@ -544,7 +544,7 @@ "left": { "payload": { "field": "sequence", - "name": "ah" + "protocol": "ah" } }, "op": "!=", diff --git a/tests/py/inet/comp.t.json b/tests/py/inet/comp.t.json index d76d6ed8..56fccafb 100644 --- a/tests/py/inet/comp.t.json +++ b/tests/py/inet/comp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -21,7 +21,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": "0x0" @@ -36,7 +36,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -52,7 +52,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -69,7 +69,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -87,7 +87,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -109,7 +109,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -132,7 +132,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -151,7 +151,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -171,7 +171,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "right": 22 @@ -186,7 +186,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -202,7 +202,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -219,7 +219,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -237,7 +237,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -259,7 +259,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -282,7 +282,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -301,7 +301,7 @@ "left": { "payload": { "field": "cpi", - "name": "comp" + "protocol": "comp" } }, "op": "!=", diff --git a/tests/py/inet/comp.t.json.output b/tests/py/inet/comp.t.json.output index 79e286b7..21517998 100644 --- a/tests/py/inet/comp.t.json.output +++ b/tests/py/inet/comp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -21,7 +21,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": 0 @@ -36,7 +36,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -52,7 +52,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -69,7 +69,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -87,7 +87,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -109,7 +109,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", @@ -132,7 +132,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "right": { @@ -151,7 +151,7 @@ "left": { "payload": { "field": "flags", - "name": "comp" + "protocol": "comp" } }, "op": "!=", diff --git a/tests/py/inet/dccp.t.json b/tests/py/inet/dccp.t.json index 7f925047..7d87966f 100644 --- a/tests/py/inet/dccp.t.json +++ b/tests/py/inet/dccp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -22,7 +22,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -40,7 +40,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -61,7 +61,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -83,7 +83,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -102,7 +102,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -119,7 +119,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -136,7 +136,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -155,7 +155,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -175,7 +175,7 @@ "left": { "payload": { "field": "dport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -196,7 +196,7 @@ "left": { "payload": { "field": "dport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -218,7 +218,7 @@ "left": { "payload": { "field": "dport", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -237,7 +237,7 @@ "left": { "payload": { "field": "dport", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -257,7 +257,7 @@ "left": { "payload": { "field": "type", - "name": "dccp" + "protocol": "dccp" } }, "right": { @@ -285,7 +285,7 @@ "left": { "payload": { "field": "type", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", @@ -314,7 +314,7 @@ "left": { "payload": { "field": "type", - "name": "dccp" + "protocol": "dccp" } }, "right": "request" @@ -329,7 +329,7 @@ "left": { "payload": { "field": "type", - "name": "dccp" + "protocol": "dccp" } }, "op": "!=", diff --git a/tests/py/inet/dccp.t.json.output b/tests/py/inet/dccp.t.json.output index 9e3a57a7..889e4209 100644 --- a/tests/py/inet/dccp.t.json.output +++ b/tests/py/inet/dccp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "dccp" + "protocol": "dccp" } }, "right": { diff --git a/tests/py/inet/esp.t.json b/tests/py/inet/esp.t.json index 39c446c7..e6f59a65 100644 --- a/tests/py/inet/esp.t.json +++ b/tests/py/inet/esp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "right": 100 @@ -20,7 +20,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -53,7 +53,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -71,7 +71,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -91,7 +91,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -112,7 +112,7 @@ "left": { "payload": { "field": "spi", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -131,7 +131,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "right": 22 @@ -146,7 +146,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -163,7 +163,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -181,7 +181,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -201,7 +201,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "op": "!=", @@ -222,7 +222,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "right": { @@ -241,7 +241,7 @@ "left": { "payload": { "field": "sequence", - "name": "esp" + "protocol": "esp" } }, "op": "!=", diff --git a/tests/py/inet/ether-ip.t.json b/tests/py/inet/ether-ip.t.json index accb9d69..b5356bb3 100644 --- a/tests/py/inet/ether-ip.t.json +++ b/tests/py/inet/ether-ip.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -24,7 +24,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -35,7 +35,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -53,7 +53,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -64,7 +64,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -75,7 +75,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" diff --git a/tests/py/inet/ether-ip.t.json.output b/tests/py/inet/ether-ip.t.json.output index 80f8a4c3..2ae5655a 100644 --- a/tests/py/inet/ether-ip.t.json.output +++ b/tests/py/inet/ether-ip.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -27,7 +27,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" diff --git a/tests/py/inet/ether.t.json b/tests/py/inet/ether.t.json index b5042adb..69b75ac0 100644 --- a/tests/py/inet/ether.t.json +++ b/tests/py/inet/ether.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -24,7 +24,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -42,7 +42,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -53,7 +53,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -71,7 +71,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" diff --git a/tests/py/inet/ether.t.json.output b/tests/py/inet/ether.t.json.output index bd7bd67e..19e3865b 100644 --- a/tests/py/inet/ether.t.json.output +++ b/tests/py/inet/ether.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" diff --git a/tests/py/inet/icmp.t.json b/tests/py/inet/icmp.t.json index 55217cc9..efc40428 100644 --- a/tests/py/inet/icmp.t.json +++ b/tests/py/inet/icmp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -41,7 +41,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -62,7 +62,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -83,7 +83,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -104,7 +104,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" diff --git a/tests/py/inet/icmp.t.json.output b/tests/py/inet/icmp.t.json.output index 2282900d..a5ee48be 100644 --- a/tests/py/inet/icmp.t.json.output +++ b/tests/py/inet/icmp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" diff --git a/tests/py/inet/icmpX.t.json b/tests/py/inet/icmpX.t.json index 23ee7ed8..b9905e9d 100644 --- a/tests/py/inet/icmpX.t.json +++ b/tests/py/inet/icmpX.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "icmp" @@ -16,7 +16,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -31,7 +31,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -46,7 +46,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": "icmpv6" @@ -57,7 +57,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -72,7 +72,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -87,7 +87,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "ipv6-icmp" @@ -106,7 +106,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": 1 diff --git a/tests/py/inet/icmpX.t.json.output b/tests/py/inet/icmpX.t.json.output index 55158fee..15fdd15a 100644 --- a/tests/py/inet/icmpX.t.json.output +++ b/tests/py/inet/icmpX.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 1 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -31,7 +31,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": 58 @@ -42,7 +42,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -57,7 +57,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 58 @@ -76,7 +76,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "destination-unreachable" diff --git a/tests/py/inet/ip.t.json b/tests/py/inet/ip.t.json index b2327377..4b2efd54 100644 --- a/tests/py/inet/ip.t.json +++ b/tests/py/inet/ip.t.json @@ -7,19 +7,19 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } } ] diff --git a/tests/py/inet/ip_tcp.t.json b/tests/py/inet/ip_tcp.t.json index f9c8b5c6..e2f918aa 100644 --- a/tests/py/inet/ip_tcp.t.json +++ b/tests/py/inet/ip_tcp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -16,7 +16,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -31,7 +31,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -42,7 +42,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -53,7 +53,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -68,7 +68,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -82,7 +82,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -93,7 +93,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -108,7 +108,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -122,7 +122,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -137,7 +137,7 @@ "left": { "payload": { "field": "type", - "name": "ether" + "protocol": "ether" } }, "right": "ip" @@ -148,7 +148,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 diff --git a/tests/py/inet/ip_tcp.t.json.output b/tests/py/inet/ip_tcp.t.json.output index 1581f30e..bd6a8620 100644 --- a/tests/py/inet/ip_tcp.t.json.output +++ b/tests/py/inet/ip_tcp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -31,7 +31,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -42,7 +42,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -57,7 +57,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -71,7 +71,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -82,7 +82,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -97,7 +97,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -111,7 +111,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 diff --git a/tests/py/inet/map.t.json b/tests/py/inet/map.t.json index bb7f2a05..7fc2ac33 100644 --- a/tests/py/inet/map.t.json +++ b/tests/py/inet/map.t.json @@ -10,7 +10,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -43,7 +43,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ip" + "protocol": "ip" } }, "right": { diff --git a/tests/py/inet/map.t.json.output b/tests/py/inet/map.t.json.output index 74c9b4f6..6e5238e3 100644 --- a/tests/py/inet/map.t.json.output +++ b/tests/py/inet/map.t.json.output @@ -10,7 +10,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -43,7 +43,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ip" + "protocol": "ip" } }, "right": { diff --git a/tests/py/inet/meta.t.json b/tests/py/inet/meta.t.json index 6c5f4567..5bf8a547 100644 --- a/tests/py/inet/meta.t.json +++ b/tests/py/inet/meta.t.json @@ -72,7 +72,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -95,7 +95,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -118,7 +118,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -164,7 +164,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" diff --git a/tests/py/inet/meta.t.json.output b/tests/py/inet/meta.t.json.output index 0dc3371f..565e2fa0 100644 --- a/tests/py/inet/meta.t.json.output +++ b/tests/py/inet/meta.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" diff --git a/tests/py/inet/sctp.t.json b/tests/py/inet/sctp.t.json index 86193080..f382c6d2 100644 --- a/tests/py/inet/sctp.t.json +++ b/tests/py/inet/sctp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "right": 23 @@ -20,7 +20,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -53,7 +53,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -71,7 +71,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -92,7 +92,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -114,7 +114,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -133,7 +133,7 @@ "left": { "payload": { "field": "sport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -153,7 +153,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "right": 23 @@ -168,7 +168,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -184,7 +184,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -201,7 +201,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -219,7 +219,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -240,7 +240,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -262,7 +262,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -281,7 +281,7 @@ "left": { "payload": { "field": "dport", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -301,7 +301,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "right": 1111 @@ -316,7 +316,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -332,7 +332,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -349,7 +349,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -367,7 +367,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -388,7 +388,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -410,7 +410,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -429,7 +429,7 @@ "left": { "payload": { "field": "checksum", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -449,7 +449,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "right": 22 @@ -464,7 +464,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -480,7 +480,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -497,7 +497,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -515,7 +515,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -537,7 +537,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", @@ -560,7 +560,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "right": { @@ -579,7 +579,7 @@ "left": { "payload": { "field": "vtag", - "name": "sctp" + "protocol": "sctp" } }, "op": "!=", diff --git a/tests/py/inet/sets.t.json b/tests/py/inet/sets.t.json index 75881f71..34f37588 100644 --- a/tests/py/inet/sets.t.json +++ b/tests/py/inet/sets.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "@set1" @@ -23,7 +23,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", diff --git a/tests/py/inet/tcp.t.json b/tests/py/inet/tcp.t.json index 2f83566d..00e8ae7e 100644 --- a/tests/py/inet/tcp.t.json +++ b/tests/py/inet/tcp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -20,7 +20,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -53,7 +53,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -71,7 +71,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -93,7 +93,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -116,7 +116,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -135,7 +135,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -155,7 +155,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -179,7 +179,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -209,7 +209,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -239,7 +239,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -261,7 +261,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -284,7 +284,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -299,7 +299,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -315,7 +315,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -332,7 +332,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -350,7 +350,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -372,7 +372,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -395,7 +395,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -414,7 +414,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -434,7 +434,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -464,7 +464,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 8080 @@ -482,7 +482,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 1024 @@ -493,7 +493,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -508,7 +508,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 1024 @@ -519,7 +519,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -530,7 +530,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -545,7 +545,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -556,7 +556,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 1024 @@ -567,7 +567,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -582,7 +582,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -593,7 +593,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -609,7 +609,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -624,7 +624,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -639,7 +639,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -655,7 +655,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -672,7 +672,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -690,7 +690,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -712,7 +712,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -735,7 +735,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -754,7 +754,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -774,7 +774,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": 42949672 @@ -792,7 +792,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -807,7 +807,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -823,7 +823,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -840,7 +840,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -858,7 +858,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -880,7 +880,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -903,7 +903,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -922,7 +922,7 @@ "left": { "payload": { "field": "ackseq", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -942,7 +942,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -971,7 +971,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -997,7 +997,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "right": "cwr" @@ -1012,7 +1012,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1028,7 +1028,7 @@ "left": { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, "op": "==", @@ -1046,7 +1046,7 @@ { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, { @@ -1075,7 +1075,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": 22222 @@ -1090,7 +1090,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -1105,7 +1105,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1121,7 +1121,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1138,7 +1138,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1156,7 +1156,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1178,7 +1178,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1201,7 +1201,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1220,7 +1220,7 @@ "left": { "payload": { "field": "window", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1240,7 +1240,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -1255,7 +1255,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1271,7 +1271,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1288,7 +1288,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1306,7 +1306,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1328,7 +1328,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1351,7 +1351,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1370,7 +1370,7 @@ "left": { "payload": { "field": "checksum", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1390,7 +1390,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": 1234 @@ -1408,7 +1408,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -1423,7 +1423,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1439,7 +1439,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1456,7 +1456,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1474,7 +1474,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1496,7 +1496,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1519,7 +1519,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -1538,7 +1538,7 @@ "left": { "payload": { "field": "urgptr", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -1558,7 +1558,7 @@ "left": { "payload": { "field": "doff", - "name": "tcp" + "protocol": "tcp" } }, "right": 8 diff --git a/tests/py/inet/tcp.t.json.output b/tests/py/inet/tcp.t.json.output index d099d6fe..e840169a 100644 --- a/tests/py/inet/tcp.t.json.output +++ b/tests/py/inet/tcp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -29,7 +29,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": 1024 @@ -40,7 +40,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -51,7 +51,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -66,7 +66,7 @@ "left": { "payload": { "field": "sport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -82,7 +82,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -93,7 +93,7 @@ "left": { "payload": { "field": "sequence", - "name": "tcp" + "protocol": "tcp" } }, "right": 0 @@ -110,7 +110,7 @@ { "payload": { "field": "flags", - "name": "tcp" + "protocol": "tcp" } }, { diff --git a/tests/py/inet/udp.t.json b/tests/py/inet/udp.t.json index 096fe559..896d20d8 100644 --- a/tests/py/inet/udp.t.json +++ b/tests/py/inet/udp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "right": 80 @@ -23,7 +23,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -42,7 +42,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -62,7 +62,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -83,7 +83,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -106,7 +106,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -130,7 +130,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -149,7 +149,7 @@ "left": { "payload": { "field": "sport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -169,7 +169,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 80 @@ -187,7 +187,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -206,7 +206,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -226,7 +226,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -247,7 +247,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -270,7 +270,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -294,7 +294,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -316,7 +316,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -339,7 +339,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "right": 6666 @@ -354,7 +354,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -370,7 +370,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -390,7 +390,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -411,7 +411,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -434,7 +434,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -458,7 +458,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -477,7 +477,7 @@ "left": { "payload": { "field": "length", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -497,7 +497,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": 6666 @@ -515,7 +515,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -539,7 +539,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": 22 @@ -554,7 +554,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -570,7 +570,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -587,7 +587,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -605,7 +605,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -627,7 +627,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -650,7 +650,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": { @@ -669,7 +669,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "op": "!=", @@ -697,7 +697,7 @@ "left": { "payload": { "field": "checksum", - "name": "udp" + "protocol": "udp" } }, "right": 0 @@ -720,7 +720,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 65535 diff --git a/tests/py/inet/udplite.t.json b/tests/py/inet/udplite.t.json index 5173a68c..75e72579 100644 --- a/tests/py/inet/udplite.t.json +++ b/tests/py/inet/udplite.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "right": 80 @@ -23,7 +23,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -42,7 +42,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -62,7 +62,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -83,7 +83,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -106,7 +106,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -130,7 +130,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -149,7 +149,7 @@ "left": { "payload": { "field": "sport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -169,7 +169,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "right": 80 @@ -187,7 +187,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -206,7 +206,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -226,7 +226,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -247,7 +247,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -270,7 +270,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -294,7 +294,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -316,7 +316,7 @@ "left": { "payload": { "field": "dport", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -339,7 +339,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": 6666 @@ -357,7 +357,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -381,7 +381,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": 22 @@ -396,7 +396,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -412,7 +412,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -429,7 +429,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -447,7 +447,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -469,7 +469,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", @@ -492,7 +492,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "right": { @@ -511,7 +511,7 @@ "left": { "payload": { "field": "checksum", - "name": "udplite" + "protocol": "udplite" } }, "op": "!=", diff --git a/tests/py/ip/dnat.t.json b/tests/py/ip/dnat.t.json index f0140305..3efa220c 100644 --- a/tests/py/ip/dnat.t.json +++ b/tests/py/ip/dnat.t.json @@ -13,7 +13,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -43,7 +43,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -74,7 +74,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -108,7 +108,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -143,7 +143,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -174,7 +174,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 81 @@ -229,7 +229,7 @@ { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } } ] diff --git a/tests/py/ip/dnat.t.json.output b/tests/py/ip/dnat.t.json.output index 73b6b204..e1727063 100644 --- a/tests/py/ip/dnat.t.json.output +++ b/tests/py/ip/dnat.t.json.output @@ -39,7 +39,7 @@ { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } } ] diff --git a/tests/py/ip/dup.t.json b/tests/py/ip/dup.t.json index abc5be47..a555fc4f 100644 --- a/tests/py/ip/dup.t.json +++ b/tests/py/ip/dup.t.json @@ -26,7 +26,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { diff --git a/tests/py/ip/ether.t.json b/tests/py/ip/ether.t.json index f176bf7e..8890f153 100644 --- a/tests/py/ip/ether.t.json +++ b/tests/py/ip/ether.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -24,7 +24,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -35,7 +35,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -53,7 +53,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -64,7 +64,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -75,7 +75,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -90,7 +90,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -101,7 +101,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -112,7 +112,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -127,7 +127,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -138,7 +138,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" diff --git a/tests/py/ip/ether.t.json.output b/tests/py/ip/ether.t.json.output index d3127161..811604e5 100644 --- a/tests/py/ip/ether.t.json.output +++ b/tests/py/ip/ether.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.2.3.4" @@ -27,7 +27,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" diff --git a/tests/py/ip/flowtable.t.json b/tests/py/ip/flowtable.t.json index 1d2b0b7a..a03cc9d7 100644 --- a/tests/py/ip/flowtable.t.json +++ b/tests/py/ip/flowtable.t.json @@ -8,7 +8,7 @@ "val": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } } } diff --git a/tests/py/ip/hash.t.json b/tests/py/ip/hash.t.json index a463f94d..640d9aa5 100644 --- a/tests/py/ip/hash.t.json +++ b/tests/py/ip/hash.t.json @@ -14,13 +14,13 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } } ] @@ -49,13 +49,13 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } } ] @@ -83,13 +83,13 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } } ] @@ -118,13 +118,13 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } } ] @@ -154,13 +154,13 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } } ] @@ -184,7 +184,7 @@ "expr": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "mod": 2, diff --git a/tests/py/ip/icmp.t.json b/tests/py/ip/icmp.t.json index 4d51ad2f..89fe754c 100644 --- a/tests/py/ip/icmp.t.json +++ b/tests/py/ip/icmp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-reply" @@ -23,7 +23,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "destination-unreachable" @@ -41,7 +41,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "source-quench" @@ -59,7 +59,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "redirect" @@ -77,7 +77,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -95,7 +95,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "time-exceeded" @@ -113,7 +113,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "parameter-problem" @@ -131,7 +131,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "timestamp-request" @@ -149,7 +149,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "timestamp-reply" @@ -167,7 +167,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "info-request" @@ -185,7 +185,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "info-reply" @@ -203,7 +203,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "address-mask-request" @@ -221,7 +221,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "address-mask-reply" @@ -239,7 +239,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "router-advertisement" @@ -257,7 +257,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "router-solicitation" @@ -275,7 +275,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -311,7 +311,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -333,7 +333,7 @@ "left": { "payload": { "field": "code", - "name": "icmp" + "protocol": "icmp" } }, "right": 111 @@ -351,7 +351,7 @@ "left": { "payload": { "field": "code", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -370,7 +370,7 @@ "left": { "payload": { "field": "code", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -387,7 +387,7 @@ "left": { "payload": { "field": "code", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -405,7 +405,7 @@ "left": { "payload": { "field": "code", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -424,7 +424,7 @@ "left": { "payload": { "field": "code", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -444,7 +444,7 @@ "left": { "payload": { "field": "code", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -467,7 +467,7 @@ "left": { "payload": { "field": "code", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -491,7 +491,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "right": 12343 @@ -509,7 +509,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -528,7 +528,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -548,7 +548,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -569,7 +569,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -591,7 +591,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -614,7 +614,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -638,7 +638,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -663,7 +663,7 @@ "left": { "payload": { "field": "id", - "name": "icmp" + "protocol": "icmp" } }, "right": 1245 @@ -681,7 +681,7 @@ "left": { "payload": { "field": "id", - "name": "icmp" + "protocol": "icmp" } }, "right": 22 @@ -696,7 +696,7 @@ "left": { "payload": { "field": "id", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -712,7 +712,7 @@ "left": { "payload": { "field": "id", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -729,7 +729,7 @@ "left": { "payload": { "field": "id", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -747,7 +747,7 @@ "left": { "payload": { "field": "id", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -766,7 +766,7 @@ "left": { "payload": { "field": "id", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -786,7 +786,7 @@ "left": { "payload": { "field": "id", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -807,7 +807,7 @@ "left": { "payload": { "field": "id", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -829,7 +829,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmp" + "protocol": "icmp" } }, "right": 22 @@ -844,7 +844,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -860,7 +860,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -877,7 +877,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -895,7 +895,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -917,7 +917,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -940,7 +940,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -959,7 +959,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -979,7 +979,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "right": 33 @@ -994,7 +994,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -1011,7 +1011,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -1030,7 +1030,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1050,7 +1050,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "right": 22 @@ -1065,7 +1065,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1081,7 +1081,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -1098,7 +1098,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1116,7 +1116,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -1138,7 +1138,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1161,7 +1161,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -1180,7 +1180,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1200,7 +1200,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "right": 22 @@ -1215,7 +1215,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1231,7 +1231,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -1248,7 +1248,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1266,7 +1266,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -1288,7 +1288,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1311,7 +1311,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -1330,7 +1330,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1350,7 +1350,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", @@ -1366,7 +1366,7 @@ "left": { "payload": { "field": "gateway", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", diff --git a/tests/py/ip/icmp.t.json.output b/tests/py/ip/icmp.t.json.output index 488048f7..31857262 100644 --- a/tests/py/ip/icmp.t.json.output +++ b/tests/py/ip/icmp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -41,7 +41,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "right": { @@ -65,7 +65,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmp" + "protocol": "icmp" } }, "op": "!=", diff --git a/tests/py/ip/ip.t.json b/tests/py/ip/ip.t.json index a6b53571..a8766cb2 100644 --- a/tests/py/ip/ip.t.json +++ b/tests/py/ip/ip.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "right": "cs1" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "right": "0x38" @@ -51,7 +51,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -67,7 +67,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -106,7 +106,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -127,7 +127,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -160,7 +160,7 @@ "left": { "payload": { "field": "length", - "name": "ip" + "protocol": "ip" } }, "right": 232 @@ -175,7 +175,7 @@ "left": { "payload": { "field": "length", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -191,7 +191,7 @@ "left": { "payload": { "field": "length", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -208,7 +208,7 @@ "left": { "payload": { "field": "length", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -226,7 +226,7 @@ "left": { "payload": { "field": "length", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -248,7 +248,7 @@ "left": { "payload": { "field": "length", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -271,7 +271,7 @@ "left": { "payload": { "field": "length", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -290,7 +290,7 @@ "left": { "payload": { "field": "length", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -310,7 +310,7 @@ "left": { "payload": { "field": "id", - "name": "ip" + "protocol": "ip" } }, "right": 22 @@ -325,7 +325,7 @@ "left": { "payload": { "field": "id", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -341,7 +341,7 @@ "left": { "payload": { "field": "id", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -358,7 +358,7 @@ "left": { "payload": { "field": "id", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -376,7 +376,7 @@ "left": { "payload": { "field": "id", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -398,7 +398,7 @@ "left": { "payload": { "field": "id", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -421,7 +421,7 @@ "left": { "payload": { "field": "id", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -440,7 +440,7 @@ "left": { "payload": { "field": "id", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -460,7 +460,7 @@ "left": { "payload": { "field": "frag-off", - "name": "ip" + "protocol": "ip" } }, "right": 222 @@ -478,7 +478,7 @@ "left": { "payload": { "field": "frag-off", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -494,7 +494,7 @@ "left": { "payload": { "field": "frag-off", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -511,7 +511,7 @@ "left": { "payload": { "field": "frag-off", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -529,7 +529,7 @@ "left": { "payload": { "field": "frag-off", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -551,7 +551,7 @@ "left": { "payload": { "field": "frag-off", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -574,7 +574,7 @@ "left": { "payload": { "field": "frag-off", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -593,7 +593,7 @@ "left": { "payload": { "field": "frag-off", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -613,7 +613,7 @@ "left": { "payload": { "field": "ttl", - "name": "ip" + "protocol": "ip" } }, "right": 0 @@ -631,7 +631,7 @@ "left": { "payload": { "field": "ttl", - "name": "ip" + "protocol": "ip" } }, "right": 233 @@ -646,7 +646,7 @@ "left": { "payload": { "field": "ttl", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -663,7 +663,7 @@ "left": { "payload": { "field": "ttl", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -681,7 +681,7 @@ "left": { "payload": { "field": "ttl", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -702,7 +702,7 @@ "left": { "payload": { "field": "ttl", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -724,7 +724,7 @@ "left": { "payload": { "field": "ttl", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -743,7 +743,7 @@ "left": { "payload": { "field": "ttl", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -763,7 +763,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -778,7 +778,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -794,7 +794,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -824,7 +824,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -855,7 +855,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 255 @@ -870,7 +870,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "right": 13172 @@ -888,7 +888,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "right": 22 @@ -903,7 +903,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -919,7 +919,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -936,7 +936,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -954,7 +954,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -976,7 +976,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -999,7 +999,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1018,7 +1018,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -1038,7 +1038,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1058,7 +1058,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -1079,7 +1079,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "192.168.3.1" @@ -1090,7 +1090,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "192.168.3.100" @@ -1105,7 +1105,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -1121,7 +1121,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "1.1.1.1" @@ -1136,7 +1136,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1153,7 +1153,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1170,7 +1170,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1187,7 +1187,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1204,7 +1204,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -1222,7 +1222,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1241,7 +1241,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -1261,7 +1261,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1285,7 +1285,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -1310,7 +1310,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1327,7 +1327,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -1345,7 +1345,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1362,7 +1362,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -1380,7 +1380,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "192.168.0.1" @@ -1395,7 +1395,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "192.168.0.1" @@ -1413,7 +1413,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "192.168.0.2" @@ -1430,7 +1430,7 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "0xff" @@ -1451,7 +1451,7 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "0.0.0.255" @@ -1472,7 +1472,7 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "0xffff0000" @@ -1490,7 +1490,7 @@ "left": { "payload": { "field": "version", - "name": "ip" + "protocol": "ip" } }, "right": 4 @@ -1501,7 +1501,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ip" + "protocol": "ip" } }, "right": 5 @@ -1516,7 +1516,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ip" + "protocol": "ip" } }, "right": 0 @@ -1531,7 +1531,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ip" + "protocol": "ip" } }, "right": 15 @@ -1546,7 +1546,7 @@ "left": { "payload": { "field": "hdrlength", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -1587,7 +1587,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "127.0.0.1" @@ -1610,7 +1610,7 @@ "left": { "payload": { "field": "checksum", - "name": "ip" + "protocol": "ip" } }, "right": 0 @@ -1633,7 +1633,7 @@ "left": { "payload": { "field": "id", - "name": "ip" + "protocol": "ip" } }, "right": 0 @@ -1656,7 +1656,7 @@ "left": { "payload": { "field": "ecn", - "name": "ip" + "protocol": "ip" } }, "right": 1 @@ -1679,7 +1679,7 @@ "left": { "payload": { "field": "ecn", - "name": "ip" + "protocol": "ip" } }, "right": "ce" @@ -1702,7 +1702,7 @@ "left": { "payload": { "field": "ttl", - "name": "ip" + "protocol": "ip" } }, "right": 23 @@ -1725,7 +1725,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 1 @@ -1748,7 +1748,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "right": "af23" @@ -1771,7 +1771,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "right": "cs0" diff --git a/tests/py/ip/ip.t.json.output b/tests/py/ip/ip.t.json.output index 967e2a59..22b4d8c9 100644 --- a/tests/py/ip/ip.t.json.output +++ b/tests/py/ip/ip.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "right": "cs7" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -75,7 +75,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -90,7 +90,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -106,7 +106,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -136,7 +136,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -169,7 +169,7 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "0.0.0.255" @@ -188,7 +188,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -216,7 +216,7 @@ "left": { "payload": { "field": "ecn", - "name": "ip" + "protocol": "ip" } }, "right": "ect1" diff --git a/tests/py/ip/ip_tcp.t.json b/tests/py/ip/ip_tcp.t.json index 9fd3339c..453c1e43 100644 --- a/tests/py/ip/ip_tcp.t.json +++ b/tests/py/ip/ip_tcp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -16,7 +16,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -31,7 +31,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -50,7 +50,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 diff --git a/tests/py/ip/ip_tcp.t.json.output b/tests/py/ip/ip_tcp.t.json.output index 90828814..15bd8e11 100644 --- a/tests/py/ip/ip_tcp.t.json.output +++ b/tests/py/ip/ip_tcp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -20,7 +20,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -39,7 +39,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 diff --git a/tests/py/ip/masquerade.t.json b/tests/py/ip/masquerade.t.json index f2f798fe..64148767 100644 --- a/tests/py/ip/masquerade.t.json +++ b/tests/py/ip/masquerade.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -23,7 +23,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -43,7 +43,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -66,7 +66,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -90,7 +90,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -113,7 +113,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -137,7 +137,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -157,7 +157,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -180,7 +180,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -204,7 +204,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -227,7 +227,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -251,7 +251,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -271,7 +271,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -293,7 +293,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -328,7 +328,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -341,7 +341,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -383,7 +383,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { diff --git a/tests/py/ip/masquerade.t.json.output b/tests/py/ip/masquerade.t.json.output index c6e6ef04..8feac1dd 100644 --- a/tests/py/ip/masquerade.t.json.output +++ b/tests/py/ip/masquerade.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -29,7 +29,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -52,7 +52,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -76,7 +76,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -99,7 +99,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 diff --git a/tests/py/ip/meta.t.json b/tests/py/ip/meta.t.json index c06e48ff..59d97187 100644 --- a/tests/py/ip/meta.t.json +++ b/tests/py/ip/meta.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -28,7 +28,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -51,7 +51,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-advert" @@ -74,7 +74,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-advert" @@ -89,7 +89,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-advert" diff --git a/tests/py/ip/meta.t.json.output b/tests/py/ip/meta.t.json.output index 5908ca6b..93cede88 100644 --- a/tests/py/ip/meta.t.json.output +++ b/tests/py/ip/meta.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-advert" @@ -35,7 +35,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-advert" diff --git a/tests/py/ip/objects.t.json b/tests/py/ip/objects.t.json index 77c68868..f3036b04 100644 --- a/tests/py/ip/objects.t.json +++ b/tests/py/ip/objects.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "192.168.1.3" @@ -24,7 +24,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -55,7 +55,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "192.168.1.3" @@ -74,7 +74,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -113,7 +113,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -140,7 +140,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "192.168.1.3" @@ -159,7 +159,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { diff --git a/tests/py/ip/objects.t.json.output b/tests/py/ip/objects.t.json.output index ea0e991e..e5cb8feb 100644 --- a/tests/py/ip/objects.t.json.output +++ b/tests/py/ip/objects.t.json.output @@ -6,7 +6,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -38,7 +38,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { diff --git a/tests/py/ip/redirect.t.json b/tests/py/ip/redirect.t.json index 4a41489b..c2f264c8 100644 --- a/tests/py/ip/redirect.t.json +++ b/tests/py/ip/redirect.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -23,7 +23,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -43,7 +43,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -66,7 +66,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -90,7 +90,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -113,7 +113,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -137,7 +137,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -157,7 +157,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -180,7 +180,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -204,7 +204,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -227,7 +227,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -251,7 +251,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -271,7 +271,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 1234 @@ -291,7 +291,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": "172.16.0.1" @@ -302,7 +302,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 9998 @@ -322,7 +322,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 39128 @@ -342,7 +342,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -364,7 +364,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 9128 @@ -385,7 +385,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 9128 @@ -406,7 +406,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 9128 @@ -427,7 +427,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 9128 @@ -451,7 +451,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -486,7 +486,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -499,7 +499,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -541,7 +541,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -574,7 +574,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 @@ -587,7 +587,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { diff --git a/tests/py/ip/redirect.t.json.output b/tests/py/ip/redirect.t.json.output index 3db03be2..2a3398b0 100644 --- a/tests/py/ip/redirect.t.json.output +++ b/tests/py/ip/redirect.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -29,7 +29,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -52,7 +52,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -76,7 +76,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -99,7 +99,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -123,7 +123,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": 6 diff --git a/tests/py/ip/sets.t.json b/tests/py/ip/sets.t.json index dd6abed8..97ea1541 100644 --- a/tests/py/ip/sets.t.json +++ b/tests/py/ip/sets.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "@set1" @@ -23,7 +23,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -42,7 +42,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": "@set2" @@ -60,7 +60,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -81,13 +81,13 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } } ] @@ -109,13 +109,13 @@ { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, { "payload": { "field": "daddr", - "name": "ip" + "protocol": "ip" } } ] @@ -133,7 +133,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { @@ -154,7 +154,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip" + "protocol": "ip" } }, "right": { diff --git a/tests/py/ip/snat.t.json b/tests/py/ip/snat.t.json index 1bf54f40..9cb85f85 100644 --- a/tests/py/ip/snat.t.json +++ b/tests/py/ip/snat.t.json @@ -13,7 +13,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -43,7 +43,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -74,7 +74,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -108,7 +108,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", @@ -143,7 +143,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", diff --git a/tests/py/ip/snat.t.json.output b/tests/py/ip/snat.t.json.output index f27c25dc..46901ba0 100644 --- a/tests/py/ip/snat.t.json.output +++ b/tests/py/ip/snat.t.json.output @@ -13,7 +13,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -47,7 +47,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "op": "!=", diff --git a/tests/py/ip/tcp.t.json b/tests/py/ip/tcp.t.json index e04cc1e2..33172f60 100644 --- a/tests/py/ip/tcp.t.json +++ b/tests/py/ip/tcp.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "right": "tcp" @@ -16,7 +16,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": "ssh" @@ -34,7 +34,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -46,7 +46,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": "ssh" diff --git a/tests/py/ip/tcp.t.json.output b/tests/py/ip/tcp.t.json.output index eb5f53f7..9dd51de6 100644 --- a/tests/py/ip/tcp.t.json.output +++ b/tests/py/ip/tcp.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -23,7 +23,7 @@ "left": { "payload": { "field": "protocol", - "name": "ip" + "protocol": "ip" } }, "op": "!=", @@ -35,7 +35,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 22 diff --git a/tests/py/ip6/dnat.t.json b/tests/py/ip6/dnat.t.json index ba16aa24..4139d645 100644 --- a/tests/py/ip6/dnat.t.json +++ b/tests/py/ip6/dnat.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -32,7 +32,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -57,7 +57,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { diff --git a/tests/py/ip6/dup.t.json b/tests/py/ip6/dup.t.json index 48d6ea3d..53ad8bed 100644 --- a/tests/py/ip6/dup.t.json +++ b/tests/py/ip6/dup.t.json @@ -26,7 +26,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { diff --git a/tests/py/ip6/ether.t.json b/tests/py/ip6/ether.t.json index 7de30481..1a349215 100644 --- a/tests/py/ip6/ether.t.json +++ b/tests/py/ip6/ether.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -24,7 +24,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1::2" @@ -35,7 +35,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -53,7 +53,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -64,7 +64,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1::2" @@ -75,7 +75,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -90,7 +90,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -101,7 +101,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -112,7 +112,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1::2" @@ -127,7 +127,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" @@ -138,7 +138,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1::2" diff --git a/tests/py/ip6/ether.t.json.output b/tests/py/ip6/ether.t.json.output index add1359e..556ce919 100644 --- a/tests/py/ip6/ether.t.json.output +++ b/tests/py/ip6/ether.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 22 @@ -16,7 +16,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1::2" @@ -27,7 +27,7 @@ "left": { "payload": { "field": "saddr", - "name": "ether" + "protocol": "ether" } }, "right": "00:0f:54:0c:11:04" diff --git a/tests/py/ip6/flowtable.t.json b/tests/py/ip6/flowtable.t.json index be4dca67..d0b3a957 100644 --- a/tests/py/ip6/flowtable.t.json +++ b/tests/py/ip6/flowtable.t.json @@ -13,7 +13,7 @@ { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } } ] @@ -41,7 +41,7 @@ { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, { diff --git a/tests/py/ip6/flowtable.t.json.output b/tests/py/ip6/flowtable.t.json.output index be4dca67..d0b3a957 100644 --- a/tests/py/ip6/flowtable.t.json.output +++ b/tests/py/ip6/flowtable.t.json.output @@ -13,7 +13,7 @@ { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } } ] @@ -41,7 +41,7 @@ { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, { diff --git a/tests/py/ip6/icmpv6.t.json b/tests/py/ip6/icmpv6.t.json index 47907c74..c953ee25 100644 --- a/tests/py/ip6/icmpv6.t.json +++ b/tests/py/ip6/icmpv6.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "destination-unreachable" @@ -23,7 +23,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "packet-too-big" @@ -41,7 +41,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "time-exceeded" @@ -59,7 +59,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-request" @@ -77,7 +77,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "echo-reply" @@ -95,7 +95,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "mld-listener-query" @@ -113,7 +113,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "mld-listener-report" @@ -131,7 +131,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "mld-listener-done" @@ -149,7 +149,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "mld-listener-reduction" @@ -167,7 +167,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-solicit" @@ -185,7 +185,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-advert" @@ -203,7 +203,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-neighbor-solicit" @@ -221,7 +221,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-neighbor-advert" @@ -239,7 +239,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-redirect" @@ -257,7 +257,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "parameter-problem" @@ -275,7 +275,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "router-renumbering" @@ -293,7 +293,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "ind-neighbor-solicit" @@ -311,7 +311,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "ind-neighbor-advert" @@ -329,7 +329,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "mld2-listener-report" @@ -347,7 +347,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -371,7 +371,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -396,7 +396,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -420,7 +420,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -445,7 +445,7 @@ "left": { "payload": { "field": "code", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": 4 @@ -460,7 +460,7 @@ "left": { "payload": { "field": "code", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -477,7 +477,7 @@ "left": { "payload": { "field": "code", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -501,7 +501,7 @@ "left": { "payload": { "field": "code", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -526,7 +526,7 @@ "left": { "payload": { "field": "code", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -545,7 +545,7 @@ "left": { "payload": { "field": "code", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -565,7 +565,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": 2222 @@ -583,7 +583,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -602,7 +602,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -619,7 +619,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -638,7 +638,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -658,7 +658,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -679,7 +679,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -698,7 +698,7 @@ "left": { "payload": { "field": "checksum", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -718,7 +718,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": 22 @@ -733,7 +733,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -749,7 +749,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -766,7 +766,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -784,7 +784,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -806,7 +806,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -829,7 +829,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -848,7 +848,7 @@ "left": { "payload": { "field": "mtu", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -868,7 +868,7 @@ "left": { "payload": { "field": "id", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -885,7 +885,7 @@ "left": { "payload": { "field": "id", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -903,7 +903,7 @@ "left": { "payload": { "field": "id", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -925,7 +925,7 @@ "left": { "payload": { "field": "id", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -948,7 +948,7 @@ "left": { "payload": { "field": "id", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -967,7 +967,7 @@ "left": { "payload": { "field": "id", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -987,7 +987,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": 2 @@ -1002,7 +1002,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -1028,7 +1028,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -1048,7 +1048,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -1069,7 +1069,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -1086,7 +1086,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", @@ -1104,7 +1104,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -1123,7 +1123,7 @@ "left": { "payload": { "field": "sequence", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", diff --git a/tests/py/ip6/icmpv6.t.json.output b/tests/py/ip6/icmpv6.t.json.output index 17d8d95b..36f1b04a 100644 --- a/tests/py/ip6/icmpv6.t.json.output +++ b/tests/py/ip6/icmpv6.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "mld-listener-done" @@ -23,7 +23,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -48,7 +48,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": { @@ -72,7 +72,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "op": "!=", diff --git a/tests/py/ip6/ip6.t.json b/tests/py/ip6/ip6.t.json index 925789cd..26f2e41f 100644 --- a/tests/py/ip6/ip6.t.json +++ b/tests/py/ip6/ip6.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "right": "cs1" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "right": "0x38" @@ -51,7 +51,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -67,7 +67,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -106,7 +106,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -139,7 +139,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "right": 22 @@ -154,7 +154,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -170,7 +170,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -192,7 +192,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -215,7 +215,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -234,7 +234,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -254,7 +254,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -284,7 +284,7 @@ "left": { "payload": { "field": "length", - "name": "ip6" + "protocol": "ip6" } }, "right": 22 @@ -299,7 +299,7 @@ "left": { "payload": { "field": "length", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -315,7 +315,7 @@ "left": { "payload": { "field": "length", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -332,7 +332,7 @@ "left": { "payload": { "field": "length", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -350,7 +350,7 @@ "left": { "payload": { "field": "length", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -372,7 +372,7 @@ "left": { "payload": { "field": "length", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -395,7 +395,7 @@ "left": { "payload": { "field": "length", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -416,7 +416,7 @@ "left": { "payload": { "field": "length", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -436,7 +436,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -461,7 +461,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -488,7 +488,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -516,7 +516,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": "esp" @@ -531,7 +531,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -547,7 +547,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -566,7 +566,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -586,7 +586,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -603,7 +603,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -621,7 +621,7 @@ "left": { "payload": { "field": "hoplimit", - "name": "ip6" + "protocol": "ip6" } }, "right": 1 @@ -636,7 +636,7 @@ "left": { "payload": { "field": "hoplimit", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -652,7 +652,7 @@ "left": { "payload": { "field": "hoplimit", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -669,7 +669,7 @@ "left": { "payload": { "field": "hoplimit", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -687,7 +687,7 @@ "left": { "payload": { "field": "hoplimit", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -709,7 +709,7 @@ "left": { "payload": { "field": "hoplimit", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -732,7 +732,7 @@ "left": { "payload": { "field": "hoplimit", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -751,7 +751,7 @@ "left": { "payload": { "field": "hoplimit", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -771,7 +771,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:1234:1234:1234:1234" @@ -786,7 +786,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::1234:1234:1234:1234:1234:1234:1234" @@ -801,7 +801,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234::1234:1234:1234:1234:1234:1234" @@ -816,7 +816,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234::1234:1234:1234:1234:1234" @@ -831,7 +831,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:0:1234:1234:1234:1234:1234" @@ -846,7 +846,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234::1234:1234:1234:1234" @@ -861,7 +861,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:0:1234:1234:1234" @@ -876,7 +876,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:1234::1234:1234" @@ -891,7 +891,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:1234:1234:0:1234" @@ -906,7 +906,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:1234:1234:1234::" @@ -921,7 +921,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::1234:1234:1234:1234:1234:1234" @@ -936,7 +936,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234::1234:1234:1234:1234:1234" @@ -951,7 +951,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234::1234:1234:1234:1234" @@ -966,7 +966,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234::1234:1234:1234" @@ -981,7 +981,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234::1234:1234" @@ -996,7 +996,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:1234::1234" @@ -1011,7 +1011,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:1234:1234::" @@ -1026,7 +1026,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::1234:1234:1234:1234:1234" @@ -1041,7 +1041,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234::1234:1234:1234:1234" @@ -1056,7 +1056,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234::1234:1234:1234" @@ -1071,7 +1071,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234::1234:1234" @@ -1086,7 +1086,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234::1234" @@ -1101,7 +1101,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:1234::" @@ -1116,7 +1116,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::1234:1234:1234:1234" @@ -1131,7 +1131,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234::1234:1234:1234" @@ -1146,7 +1146,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234::1234:1234" @@ -1161,7 +1161,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234::1234" @@ -1176,7 +1176,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234::" @@ -1191,7 +1191,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::1234:1234:1234" @@ -1206,7 +1206,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234::1234:1234" @@ -1221,7 +1221,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234::1234" @@ -1236,7 +1236,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234::" @@ -1251,7 +1251,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::1234:1234" @@ -1266,7 +1266,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234::1234" @@ -1281,7 +1281,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234::" @@ -1296,7 +1296,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::1234" @@ -1311,7 +1311,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234::" @@ -1326,7 +1326,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -1346,7 +1346,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::1" @@ -1357,7 +1357,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::2" @@ -1372,7 +1372,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -1393,7 +1393,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -1419,7 +1419,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::1" @@ -1442,7 +1442,7 @@ "left": { "payload": { "field": "hoplimit", - "name": "ip6" + "protocol": "ip6" } }, "right": 1 @@ -1465,7 +1465,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "right": "af42" @@ -1488,7 +1488,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "right": 63 @@ -1511,7 +1511,7 @@ "left": { "payload": { "field": "ecn", - "name": "ip6" + "protocol": "ip6" } }, "right": "ect0" @@ -1534,7 +1534,7 @@ "left": { "payload": { "field": "ecn", - "name": "ip6" + "protocol": "ip6" } }, "right": "ce" @@ -1557,7 +1557,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "right": 0 @@ -1580,7 +1580,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "right": 12345 @@ -1603,7 +1603,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "right": "0xfffff" diff --git a/tests/py/ip6/ip6.t.json.output b/tests/py/ip6/ip6.t.json.output index d72f3d18..2e548ca3 100644 --- a/tests/py/ip6/ip6.t.json.output +++ b/tests/py/ip6/ip6.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "right": "cs7" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -36,7 +36,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -75,7 +75,7 @@ "left": { "payload": { "field": "dscp", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -108,7 +108,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -133,7 +133,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -150,7 +150,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -168,7 +168,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": 50 @@ -183,7 +183,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -199,7 +199,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "0:1234:1234:1234:1234:1234:1234:1234" @@ -214,7 +214,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:0:1234:1234:1234:1234:1234:1234" @@ -229,7 +229,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:0:1234:1234:1234:1234:1234" @@ -244,7 +244,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:0:1234:1234:1234:1234" @@ -259,7 +259,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:1234:0:1234:1234" @@ -274,7 +274,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "1234:1234:1234:1234:1234:1234:1234:0" @@ -289,7 +289,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "::18.52.18.52" @@ -304,7 +304,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -325,7 +325,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -351,7 +351,7 @@ "left": { "payload": { "field": "flowlabel", - "name": "ip6" + "protocol": "ip6" } }, "right": 1048575 diff --git a/tests/py/ip6/map.t.json b/tests/py/ip6/map.t.json index 3dff018a..1117117e 100644 --- a/tests/py/ip6/map.t.json +++ b/tests/py/ip6/map.t.json @@ -12,7 +12,7 @@ { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "::ffff" diff --git a/tests/py/ip6/map.t.json.output b/tests/py/ip6/map.t.json.output index c1baf0cc..59922df7 100644 --- a/tests/py/ip6/map.t.json.output +++ b/tests/py/ip6/map.t.json.output @@ -12,7 +12,7 @@ { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "::ffff" diff --git a/tests/py/ip6/masquerade.t.json b/tests/py/ip6/masquerade.t.json index 8191ce51..5071e42c 100644 --- a/tests/py/ip6/masquerade.t.json +++ b/tests/py/ip6/masquerade.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -23,7 +23,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -43,7 +43,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -66,7 +66,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -90,7 +90,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -113,7 +113,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -137,7 +137,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -157,7 +157,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -180,7 +180,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -204,7 +204,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -227,7 +227,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -287,7 +287,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -322,7 +322,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -335,7 +335,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -377,7 +377,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { diff --git a/tests/py/ip6/masquerade.t.json.output b/tests/py/ip6/masquerade.t.json.output index 68f5ae22..78a75dac 100644 --- a/tests/py/ip6/masquerade.t.json.output +++ b/tests/py/ip6/masquerade.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -28,7 +28,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -52,7 +52,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -75,7 +75,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 diff --git a/tests/py/ip6/meta.t.json b/tests/py/ip6/meta.t.json index 176ef0f5..e3c22353 100644 --- a/tests/py/ip6/meta.t.json +++ b/tests/py/ip6/meta.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-advert" @@ -28,7 +28,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-advert" @@ -51,7 +51,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -74,7 +74,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -89,7 +89,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" diff --git a/tests/py/ip6/meta.t.json.output b/tests/py/ip6/meta.t.json.output index 142d056a..3ecc4f28 100644 --- a/tests/py/ip6/meta.t.json.output +++ b/tests/py/ip6/meta.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "type", - "name": "icmpv6" + "protocol": "icmpv6" } }, "right": "nd-router-advert" @@ -20,7 +20,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" @@ -35,7 +35,7 @@ "left": { "payload": { "field": "type", - "name": "icmp" + "protocol": "icmp" } }, "right": "echo-request" diff --git a/tests/py/ip6/redirect.t.json b/tests/py/ip6/redirect.t.json index ed227e76..9715c733 100644 --- a/tests/py/ip6/redirect.t.json +++ b/tests/py/ip6/redirect.t.json @@ -12,7 +12,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 954 @@ -30,7 +30,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "fe00::cafe" @@ -51,7 +51,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -71,7 +71,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -94,7 +94,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -118,7 +118,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -141,7 +141,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -165,7 +165,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -185,7 +185,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -208,7 +208,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -232,7 +232,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -255,7 +255,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -279,7 +279,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 1234 @@ -299,7 +299,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "fe00::cafe" @@ -310,7 +310,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 9998 @@ -330,7 +330,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": "tcp" @@ -352,7 +352,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 39128 @@ -372,7 +372,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 9128 @@ -393,7 +393,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": 9128 @@ -417,7 +417,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -452,7 +452,7 @@ "left": { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -465,7 +465,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -507,7 +507,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -540,7 +540,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": 6 @@ -553,7 +553,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { diff --git a/tests/py/ip6/redirect.t.json.output b/tests/py/ip6/redirect.t.json.output index ffc898ec..6f919ac8 100644 --- a/tests/py/ip6/redirect.t.json.output +++ b/tests/py/ip6/redirect.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -29,7 +29,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -52,7 +52,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -76,7 +76,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -99,7 +99,7 @@ "left": { "payload": { "field": "dport", - "name": "udp" + "protocol": "udp" } }, "right": 53 @@ -123,7 +123,7 @@ "left": { "payload": { "field": "nexthdr", - "name": "ip6" + "protocol": "ip6" } }, "right": 6 diff --git a/tests/py/ip6/sets.t.json b/tests/py/ip6/sets.t.json index 7b08316e..4f0d99bf 100644 --- a/tests/py/ip6/sets.t.json +++ b/tests/py/ip6/sets.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": "@set2" @@ -23,7 +23,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "op": "!=", @@ -44,13 +44,13 @@ { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } } ] @@ -72,13 +72,13 @@ { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, { "payload": { "field": "daddr", - "name": "ip6" + "protocol": "ip6" } } ] diff --git a/tests/py/ip6/snat.t.json b/tests/py/ip6/snat.t.json index 7f3cf9d7..b8fed518 100644 --- a/tests/py/ip6/snat.t.json +++ b/tests/py/ip6/snat.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { @@ -32,7 +32,7 @@ "left": { "payload": { "field": "dport", - "name": "tcp" + "protocol": "tcp" } }, "right": { diff --git a/tests/py/ip6/vmap.t.json b/tests/py/ip6/vmap.t.json index 0dfa0e0d..aa299864 100644 --- a/tests/py/ip6/vmap.t.json +++ b/tests/py/ip6/vmap.t.json @@ -5,7 +5,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -29,7 +29,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -53,7 +53,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -77,7 +77,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -101,7 +101,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -125,7 +125,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -149,7 +149,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -173,7 +173,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -197,7 +197,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -221,7 +221,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -245,7 +245,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -269,7 +269,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -293,7 +293,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -317,7 +317,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -341,7 +341,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -365,7 +365,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -389,7 +389,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -413,7 +413,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -437,7 +437,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -461,7 +461,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -485,7 +485,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -509,7 +509,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -533,7 +533,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -557,7 +557,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -581,7 +581,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -605,7 +605,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -629,7 +629,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -653,7 +653,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -677,7 +677,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -701,7 +701,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -725,7 +725,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -749,7 +749,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -773,7 +773,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -797,7 +797,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -821,7 +821,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -845,7 +845,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -869,7 +869,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -893,7 +893,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -922,7 +922,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -952,7 +952,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -982,7 +982,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -1012,7 +1012,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { diff --git a/tests/py/ip6/vmap.t.json.output b/tests/py/ip6/vmap.t.json.output index 3b5bc78e..a0ec0c91 100644 --- a/tests/py/ip6/vmap.t.json.output +++ b/tests/py/ip6/vmap.t.json.output @@ -5,7 +5,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -29,7 +29,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -53,7 +53,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -77,7 +77,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -101,7 +101,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -125,7 +125,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -149,7 +149,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -173,7 +173,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -197,7 +197,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -221,7 +221,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -251,7 +251,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -281,7 +281,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { @@ -311,7 +311,7 @@ "left": { "payload": { "field": "saddr", - "name": "ip6" + "protocol": "ip6" } }, "right": { |