From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 231B9C05022 for ; Thu, 9 Nov 2023 16:23:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234424AbjKIQXT (ORCPT ); Thu, 9 Nov 2023 11:23:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343866AbjKIQXQ (ORCPT ); Thu, 9 Nov 2023 11:23:16 -0500 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CDB26327D for ; Thu, 9 Nov 2023 08:23:13 -0800 (PST) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: thaller@redhat.com, fw@strlen.de Subject: [PATCH nft 10/12] tests: shell: split map test Date: Thu, 9 Nov 2023 17:23:02 +0100 Message-Id: <20231109162304.119506-11-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231109162304.119506-1-pablo@netfilter.org> References: <20231109162304.119506-1-pablo@netfilter.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 +++++++++++++++++++ .../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 diff --git a/tests/shell/testcases/maps/0012map_0 b/tests/shell/testcases/maps/0012map_0 index 49e51b755b0f..dd93c482f441 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 000000000000..d18c7a73c844 --- /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 895490cffa8c..e734fc1c70b9 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 000000000000..6649d0342a28 --- /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 + } +} -- 2.30.2