summaryrefslogtreecommitdiffstats
path: root/tests/shell
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2025-05-08 16:39:24 +0200
committerPhil Sutter <phil@nwl.cc>2025-05-13 10:48:53 +0200
commit6bedb12af1658562f277ca68d74cf1e9e7433a08 (patch)
treed71175d9428fd39992b5625d76f2bdfb9da245c9 /tests/shell
parent1b3c33a7931967fb7afe4efdf68deb7781786489 (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')
-rw-r--r--tests/shell/testcases/cache/dumps/0002_interval_0.json-nft4
-rw-r--r--tests/shell/testcases/json/dumps/0001set_statements_0.json-nft4
-rw-r--r--tests/shell/testcases/listing/dumps/0010sets_0.json-nft8
-rw-r--r--tests/shell/testcases/listing/dumps/0012sets_0.json-nft8
-rw-r--r--tests/shell/testcases/listing/dumps/0022terse_0.json-nft4
-rw-r--r--tests/shell/testcases/maps/dumps/0005interval_map_add_many_elements_0.json-nft4
-rw-r--r--tests/shell/testcases/maps/dumps/0006interval_map_overlap_0.json-nft4
-rw-r--r--tests/shell/testcases/maps/dumps/0008interval_map_delete_0.json-nft4
-rw-r--r--tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft4
-rw-r--r--tests/shell/testcases/maps/dumps/0013map_0.json-nft4
-rw-r--r--tests/shell/testcases/maps/dumps/map_with_flags_0.json-nft4
-rw-r--r--tests/shell/testcases/maps/dumps/named_limits.json-nft8
-rw-r--r--tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft4
-rw-r--r--tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft4
-rw-r--r--tests/shell/testcases/maps/dumps/typeof_maps_update_0.json-nft8
-rw-r--r--tests/shell/testcases/maps/dumps/vmap_timeout.json-nft8
-rw-r--r--tests/shell/testcases/nft-f/dumps/0025empty_dynset_0.json-nft12
-rw-r--r--tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft4
-rw-r--r--tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft4
-rw-r--r--tests/shell/testcases/packetpath/dumps/set_lookups.json-nft8
-rw-r--r--tests/shell/testcases/rule_management/dumps/0004replace_0.json-nft4
-rw-r--r--tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft16
-rw-r--r--tests/shell/testcases/sets/dumps/0002named_interval_automerging_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0004named_interval_shadow_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0005named_interval_shadow_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0008comments_interval_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0009comments_timeout_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0015rulesetflush_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0024synproxy_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0027ipv6_maps_ipv4_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft12
-rw-r--r--tests/shell/testcases/sets/dumps/0028delete_handle_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0032restore_set_simple_0.json-nft8
-rw-r--r--tests/shell/testcases/sets/dumps/0033add_set_simple_flat_0.json-nft8
-rw-r--r--tests/shell/testcases/sets/dumps/0034get_element_0.json-nft12
-rw-r--r--tests/shell/testcases/sets/dumps/0035add_set_elements_flat_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0039delete_interval_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0040get_host_endian_elements_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0041interval_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0042update_set_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0043concatenated_ranges_1.json-nft8
-rw-r--r--tests/shell/testcases/sets/dumps/0044interval_overlap_1.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0049set_define_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0051set_interval_counter_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0052overlap_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0054comments_set_0.json-nft8
-rw-r--r--tests/shell/testcases/sets/dumps/0055tcpflags_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0062set_connlimit_0.json-nft8
-rw-r--r--tests/shell/testcases/sets/dumps/0063set_catchall_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0069interval_merge_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0071unclosed_prefix_interval_0.json-nft8
-rw-r--r--tests/shell/testcases/sets/dumps/0073flat_interval_set.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/0074nested_interval_set.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/concat_interval_0.json-nft8
-rw-r--r--tests/shell/testcases/sets/dumps/dynset_missing.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/exact_overlap_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/inner_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/meter_set_reuse.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/range_with_same_start_end.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/set_element_timeout_updates.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/set_eval_0.json-nft4
-rw-r--r--tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft12
-rw-r--r--tests/shell/testcases/transactions/dumps/0037set_0.json-nft4
-rw-r--r--tests/shell/testcases/transactions/dumps/0038set_0.json-nft4
-rw-r--r--tests/shell/testcases/transactions/dumps/0039set_0.json-nft4
-rw-r--r--tests/shell/testcases/transactions/dumps/0047set_0.json-nft4
-rw-r--r--tests/shell/testcases/transactions/dumps/doubled-set.json-nft4
72 files changed, 96 insertions, 288 deletions
diff --git a/tests/shell/testcases/cache/dumps/0002_interval_0.json-nft b/tests/shell/testcases/cache/dumps/0002_interval_0.json-nft
index fa15d658..5e2b9b42 100644
--- a/tests/shell/testcases/cache/dumps/0002_interval_0.json-nft
+++ b/tests/shell/testcases/cache/dumps/0002_interval_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/json/dumps/0001set_statements_0.json-nft b/tests/shell/testcases/json/dumps/0001set_statements_0.json-nft
index 91db43e2..ecc7eade 100644
--- a/tests/shell/testcases/json/dumps/0001set_statements_0.json-nft
+++ b/tests/shell/testcases/json/dumps/0001set_statements_0.json-nft
@@ -34,9 +34,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
diff --git a/tests/shell/testcases/listing/dumps/0010sets_0.json-nft b/tests/shell/testcases/listing/dumps/0010sets_0.json-nft
index efca892e..6aa99b4e 100644
--- a/tests/shell/testcases/listing/dumps/0010sets_0.json-nft
+++ b/tests/shell/testcases/listing/dumps/0010sets_0.json-nft
@@ -62,9 +62,7 @@
"table": "test_arp",
"type": "inet_service",
"handle": 0,
- "flags": [
- "constant"
- ]
+ "flags": "constant"
}
},
{
@@ -106,9 +104,7 @@
"table": "filter",
"type": "inet_service",
"handle": 0,
- "flags": [
- "constant"
- ]
+ "flags": "constant"
}
},
{
diff --git a/tests/shell/testcases/listing/dumps/0012sets_0.json-nft b/tests/shell/testcases/listing/dumps/0012sets_0.json-nft
index efca892e..6aa99b4e 100644
--- a/tests/shell/testcases/listing/dumps/0012sets_0.json-nft
+++ b/tests/shell/testcases/listing/dumps/0012sets_0.json-nft
@@ -62,9 +62,7 @@
"table": "test_arp",
"type": "inet_service",
"handle": 0,
- "flags": [
- "constant"
- ]
+ "flags": "constant"
}
},
{
@@ -106,9 +104,7 @@
"table": "filter",
"type": "inet_service",
"handle": 0,
- "flags": [
- "constant"
- ]
+ "flags": "constant"
}
},
{
diff --git a/tests/shell/testcases/listing/dumps/0022terse_0.json-nft b/tests/shell/testcases/listing/dumps/0022terse_0.json-nft
index bd6383da..1a33d688 100644
--- a/tests/shell/testcases/listing/dumps/0022terse_0.json-nft
+++ b/tests/shell/testcases/listing/dumps/0022terse_0.json-nft
@@ -33,9 +33,7 @@
"table": "filter",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
"10.10.10.10",
"10.10.11.11"
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": [
[
diff --git a/tests/shell/testcases/nft-f/dumps/0025empty_dynset_0.json-nft b/tests/shell/testcases/nft-f/dumps/0025empty_dynset_0.json-nft
index 0cde23b0..63d67641 100644
--- a/tests/shell/testcases/nft-f/dumps/0025empty_dynset_0.json-nft
+++ b/tests/shell/testcases/nft-f/dumps/0025empty_dynset_0.json-nft
@@ -27,9 +27,7 @@
"inet_service"
],
"handle": 0,
- "flags": [
- "dynamic"
- ],
+ "flags": "dynamic",
"elem": [
{
"elem": {
@@ -64,9 +62,7 @@
"inet_service"
],
"handle": 0,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
@@ -82,9 +78,7 @@
"inet_service"
],
"handle": 0,
- "flags": [
- "dynamic"
- ],
+ "flags": "dynamic",
"elem": [
{
"elem": {
diff --git a/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft b/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft
index e87f1c4c..f058d6f1 100644
--- a/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft
@@ -46,9 +46,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
diff --git a/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft b/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft
index d6347b1e..bf5a8cec 100644
--- a/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft
+++ b/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft
@@ -29,9 +29,7 @@
"table": "x",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft b/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft
index bcf6914e..23f4b17f 100644
--- a/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft
+++ b/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft
@@ -36,9 +36,7 @@
"iface_index"
],
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"concat": [
@@ -113,9 +111,7 @@
"table": "t",
"type": "iface_index",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
"lo"
]
diff --git a/tests/shell/testcases/rule_management/dumps/0004replace_0.json-nft b/tests/shell/testcases/rule_management/dumps/0004replace_0.json-nft
index 767e80f1..811cb738 100644
--- a/tests/shell/testcases/rule_management/dumps/0004replace_0.json-nft
+++ b/tests/shell/testcases/rule_management/dumps/0004replace_0.json-nft
@@ -38,9 +38,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ]
+ "flags": "interval"
}
},
{
diff --git a/tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft b/tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft
index bc242467..e57dee79 100644
--- a/tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft
+++ b/tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft
@@ -38,9 +38,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ],
+ "flags": "dynamic",
"elem": [
{
"elem": {
diff --git a/tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft b/tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft
index b9c66a21..9200154a 100644
--- a/tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft
@@ -29,9 +29,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"range": [
@@ -55,9 +53,7 @@
"table": "t",
"type": "ipv6_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
@@ -81,9 +77,7 @@
"table": "t",
"type": "inet_proto",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"range": [
@@ -107,9 +101,7 @@
"table": "t",
"type": "inet_service",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"range": [
diff --git a/tests/shell/testcases/sets/dumps/0002named_interval_automerging_0.json-nft b/tests/shell/testcases/sets/dumps/0002named_interval_automerging_0.json-nft
index 4c0be670..b083ecb5 100644
--- a/tests/shell/testcases/sets/dumps/0002named_interval_automerging_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0002named_interval_automerging_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/sets/dumps/0004named_interval_shadow_0.json-nft b/tests/shell/testcases/sets/dumps/0004named_interval_shadow_0.json-nft
index c55858fa..c79d9ba8 100644
--- a/tests/shell/testcases/sets/dumps/0004named_interval_shadow_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0004named_interval_shadow_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv6_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/sets/dumps/0005named_interval_shadow_0.json-nft b/tests/shell/testcases/sets/dumps/0005named_interval_shadow_0.json-nft
index a75681f3..464661e6 100644
--- a/tests/shell/testcases/sets/dumps/0005named_interval_shadow_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0005named_interval_shadow_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv6_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/sets/dumps/0008comments_interval_0.json-nft b/tests/shell/testcases/sets/dumps/0008comments_interval_0.json-nft
index c6f5aa68..e7152413 100644
--- a/tests/shell/testcases/sets/dumps/0008comments_interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0008comments_interval_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"elem": {
diff --git a/tests/shell/testcases/sets/dumps/0009comments_timeout_0.json-nft b/tests/shell/testcases/sets/dumps/0009comments_timeout_0.json-nft
index 2418b39a..a67a0670 100644
--- a/tests/shell/testcases/sets/dumps/0009comments_timeout_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0009comments_timeout_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "timeout"
- ],
+ "flags": "timeout",
"elem": [
{
"elem": {
diff --git a/tests/shell/testcases/sets/dumps/0015rulesetflush_0.json-nft b/tests/shell/testcases/sets/dumps/0015rulesetflush_0.json-nft
index 6268e216..86d7eb6a 100644
--- a/tests/shell/testcases/sets/dumps/0015rulesetflush_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0015rulesetflush_0.json-nft
@@ -36,9 +36,7 @@
"table": "filter",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft b/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft
index c6171392..dcb62eb7 100644
--- a/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft
@@ -49,9 +49,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 1024,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
diff --git a/tests/shell/testcases/sets/dumps/0024synproxy_0.json-nft b/tests/shell/testcases/sets/dumps/0024synproxy_0.json-nft
index 0af61333..dd71bb39 100644
--- a/tests/shell/testcases/sets/dumps/0024synproxy_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0024synproxy_0.json-nft
@@ -58,9 +58,7 @@
"type": "ipv4_addr",
"handle": 0,
"map": "synproxy",
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
[
{
diff --git a/tests/shell/testcases/sets/dumps/0027ipv6_maps_ipv4_0.json-nft b/tests/shell/testcases/sets/dumps/0027ipv6_maps_ipv4_0.json-nft
index b9251ffa..75d8b46d 100644
--- a/tests/shell/testcases/sets/dumps/0027ipv6_maps_ipv4_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0027ipv6_maps_ipv4_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv6_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft b/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft
index 5968b2e0..05fc072c 100644
--- a/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft
@@ -34,9 +34,7 @@
"type": "inet_proto",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
@@ -47,9 +45,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
@@ -60,9 +56,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 1024,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
diff --git a/tests/shell/testcases/sets/dumps/0028delete_handle_0.json-nft b/tests/shell/testcases/sets/dumps/0028delete_handle_0.json-nft
index 96314141..9e5f708d 100644
--- a/tests/shell/testcases/sets/dumps/0028delete_handle_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0028delete_handle_0.json-nft
@@ -30,9 +30,7 @@
"table": "test-ip",
"type": "inet_service",
"handle": 0,
- "flags": [
- "timeout"
- ],
+ "flags": "timeout",
"timeout": 10845
}
},
diff --git a/tests/shell/testcases/sets/dumps/0032restore_set_simple_0.json-nft b/tests/shell/testcases/sets/dumps/0032restore_set_simple_0.json-nft
index 4d194bff..7a723150 100644
--- a/tests/shell/testcases/sets/dumps/0032restore_set_simple_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0032restore_set_simple_0.json-nft
@@ -25,9 +25,7 @@
"ipv4_addr"
],
"handle": 0,
- "flags": [
- "timeout"
- ]
+ "flags": "timeout"
}
},
{
@@ -40,9 +38,7 @@
"inet_service"
],
"handle": 0,
- "flags": [
- "timeout"
- ]
+ "flags": "timeout"
}
}
]
diff --git a/tests/shell/testcases/sets/dumps/0033add_set_simple_flat_0.json-nft b/tests/shell/testcases/sets/dumps/0033add_set_simple_flat_0.json-nft
index 16684438..56976528 100644
--- a/tests/shell/testcases/sets/dumps/0033add_set_simple_flat_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0033add_set_simple_flat_0.json-nft
@@ -25,9 +25,7 @@
"ipv4_addr"
],
"handle": 0,
- "flags": [
- "timeout"
- ]
+ "flags": "timeout"
}
},
{
@@ -40,9 +38,7 @@
"inet_service"
],
"handle": 0,
- "flags": [
- "timeout"
- ]
+ "flags": "timeout"
}
}
]
diff --git a/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft b/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft
index bfc0e4a0..4f5ba0aa 100644
--- a/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "inet_service",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
10,
{
@@ -49,9 +47,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
"10.0.0.1",
{
@@ -91,9 +87,7 @@
"inet_service"
],
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"concat": [
diff --git a/tests/shell/testcases/sets/dumps/0035add_set_elements_flat_0.json-nft b/tests/shell/testcases/sets/dumps/0035add_set_elements_flat_0.json-nft
index e4c77147..f9fe4e6f 100644
--- a/tests/shell/testcases/sets/dumps/0035add_set_elements_flat_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0035add_set_elements_flat_0.json-nft
@@ -21,9 +21,7 @@
"table": "x",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ]
+ "flags": "interval"
}
}
]
diff --git a/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft b/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
index 5b13f59a..6f6555d2 100644
--- a/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
@@ -44,9 +44,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 128,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
diff --git a/tests/shell/testcases/sets/dumps/0039delete_interval_0.json-nft b/tests/shell/testcases/sets/dumps/0039delete_interval_0.json-nft
index d6e46aad..afa81958 100644
--- a/tests/shell/testcases/sets/dumps/0039delete_interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0039delete_interval_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"range": [
diff --git a/tests/shell/testcases/sets/dumps/0040get_host_endian_elements_0.json-nft b/tests/shell/testcases/sets/dumps/0040get_host_endian_elements_0.json-nft
index 4b6cf03c..486ca453 100644
--- a/tests/shell/testcases/sets/dumps/0040get_host_endian_elements_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0040get_host_endian_elements_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "mark",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"range": [
diff --git a/tests/shell/testcases/sets/dumps/0041interval_0.json-nft b/tests/shell/testcases/sets/dumps/0041interval_0.json-nft
index 14a39330..c59a65ae 100644
--- a/tests/shell/testcases/sets/dumps/0041interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0041interval_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
"192.168.2.196"
]
diff --git a/tests/shell/testcases/sets/dumps/0042update_set_0.json-nft b/tests/shell/testcases/sets/dumps/0042update_set_0.json-nft
index bc1d4cc2..3f98e120 100644
--- a/tests/shell/testcases/sets/dumps/0042update_set_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0042update_set_0.json-nft
@@ -39,9 +39,7 @@
"type": "ether_addr",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
diff --git a/tests/shell/testcases/sets/dumps/0043concatenated_ranges_1.json-nft b/tests/shell/testcases/sets/dumps/0043concatenated_ranges_1.json-nft
index 92b59c86..5ce063d7 100644
--- a/tests/shell/testcases/sets/dumps/0043concatenated_ranges_1.json-nft
+++ b/tests/shell/testcases/sets/dumps/0043concatenated_ranges_1.json-nft
@@ -24,9 +24,7 @@
"ipv6_addr"
],
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"concat": [
@@ -1584,9 +1582,7 @@
"ipv4_addr"
],
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"concat": [
diff --git a/tests/shell/testcases/sets/dumps/0044interval_overlap_1.json-nft b/tests/shell/testcases/sets/dumps/0044interval_overlap_1.json-nft
index f4aae383..8f82990a 100644
--- a/tests/shell/testcases/sets/dumps/0044interval_overlap_1.json-nft
+++ b/tests/shell/testcases/sets/dumps/0044interval_overlap_1.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "inet_service",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
25,
30,
diff --git a/tests/shell/testcases/sets/dumps/0049set_define_0.json-nft b/tests/shell/testcases/sets/dumps/0049set_define_0.json-nft
index f8495bab..98ccafd4 100644
--- a/tests/shell/testcases/sets/dumps/0049set_define_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0049set_define_0.json-nft
@@ -33,9 +33,7 @@
"table": "filter",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"auto-merge": true,
"elem": [
"1.1.1.1"
diff --git a/tests/shell/testcases/sets/dumps/0051set_interval_counter_0.json-nft b/tests/shell/testcases/sets/dumps/0051set_interval_counter_0.json-nft
index b468b5f9..96cb397f 100644
--- a/tests/shell/testcases/sets/dumps/0051set_interval_counter_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0051set_interval_counter_0.json-nft
@@ -33,9 +33,7 @@
"table": "x",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"elem": {
diff --git a/tests/shell/testcases/sets/dumps/0052overlap_0.json-nft b/tests/shell/testcases/sets/dumps/0052overlap_0.json-nft
index 96d5fbcc..1ea8ede6 100644
--- a/tests/shell/testcases/sets/dumps/0052overlap_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0052overlap_0.json-nft
@@ -21,9 +21,7 @@
"table": "filter",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"auto-merge": true,
"elem": [
"10.10.10.10",
diff --git a/tests/shell/testcases/sets/dumps/0054comments_set_0.json-nft b/tests/shell/testcases/sets/dumps/0054comments_set_0.json-nft
index 3fd6d37e..a7293922 100644
--- a/tests/shell/testcases/sets/dumps/0054comments_set_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0054comments_set_0.json-nft
@@ -22,9 +22,7 @@
"type": "ipv4_addr",
"handle": 0,
"comment": "test",
- "flags": [
- "interval"
- ]
+ "flags": "interval"
}
},
{
@@ -36,9 +34,7 @@
"handle": 0,
"comment": "another test",
"map": "ipv4_addr",
- "flags": [
- "interval"
- ]
+ "flags": "interval"
}
}
]
diff --git a/tests/shell/testcases/sets/dumps/0055tcpflags_0.json-nft b/tests/shell/testcases/sets/dumps/0055tcpflags_0.json-nft
index e37139f3..0232ad6f 100644
--- a/tests/shell/testcases/sets/dumps/0055tcpflags_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0055tcpflags_0.json-nft
@@ -21,9 +21,7 @@
"table": "test",
"type": "tcp_flag",
"handle": 0,
- "flags": [
- "constant"
- ],
+ "flags": "constant",
"elem": [
{
"|": [
diff --git a/tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft b/tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft
index 6098dc56..99805e55 100644
--- a/tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft
+++ b/tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft
@@ -34,9 +34,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ],
+ "flags": "dynamic",
"elem": [
{
"elem": {
diff --git a/tests/shell/testcases/sets/dumps/0062set_connlimit_0.json-nft b/tests/shell/testcases/sets/dumps/0062set_connlimit_0.json-nft
index c5e60e36..7a948b1d 100644
--- a/tests/shell/testcases/sets/dumps/0062set_connlimit_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0062set_connlimit_0.json-nft
@@ -22,9 +22,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
@@ -35,9 +33,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ],
+ "flags": "dynamic",
"stmt": [
{
"ct count": {
diff --git a/tests/shell/testcases/sets/dumps/0063set_catchall_0.json-nft b/tests/shell/testcases/sets/dumps/0063set_catchall_0.json-nft
index 3006f75a..fcfe9830 100644
--- a/tests/shell/testcases/sets/dumps/0063set_catchall_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0063set_catchall_0.json-nft
@@ -55,9 +55,7 @@
"table": "x",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"elem": {
diff --git a/tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft b/tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft
index 64dd2667..b7496ac8 100644
--- a/tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft
@@ -50,9 +50,7 @@
"type": "ipv4_addr",
"handle": 0,
"map": "ipv4_addr",
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
[
{
diff --git a/tests/shell/testcases/sets/dumps/0069interval_merge_0.json-nft b/tests/shell/testcases/sets/dumps/0069interval_merge_0.json-nft
index d7b32f8c..7868cb33 100644
--- a/tests/shell/testcases/sets/dumps/0069interval_merge_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0069interval_merge_0.json-nft
@@ -21,9 +21,7 @@
"table": "x",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"auto-merge": true,
"elem": [
{
diff --git a/tests/shell/testcases/sets/dumps/0071unclosed_prefix_interval_0.json-nft b/tests/shell/testcases/sets/dumps/0071unclosed_prefix_interval_0.json-nft
index 6b579a2e..588c2b1b 100644
--- a/tests/shell/testcases/sets/dumps/0071unclosed_prefix_interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0071unclosed_prefix_interval_0.json-nft
@@ -29,9 +29,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
@@ -55,9 +53,7 @@
"table": "t",
"type": "ipv6_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/sets/dumps/0073flat_interval_set.json-nft b/tests/shell/testcases/sets/dumps/0073flat_interval_set.json-nft
index e2fb6214..e4649a7d 100644
--- a/tests/shell/testcases/sets/dumps/0073flat_interval_set.json-nft
+++ b/tests/shell/testcases/sets/dumps/0073flat_interval_set.json-nft
@@ -32,9 +32,7 @@
"type": "ipv4_addr",
"handle": 0,
"map": "counter",
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
[
{
diff --git a/tests/shell/testcases/sets/dumps/0074nested_interval_set.json-nft b/tests/shell/testcases/sets/dumps/0074nested_interval_set.json-nft
index e2fb6214..e4649a7d 100644
--- a/tests/shell/testcases/sets/dumps/0074nested_interval_set.json-nft
+++ b/tests/shell/testcases/sets/dumps/0074nested_interval_set.json-nft
@@ -32,9 +32,7 @@
"type": "ipv4_addr",
"handle": 0,
"map": "counter",
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
[
{
diff --git a/tests/shell/testcases/sets/dumps/concat_interval_0.json-nft b/tests/shell/testcases/sets/dumps/concat_interval_0.json-nft
index d65065e4..3283f269 100644
--- a/tests/shell/testcases/sets/dumps/concat_interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/concat_interval_0.json-nft
@@ -25,9 +25,7 @@
"inet_service"
],
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"stmt": [
{
"counter": null
@@ -45,9 +43,7 @@
"mark"
],
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"concat": [
diff --git a/tests/shell/testcases/sets/dumps/dynset_missing.json-nft b/tests/shell/testcases/sets/dumps/dynset_missing.json-nft
index ad8a7cc0..9de5b821 100644
--- a/tests/shell/testcases/sets/dumps/dynset_missing.json-nft
+++ b/tests/shell/testcases/sets/dumps/dynset_missing.json-nft
@@ -34,9 +34,7 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
diff --git a/tests/shell/testcases/sets/dumps/exact_overlap_0.json-nft b/tests/shell/testcases/sets/dumps/exact_overlap_0.json-nft
index 958d1e5c..7bba69d5 100644
--- a/tests/shell/testcases/sets/dumps/exact_overlap_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/exact_overlap_0.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/sets/dumps/inner_0.json-nft b/tests/shell/testcases/sets/dumps/inner_0.json-nft
index e5dc198f..581d5340 100644
--- a/tests/shell/testcases/sets/dumps/inner_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/inner_0.json-nft
@@ -74,9 +74,7 @@
},
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
diff --git a/tests/shell/testcases/sets/dumps/meter_set_reuse.json-nft b/tests/shell/testcases/sets/dumps/meter_set_reuse.json-nft
index ab4ac061..9210c90b 100644
--- a/tests/shell/testcases/sets/dumps/meter_set_reuse.json-nft
+++ b/tests/shell/testcases/sets/dumps/meter_set_reuse.json-nft
@@ -33,9 +33,7 @@
],
"handle": 0,
"size": 65535,
- "flags": [
- "dynamic"
- ]
+ "flags": "dynamic"
}
},
{
diff --git a/tests/shell/testcases/sets/dumps/range_with_same_start_end.json-nft b/tests/shell/testcases/sets/dumps/range_with_same_start_end.json-nft
index c4682475..e1daa8f8 100644
--- a/tests/shell/testcases/sets/dumps/range_with_same_start_end.json-nft
+++ b/tests/shell/testcases/sets/dumps/range_with_same_start_end.json-nft
@@ -21,9 +21,7 @@
"table": "t",
"type": "inet_service",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
10,
30,
diff --git a/tests/shell/testcases/sets/dumps/set_element_timeout_updates.json-nft b/tests/shell/testcases/sets/dumps/set_element_timeout_updates.json-nft
index d92d8d7a..acb2f1f4 100644
--- a/tests/shell/testcases/sets/dumps/set_element_timeout_updates.json-nft
+++ b/tests/shell/testcases/sets/dumps/set_element_timeout_updates.json-nft
@@ -40,9 +40,7 @@
}
},
"handle": 0,
- "flags": [
- "timeout"
- ],
+ "flags": "timeout",
"timeout": 60
}
}
diff --git a/tests/shell/testcases/sets/dumps/set_eval_0.json-nft b/tests/shell/testcases/sets/dumps/set_eval_0.json-nft
index 6f692381..6f4f4c61 100644
--- a/tests/shell/testcases/sets/dumps/set_eval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/set_eval_0.json-nft
@@ -33,9 +33,7 @@
"table": "nat",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ]
+ "flags": "interval"
}
},
{
diff --git a/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft b/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft
index ac428429..77ca5086 100644
--- a/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft
+++ b/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft
@@ -71,9 +71,7 @@
"table": "testifsets",
"type": "ifname",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
"abcdef*",
"othername",
@@ -117,9 +115,7 @@
"ifname"
],
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"concat": [
@@ -166,9 +162,7 @@
"type": "ifname",
"handle": 0,
"map": "verdict",
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
[
"abcdef*",
diff --git a/tests/shell/testcases/transactions/dumps/0037set_0.json-nft b/tests/shell/testcases/transactions/dumps/0037set_0.json-nft
index e4c77147..f9fe4e6f 100644
--- a/tests/shell/testcases/transactions/dumps/0037set_0.json-nft
+++ b/tests/shell/testcases/transactions/dumps/0037set_0.json-nft
@@ -21,9 +21,7 @@
"table": "x",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ]
+ "flags": "interval"
}
}
]
diff --git a/tests/shell/testcases/transactions/dumps/0038set_0.json-nft b/tests/shell/testcases/transactions/dumps/0038set_0.json-nft
index 0a36f4a8..5f97d09e 100644
--- a/tests/shell/testcases/transactions/dumps/0038set_0.json-nft
+++ b/tests/shell/testcases/transactions/dumps/0038set_0.json-nft
@@ -21,9 +21,7 @@
"table": "x",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/transactions/dumps/0039set_0.json-nft b/tests/shell/testcases/transactions/dumps/0039set_0.json-nft
index 0a36f4a8..5f97d09e 100644
--- a/tests/shell/testcases/transactions/dumps/0039set_0.json-nft
+++ b/tests/shell/testcases/transactions/dumps/0039set_0.json-nft
@@ -21,9 +21,7 @@
"table": "x",
"type": "ipv4_addr",
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"prefix": {
diff --git a/tests/shell/testcases/transactions/dumps/0047set_0.json-nft b/tests/shell/testcases/transactions/dumps/0047set_0.json-nft
index a7e677b2..fb6348f2 100644
--- a/tests/shell/testcases/transactions/dumps/0047set_0.json-nft
+++ b/tests/shell/testcases/transactions/dumps/0047set_0.json-nft
@@ -22,9 +22,7 @@
"type": "ipv4_addr",
"handle": 0,
"map": "classid",
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
[
"10.1.26.2",
diff --git a/tests/shell/testcases/transactions/dumps/doubled-set.json-nft b/tests/shell/testcases/transactions/dumps/doubled-set.json-nft
index 2dced124..1b9af211 100644
--- a/tests/shell/testcases/transactions/dumps/doubled-set.json-nft
+++ b/tests/shell/testcases/transactions/dumps/doubled-set.json-nft
@@ -24,9 +24,7 @@
"ifname"
],
"handle": 0,
- "flags": [
- "interval"
- ],
+ "flags": "interval",
"elem": [
{
"concat": [