From 665da8df3cfaf482157b752f5de98c45038621c3 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 29 Aug 2018 16:23:25 +0200 Subject: 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 Signed-off-by: Pablo Neira Ayuso --- tests/py/ip/dnat.t.json | 8 ++++---- tests/py/ip/dnat.t.json.output | 8 ++++---- tests/py/ip/dup.t.json | 4 ++-- tests/py/ip/hash.t.json | 4 ++-- tests/py/ip/ip.t.json | 8 ++++---- tests/py/ip/masquerade.t.json | 4 ++-- tests/py/ip/numgen.t.json | 8 ++++---- tests/py/ip/numgen.t.json.output | 8 ++++---- tests/py/ip/objects.t.json | 16 ++++++++-------- tests/py/ip/objects.t.json.output | 8 ++++---- tests/py/ip/redirect.t.json | 8 ++++---- 11 files changed, 42 insertions(+), 42 deletions(-) (limited to 'tests/py/ip') diff --git a/tests/py/ip/dnat.t.json b/tests/py/ip/dnat.t.json index 3efa220c..c4ae8302 100644 --- a/tests/py/ip/dnat.t.json +++ b/tests/py/ip/dnat.t.json @@ -194,12 +194,12 @@ "dnat": { "addr": { "map": { - "left": { + "key": { "ct": { "key": "mark" } }, - "right": { + "data": { "set": [ [ "0x00000014", @@ -219,7 +219,7 @@ "dnat": { "addr": { "map": { - "left": { + "key": { "concat": [ { "ct": { @@ -234,7 +234,7 @@ } ] }, - "right": { + "data": { "set": [ [ { diff --git a/tests/py/ip/dnat.t.json.output b/tests/py/ip/dnat.t.json.output index e1727063..4f2c6dfc 100644 --- a/tests/py/ip/dnat.t.json.output +++ b/tests/py/ip/dnat.t.json.output @@ -4,12 +4,12 @@ "dnat": { "addr": { "map": { - "left": { + "key": { "ct": { "key": "mark" } }, - "right": { + "data": { "set": [ [ 20, @@ -29,7 +29,7 @@ "dnat": { "addr": { "map": { - "left": { + "key": { "concat": [ { "ct": { @@ -44,7 +44,7 @@ } ] }, - "right": { + "data": { "set": [ [ { diff --git a/tests/py/ip/dup.t.json b/tests/py/ip/dup.t.json index a555fc4f..aa1e8269 100644 --- a/tests/py/ip/dup.t.json +++ b/tests/py/ip/dup.t.json @@ -23,13 +23,13 @@ "dup": { "addr": { "map": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip" } }, - "right": { + "data": { "set": [ [ "192.168.2.120", diff --git a/tests/py/ip/hash.t.json b/tests/py/ip/hash.t.json index 640d9aa5..febf0274 100644 --- a/tests/py/ip/hash.t.json +++ b/tests/py/ip/hash.t.json @@ -179,7 +179,7 @@ "dnat": { "addr": { "map": { - "left": { + "key": { "jhash": { "expr": { "payload": { @@ -191,7 +191,7 @@ "seed": 3735928559 } }, - "right": { + "data": { "set": [ [ 0, diff --git a/tests/py/ip/ip.t.json b/tests/py/ip/ip.t.json index a8766cb2..3e4f2d80 100644 --- a/tests/py/ip/ip.t.json +++ b/tests/py/ip/ip.t.json @@ -124,13 +124,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "dscp", "protocol": "ip" } }, - "right": { + "data": { "set": [ [ "cs1", @@ -1543,13 +1543,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "hdrlength", "protocol": "ip" } }, - "right": { + "data": { "set": [ [ { "range": [ 0, 4 ] }, diff --git a/tests/py/ip/masquerade.t.json b/tests/py/ip/masquerade.t.json index 64148767..79c80804 100644 --- a/tests/py/ip/masquerade.t.json +++ b/tests/py/ip/masquerade.t.json @@ -380,13 +380,13 @@ }, { "vmap": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, diff --git a/tests/py/ip/numgen.t.json b/tests/py/ip/numgen.t.json index 70514abb..5318a0f5 100644 --- a/tests/py/ip/numgen.t.json +++ b/tests/py/ip/numgen.t.json @@ -43,13 +43,13 @@ "dnat": { "addr": { "map": { - "left": { + "key": { "numgen": { "mod": 2, "mode": "inc" } }, - "right": { + "data": { "set": [ [ 0, @@ -73,13 +73,13 @@ "dnat": { "addr": { "map": { - "left": { + "key": { "numgen": { "mod": 10, "mode": "inc" } }, - "right": { + "data": { "set": [ [ { "range": [ 0, 5 ] }, diff --git a/tests/py/ip/numgen.t.json.output b/tests/py/ip/numgen.t.json.output index 7a989551..ffab43ba 100644 --- a/tests/py/ip/numgen.t.json.output +++ b/tests/py/ip/numgen.t.json.output @@ -24,14 +24,14 @@ "dnat": { "addr": { "map": { - "left": { + "key": { "numgen": { "mod": 2, "mode": "inc", "offset": 0 } }, - "right": { + "data": { "set": [ [ 0, @@ -55,14 +55,14 @@ "dnat": { "addr": { "map": { - "left": { + "key": { "numgen": { "mod": 10, "mode": "inc", "offset": 0 } }, - "right": { + "data": { "set": [ [ { "range": [ 0, 5 ] }, diff --git a/tests/py/ip/objects.t.json b/tests/py/ip/objects.t.json index f3036b04..953e5570 100644 --- a/tests/py/ip/objects.t.json +++ b/tests/py/ip/objects.t.json @@ -21,13 +21,13 @@ { "counter": { "map": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 443, @@ -71,13 +71,13 @@ { "quota": { "map": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 443, @@ -110,13 +110,13 @@ { "ct helper": { "map": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 21, @@ -156,13 +156,13 @@ { "limit": { "map": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, diff --git a/tests/py/ip/objects.t.json.output b/tests/py/ip/objects.t.json.output index e5cb8feb..ade195d6 100644 --- a/tests/py/ip/objects.t.json.output +++ b/tests/py/ip/objects.t.json.output @@ -3,13 +3,13 @@ { "counter": { "map": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, @@ -35,13 +35,13 @@ { "quota": { "map": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, diff --git a/tests/py/ip/redirect.t.json b/tests/py/ip/redirect.t.json index c2f264c8..7ee3a516 100644 --- a/tests/py/ip/redirect.t.json +++ b/tests/py/ip/redirect.t.json @@ -538,13 +538,13 @@ }, { "vmap": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, @@ -584,13 +584,13 @@ "redirect": { "port": { "map": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, -- cgit v1.2.3