diff options
| author | Phil Sutter <phil@nwl.cc> | 2025-05-08 16:39:24 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2025-05-13 10:48:53 +0200 |
| commit | 6bedb12af1658562f277ca68d74cf1e9e7433a08 (patch) | |
| tree | d71175d9428fd39992b5625d76f2bdfb9da245c9 /tests/shell/testcases/maps | |
| parent | 1b3c33a7931967fb7afe4efdf68deb7781786489 (diff) | |
json: Print single set flag as non-array
The code obviously intended to do this already but got the array length
check wrong.
Fixes: e70354f53e9f6 ("libnftables: Implement JSON output support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'tests/shell/testcases/maps')
11 files changed, 14 insertions, 42 deletions
diff --git a/tests/shell/testcases/maps/dumps/0005interval_map_add_many_elements_0.json-nft b/tests/shell/testcases/maps/dumps/0005interval_map_add_many_elements_0.json-nft index d1a46295..f9ac5bce 100644 --- a/tests/shell/testcases/maps/dumps/0005interval_map_add_many_elements_0.json-nft +++ b/tests/shell/testcases/maps/dumps/0005interval_map_add_many_elements_0.json-nft @@ -22,9 +22,7 @@ "type": "ipv4_addr", "handle": 0, "map": "ipv4_addr", - "flags": [ - "interval" - ], + "flags": "interval", "elem": [ [ { diff --git a/tests/shell/testcases/maps/dumps/0006interval_map_overlap_0.json-nft b/tests/shell/testcases/maps/dumps/0006interval_map_overlap_0.json-nft index 1e983219..d6b32d0f 100644 --- a/tests/shell/testcases/maps/dumps/0006interval_map_overlap_0.json-nft +++ b/tests/shell/testcases/maps/dumps/0006interval_map_overlap_0.json-nft @@ -22,9 +22,7 @@ "type": "ipv4_addr", "handle": 0, "map": "ipv4_addr", - "flags": [ - "interval" - ], + "flags": "interval", "elem": [ [ { diff --git a/tests/shell/testcases/maps/dumps/0008interval_map_delete_0.json-nft b/tests/shell/testcases/maps/dumps/0008interval_map_delete_0.json-nft index bd3c6cc7..09cb6c85 100644 --- a/tests/shell/testcases/maps/dumps/0008interval_map_delete_0.json-nft +++ b/tests/shell/testcases/maps/dumps/0008interval_map_delete_0.json-nft @@ -34,9 +34,7 @@ "type": "ipv4_addr", "handle": 0, "map": "mark", - "flags": [ - "interval" - ], + "flags": "interval", "elem": [ [ "127.0.0.2", diff --git a/tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft b/tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft index 88bf4984..85384c53 100644 --- a/tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft +++ b/tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft @@ -50,9 +50,7 @@ }, "handle": 0, "map": "verdict", - "flags": [ - "interval" - ], + "flags": "interval", "elem": [ [ { diff --git a/tests/shell/testcases/maps/dumps/0013map_0.json-nft b/tests/shell/testcases/maps/dumps/0013map_0.json-nft index e91a269d..2c8d21b4 100644 --- a/tests/shell/testcases/maps/dumps/0013map_0.json-nft +++ b/tests/shell/testcases/maps/dumps/0013map_0.json-nft @@ -38,9 +38,7 @@ ], "handle": 0, "map": "verdict", - "flags": [ - "interval" - ], + "flags": "interval", "elem": [ [ { diff --git a/tests/shell/testcases/maps/dumps/map_with_flags_0.json-nft b/tests/shell/testcases/maps/dumps/map_with_flags_0.json-nft index 97b7e94e..94ec5f75 100644 --- a/tests/shell/testcases/maps/dumps/map_with_flags_0.json-nft +++ b/tests/shell/testcases/maps/dumps/map_with_flags_0.json-nft @@ -22,9 +22,7 @@ "type": "ipv4_addr", "handle": 0, "map": "ipv4_addr", - "flags": [ - "timeout" - ] + "flags": "timeout" } } ] diff --git a/tests/shell/testcases/maps/dumps/named_limits.json-nft b/tests/shell/testcases/maps/dumps/named_limits.json-nft index 3c6845ac..07e28929 100644 --- a/tests/shell/testcases/maps/dumps/named_limits.json-nft +++ b/tests/shell/testcases/maps/dumps/named_limits.json-nft @@ -144,9 +144,7 @@ }, "handle": 0, "map": "limit", - "flags": [ - "interval" - ], + "flags": "interval", "elem": [ [ { @@ -286,9 +284,7 @@ }, "handle": 0, "map": "limit", - "flags": [ - "interval" - ], + "flags": "interval", "elem": [ [ { diff --git a/tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft b/tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft index ef8c3930..dc793a65 100644 --- a/tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft +++ b/tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft @@ -33,9 +33,7 @@ ], "handle": 0, "map": "verdict", - "flags": [ - "interval" - ] + "flags": "interval" } } ] diff --git a/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft b/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft index effe02dc..8b18a78d 100644 --- a/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft +++ b/tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft @@ -50,9 +50,7 @@ "handle": 0, "map": "mark", "size": 64, - "flags": [ - "timeout" - ], + "flags": "timeout", "timeout": 300, "stmt": [ { diff --git a/tests/shell/testcases/maps/dumps/typeof_maps_update_0.json-nft b/tests/shell/testcases/maps/dumps/typeof_maps_update_0.json-nft index 73151466..b79237d0 100644 --- a/tests/shell/testcases/maps/dumps/typeof_maps_update_0.json-nft +++ b/tests/shell/testcases/maps/dumps/typeof_maps_update_0.json-nft @@ -39,9 +39,7 @@ "handle": 0, "map": "mark", "size": 65535, - "flags": [ - "timeout" - ], + "flags": "timeout", "timeout": 360 } }, @@ -61,9 +59,7 @@ "handle": 0, "map": "mark", "size": 65535, - "flags": [ - "timeout" - ], + "flags": "timeout", "timeout": 60 } }, diff --git a/tests/shell/testcases/maps/dumps/vmap_timeout.json-nft b/tests/shell/testcases/maps/dumps/vmap_timeout.json-nft index 71e9a9ee..2d7d8cc2 100644 --- a/tests/shell/testcases/maps/dumps/vmap_timeout.json-nft +++ b/tests/shell/testcases/maps/dumps/vmap_timeout.json-nft @@ -66,9 +66,7 @@ "type": "inet_service", "handle": 0, "map": "verdict", - "flags": [ - "timeout" - ], + "flags": "timeout", "gc-interval": 10, "elem": [ [ @@ -107,9 +105,7 @@ }, "handle": 0, "map": "verdict", - "flags": [ - "timeout" - ], + "flags": "timeout", "gc-interval": 10, "elem": [ [ |