Signed-off-by: Florian Westphal <[email protected]>
---
.../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
