summaryrefslogtreecommitdiffstats
path: root/tests/py/bridge
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2018-08-29 16:23:24 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-08-30 12:19:36 +0200
commitdfd72398d44ebbe17929d6e8ca0c870087a0c644 (patch)
treea4dbab2e4c814f99f7ffe2d4831a82ceb249c249 /tests/py/bridge
parent8125785d5c5d35ec275e508166091d5472748bc1 (diff)
JSON: Review payload expression
For raw payloads, property "name" is not needed, it's clearly identified by base/offset/len properties. In non-raw payload expressions, rename property "name" to "protocol" as suggested during NFWS. Signed-off-by: Phil Sutter <phil@nwl.cc> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py/bridge')
-rw-r--r--tests/py/bridge/ether.t.json26
-rw-r--r--tests/py/bridge/ether.t.json.output12
-rw-r--r--tests/py/bridge/icmpX.t.json12
-rw-r--r--tests/py/bridge/icmpX.t.json.output8
-rw-r--r--tests/py/bridge/reject.t.json6
-rw-r--r--tests/py/bridge/reject.t.json.output24
-rw-r--r--tests/py/bridge/vlan.t.json68
7 files changed, 78 insertions, 78 deletions
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": {