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/maps/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/maps/dumps')
11 files changed, 128 insertions, 128 deletions
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 @@ -15,6 +15,14 @@ } }, { + "chain": { + "family": "inet", + "table": "t", + "name": "c", + "handle": 0 + } + }, + { "map": { "family": "inet", "name": "m1", @@ -31,14 +39,6 @@ } }, { - "chain": { - "family": "inet", - "table": "t", - "name": "c", - "handle": 0 - } - }, - { "rule": { "family": "inet", "table": "t", 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 @@ -15,6 +15,18 @@ } }, { + "chain": { + "family": "ip", + "table": "filter", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, + { "map": { "family": "ip", "name": "m", @@ -38,18 +50,6 @@ } }, { - "chain": { - "family": "ip", - "table": "filter", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, - { "rule": { "family": "ip", "table": "filter", 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 @@ -15,6 +15,14 @@ } }, { + "chain": { + "family": "ip", + "table": "x", + "name": "y", + "handle": 0 + } + }, + { "map": { "family": "ip", "name": "z", @@ -45,14 +53,6 @@ } }, { - "chain": { - "family": "ip", - "table": "x", - "name": "y", - "handle": 0 - } - }, - { "rule": { "family": "ip", "table": "x", 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 @@ -15,6 +15,18 @@ } }, { + "chain": { + "family": "ip", + "table": "x", + "name": "k", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 1, + "policy": "accept" + } + }, + { "map": { "family": "ip", "name": "w", @@ -67,18 +79,6 @@ } }, { - "chain": { - "family": "ip", - "table": "x", - "name": "k", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 1, - "policy": "accept" - } - }, - { "rule": { "family": "ip", "table": "x", 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 @@ -15,6 +15,18 @@ } }, { + "chain": { + "family": "ip", + "table": "filter", + "name": "FORWARD", + "handle": 0, + "type": "filter", + "hook": "forward", + "prio": 0, + "policy": "drop" + } + }, + { "map": { "family": "ip", "name": "forwport", @@ -59,18 +71,6 @@ } }, { - "chain": { - "family": "ip", - "table": "filter", - "name": "FORWARD", - "handle": 0, - "type": "filter", - "hook": "forward", - "prio": 0, - "policy": "drop" - } - }, - { "rule": { "family": "ip", "table": "filter", 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 @@ -15,6 +15,18 @@ } }, { + "chain": { + "family": "inet", + "table": "filter", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, + { "ct helper": { "family": "inet", "name": "sip-5060u", @@ -37,18 +49,6 @@ } }, { - "chain": { - "family": "inet", - "table": "filter", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, - { "rule": { "family": "inet", "table": "filter", 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 @@ -15,6 +15,18 @@ } }, { + "chain": { + "family": "inet", + "table": "filter", + "name": "input", + "handle": 0, + "type": "filter", + "hook": "input", + "prio": 0, + "policy": "accept" + } + }, + { "limit": { "family": "inet", "name": "tarpit-pps", @@ -252,18 +264,6 @@ } }, { - "chain": { - "family": "inet", - "table": "filter", - "name": "input", - "handle": 0, - "type": "filter", - "hook": "input", - "prio": 0, - "policy": "accept" - } - }, - { "rule": { "family": "inet", "table": "filter", 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 @@ -15,6 +15,14 @@ } }, { + "chain": { + "family": "ip", + "table": "nat", + "name": "postrouting", + "handle": 0 + } + }, + { "map": { "family": "ip", "name": "m", @@ -31,14 +39,6 @@ } }, { - "chain": { - "family": "ip", - "table": "nat", - "name": "postrouting", - "handle": 0 - } - }, - { "rule": { "family": "ip", "table": "nat", 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 @@ -15,6 +15,14 @@ } }, { + "chain": { + "family": "inet", + "table": "t", + "name": "c", + "handle": 0 + } + }, + { "map": { "family": "inet", "name": "m", @@ -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 @@ -15,26 +15,6 @@ } }, { - "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", "table": "dynset", @@ -55,6 +35,26 @@ } }, { + "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", "table": "dynset", 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 @@ -15,6 +15,22 @@ } }, { + "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", "name": "sticky-set-svc-M53CN2XYVUHRQ7UB", @@ -45,22 +61,6 @@ } }, { - "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", "table": "kube-nfproxy-v4", |