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 --- .../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 +++++++++++----------- 22 files changed, 231 insertions(+), 231 deletions(-) (limited to 'tests/shell/testcases/sets/dumps') 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", -- cgit v1.2.3