From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH nftables 8/8] tests: add typeof test cases
Date: Fri, 16 Aug 2019 16:42:41 +0200 [thread overview]
Message-ID: <20190816144241.11469-9-fw@strlen.de> (raw)
In-Reply-To: <20190816144241.11469-1-fw@strlen.de>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
.../testcases/maps/dumps/typeof_maps_0.nft | 16 ++++++++
tests/shell/testcases/maps/typeof_maps_0 | 26 ++++++++++++
.../testcases/sets/dumps/typeof_sets_0.nft | 31 ++++++++++++++
tests/shell/testcases/sets/typeof_sets_0 | 40 +++++++++++++++++++
4 files changed, 113 insertions(+)
create mode 100644 tests/shell/testcases/maps/dumps/typeof_maps_0.nft
create mode 100755 tests/shell/testcases/maps/typeof_maps_0
create mode 100644 tests/shell/testcases/sets/dumps/typeof_sets_0.nft
create mode 100755 tests/shell/testcases/sets/typeof_sets_0
diff --git a/tests/shell/testcases/maps/dumps/typeof_maps_0.nft b/tests/shell/testcases/maps/dumps/typeof_maps_0.nft
new file mode 100644
index 000000000000..d691f406047f
--- /dev/null
+++ b/tests/shell/testcases/maps/dumps/typeof_maps_0.nft
@@ -0,0 +1,16 @@
+table inet t {
+ map m1 {
+ type typeof(osf name) : mark
+ elements = { "Linux" : 0x00000001 }
+ }
+
+ map m2 {
+ type string,128 : mark
+ elements = { "Linux" : 0x00000001 }
+ }
+
+ chain c {
+ ct mark set osf name map @m1
+ ct mark set osf name map @m2
+ }
+}
diff --git a/tests/shell/testcases/maps/typeof_maps_0 b/tests/shell/testcases/maps/typeof_maps_0
new file mode 100755
index 000000000000..59112c11e224
--- /dev/null
+++ b/tests/shell/testcases/maps/typeof_maps_0
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# support for strings/typeof in named maps.
+# m1 and m2 are identical, they just use different
+# ways for declaration.
+
+EXPECTED="table inet t {
+ map m1 {
+ type typeof(osf name) : typeof(ct mark)
+ elements = { \"Linux\" : 0x1 }
+ }
+
+ map m2 {
+ type string, 128 : mark
+ elements = { \"Linux\" : 0x1 }
+ }
+
+ chain c {
+ ct mark set osf name map @m1
+ ct mark set osf name map @m2
+ }
+}"
+
+set -e
+$NFT -f - <<< $EXPECTED
+
diff --git a/tests/shell/testcases/sets/dumps/typeof_sets_0.nft b/tests/shell/testcases/sets/dumps/typeof_sets_0.nft
new file mode 100644
index 000000000000..7f588fc89ab7
--- /dev/null
+++ b/tests/shell/testcases/sets/dumps/typeof_sets_0.nft
@@ -0,0 +1,31 @@
+table inet t {
+ set s1 {
+ type typeof(osf name)
+ elements = { "Linux" }
+ }
+
+ set s2 {
+ type string,128
+ elements = { "Linux" }
+ }
+
+ set s3 {
+ type typeof(vlan id)
+ elements = { 2, 3, 103 }
+ }
+
+ set s4 {
+ type integer,16
+ elements = { 2, 3, 103, 2003 }
+ }
+
+ chain c1 {
+ osf name @s1 accept
+ osf name @s2 accept
+ }
+
+ chain c2 {
+ vlan id @s3 accept
+ vlan id @s4 accept
+ }
+}
diff --git a/tests/shell/testcases/sets/typeof_sets_0 b/tests/shell/testcases/sets/typeof_sets_0
new file mode 100755
index 000000000000..6ffa10107727
--- /dev/null
+++ b/tests/shell/testcases/sets/typeof_sets_0
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# support for strings/typeof in named sets.
+# s1 and s2 are identical, they just use different
+# ways for declaration.
+
+EXPECTED="table inet t {
+ set s1 {
+ type typeof(osf name)
+ elements = { \"Linux\" }
+ }
+
+ set s2 {
+ type string, 128
+ elements = { \"Linux\" }
+ }
+
+ set s3 {
+ type typeof(vlan id)
+ elements = { 2, 3, 103 }
+ }
+
+ set s4 {
+ type integer,16
+ elements = { 2, 3, 103, 2003 }
+ }
+ chain c1 {
+ osf name @s1 accept
+ osf name @s2 accept
+ }
+
+ chain c2 {
+ ether type vlan vlan id @s3 accept
+ ether type vlan vlan id @s4 accept
+ }
+}"
+
+set -e
+$NFT -f - <<< $EXPECTED
+
--
2.21.0
next prev parent reply other threads:[~2019-08-16 14:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 14:42 [PATCH nftables 0/8] add typeof keyword Florian Westphal
2019-08-16 14:42 ` [PATCH nftables 1/8] src: libnftnl: run single-initcalls only once Florian Westphal
2019-08-16 14:42 ` [PATCH nftables 2/8] src: libnftnl: split nft_ctx_new/free Florian Westphal
2019-08-16 14:42 ` [PATCH nftables 3/8] src: store expr, not dtype to track data in sets Florian Westphal
2019-08-16 14:42 ` [PATCH nftables 4/8] src: parser: add syntax to provide bitsize for non-spcific types Florian Westphal
2019-08-16 14:42 ` [PATCH nftables 5/8] src: add "typeof" keyword Florian Westphal
2019-08-16 14:42 ` [PATCH nftables 6/8] src: add "typeof" print support Florian Westphal
2019-08-16 14:42 ` [PATCH nftables 7/8] src: netlink: remove assertion Florian Westphal
2019-08-16 14:42 ` Florian Westphal [this message]
2019-08-17 10:23 ` [PATCH nftables 0/8] add typeof keyword Pablo Neira Ayuso
2019-08-17 10:33 ` Pablo Neira Ayuso
2019-08-17 19:26 ` Florian Westphal
2019-08-17 20:55 ` Florian Westphal
2019-08-18 14:33 ` Arturo Borrero Gonzalez
2019-08-26 9:49 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190816144241.11469-9-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).