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 +++++++++++----------- 3 files changed, 36 insertions(+), 36 deletions(-) (limited to 'tests/shell/testcases/cache/dumps') 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" + ] } }, { -- cgit v1.2.3