summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2025-06-18 21:55:51 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2025-07-29 03:09:03 +0200
commit0a31551e15e7cb8b93524696b9bf9783a0035c55 (patch)
tree50fbb944c68e5a1e054e050853e3ccf0c9405c86
parent249c6979819a5f061b24e53c2f2bd5dab679da0d (diff)
Revert "json: Print single set flag as non-array"
This reverts commit 6bedb12af1658562f277ca68d74cf1e9e7433a08. This more compact json representation for flags is not present in 1.0.6.y
-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, 288 insertions, 96 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 5e2b9b42..fa15d658 100644
--- a/tests/shell/testcases/cache/dumps/0002_interval_0.json-nft
+++ b/tests/shell/testcases/cache/dumps/0002_interval_0.json-nft
@@ -21,7 +21,9 @@
"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 ecc7eade..91db43e2 100644
--- a/tests/shell/testcases/json/dumps/0001set_statements_0.json-nft
+++ b/tests/shell/testcases/json/dumps/0001set_statements_0.json-nft
@@ -34,7 +34,9 @@
"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 6aa99b4e..efca892e 100644
--- a/tests/shell/testcases/listing/dumps/0010sets_0.json-nft
+++ b/tests/shell/testcases/listing/dumps/0010sets_0.json-nft
@@ -62,7 +62,9 @@
"table": "test_arp",
"type": "inet_service",
"handle": 0,
- "flags": "constant"
+ "flags": [
+ "constant"
+ ]
}
},
{
@@ -104,7 +106,9 @@
"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 6aa99b4e..efca892e 100644
--- a/tests/shell/testcases/listing/dumps/0012sets_0.json-nft
+++ b/tests/shell/testcases/listing/dumps/0012sets_0.json-nft
@@ -62,7 +62,9 @@
"table": "test_arp",
"type": "inet_service",
"handle": 0,
- "flags": "constant"
+ "flags": [
+ "constant"
+ ]
}
},
{
@@ -104,7 +106,9 @@
"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 1a33d688..bd6383da 100644
--- a/tests/shell/testcases/listing/dumps/0022terse_0.json-nft
+++ b/tests/shell/testcases/listing/dumps/0022terse_0.json-nft
@@ -33,7 +33,9 @@
"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 f9ac5bce..d1a46295 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,7 +22,9 @@
"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 d6b32d0f..1e983219 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,7 +22,9 @@
"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 09cb6c85..bd3c6cc7 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,7 +34,9 @@
"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 85384c53..88bf4984 100644
--- a/tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft
+++ b/tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft
@@ -50,7 +50,9 @@
},
"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 2c8d21b4..e91a269d 100644
--- a/tests/shell/testcases/maps/dumps/0013map_0.json-nft
+++ b/tests/shell/testcases/maps/dumps/0013map_0.json-nft
@@ -38,7 +38,9 @@
],
"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 94ec5f75..97b7e94e 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,7 +22,9 @@
"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 07e28929..3c6845ac 100644
--- a/tests/shell/testcases/maps/dumps/named_limits.json-nft
+++ b/tests/shell/testcases/maps/dumps/named_limits.json-nft
@@ -144,7 +144,9 @@
},
"handle": 0,
"map": "limit",
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
[
{
@@ -284,7 +286,9 @@
},
"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 dc793a65..ef8c3930 100644
--- a/tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft
+++ b/tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft
@@ -33,7 +33,9 @@
],
"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 8b18a78d..effe02dc 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,7 +50,9 @@
"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 b79237d0..73151466 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,7 +39,9 @@
"handle": 0,
"map": "mark",
"size": 65535,
- "flags": "timeout",
+ "flags": [
+ "timeout"
+ ],
"timeout": 360
}
},
@@ -59,7 +61,9 @@
"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 2d7d8cc2..71e9a9ee 100644
--- a/tests/shell/testcases/maps/dumps/vmap_timeout.json-nft
+++ b/tests/shell/testcases/maps/dumps/vmap_timeout.json-nft
@@ -66,7 +66,9 @@
"type": "inet_service",
"handle": 0,
"map": "verdict",
- "flags": "timeout",
+ "flags": [
+ "timeout"
+ ],
"gc-interval": 10,
"elem": [
[
@@ -105,7 +107,9 @@
},
"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 63d67641..0cde23b0 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,7 +27,9 @@
"inet_service"
],
"handle": 0,
- "flags": "dynamic",
+ "flags": [
+ "dynamic"
+ ],
"elem": [
{
"elem": {
@@ -62,7 +64,9 @@
"inet_service"
],
"handle": 0,
- "flags": "dynamic"
+ "flags": [
+ "dynamic"
+ ]
}
},
{
@@ -78,7 +82,9 @@
"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 f058d6f1..e87f1c4c 100644
--- a/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft
+++ b/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft
@@ -46,7 +46,9 @@
"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 bf5a8cec..d6347b1e 100644
--- a/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft
+++ b/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft
@@ -29,7 +29,9 @@
"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 23f4b17f..bcf6914e 100644
--- a/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft
+++ b/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft
@@ -36,7 +36,9 @@
"iface_index"
],
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
{
"concat": [
@@ -111,7 +113,9 @@
"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 811cb738..767e80f1 100644
--- a/tests/shell/testcases/rule_management/dumps/0004replace_0.json-nft
+++ b/tests/shell/testcases/rule_management/dumps/0004replace_0.json-nft
@@ -38,7 +38,9 @@
"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 e57dee79..bc242467 100644
--- a/tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft
+++ b/tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft
@@ -38,7 +38,9 @@
"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 9200154a..b9c66a21 100644
--- a/tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft
@@ -29,7 +29,9 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
{
"range": [
@@ -53,7 +55,9 @@
"table": "t",
"type": "ipv6_addr",
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
{
"prefix": {
@@ -77,7 +81,9 @@
"table": "t",
"type": "inet_proto",
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
{
"range": [
@@ -101,7 +107,9 @@
"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 b083ecb5..4c0be670 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,7 +21,9 @@
"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 c79d9ba8..c55858fa 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,7 +21,9 @@
"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 464661e6..a75681f3 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,7 +21,9 @@
"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 e7152413..c6f5aa68 100644
--- a/tests/shell/testcases/sets/dumps/0008comments_interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0008comments_interval_0.json-nft
@@ -21,7 +21,9 @@
"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 a67a0670..2418b39a 100644
--- a/tests/shell/testcases/sets/dumps/0009comments_timeout_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0009comments_timeout_0.json-nft
@@ -21,7 +21,9 @@
"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 86d7eb6a..6268e216 100644
--- a/tests/shell/testcases/sets/dumps/0015rulesetflush_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0015rulesetflush_0.json-nft
@@ -36,7 +36,9 @@
"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 dcb62eb7..c6171392 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,7 +49,9 @@
"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 dd71bb39..0af61333 100644
--- a/tests/shell/testcases/sets/dumps/0024synproxy_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0024synproxy_0.json-nft
@@ -58,7 +58,9 @@
"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 75d8b46d..b9251ffa 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,7 +21,9 @@
"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 05fc072c..5968b2e0 100644
--- a/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft
@@ -34,7 +34,9 @@
"type": "inet_proto",
"handle": 0,
"size": 65535,
- "flags": "dynamic"
+ "flags": [
+ "dynamic"
+ ]
}
},
{
@@ -45,7 +47,9 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": "dynamic"
+ "flags": [
+ "dynamic"
+ ]
}
},
{
@@ -56,7 +60,9 @@
"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 9e5f708d..96314141 100644
--- a/tests/shell/testcases/sets/dumps/0028delete_handle_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0028delete_handle_0.json-nft
@@ -30,7 +30,9 @@
"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 7a723150..4d194bff 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,7 +25,9 @@
"ipv4_addr"
],
"handle": 0,
- "flags": "timeout"
+ "flags": [
+ "timeout"
+ ]
}
},
{
@@ -38,7 +40,9 @@
"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 56976528..16684438 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,7 +25,9 @@
"ipv4_addr"
],
"handle": 0,
- "flags": "timeout"
+ "flags": [
+ "timeout"
+ ]
}
},
{
@@ -38,7 +40,9 @@
"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 4f5ba0aa..bfc0e4a0 100644
--- a/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft
@@ -21,7 +21,9 @@
"table": "t",
"type": "inet_service",
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
10,
{
@@ -47,7 +49,9 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
"10.0.0.1",
{
@@ -87,7 +91,9 @@
"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 f9fe4e6f..e4c77147 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,7 +21,9 @@
"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 6f6555d2..5b13f59a 100644
--- a/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
@@ -44,7 +44,9 @@
"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 afa81958..d6e46aad 100644
--- a/tests/shell/testcases/sets/dumps/0039delete_interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0039delete_interval_0.json-nft
@@ -21,7 +21,9 @@
"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 486ca453..4b6cf03c 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,7 +21,9 @@
"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 c59a65ae..14a39330 100644
--- a/tests/shell/testcases/sets/dumps/0041interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0041interval_0.json-nft
@@ -21,7 +21,9 @@
"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 3f98e120..bc1d4cc2 100644
--- a/tests/shell/testcases/sets/dumps/0042update_set_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0042update_set_0.json-nft
@@ -39,7 +39,9 @@
"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 5ce063d7..92b59c86 100644
--- a/tests/shell/testcases/sets/dumps/0043concatenated_ranges_1.json-nft
+++ b/tests/shell/testcases/sets/dumps/0043concatenated_ranges_1.json-nft
@@ -24,7 +24,9 @@
"ipv6_addr"
],
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
{
"concat": [
@@ -1582,7 +1584,9 @@
"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 8f82990a..f4aae383 100644
--- a/tests/shell/testcases/sets/dumps/0044interval_overlap_1.json-nft
+++ b/tests/shell/testcases/sets/dumps/0044interval_overlap_1.json-nft
@@ -21,7 +21,9 @@
"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 98ccafd4..f8495bab 100644
--- a/tests/shell/testcases/sets/dumps/0049set_define_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0049set_define_0.json-nft
@@ -33,7 +33,9 @@
"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 96cb397f..b468b5f9 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,7 +33,9 @@
"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 1ea8ede6..96d5fbcc 100644
--- a/tests/shell/testcases/sets/dumps/0052overlap_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0052overlap_0.json-nft
@@ -21,7 +21,9 @@
"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 a7293922..3fd6d37e 100644
--- a/tests/shell/testcases/sets/dumps/0054comments_set_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0054comments_set_0.json-nft
@@ -22,7 +22,9 @@
"type": "ipv4_addr",
"handle": 0,
"comment": "test",
- "flags": "interval"
+ "flags": [
+ "interval"
+ ]
}
},
{
@@ -34,7 +36,9 @@
"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 0232ad6f..e37139f3 100644
--- a/tests/shell/testcases/sets/dumps/0055tcpflags_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0055tcpflags_0.json-nft
@@ -21,7 +21,9 @@
"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 99805e55..6098dc56 100644
--- a/tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft
+++ b/tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft
@@ -34,7 +34,9 @@
"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 7a948b1d..c5e60e36 100644
--- a/tests/shell/testcases/sets/dumps/0062set_connlimit_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0062set_connlimit_0.json-nft
@@ -22,7 +22,9 @@
"type": "ipv4_addr",
"handle": 0,
"size": 65535,
- "flags": "dynamic"
+ "flags": [
+ "dynamic"
+ ]
}
},
{
@@ -33,7 +35,9 @@
"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 fcfe9830..3006f75a 100644
--- a/tests/shell/testcases/sets/dumps/0063set_catchall_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0063set_catchall_0.json-nft
@@ -55,7 +55,9 @@
"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 b7496ac8..64dd2667 100644
--- a/tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft
@@ -50,7 +50,9 @@
"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 7868cb33..d7b32f8c 100644
--- a/tests/shell/testcases/sets/dumps/0069interval_merge_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0069interval_merge_0.json-nft
@@ -21,7 +21,9 @@
"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 588c2b1b..6b579a2e 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,7 +29,9 @@
"table": "t",
"type": "ipv4_addr",
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
{
"prefix": {
@@ -53,7 +55,9 @@
"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 e4649a7d..e2fb6214 100644
--- a/tests/shell/testcases/sets/dumps/0073flat_interval_set.json-nft
+++ b/tests/shell/testcases/sets/dumps/0073flat_interval_set.json-nft
@@ -32,7 +32,9 @@
"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 e4649a7d..e2fb6214 100644
--- a/tests/shell/testcases/sets/dumps/0074nested_interval_set.json-nft
+++ b/tests/shell/testcases/sets/dumps/0074nested_interval_set.json-nft
@@ -32,7 +32,9 @@
"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 3283f269..d65065e4 100644
--- a/tests/shell/testcases/sets/dumps/concat_interval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/concat_interval_0.json-nft
@@ -25,7 +25,9 @@
"inet_service"
],
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"stmt": [
{
"counter": null
@@ -43,7 +45,9 @@
"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 9de5b821..ad8a7cc0 100644
--- a/tests/shell/testcases/sets/dumps/dynset_missing.json-nft
+++ b/tests/shell/testcases/sets/dumps/dynset_missing.json-nft
@@ -34,7 +34,9 @@
"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 7bba69d5..958d1e5c 100644
--- a/tests/shell/testcases/sets/dumps/exact_overlap_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/exact_overlap_0.json-nft
@@ -21,7 +21,9 @@
"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 581d5340..e5dc198f 100644
--- a/tests/shell/testcases/sets/dumps/inner_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/inner_0.json-nft
@@ -74,7 +74,9 @@
},
"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 9210c90b..ab4ac061 100644
--- a/tests/shell/testcases/sets/dumps/meter_set_reuse.json-nft
+++ b/tests/shell/testcases/sets/dumps/meter_set_reuse.json-nft
@@ -33,7 +33,9 @@
],
"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 e1daa8f8..c4682475 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,7 +21,9 @@
"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 acb2f1f4..d92d8d7a 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,7 +40,9 @@
}
},
"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 6f4f4c61..6f692381 100644
--- a/tests/shell/testcases/sets/dumps/set_eval_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/set_eval_0.json-nft
@@ -33,7 +33,9 @@
"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 77ca5086..ac428429 100644
--- a/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft
+++ b/tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft
@@ -71,7 +71,9 @@
"table": "testifsets",
"type": "ifname",
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
"abcdef*",
"othername",
@@ -115,7 +117,9 @@
"ifname"
],
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
{
"concat": [
@@ -162,7 +166,9 @@
"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 f9fe4e6f..e4c77147 100644
--- a/tests/shell/testcases/transactions/dumps/0037set_0.json-nft
+++ b/tests/shell/testcases/transactions/dumps/0037set_0.json-nft
@@ -21,7 +21,9 @@
"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 5f97d09e..0a36f4a8 100644
--- a/tests/shell/testcases/transactions/dumps/0038set_0.json-nft
+++ b/tests/shell/testcases/transactions/dumps/0038set_0.json-nft
@@ -21,7 +21,9 @@
"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 5f97d09e..0a36f4a8 100644
--- a/tests/shell/testcases/transactions/dumps/0039set_0.json-nft
+++ b/tests/shell/testcases/transactions/dumps/0039set_0.json-nft
@@ -21,7 +21,9 @@
"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 fb6348f2..a7e677b2 100644
--- a/tests/shell/testcases/transactions/dumps/0047set_0.json-nft
+++ b/tests/shell/testcases/transactions/dumps/0047set_0.json-nft
@@ -22,7 +22,9 @@
"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 1b9af211..2dced124 100644
--- a/tests/shell/testcases/transactions/dumps/doubled-set.json-nft
+++ b/tests/shell/testcases/transactions/dumps/doubled-set.json-nft
@@ -24,7 +24,9 @@
"ifname"
],
"handle": 0,
- "flags": "interval",
+ "flags": [
+ "interval"
+ ],
"elem": [
{
"concat": [