diff options
author | Phil Sutter <phil@nwl.cc> | 2024-03-08 20:22:37 +0100 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2024-03-19 18:24:47 +0100 |
commit | 2a0fe52eca32acc8927c97e164b5e79337073ceb (patch) | |
tree | aaf1bd36c183a90f15adb4feef043761b6f4b909 /tests/shell/testcases/nft-f/dumps | |
parent | 38f04196ebef64a6672c55c27a6afe9af811c8f7 (diff) |
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 <phil@nwl.cc>
Diffstat (limited to 'tests/shell/testcases/nft-f/dumps')
9 files changed, 93 insertions, 93 deletions
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 @@ -15,6 +15,14 @@ } }, { + "chain": { + "family": "ip", + "table": "filter", + "name": "c", + "handle": 0 + } + }, + { "ct timeout": { "family": "ip", "name": "cttime", @@ -29,14 +37,6 @@ } }, { - "chain": { - "family": "ip", - "table": "filter", - "name": "c", - "handle": 0 - } - }, - { "rule": { "family": "ip", "table": "filter", 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 @@ -15,6 +15,14 @@ } }, { + "chain": { + "family": "ip", + "table": "filter", + "name": "c", + "handle": 0 + } + }, + { "ct expectation": { "family": "ip", "name": "ctexpect", @@ -28,14 +36,6 @@ } }, { - "chain": { - "family": "ip", - "table": "filter", - "name": "c", - "handle": 0 - } - }, - { "rule": { "family": "ip", "table": "filter", 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 @@ -15,6 +15,18 @@ } }, { + "chain": { + "family": "ip", + "table": "x", + "name": "z", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, + { "set": { "family": "ip", "name": "y", @@ -29,18 +41,6 @@ } }, { - "chain": { - "family": "ip", - "table": "x", - "name": "z", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, - { "rule": { "family": "ip", "table": "x", 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 @@ -15,15 +15,6 @@ } }, { - "set": { - "family": "inet", - "name": "whitelist_v4", - "table": "filter", - "type": "ipv4_addr", - "handle": 0 - } - }, - { "chain": { "family": "inet", "table": "filter", @@ -36,6 +27,15 @@ } }, { + "set": { + "family": "inet", + "name": "whitelist_v4", + "table": "filter", + "type": "ipv4_addr", + "handle": 0 + } + }, + { "rule": { "family": "inet", "table": "filter", 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 @@ -15,6 +15,18 @@ } }, { + "chain": { + "family": "inet", + "table": "portknock", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": -10, + "policy": "accept" + } + }, + { "set": { "family": "inet", "name": "clients_ipv4", @@ -46,18 +58,6 @@ } }, { - "chain": { - "family": "inet", - "table": "portknock", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": -10, - "policy": "accept" - } - }, - { "rule": { "family": "inet", "table": "portknock", |