diff options
author | Phil Sutter <phil@nwl.cc> | 2018-06-08 17:27:13 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-06-11 11:31:49 +0200 |
commit | d4bd008be257cc95b2e9625cc5506b9e925c766d (patch) | |
tree | 07582fa8e876be57b0ff350c78fcabf072753308 /tests/py/ip6 | |
parent | 4e20921ea9200453fbfbec0e9dc891ed37b95a6c (diff) |
JSON: Call verdict maps 'vmap' in JSON as well
This way JSON format is more consistent with the standard one.
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/ip6.t.json | 4 | ||||
-rw-r--r-- | tests/py/ip6/ip6.t.json.output | 2 | ||||
-rw-r--r-- | tests/py/ip6/masquerade.t.json | 2 | ||||
-rw-r--r-- | tests/py/ip6/redirect.t.json | 2 | ||||
-rw-r--r-- | tests/py/ip6/vmap.t.json | 84 | ||||
-rw-r--r-- | tests/py/ip6/vmap.t.json.output | 26 |
6 files changed, 60 insertions, 60 deletions
diff --git a/tests/py/ip6/ip6.t.json b/tests/py/ip6/ip6.t.json index 8e217bb1..272ef0d0 100644 --- a/tests/py/ip6/ip6.t.json +++ b/tests/py/ip6/ip6.t.json @@ -102,7 +102,7 @@ # ip6 dscp vmap { 0x04 : accept, 0x3f : continue } counter [ { - "map": { + "vmap": { "left": { "payload": { "field": "dscp", @@ -250,7 +250,7 @@ # ip6 flowlabel vmap { 0 : accept, 2 : continue } [ { - "map": { + "vmap": { "left": { "payload": { "field": "flowlabel", diff --git a/tests/py/ip6/ip6.t.json.output b/tests/py/ip6/ip6.t.json.output index ea7cf777..6f983533 100644 --- a/tests/py/ip6/ip6.t.json.output +++ b/tests/py/ip6/ip6.t.json.output @@ -71,7 +71,7 @@ # ip6 dscp vmap { 0x04 : accept, 0x3f : continue } counter [ { - "map": { + "vmap": { "left": { "payload": { "field": "dscp", diff --git a/tests/py/ip6/masquerade.t.json b/tests/py/ip6/masquerade.t.json index 65f65ee5..a54761d3 100644 --- a/tests/py/ip6/masquerade.t.json +++ b/tests/py/ip6/masquerade.t.json @@ -373,7 +373,7 @@ } }, { - "map": { + "vmap": { "left": { "payload": { "field": "dport", diff --git a/tests/py/ip6/redirect.t.json b/tests/py/ip6/redirect.t.json index 08d6a086..757fbb60 100644 --- a/tests/py/ip6/redirect.t.json +++ b/tests/py/ip6/redirect.t.json @@ -503,7 +503,7 @@ } }, { - "map": { + "vmap": { "left": { "payload": { "field": "dport", diff --git a/tests/py/ip6/vmap.t.json b/tests/py/ip6/vmap.t.json index 1fbe0093..0dfa0e0d 100644 --- a/tests/py/ip6/vmap.t.json +++ b/tests/py/ip6/vmap.t.json @@ -1,7 +1,7 @@ # ip6 saddr vmap { abcd::3 : accept } [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -25,7 +25,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -49,7 +49,7 @@ # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -73,7 +73,7 @@ # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -97,7 +97,7 @@ # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -121,7 +121,7 @@ # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -145,7 +145,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -169,7 +169,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -193,7 +193,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -217,7 +217,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -241,7 +241,7 @@ # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -265,7 +265,7 @@ # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -289,7 +289,7 @@ # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -313,7 +313,7 @@ # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -337,7 +337,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -361,7 +361,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -385,7 +385,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:: : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -409,7 +409,7 @@ # ip6 saddr vmap { ::1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -433,7 +433,7 @@ # ip6 saddr vmap { 1234::1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -457,7 +457,7 @@ # ip6 saddr vmap { 1234:1234::1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -481,7 +481,7 @@ # ip6 saddr vmap { 1234:1234:1234::1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -505,7 +505,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234::1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -529,7 +529,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234:: : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -553,7 +553,7 @@ # ip6 saddr vmap { ::1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -577,7 +577,7 @@ # ip6 saddr vmap { 1234::1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -601,7 +601,7 @@ # ip6 saddr vmap { 1234:1234::1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -625,7 +625,7 @@ # ip6 saddr vmap { 1234:1234:1234::1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -649,7 +649,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:: : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -673,7 +673,7 @@ # ip6 saddr vmap { ::1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -697,7 +697,7 @@ # ip6 saddr vmap { 1234::1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -721,7 +721,7 @@ # ip6 saddr vmap { 1234:1234::1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -745,7 +745,7 @@ # ip6 saddr vmap { 1234:1234:1234:: : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -769,7 +769,7 @@ # ip6 saddr vmap { ::1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -793,7 +793,7 @@ # ip6 saddr vmap { 1234::1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -817,7 +817,7 @@ # ip6 saddr vmap { 1234:1234:: : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -841,7 +841,7 @@ # ip6 saddr vmap { ::1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -865,7 +865,7 @@ # ip6 saddr vmap { 1234:: : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -889,7 +889,7 @@ # ip6 saddr vmap { ::/64 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -918,7 +918,7 @@ # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -948,7 +948,7 @@ # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -978,7 +978,7 @@ # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -1008,7 +1008,7 @@ # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", diff --git a/tests/py/ip6/vmap.t.json.output b/tests/py/ip6/vmap.t.json.output index aba563fc..3b5bc78e 100644 --- a/tests/py/ip6/vmap.t.json.output +++ b/tests/py/ip6/vmap.t.json.output @@ -1,7 +1,7 @@ # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -25,7 +25,7 @@ # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -49,7 +49,7 @@ # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -73,7 +73,7 @@ # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -97,7 +97,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -121,7 +121,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -145,7 +145,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -169,7 +169,7 @@ # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -193,7 +193,7 @@ # ip6 saddr vmap { ::1234:1234 : accept} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -217,7 +217,7 @@ # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -247,7 +247,7 @@ # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -277,7 +277,7 @@ # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", @@ -307,7 +307,7 @@ # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop} [ { - "map": { + "vmap": { "left": { "payload": { "field": "saddr", |