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/inet/comp.t.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'tests/py/inet/comp.t.json')

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": "!=",
-- 
cgit v1.2.3