From dfd72398d44ebbe17929d6e8ca0c870087a0c644 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Wed, 29 Aug 2018 16:23:24 +0200
Subject: 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>
---
 tests/py/arp/arp.t.json        | 100 ++++++++++++++++++++---------------------
 tests/py/arp/arp.t.json.output |  16 +++----
 2 files changed, 56 insertions(+), 60 deletions(-)

(limited to 'tests/py/arp')

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
                 }
             },
-- 
cgit v1.2.3