From 2a0fe52eca32acc8927c97e164b5e79337073ceb Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 8 Mar 2024 20:22:37 +0100 Subject: tests: shell: Regenerate all json-nft dumps Ordering of 'nft -j list ruleset' output has changed, Regenerate existing json-nft dumps. No functional change intended, merely the position of chain objects should have moved up in the "nftables" array. Signed-off-by: Phil Sutter --- .../cache/dumps/0001_cache_handling_0.json-nft | 16 ++++----- .../cache/dumps/0005_cache_chain_flush.json-nft | 28 +++++++-------- .../cache/dumps/0006_cache_table_flush.json-nft | 28 +++++++-------- .../testcases/comments/dumps/comments_0.json-nft | 16 ++++----- .../flowtable/dumps/0001flowtable_0.json-nft | 16 ++++----- .../flowtable/dumps/0005delete_in_use_1.json-nft | 16 ++++----- .../flowtable/dumps/0014addafterdelete_0.json-nft | 22 ++++++------ .../json/dumps/0001set_statements_0.json-nft | 24 ++++++------- .../json/dumps/0005secmark_objref_0.json-nft | 18 +++++----- .../testcases/listing/dumps/0013objects_0.json-nft | 16 ++++----- .../dumps/0021ruleset_json_terse_0.json-nft | 16 ++++----- .../testcases/listing/dumps/0022terse_0.json-nft | 24 ++++++------- .../maps/dumps/0007named_ifname_dtype_0.json-nft | 16 ++++----- .../maps/dumps/0008interval_map_delete_0.json-nft | 24 ++++++------- .../shell/testcases/maps/dumps/0012map_0.json-nft | 16 ++++----- .../testcases/maps/dumps/0012map_concat_0.json-nft | 24 ++++++------- .../shell/testcases/maps/dumps/0013map_0.json-nft | 24 ++++++------- .../maps/dumps/anon_objmap_concat.json-nft | 24 ++++++------- .../testcases/maps/dumps/named_limits.json-nft | 24 ++++++------- .../testcases/maps/dumps/named_snat_map_0.json-nft | 16 ++++----- .../maps/dumps/pipapo_double_flush.json-nft | 16 ++++----- .../maps/dumps/typeof_maps_add_delete.json-nft | 40 +++++++++++----------- .../maps/dumps/typeof_maps_update_0.json-nft | 32 ++++++++--------- .../nft-f/dumps/0002rollback_rule_0.json-nft | 22 ++++++------ .../nft-f/dumps/0003rollback_jump_0.json-nft | 22 ++++++------ .../nft-f/dumps/0004rollback_set_0.json-nft | 22 ++++++------ .../nft-f/dumps/0005rollback_map_0.json-nft | 22 ++++++------ .../nft-f/dumps/0017ct_timeout_obj_0.json-nft | 16 ++++----- .../nft-f/dumps/0018ct_expectation_obj_0.json-nft | 16 ++++----- .../testcases/nft-f/dumps/0022variables_0.json-nft | 24 ++++++------- .../nft-f/dumps/0029split_file_0.json-nft | 18 +++++----- .../testcases/nft-f/dumps/0032pknock_0.json-nft | 24 ++++++------- .../optimizations/dumps/merge_vmaps.json-nft | 26 +++++++------- .../optimizations/dumps/skip_merge.json-nft | 32 ++++++++--------- .../optimizations/dumps/skip_unsupported.json-nft | 16 ++++----- .../packetpath/dumps/set_lookups.json-nft | 24 ++++++------- .../rule_management/dumps/0011reset_0.json-nft | 32 ++++++++--------- .../sets/dumps/0001named_interval_0.json-nft | 16 ++++----- .../sets/dumps/0022type_selective_flush_0.json-nft | 16 ++++----- .../sets/dumps/0026named_limit_0.json-nft | 22 ++++++------ .../testcases/sets/dumps/0028autoselect_0.json-nft | 24 ++++++------- .../dumps/0037_set_with_inet_service_0.json-nft | 24 ++++++------- .../testcases/sets/dumps/0038meter_list_0.json-nft | 16 ++++----- .../testcases/sets/dumps/0042update_set_0.json-nft | 16 ++++----- .../sets/dumps/0043concatenated_ranges_0.json-nft | 24 ++++++------- .../sets/dumps/0045concat_ipv4_service.json-nft | 16 ++++----- .../sets/dumps/0048set_counters_0.json-nft | 24 ++++++------- .../testcases/sets/dumps/0049set_define_0.json-nft | 24 ++++++------- .../sets/dumps/0051set_interval_counter_0.json-nft | 24 ++++++------- .../sets/dumps/0058_setupdate_timeout_0.json-nft | 16 ++++----- .../sets/dumps/0059set_update_multistmt_0.json-nft | 24 ++++++------- .../sets/dumps/0060set_multistmt_0.json-nft | 24 ++++++------- .../sets/dumps/0060set_multistmt_1.json-nft | 24 ++++++------- .../sets/dumps/0064map_catchall_0.json-nft | 16 ++++----- .../dumps/0071unclosed_prefix_interval_0.json-nft | 16 ++++----- .../testcases/sets/dumps/dynset_missing.json-nft | 24 ++++++------- tests/shell/testcases/sets/dumps/inner_0.json-nft | 16 ++++----- .../shell/testcases/sets/dumps/set_eval_0.json-nft | 24 ++++++------- .../testcases/sets/dumps/type_set_symbol.json-nft | 32 ++++++++--------- .../transactions/dumps/0040set_0.json-nft | 20 +++++------ 60 files changed, 647 insertions(+), 647 deletions(-) (limited to 'tests/shell') diff --git a/tests/shell/testcases/cache/dumps/0001_cache_handling_0.json-nft b/tests/shell/testcases/cache/dumps/0001_cache_handling_0.json-nft index 75219662..7a2eacdd 100644 --- a/tests/shell/testcases/cache/dumps/0001_cache_handling_0.json-nft +++ b/tests/shell/testcases/cache/dumps/0001_cache_handling_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "test", + "name": "test", + "handle": 0 + } + }, { "set": { "family": "inet", @@ -27,14 +35,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "test", - "name": "test", - "handle": 0 - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/cache/dumps/0005_cache_chain_flush.json-nft b/tests/shell/testcases/cache/dumps/0005_cache_chain_flush.json-nft index dbf56117..1c47d3ef 100644 --- a/tests/shell/testcases/cache/dumps/0005_cache_chain_flush.json-nft +++ b/tests/shell/testcases/cache/dumps/0005_cache_chain_flush.json-nft @@ -15,34 +15,34 @@ } }, { - "map": { + "chain": { "family": "ip", - "name": "mapping", "table": "x", - "type": "ipv4_addr", - "handle": 0, - "map": "inet_service", - "size": 65535, - "flags": [ - "timeout", - "dynamic" - ] + "name": "y", + "handle": 0 } }, { "chain": { "family": "ip", "table": "x", - "name": "y", + "name": "z", "handle": 0 } }, { - "chain": { + "map": { "family": "ip", + "name": "mapping", "table": "x", - "name": "z", - "handle": 0 + "type": "ipv4_addr", + "handle": 0, + "map": "inet_service", + "size": 65535, + "flags": [ + "timeout", + "dynamic" + ] } }, { diff --git a/tests/shell/testcases/cache/dumps/0006_cache_table_flush.json-nft b/tests/shell/testcases/cache/dumps/0006_cache_table_flush.json-nft index dbf56117..1c47d3ef 100644 --- a/tests/shell/testcases/cache/dumps/0006_cache_table_flush.json-nft +++ b/tests/shell/testcases/cache/dumps/0006_cache_table_flush.json-nft @@ -15,34 +15,34 @@ } }, { - "map": { + "chain": { "family": "ip", - "name": "mapping", "table": "x", - "type": "ipv4_addr", - "handle": 0, - "map": "inet_service", - "size": 65535, - "flags": [ - "timeout", - "dynamic" - ] + "name": "y", + "handle": 0 } }, { "chain": { "family": "ip", "table": "x", - "name": "y", + "name": "z", "handle": 0 } }, { - "chain": { + "map": { "family": "ip", + "name": "mapping", "table": "x", - "name": "z", - "handle": 0 + "type": "ipv4_addr", + "handle": 0, + "map": "inet_service", + "size": 65535, + "flags": [ + "timeout", + "dynamic" + ] } }, { diff --git a/tests/shell/testcases/comments/dumps/comments_0.json-nft b/tests/shell/testcases/comments/dumps/comments_0.json-nft index 28898a52..201abd6f 100644 --- a/tests/shell/testcases/comments/dumps/comments_0.json-nft +++ b/tests/shell/testcases/comments/dumps/comments_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "x", + "name": "y", + "handle": 0 + } + }, { "set": { "family": "inet", @@ -27,14 +35,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "x", - "name": "y", - "handle": 0 - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/flowtable/dumps/0001flowtable_0.json-nft b/tests/shell/testcases/flowtable/dumps/0001flowtable_0.json-nft index 090c9744..4d15fe3a 100644 --- a/tests/shell/testcases/flowtable/dumps/0001flowtable_0.json-nft +++ b/tests/shell/testcases/flowtable/dumps/0001flowtable_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "t", + "name": "c", + "handle": 0 + } + }, { "flowtable": { "family": "inet", @@ -25,14 +33,6 @@ "dev": "lo" } }, - { - "chain": { - "family": "inet", - "table": "t", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/flowtable/dumps/0005delete_in_use_1.json-nft b/tests/shell/testcases/flowtable/dumps/0005delete_in_use_1.json-nft index db73a530..302502dc 100644 --- a/tests/shell/testcases/flowtable/dumps/0005delete_in_use_1.json-nft +++ b/tests/shell/testcases/flowtable/dumps/0005delete_in_use_1.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "x", + "handle": 0 + } + }, { "flowtable": { "family": "ip", @@ -25,14 +33,6 @@ "dev": "lo" } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "x", - "handle": 0 - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/flowtable/dumps/0014addafterdelete_0.json-nft b/tests/shell/testcases/flowtable/dumps/0014addafterdelete_0.json-nft index 79707ca3..471ba5be 100644 --- a/tests/shell/testcases/flowtable/dumps/0014addafterdelete_0.json-nft +++ b/tests/shell/testcases/flowtable/dumps/0014addafterdelete_0.json-nft @@ -14,17 +14,6 @@ "handle": 0 } }, - { - "flowtable": { - "family": "inet", - "name": "f", - "table": "filter", - "handle": 0, - "hook": "ingress", - "prio": -1, - "dev": "lo" - } - }, { "chain": { "family": "inet", @@ -37,6 +26,17 @@ "policy": "accept" } }, + { + "flowtable": { + "family": "inet", + "name": "f", + "table": "filter", + "handle": 0, + "hook": "ingress", + "prio": -1, + "dev": "lo" + } + }, { "rule": { "family": "inet", 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 3830b845..91db43e2 100644 --- a/tests/shell/testcases/json/dumps/0001set_statements_0.json-nft +++ b/tests/shell/testcases/json/dumps/0001set_statements_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "testt", + "name": "testc", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -27,18 +39,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "testt", - "name": "testc", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/json/dumps/0005secmark_objref_0.json-nft b/tests/shell/testcases/json/dumps/0005secmark_objref_0.json-nft index f5519a6e..3783c6b7 100644 --- a/tests/shell/testcases/json/dumps/0005secmark_objref_0.json-nft +++ b/tests/shell/testcases/json/dumps/0005secmark_objref_0.json-nft @@ -14,15 +14,6 @@ "handle": 0 } }, - { - "secmark": { - "family": "inet", - "name": "ssh_server", - "table": "x", - "handle": 0, - "context": "system_u:object_r:ssh_server_packet_t:s0" - } - }, { "chain": { "family": "inet", @@ -47,6 +38,15 @@ "policy": "accept" } }, + { + "secmark": { + "family": "inet", + "name": "ssh_server", + "table": "x", + "handle": 0, + "context": "system_u:object_r:ssh_server_packet_t:s0" + } + }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/listing/dumps/0013objects_0.json-nft b/tests/shell/testcases/listing/dumps/0013objects_0.json-nft index feb32b1b..830aad85 100644 --- a/tests/shell/testcases/listing/dumps/0013objects_0.json-nft +++ b/tests/shell/testcases/listing/dumps/0013objects_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "test", + "name": "input", + "handle": 0 + } + }, { "quota": { "family": "ip", @@ -62,14 +70,6 @@ "size": 12, "l3proto": "ip" } - }, - { - "chain": { - "family": "ip", - "table": "test", - "name": "input", - "handle": 0 - } } ] } diff --git a/tests/shell/testcases/listing/dumps/0021ruleset_json_terse_0.json-nft b/tests/shell/testcases/listing/dumps/0021ruleset_json_terse_0.json-nft index e9bc05ac..d1131bb4 100644 --- a/tests/shell/testcases/listing/dumps/0021ruleset_json_terse_0.json-nft +++ b/tests/shell/testcases/listing/dumps/0021ruleset_json_terse_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "test", + "name": "c", + "handle": 0 + } + }, { "set": { "family": "ip", @@ -26,14 +34,6 @@ "192.168.3.5" ] } - }, - { - "chain": { - "family": "ip", - "table": "test", - "name": "c", - "handle": 0 - } } ] } diff --git a/tests/shell/testcases/listing/dumps/0022terse_0.json-nft b/tests/shell/testcases/listing/dumps/0022terse_0.json-nft index db19d0c3..bd6383da 100644 --- a/tests/shell/testcases/listing/dumps/0022terse_0.json-nft +++ b/tests/shell/testcases/listing/dumps/0022terse_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "filter", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "prerouting", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "inet", @@ -30,18 +42,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "filter", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "prerouting", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/maps/dumps/0007named_ifname_dtype_0.json-nft b/tests/shell/testcases/maps/dumps/0007named_ifname_dtype_0.json-nft index ec409c6c..ef57a749 100644 --- a/tests/shell/testcases/maps/dumps/0007named_ifname_dtype_0.json-nft +++ b/tests/shell/testcases/maps/dumps/0007named_ifname_dtype_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "t", + "name": "c", + "handle": 0 + } + }, { "map": { "family": "inet", @@ -30,14 +38,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "t", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "inet", 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 0f8f25dc..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 @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "filter", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, { "map": { "family": "ip", @@ -37,18 +49,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "filter", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/maps/dumps/0012map_0.json-nft b/tests/shell/testcases/maps/dumps/0012map_0.json-nft index e546a679..2892e11d 100644 --- a/tests/shell/testcases/maps/dumps/0012map_0.json-nft +++ b/tests/shell/testcases/maps/dumps/0012map_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "y", + "handle": 0 + } + }, { "map": { "family": "ip", @@ -44,14 +52,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "y", - "handle": 0 - } - }, { "rule": { "family": "ip", 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 08fce286..00052236 100644 --- a/tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft +++ b/tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "k", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 1, + "policy": "accept" + } + }, { "map": { "family": "ip", @@ -66,18 +78,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "k", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 1, - "policy": "accept" - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/maps/dumps/0013map_0.json-nft b/tests/shell/testcases/maps/dumps/0013map_0.json-nft index 0379746a..e91a269d 100644 --- a/tests/shell/testcases/maps/dumps/0013map_0.json-nft +++ b/tests/shell/testcases/maps/dumps/0013map_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "filter", + "name": "FORWARD", + "handle": 0, + "type": "filter", + "hook": "forward", + "prio": 0, + "policy": "drop" + } + }, { "map": { "family": "ip", @@ -58,18 +70,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "filter", - "name": "FORWARD", - "handle": 0, - "type": "filter", - "hook": "forward", - "prio": 0, - "policy": "drop" - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/maps/dumps/anon_objmap_concat.json-nft b/tests/shell/testcases/maps/dumps/anon_objmap_concat.json-nft index f8352344..64209842 100644 --- a/tests/shell/testcases/maps/dumps/anon_objmap_concat.json-nft +++ b/tests/shell/testcases/maps/dumps/anon_objmap_concat.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "filter", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, { "ct helper": { "family": "inet", @@ -36,18 +48,6 @@ "l3proto": "ip" } }, - { - "chain": { - "family": "inet", - "table": "filter", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/maps/dumps/named_limits.json-nft b/tests/shell/testcases/maps/dumps/named_limits.json-nft index 28a92529..7fa12981 100644 --- a/tests/shell/testcases/maps/dumps/named_limits.json-nft +++ b/tests/shell/testcases/maps/dumps/named_limits.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "filter", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, { "limit": { "family": "inet", @@ -251,18 +263,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "filter", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/maps/dumps/named_snat_map_0.json-nft b/tests/shell/testcases/maps/dumps/named_snat_map_0.json-nft index ed141597..ad9eb36e 100644 --- a/tests/shell/testcases/maps/dumps/named_snat_map_0.json-nft +++ b/tests/shell/testcases/maps/dumps/named_snat_map_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "nat", + "name": "postrouting", + "handle": 0 + } + }, { "map": { "family": "ip", @@ -30,14 +38,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "nat", - "name": "postrouting", - "handle": 0 - } - }, { "rule": { "family": "ip", 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 5cb600db..ef8c3930 100644 --- a/tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft +++ b/tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "t", + "name": "c", + "handle": 0 + } + }, { "map": { "family": "inet", @@ -29,14 +37,6 @@ "interval" ] } - }, - { - "chain": { - "family": "inet", - "table": "t", - "name": "c", - "handle": 0 - } } ] } 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 4a58602a..8130c46c 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 @@ -14,26 +14,6 @@ "handle": 0 } }, - { - "map": { - "family": "ip", - "name": "dynmark", - "table": "dynset", - "type": "ipv4_addr", - "handle": 0, - "map": "mark", - "size": 64, - "flags": [ - "timeout" - ], - "timeout": 300, - "stmt": [ - { - "counter": null - } - ] - } - }, { "chain": { "family": "ip", @@ -54,6 +34,26 @@ "policy": "accept" } }, + { + "map": { + "family": "ip", + "name": "dynmark", + "table": "dynset", + "type": "ipv4_addr", + "handle": 0, + "map": "mark", + "size": 64, + "flags": [ + "timeout" + ], + "timeout": 300, + "stmt": [ + { + "counter": null + } + ] + } + }, { "rule": { "family": "ip", 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 826785d1..1d50477d 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 @@ -14,6 +14,22 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "kube-nfproxy-v4", + "name": "k8s-nfproxy-sep-TMVEFT7EX55F4T62", + "handle": 0 + } + }, + { + "chain": { + "family": "ip", + "table": "kube-nfproxy-v4", + "name": "k8s-nfproxy-sep-GMVEFT7EX55F4T62", + "handle": 0 + } + }, { "map": { "family": "ip", @@ -44,22 +60,6 @@ "timeout": 60 } }, - { - "chain": { - "family": "ip", - "table": "kube-nfproxy-v4", - "name": "k8s-nfproxy-sep-TMVEFT7EX55F4T62", - "handle": 0 - } - }, - { - "chain": { - "family": "ip", - "table": "kube-nfproxy-v4", - "name": "k8s-nfproxy-sep-GMVEFT7EX55F4T62", - "handle": 0 - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.json-nft b/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.json-nft index 8d500578..99b0b28d 100644 --- a/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.json-nft +++ b/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.json-nft @@ -15,31 +15,31 @@ } }, { - "set": { + "chain": { "family": "ip", - "name": "t", "table": "t", - "type": "ipv4_addr", - "handle": 0, - "elem": [ - "1.1.1.1" - ] + "name": "c", + "handle": 0 } }, { "chain": { "family": "ip", "table": "t", - "name": "c", + "name": "other", "handle": 0 } }, { - "chain": { + "set": { "family": "ip", + "name": "t", "table": "t", - "name": "other", - "handle": 0 + "type": "ipv4_addr", + "handle": 0, + "elem": [ + "1.1.1.1" + ] } }, { diff --git a/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.json-nft b/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.json-nft index 8d500578..99b0b28d 100644 --- a/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.json-nft +++ b/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.json-nft @@ -15,31 +15,31 @@ } }, { - "set": { + "chain": { "family": "ip", - "name": "t", "table": "t", - "type": "ipv4_addr", - "handle": 0, - "elem": [ - "1.1.1.1" - ] + "name": "c", + "handle": 0 } }, { "chain": { "family": "ip", "table": "t", - "name": "c", + "name": "other", "handle": 0 } }, { - "chain": { + "set": { "family": "ip", + "name": "t", "table": "t", - "name": "other", - "handle": 0 + "type": "ipv4_addr", + "handle": 0, + "elem": [ + "1.1.1.1" + ] } }, { diff --git a/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.json-nft b/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.json-nft index 8d500578..99b0b28d 100644 --- a/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.json-nft +++ b/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.json-nft @@ -15,31 +15,31 @@ } }, { - "set": { + "chain": { "family": "ip", - "name": "t", "table": "t", - "type": "ipv4_addr", - "handle": 0, - "elem": [ - "1.1.1.1" - ] + "name": "c", + "handle": 0 } }, { "chain": { "family": "ip", "table": "t", - "name": "c", + "name": "other", "handle": 0 } }, { - "chain": { + "set": { "family": "ip", + "name": "t", "table": "t", - "name": "other", - "handle": 0 + "type": "ipv4_addr", + "handle": 0, + "elem": [ + "1.1.1.1" + ] } }, { diff --git a/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.json-nft b/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.json-nft index 8d500578..99b0b28d 100644 --- a/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.json-nft +++ b/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.json-nft @@ -15,31 +15,31 @@ } }, { - "set": { + "chain": { "family": "ip", - "name": "t", "table": "t", - "type": "ipv4_addr", - "handle": 0, - "elem": [ - "1.1.1.1" - ] + "name": "c", + "handle": 0 } }, { "chain": { "family": "ip", "table": "t", - "name": "c", + "name": "other", "handle": 0 } }, { - "chain": { + "set": { "family": "ip", + "name": "t", "table": "t", - "name": "other", - "handle": 0 + "type": "ipv4_addr", + "handle": 0, + "elem": [ + "1.1.1.1" + ] } }, { diff --git a/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.json-nft b/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.json-nft index 581d4d41..b56240ea 100644 --- a/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.json-nft +++ b/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "filter", + "name": "c", + "handle": 0 + } + }, { "ct timeout": { "family": "ip", @@ -28,14 +36,6 @@ } } }, - { - "chain": { - "family": "ip", - "table": "filter", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/nft-f/dumps/0018ct_expectation_obj_0.json-nft b/tests/shell/testcases/nft-f/dumps/0018ct_expectation_obj_0.json-nft index 5e2b07f0..21c97970 100644 --- a/tests/shell/testcases/nft-f/dumps/0018ct_expectation_obj_0.json-nft +++ b/tests/shell/testcases/nft-f/dumps/0018ct_expectation_obj_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "filter", + "name": "c", + "handle": 0 + } + }, { "ct expectation": { "family": "ip", @@ -27,14 +35,6 @@ "l3proto": "ip" } }, - { - "chain": { - "family": "ip", - "table": "filter", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/nft-f/dumps/0022variables_0.json-nft b/tests/shell/testcases/nft-f/dumps/0022variables_0.json-nft index b971454f..09a4c1e3 100644 --- a/tests/shell/testcases/nft-f/dumps/0022variables_0.json-nft +++ b/tests/shell/testcases/nft-f/dumps/0022variables_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "z", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -28,18 +40,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "z", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/nft-f/dumps/0029split_file_0.json-nft b/tests/shell/testcases/nft-f/dumps/0029split_file_0.json-nft index c2aa400a..ab680af8 100644 --- a/tests/shell/testcases/nft-f/dumps/0029split_file_0.json-nft +++ b/tests/shell/testcases/nft-f/dumps/0029split_file_0.json-nft @@ -14,15 +14,6 @@ "handle": 0 } }, - { - "set": { - "family": "inet", - "name": "whitelist_v4", - "table": "filter", - "type": "ipv4_addr", - "handle": 0 - } - }, { "chain": { "family": "inet", @@ -35,6 +26,15 @@ "policy": "accept" } }, + { + "set": { + "family": "inet", + "name": "whitelist_v4", + "table": "filter", + "type": "ipv4_addr", + "handle": 0 + } + }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/nft-f/dumps/0032pknock_0.json-nft b/tests/shell/testcases/nft-f/dumps/0032pknock_0.json-nft index 57d57bb9..4c7d2bbe 100644 --- a/tests/shell/testcases/nft-f/dumps/0032pknock_0.json-nft +++ b/tests/shell/testcases/nft-f/dumps/0032pknock_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "portknock", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": -10, + "policy": "accept" + } + }, { "set": { "family": "inet", @@ -45,18 +57,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "portknock", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": -10, - "policy": "accept" - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft b/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft index f2ac7917..e87f1c4c 100644 --- a/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft +++ b/tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft @@ -14,19 +14,6 @@ "handle": 0 } }, - { - "set": { - "family": "ip", - "name": "s", - "table": "x", - "type": "ipv4_addr", - "handle": 0, - "size": 65535, - "flags": [ - "dynamic" - ] - } - }, { "chain": { "family": "ip", @@ -51,6 +38,19 @@ "handle": 0 } }, + { + "set": { + "family": "ip", + "name": "s", + "table": "x", + "type": "ipv4_addr", + "handle": 0, + "size": 65535, + "flags": [ + "dynamic" + ] + } + }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/optimizations/dumps/skip_merge.json-nft b/tests/shell/testcases/optimizations/dumps/skip_merge.json-nft index 3404a2e7..7bb6c656 100644 --- a/tests/shell/testcases/optimizations/dumps/skip_merge.json-nft +++ b/tests/shell/testcases/optimizations/dumps/skip_merge.json-nft @@ -14,6 +14,22 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "filter", + "name": "udp_input", + "handle": 0 + } + }, + { + "chain": { + "family": "inet", + "table": "filter", + "name": "tcp_input", + "handle": 0 + } + }, { "set": { "family": "inet", @@ -40,22 +56,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "filter", - "name": "udp_input", - "handle": 0 - } - }, - { - "chain": { - "family": "inet", - "table": "filter", - "name": "tcp_input", - "handle": 0 - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft b/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft index a0820206..d6347b1e 100644 --- a/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft +++ b/tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "x", + "name": "y", + "handle": 0 + } + }, { "set": { "family": "inet", @@ -100,14 +108,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "x", - "name": "y", - "handle": 0 - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft b/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft index 49b51aba..24363f90 100644 --- a/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft +++ b/tests/shell/testcases/packetpath/dumps/set_lookups.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "t", + "name": "c", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -136,18 +148,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "t", - "name": "c", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", 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 94203517..bc242467 100644 --- a/tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft +++ b/tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft @@ -14,6 +14,22 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "t", + "name": "c", + "handle": 0 + } + }, + { + "chain": { + "family": "ip", + "table": "t", + "name": "c2", + "handle": 0 + } + }, { "set": { "family": "ip", @@ -43,22 +59,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "t", - "name": "c", - "handle": 0 - } - }, - { - "chain": { - "family": "ip", - "table": "t", - "name": "c2", - "handle": 0 - } - }, { "rule": { "family": "ip", 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 c48f3a9c..b9c66a21 100644 --- a/tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "t", + "name": "c", + "handle": 0 + } + }, { "set": { "family": "inet", @@ -124,14 +132,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "t", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "inet", 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 c6281ae8..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 @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "t", + "name": "c", + "handle": 0 + } + }, { "set": { "family": "ip", @@ -46,14 +54,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "t", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/sets/dumps/0026named_limit_0.json-nft b/tests/shell/testcases/sets/dumps/0026named_limit_0.json-nft index 5307e265..5d21f26c 100644 --- a/tests/shell/testcases/sets/dumps/0026named_limit_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0026named_limit_0.json-nft @@ -14,17 +14,6 @@ "handle": 0 } }, - { - "limit": { - "family": "ip", - "name": "http-traffic", - "table": "filter", - "handle": 0, - "rate": 1, - "per": "second", - "burst": 5 - } - }, { "chain": { "family": "ip", @@ -37,6 +26,17 @@ "policy": "accept" } }, + { + "limit": { + "family": "ip", + "name": "http-traffic", + "table": "filter", + "handle": 0, + "rate": 1, + "per": "second", + "burst": 5 + } + }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft b/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft index 682496a7..5968b2e0 100644 --- a/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "t", + "name": "c", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -53,18 +65,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "t", - "name": "c", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.json-nft b/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.json-nft index 3305f040..1c3b559d 100644 --- a/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0037_set_with_inet_service_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "filter", + "name": "forward", + "handle": 0, + "type": "filter", + "hook": "forward", + "prio": 0, + "policy": "drop" + } + }, { "set": { "family": "inet", @@ -64,18 +76,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "filter", - "name": "forward", - "handle": 0, - "type": "filter", - "hook": "forward", - "prio": 0, - "policy": "drop" - } - }, { "rule": { "family": "inet", 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 853fb5e3..5b13f59a 100644 --- a/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "t", + "name": "c", + "handle": 0 + } + }, { "set": { "family": "ip", @@ -41,14 +49,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "t", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "ip", 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 8521adb8..bc1d4cc2 100644 --- a/tests/shell/testcases/sets/dumps/0042update_set_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0042update_set_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "t", + "name": "c", + "handle": 0 + } + }, { "set": { "family": "ip", @@ -36,14 +44,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "t", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/sets/dumps/0043concatenated_ranges_0.json-nft b/tests/shell/testcases/sets/dumps/0043concatenated_ranges_0.json-nft index d51db884..ffb76e2f 100644 --- a/tests/shell/testcases/sets/dumps/0043concatenated_ranges_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0043concatenated_ranges_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "filter", + "name": "output", + "handle": 0, + "type": "filter", + "hook": "output", + "prio": 0, + "policy": "accept" + } + }, { "map": { "family": "inet", @@ -32,18 +44,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "filter", - "name": "output", - "handle": 0, - "type": "filter", - "hook": "output", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.json-nft b/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.json-nft index 211942c9..8473c333 100644 --- a/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.json-nft +++ b/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "t", + "name": "c", + "handle": 0 + } + }, { "set": { "family": "inet", @@ -39,14 +47,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "t", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/sets/dumps/0048set_counters_0.json-nft b/tests/shell/testcases/sets/dumps/0048set_counters_0.json-nft index 2fa0e788..62a6a177 100644 --- a/tests/shell/testcases/sets/dumps/0048set_counters_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0048set_counters_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "z", + "handle": 0, + "type": "filter", + "hook": "output", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -57,18 +69,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "z", - "handle": 0, - "type": "filter", - "hook": "output", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", 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 79e376b6..f8495bab 100644 --- a/tests/shell/testcases/sets/dumps/0049set_define_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0049set_define_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "filter", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "drop" + } + }, { "set": { "family": "inet", @@ -30,18 +42,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "filter", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "drop" - } - }, { "rule": { "family": "inet", 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 0e673759..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 @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "y", + "handle": 0, + "type": "filter", + "hook": "output", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -47,18 +59,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "y", - "handle": 0, - "type": "filter", - "hook": "output", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/sets/dumps/0058_setupdate_timeout_0.json-nft b/tests/shell/testcases/sets/dumps/0058_setupdate_timeout_0.json-nft index a727b25b..ac8d8bef 100644 --- a/tests/shell/testcases/sets/dumps/0058_setupdate_timeout_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0058_setupdate_timeout_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "filter", + "name": "test", + "handle": 0 + } + }, { "set": { "family": "inet", @@ -29,14 +37,6 @@ "timeout": 2592000 } }, - { - "chain": { - "family": "inet", - "table": "filter", - "name": "test", - "handle": 0 - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/sets/dumps/0059set_update_multistmt_0.json-nft b/tests/shell/testcases/sets/dumps/0059set_update_multistmt_0.json-nft index 9e5fae76..16ecdb2a 100644 --- a/tests/shell/testcases/sets/dumps/0059set_update_multistmt_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0059set_update_multistmt_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "z", + "handle": 0, + "type": "filter", + "hook": "output", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -29,18 +41,6 @@ "timeout": 3600 } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "z", - "handle": 0, - "type": "filter", - "hook": "output", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/sets/dumps/0060set_multistmt_0.json-nft b/tests/shell/testcases/sets/dumps/0060set_multistmt_0.json-nft index 0026ba91..1aede147 100644 --- a/tests/shell/testcases/sets/dumps/0060set_multistmt_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0060set_multistmt_0.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "y", + "handle": 0, + "type": "filter", + "hook": "output", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -67,18 +79,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "y", - "handle": 0, - "type": "filter", - "hook": "output", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", 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 86b70b20..6098dc56 100644 --- a/tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft +++ b/tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "y", + "handle": 0, + "type": "filter", + "hook": "output", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -67,18 +79,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "y", - "handle": 0, - "type": "filter", - "hook": "output", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", 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 eba5d40e..64dd2667 100644 --- a/tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft +++ b/tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "x", + "name": "y", + "handle": 0 + } + }, { "map": { "family": "ip", @@ -62,14 +70,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "x", - "name": "y", - "handle": 0 - } - }, { "rule": { "family": "ip", 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 426bf2d1..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 @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "inet", + "table": "t", + "name": "c", + "handle": 0 + } + }, { "set": { "family": "inet", @@ -66,14 +74,6 @@ ] } }, - { - "chain": { - "family": "inet", - "table": "t", - "name": "c", - "handle": 0 - } - }, { "rule": { "family": "inet", diff --git a/tests/shell/testcases/sets/dumps/dynset_missing.json-nft b/tests/shell/testcases/sets/dumps/dynset_missing.json-nft index 3462d67f..ad8a7cc0 100644 --- a/tests/shell/testcases/sets/dumps/dynset_missing.json-nft +++ b/tests/shell/testcases/sets/dumps/dynset_missing.json-nft @@ -14,6 +14,18 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "test", + "name": "output", + "handle": 0, + "type": "filter", + "hook": "output", + "prio": 0, + "policy": "accept" + } + }, { "set": { "family": "ip", @@ -27,18 +39,6 @@ ] } }, - { - "chain": { - "family": "ip", - "table": "test", - "name": "output", - "handle": 0, - "type": "filter", - "hook": "output", - "prio": 0, - "policy": "accept" - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/sets/dumps/inner_0.json-nft b/tests/shell/testcases/sets/dumps/inner_0.json-nft index cc48de6b..8d84e1cc 100644 --- a/tests/shell/testcases/sets/dumps/inner_0.json-nft +++ b/tests/shell/testcases/sets/dumps/inner_0.json-nft @@ -14,6 +14,14 @@ "handle": 0 } }, + { + "chain": { + "family": "netdev", + "table": "x", + "name": "y", + "handle": 0 + } + }, { "set": { "family": "netdev", @@ -47,14 +55,6 @@ ] } }, - { - "chain": { - "family": "netdev", - "table": "x", - "name": "y", - "handle": 0 - } - }, { "rule": { "family": "netdev", 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 4590b884..6f692381 100644 --- a/tests/shell/testcases/sets/dumps/set_eval_0.json-nft +++ b/tests/shell/testcases/sets/dumps/set_eval_0.json-nft @@ -14,18 +14,6 @@ "handle": 0 } }, - { - "set": { - "family": "ip", - "name": "set_with_interval", - "table": "nat", - "type": "ipv4_addr", - "handle": 0, - "flags": [ - "interval" - ] - } - }, { "chain": { "family": "ip", @@ -38,6 +26,18 @@ "policy": "accept" } }, + { + "set": { + "family": "ip", + "name": "set_with_interval", + "table": "nat", + "type": "ipv4_addr", + "handle": 0, + "flags": [ + "interval" + ] + } + }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/sets/dumps/type_set_symbol.json-nft b/tests/shell/testcases/sets/dumps/type_set_symbol.json-nft index e4ae0a2e..e22213ea 100644 --- a/tests/shell/testcases/sets/dumps/type_set_symbol.json-nft +++ b/tests/shell/testcases/sets/dumps/type_set_symbol.json-nft @@ -14,6 +14,22 @@ "handle": 0 } }, + { + "chain": { + "family": "ip", + "table": "t", + "name": "c1", + "handle": 0 + } + }, + { + "chain": { + "family": "ip", + "table": "t", + "name": "c2", + "handle": 0 + } + }, { "set": { "family": "ip", @@ -33,22 +49,6 @@ "timeout": 10800 } }, - { - "chain": { - "family": "ip", - "table": "t", - "name": "c1", - "handle": 0 - } - }, - { - "chain": { - "family": "ip", - "table": "t", - "name": "c2", - "handle": 0 - } - }, { "rule": { "family": "ip", diff --git a/tests/shell/testcases/transactions/dumps/0040set_0.json-nft b/tests/shell/testcases/transactions/dumps/0040set_0.json-nft index f8130d95..1718a5b9 100644 --- a/tests/shell/testcases/transactions/dumps/0040set_0.json-nft +++ b/tests/shell/testcases/transactions/dumps/0040set_0.json-nft @@ -14,16 +14,6 @@ "handle": 0 } }, - { - "map": { - "family": "ip", - "name": "client_to_any", - "table": "filter", - "type": "ipv4_addr", - "handle": 0, - "map": "verdict" - } - }, { "chain": { "family": "ip", @@ -44,6 +34,16 @@ "handle": 0 } }, + { + "map": { + "family": "ip", + "name": "client_to_any", + "table": "filter", + "type": "ipv4_addr", + "handle": 0, + "map": "verdict" + } + }, { "rule": { "family": "ip", -- cgit v1.2.3