diff options
Diffstat (limited to 'tests/py/ip')
26 files changed, 315 insertions, 315 deletions
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 |