diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-08-29 16:23:25 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-08-30 12:19:36 +0200 |
| commit | 665da8df3cfaf482157b752f5de98c45038621c3 (patch) | |
| tree | 2e24a645694a8b0c06ff1adfbc2b6165fae4f5b8 /tests/py/inet | |
| parent | dfd72398d44ebbe17929d6e8ca0c870087a0c644 (diff) | |
JSON: Rename (v)map expression properties
Change the rather generic "left" and "right" into "key" and "data" as
suggested at NFWS.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py/inet')
| -rw-r--r-- | tests/py/inet/fib.t.json | 4 | ||||
| -rw-r--r-- | tests/py/inet/fib.t.json.output | 4 | ||||
| -rw-r--r-- | tests/py/inet/map.t.json | 8 | ||||
| -rw-r--r-- | tests/py/inet/map.t.json.output | 8 | ||||
| -rw-r--r-- | tests/py/inet/tcp.t.json | 12 |
5 files changed, 18 insertions, 18 deletions
diff --git a/tests/py/inet/fib.t.json b/tests/py/inet/fib.t.json index 00c79abc..92bb5ec0 100644 --- a/tests/py/inet/fib.t.json +++ b/tests/py/inet/fib.t.json @@ -57,7 +57,7 @@ [ { "vmap": { - "left": { + "key": { "fib": { "flags": [ "daddr", @@ -66,7 +66,7 @@ "result": "type" } }, - "right": { + "data": { "set": [ [ "blackhole", diff --git a/tests/py/inet/fib.t.json.output b/tests/py/inet/fib.t.json.output index b06e488a..52cd46bc 100644 --- a/tests/py/inet/fib.t.json.output +++ b/tests/py/inet/fib.t.json.output @@ -2,7 +2,7 @@ [ { "vmap": { - "left": { + "key": { "fib": { "flags": [ "daddr", @@ -11,7 +11,7 @@ "result": "type" } }, - "right": { + "data": { "set": [ [ "unicast", diff --git a/tests/py/inet/map.t.json b/tests/py/inet/map.t.json index 7fc2ac33..207ac3f3 100644 --- a/tests/py/inet/map.t.json +++ b/tests/py/inet/map.t.json @@ -7,13 +7,13 @@ }, "right": { "map": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip" } }, - "right": { + "data": { "set": [ [ "10.2.3.2", @@ -40,13 +40,13 @@ }, "right": { "map": { - "left": { + "key": { "payload": { "field": "hdrlength", "protocol": "ip" } }, - "right": { + "data": { "set": [ [ 5, diff --git a/tests/py/inet/map.t.json.output b/tests/py/inet/map.t.json.output index 6e5238e3..9c235e30 100644 --- a/tests/py/inet/map.t.json.output +++ b/tests/py/inet/map.t.json.output @@ -7,13 +7,13 @@ }, "right": { "map": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip" } }, - "right": { + "data": { "set": [ [ "10.2.3.1", @@ -40,13 +40,13 @@ }, "right": { "map": { - "left": { + "key": { "payload": { "field": "hdrlength", "protocol": "ip" } }, - "right": { + "data": { "set": [ [ 4, diff --git a/tests/py/inet/tcp.t.json b/tests/py/inet/tcp.t.json index 00e8ae7e..0b30fbcf 100644 --- a/tests/py/inet/tcp.t.json +++ b/tests/py/inet/tcp.t.json @@ -176,13 +176,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, @@ -206,13 +206,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 25, @@ -431,13 +431,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "sport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 25, |