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/ip6 | |
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/ip6')
-rw-r--r-- | tests/py/ip6/dup.t.json | 4 | ||||
-rw-r--r-- | tests/py/ip6/ip6.t.json | 8 | ||||
-rw-r--r-- | tests/py/ip6/ip6.t.json.output | 4 | ||||
-rw-r--r-- | tests/py/ip6/map.t.json | 4 | ||||
-rw-r--r-- | tests/py/ip6/map.t.json.output | 4 | ||||
-rw-r--r-- | tests/py/ip6/masquerade.t.json | 4 | ||||
-rw-r--r-- | tests/py/ip6/redirect.t.json | 8 | ||||
-rw-r--r-- | tests/py/ip6/vmap.t.json | 168 | ||||
-rw-r--r-- | tests/py/ip6/vmap.t.json.output | 52 |
9 files changed, 128 insertions, 128 deletions
diff --git a/tests/py/ip6/dup.t.json b/tests/py/ip6/dup.t.json index 53ad8bed..8a9493b3 100644 --- a/tests/py/ip6/dup.t.json +++ b/tests/py/ip6/dup.t.json @@ -23,13 +23,13 @@ "dup": { "addr": { "map": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "abcd::1", diff --git a/tests/py/ip6/ip6.t.json b/tests/py/ip6/ip6.t.json index 26f2e41f..a0a3079a 100644 --- a/tests/py/ip6/ip6.t.json +++ b/tests/py/ip6/ip6.t.json @@ -103,13 +103,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "dscp", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "0x04", @@ -251,13 +251,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "flowlabel", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ 0, diff --git a/tests/py/ip6/ip6.t.json.output b/tests/py/ip6/ip6.t.json.output index 2e548ca3..2b814721 100644 --- a/tests/py/ip6/ip6.t.json.output +++ b/tests/py/ip6/ip6.t.json.output @@ -72,13 +72,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "dscp", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ 4, diff --git a/tests/py/ip6/map.t.json b/tests/py/ip6/map.t.json index 1117117e..2ddb3080 100644 --- a/tests/py/ip6/map.t.json +++ b/tests/py/ip6/map.t.json @@ -7,7 +7,7 @@ }, "right": { "map": { - "left": { + "key": { "&": [ { "payload": { @@ -18,7 +18,7 @@ "::ffff" ] }, - "right": { + "data": { "set": [ [ "::2", diff --git a/tests/py/ip6/map.t.json.output b/tests/py/ip6/map.t.json.output index 59922df7..84343763 100644 --- a/tests/py/ip6/map.t.json.output +++ b/tests/py/ip6/map.t.json.output @@ -7,7 +7,7 @@ }, "right": { "map": { - "left": { + "key": { "&": [ { "payload": { @@ -18,7 +18,7 @@ "::ffff" ] }, - "right": { + "data": { "set": [ [ "::2", diff --git a/tests/py/ip6/masquerade.t.json b/tests/py/ip6/masquerade.t.json index 5071e42c..ae006510 100644 --- a/tests/py/ip6/masquerade.t.json +++ b/tests/py/ip6/masquerade.t.json @@ -374,13 +374,13 @@ }, { "vmap": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, diff --git a/tests/py/ip6/redirect.t.json b/tests/py/ip6/redirect.t.json index 9715c733..bd3df47f 100644 --- a/tests/py/ip6/redirect.t.json +++ b/tests/py/ip6/redirect.t.json @@ -504,13 +504,13 @@ }, { "vmap": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, @@ -550,13 +550,13 @@ "redirect": { "port": { "map": { - "left": { + "key": { "payload": { "field": "dport", "protocol": "tcp" } }, - "right": { + "data": { "set": [ [ 22, diff --git a/tests/py/ip6/vmap.t.json b/tests/py/ip6/vmap.t.json index aa299864..1b867ff0 100644 --- a/tests/py/ip6/vmap.t.json +++ b/tests/py/ip6/vmap.t.json @@ -2,13 +2,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "abcd::3", @@ -26,13 +26,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234:1234:1234", @@ -50,13 +50,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::1234:1234:1234:1234:1234:1234:1234", @@ -74,13 +74,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234::1234:1234:1234:1234:1234:1234", @@ -98,13 +98,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234::1234:1234:1234:1234:1234", @@ -122,13 +122,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234::1234:1234:1234:1234", @@ -146,13 +146,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234::1234:1234:1234", @@ -170,13 +170,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234::1234:1234", @@ -194,13 +194,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234::1234", @@ -218,13 +218,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234:1234::", @@ -242,13 +242,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::1234:1234:1234:1234:1234:1234", @@ -266,13 +266,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234::1234:1234:1234:1234:1234", @@ -290,13 +290,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234::1234:1234:1234:1234", @@ -314,13 +314,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234::1234:1234:1234", @@ -338,13 +338,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234::1234:1234", @@ -362,13 +362,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234::1234", @@ -386,13 +386,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234::", @@ -410,13 +410,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::1234:1234:1234:1234:1234", @@ -434,13 +434,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234::1234:1234:1234:1234", @@ -458,13 +458,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234::1234:1234:1234", @@ -482,13 +482,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234::1234:1234", @@ -506,13 +506,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234::1234", @@ -530,13 +530,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234::", @@ -554,13 +554,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::1234:1234:1234:1234", @@ -578,13 +578,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234::1234:1234:1234", @@ -602,13 +602,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234::1234:1234", @@ -626,13 +626,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234::1234", @@ -650,13 +650,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234::", @@ -674,13 +674,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::1234:1234:1234", @@ -698,13 +698,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234::1234:1234", @@ -722,13 +722,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234::1234", @@ -746,13 +746,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234::", @@ -770,13 +770,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::1234:1234", @@ -794,13 +794,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234::1234", @@ -818,13 +818,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234::", @@ -842,13 +842,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::1234", @@ -866,13 +866,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234::", @@ -890,13 +890,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ { @@ -919,13 +919,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234:aaaa::", @@ -949,13 +949,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234:aaaa::", @@ -979,13 +979,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234:aaaa::", @@ -1009,13 +1009,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234:aaaa::", diff --git a/tests/py/ip6/vmap.t.json.output b/tests/py/ip6/vmap.t.json.output index a0ec0c91..affe383b 100644 --- a/tests/py/ip6/vmap.t.json.output +++ b/tests/py/ip6/vmap.t.json.output @@ -2,13 +2,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "0:1234:1234:1234:1234:1234:1234:1234", @@ -26,13 +26,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:0:1234:1234:1234:1234:1234:1234", @@ -50,13 +50,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:0:1234:1234:1234:1234:1234", @@ -74,13 +74,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:0:1234:1234:1234:1234", @@ -98,13 +98,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:0:1234:1234:1234", @@ -122,13 +122,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:0:1234:1234", @@ -146,13 +146,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234:0:1234", @@ -170,13 +170,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "1234:1234:1234:1234:1234:1234:1234:0", @@ -194,13 +194,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::18.52.18.52", @@ -218,13 +218,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::aaaa", @@ -248,13 +248,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::bbbb", @@ -278,13 +278,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::cccc", @@ -308,13 +308,13 @@ [ { "vmap": { - "left": { + "key": { "payload": { "field": "saddr", "protocol": "ip6" } }, - "right": { + "data": { "set": [ [ "::dddd", |