tests: add concat test case with integer base type subkey

Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/tests/shell/testcases/maps/dumps/typeof_maps_0.nft b/tests/shell/testcases/maps/dumps/typeof_maps_0.nft
index ea411335cbd47b0d3c46f2105557a417eb5e34a8..a5c0a60927a7b2757c1f68e35dc0e008f6462d88 100644 (file)
--- a/tests/shell/testcases/maps/dumps/typeof_maps_0.nft
+++ b/tests/shell/testcases/maps/dumps/typeof_maps_0.nft
@@ -20,11 +20,17 @@ table inet t {
                elements = { "eth0" . tcp . 22 : accept }
        }
 
+       map m5 {
+               typeof ipsec in reqid . iifname : verdict
+               elements = { 23 . "eth0" : accept }
+       }
+
        chain c {
                ct mark set osf name map @m1
                meta mark set vlan id map @m2
                meta mark set ip saddr . ip daddr map @m3
                iifname . ip protocol . th dport vmap @m4
                iifname . ip protocol . th dport vmap { "eth0" . tcp . 22 : accept, "eth1" . udp . 67 : drop }
+               ipsec in reqid . iifname vmap @m5
        }
 }

diff --git a/tests/shell/testcases/maps/typeof_maps_0 b/tests/shell/testcases/maps/typeof_maps_0
index 1014d8115fd9308e9b9aac26a1ef8ac0cee1ada2..5cf5dddeb1d61bdac4472d81fb37551e986c3e1c 100755 (executable)
--- a/tests/shell/testcases/maps/typeof_maps_0
+++ b/tests/shell/testcases/maps/typeof_maps_0
@@ -27,12 +27,18 @@ EXPECTED="table inet t {
                elements = { eth0 . tcp . 22 : accept }
        }
 
+       map m5 {
+               typeof ipsec in reqid . meta iifname : verdict
+               elements = { 23 . eth0 : accept }
+       }
+
        chain c {
                ct mark set osf name map @m1
                ether type vlan meta mark set vlan id map @m2
                meta mark set ip saddr . ip daddr map @m3
                iifname . ip protocol . th dport vmap @m4
                iifname . ip protocol . th dport vmap { \"eth0\" . tcp . 22 : accept, \"eth1\" . udp . 67 : drop }
+               ipsec in reqid . meta iifname vmap @m5
        }
 }"
 

diff --git a/tests/shell/testcases/sets/dumps/typeof_sets_0.nft b/tests/shell/testcases/sets/dumps/typeof_sets_0.nft
index e397a63454625b4c63c2076107bb707ce14bb5d7..68b4dcc56e9ad6a8d6cab3f9b1c7496e6997453f 100644 (file)
--- a/tests/shell/testcases/sets/dumps/typeof_sets_0.nft
+++ b/tests/shell/testcases/sets/dumps/typeof_sets_0.nft
@@ -45,6 +45,11 @@ table inet t {
                             15 }
        }
 
+       set s10 {
+               typeof iifname . ip saddr . ipsec in reqid
+               elements = { "eth0" . 10.1.1.2 . 42 }
+       }
+
        chain c1 {
                osf name @s1 accept
        }
@@ -76,4 +81,8 @@ table inet t {
        chain c9 {
                ip hdrlength @s9 accept
        }
+
+       chain c10 {
+               iifname . ip saddr . ipsec in reqid @s10 accept
+       }
 }

diff --git a/tests/shell/testcases/sets/typeof_sets_0 b/tests/shell/testcases/sets/typeof_sets_0
index be906cdcc8421189840fe5d42b07ba908b9c5794..5fc6a1214729d121c121b9d4ee93035a2e796578 100755 (executable)
--- a/tests/shell/testcases/sets/typeof_sets_0
+++ b/tests/shell/testcases/sets/typeof_sets_0
@@ -50,6 +50,11 @@ EXPECTED="table inet t {
                elements = { 0, 1, 2, 3, 4, 15 }
        }
 
+       set s10 {
+               typeof meta iifname . ip saddr . ipsec in reqid
+               elements = { \"eth0\" . 10.1.1.2 . 42 }
+       }
+
        chain c1 {
                osf name @s1 accept
        }
@@ -81,6 +86,10 @@ EXPECTED="table inet t {
        chain c9 {
                ip hdrlength @s9 accept
        }
+
+       chain c10 {
+               meta iifname . ip saddr . ipsec in reqid @s10 accept
+       }
 }"
 
 set -e