From 8e9807c04b23eb1ffb979f972c0f6061aaaabfeb Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 7 Nov 2023 12:21:28 +0100 Subject: tests: shell: split map test Split interval + concatenation into a separated file, so older kernels with no pipapo can still run what it is supported. Signed-off-by: Pablo Neira Ayuso --- tests/shell/testcases/maps/0012map_0 | 19 ----------------- tests/shell/testcases/maps/0012map_concat_0 | 24 ++++++++++++++++++++++ tests/shell/testcases/maps/dumps/0012map_0.nft | 13 ------------ .../testcases/maps/dumps/0012map_concat_0.nft | 14 +++++++++++++ 4 files changed, 38 insertions(+), 32 deletions(-) create mode 100755 tests/shell/testcases/maps/0012map_concat_0 create mode 100644 tests/shell/testcases/maps/dumps/0012map_concat_0.nft (limited to 'tests/shell') diff --git a/tests/shell/testcases/maps/0012map_0 b/tests/shell/testcases/maps/0012map_0 index 49e51b75..dd93c482 100755 --- a/tests/shell/testcases/maps/0012map_0 +++ b/tests/shell/testcases/maps/0012map_0 @@ -15,22 +15,3 @@ table ip x { }" $NFT -f - <<< "$EXPECTED" - -EXPECTED="table ip x { - map w { - typeof ip saddr . meta mark : verdict - flags interval - counter - elements = { - 127.0.0.1-127.0.0.4 . 0x123434-0xb00122 : accept, - } - } - - chain k { - type filter hook input priority filter + 1; policy accept; - meta mark set 0x123434 - ip saddr . meta mark vmap @w - } -}" - -$NFT -f - <<< "$EXPECTED" diff --git a/tests/shell/testcases/maps/0012map_concat_0 b/tests/shell/testcases/maps/0012map_concat_0 new file mode 100755 index 00000000..d18c7a73 --- /dev/null +++ b/tests/shell/testcases/maps/0012map_concat_0 @@ -0,0 +1,24 @@ +#!/bin/bash + +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo) + +set -e + +EXPECTED="table ip x { + map w { + typeof ip saddr . meta mark : verdict + flags interval + counter + elements = { + 127.0.0.1-127.0.0.4 . 0x123434-0xb00122 : accept, + } + } + + chain k { + type filter hook input priority filter + 1; policy accept; + meta mark set 0x123434 + ip saddr . meta mark vmap @w + } +}" + +$NFT -f - <<< "$EXPECTED" diff --git a/tests/shell/testcases/maps/dumps/0012map_0.nft b/tests/shell/testcases/maps/dumps/0012map_0.nft index 895490cf..e734fc1c 100644 --- a/tests/shell/testcases/maps/dumps/0012map_0.nft +++ b/tests/shell/testcases/maps/dumps/0012map_0.nft @@ -6,20 +6,7 @@ table ip x { "eth1" : drop } } - map w { - typeof ip saddr . meta mark : verdict - flags interval - counter - elements = { 127.0.0.1-127.0.0.4 . 0x00123434-0x00b00122 counter packets 0 bytes 0 : accept } - } - chain y { iifname vmap { "lo" : accept, "eth0" : drop, "eth1" : drop } } - - chain k { - type filter hook input priority filter + 1; policy accept; - meta mark set 0x00123434 - ip saddr . meta mark vmap @w - } } diff --git a/tests/shell/testcases/maps/dumps/0012map_concat_0.nft b/tests/shell/testcases/maps/dumps/0012map_concat_0.nft new file mode 100644 index 00000000..6649d034 --- /dev/null +++ b/tests/shell/testcases/maps/dumps/0012map_concat_0.nft @@ -0,0 +1,14 @@ +table ip x { + map w { + typeof ip saddr . meta mark : verdict + flags interval + counter + elements = { 127.0.0.1-127.0.0.4 . 0x00123434-0x00b00122 counter packets 0 bytes 0 : accept } + } + + chain k { + type filter hook input priority filter + 1; policy accept; + meta mark set 0x00123434 + ip saddr . meta mark vmap @w + } +} -- cgit v1.2.3