tests: update nat_addr_port with typeof+concat maps

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

diff --git a/tests/shell/testcases/maps/dumps/nat_addr_port.nft b/tests/shell/testcases/maps/dumps/nat_addr_port.nft
index 210cab7f6b00de1f658b10d6096c322ec17d72fc..89c3bd145b4d7102efaa6a05c09738f80f2652a2 100644 (file)
--- a/tests/shell/testcases/maps/dumps/nat_addr_port.nft
+++ b/tests/shell/testcases/maps/dumps/nat_addr_port.nft
@@ -1,4 +1,12 @@
 table ip ipfoo {
+       map t1 {
+               typeof numgen inc mod 2 : ip daddr
+       }
+
+       map t2 {
+               typeof numgen inc mod 2 : ip daddr . tcp dport
+       }
+
        map x {
                type ipv4_addr : ipv4_addr
        }
@@ -21,9 +29,19 @@ table ip ipfoo {
                ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242
                meta l4proto tcp dnat ip addr . port to ip saddr map @y
                dnat ip addr . port to ip saddr . tcp dport map @z
+               dnat to numgen inc mod 2 map @t1
+               meta l4proto tcp dnat ip addr . port to numgen inc mod 2 map @t2
        }
 }
 table ip6 ip6foo {
+       map t1 {
+               typeof numgen inc mod 2 : ip6 daddr
+       }
+
+       map t2 {
+               typeof numgen inc mod 2 : ip6 daddr . tcp dport
+       }
+
        map x {
                type ipv6_addr : ipv6_addr
        }
@@ -44,9 +62,27 @@ table ip6 ip6foo {
                ip6 saddr dead::2 tcp dport 42 dnat to [c0::1a]:4242
                meta l4proto tcp dnat ip6 addr . port to ip6 saddr map @y
                dnat ip6 addr . port to ip6 saddr . tcp dport map @z
+               dnat to numgen inc mod 2 map @t1
+               meta l4proto tcp dnat ip6 addr . port to numgen inc mod 2 map @t2
        }
 }
 table inet inetfoo {
+       map t1v4 {
+               typeof numgen inc mod 2 : ip daddr
+       }
+
+       map t2v4 {
+               typeof numgen inc mod 2 : ip daddr . tcp dport
+       }
+
+       map t1v6 {
+               typeof numgen inc mod 2 : ip6 daddr
+       }
+
+       map t2v6 {
+               typeof numgen inc mod 2 : ip6 daddr . tcp dport
+       }
+
        map x4 {
                type ipv4_addr : ipv4_addr
        }
@@ -80,10 +116,14 @@ table inet inetfoo {
                ip saddr 10.1.1.2 tcp dport 42 dnat ip to 10.2.3.4:4242
                meta l4proto tcp meta nfproto ipv4 dnat ip addr . port to ip saddr map @y4
                meta nfproto ipv4 dnat ip addr . port to ip saddr . tcp dport map @z4
+               dnat ip to numgen inc mod 2 map @t1v4
+               meta l4proto tcp dnat ip addr . port to numgen inc mod 2 map @t2v4
                dnat ip6 to ip6 daddr map @x6
                ip6 saddr dead::1 dnat ip6 to feed::1
                ip6 saddr dead::2 tcp dport 42 dnat ip6 to [c0::1a]:4242
                meta l4proto tcp meta nfproto ipv6 dnat ip6 addr . port to ip6 saddr map @y6
                meta nfproto ipv6 dnat ip6 addr . port to ip6 saddr . tcp dport map @z6
+               dnat ip6 to numgen inc mod 2 map @t1v6
+               meta l4proto tcp dnat ip6 addr . port to numgen inc mod 2 map @t2v6
        }
 }

diff --git a/tests/shell/testcases/maps/nat_addr_port b/tests/shell/testcases/maps/nat_addr_port
index a8d970e5e5ef597e8b409b15f0a460a59f6b6026..2804d48ca406234e705355c1648f85af8d04dc9c 100755 (executable)
--- a/tests/shell/testcases/maps/nat_addr_port
+++ b/tests/shell/testcases/maps/nat_addr_port
@@ -3,6 +3,14 @@
 # skeleton
 $NFT -f /dev/stdin <<EOF || exit 1
 table ip ipfoo {
+       map t1 {
+               typeof numgen inc mod 2 : ip daddr;
+       }
+
+       map t2 {
+               typeof numgen inc mod 2 : ip daddr . tcp dport
+       }
+
        map x {
                type ipv4_addr : ipv4_addr
        }
@@ -23,6 +31,8 @@ table ip ipfoo {
                ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242
                meta l4proto tcp dnat ip addr . port to ip saddr map @y
                meta l4proto tcp dnat ip addr . port to ip saddr . tcp dport map @z
+               dnat ip to numgen inc mod 2 map @t1
+               meta l4proto tcp dnat ip addr . port to numgen inc mod 2 map @t2
        }
 }
 EOF
@@ -36,6 +46,14 @@ $NFT add rule 'ip ipfoo c dnat to ip daddr map @y' && exit 1
 # skeleton 6
 $NFT -f /dev/stdin <<EOF || exit 1
 table ip6 ip6foo {
+       map t1 {
+               typeof numgen inc mod 2 : ip6 daddr;
+       }
+
+       map t2 {
+               typeof numgen inc mod 2 : ip6 daddr . tcp dport
+       }
+
        map x {
                type ipv6_addr : ipv6_addr
        }
@@ -54,6 +72,8 @@ table ip6 ip6foo {
                ip6 saddr dead::2 tcp dport 42 dnat to [c0::1a]:4242
                meta l4proto tcp dnat ip6 addr . port to ip6 saddr map @y
                meta l4proto tcp dnat ip6 addr . port to ip6 saddr . tcp dport map @z
+               dnat ip6 to numgen inc mod 2 map @t1
+               meta l4proto tcp dnat ip6 addr . port to numgen inc mod 2 map @t2
        }
 }
 EOF
@@ -67,6 +87,22 @@ $NFT add rule 'ip6 ip6foo c dnat to ip daddr map @y' && exit 1
 # skeleton inet
 $NFT -f /dev/stdin <<EOF || exit 1
 table inet inetfoo {
+       map t1v4 {
+               typeof numgen inc mod 2 : ip daddr
+       }
+
+       map t2v4 {
+               typeof numgen inc mod 2 : ip daddr . tcp dport;
+       }
+
+       map t1v6 {
+               typeof numgen inc mod 2 : ip6 daddr;
+       }
+
+       map t2v6 {
+               typeof numgen inc mod 2 : ip6 daddr . tcp dport
+       }
+
        map x4 {
                type ipv4_addr : ipv4_addr
        }
@@ -95,11 +131,15 @@ table inet inetfoo {
                ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242
                meta l4proto tcp dnat ip addr . port to ip saddr map @y4
                meta l4proto tcp dnat ip addr . port to ip saddr . tcp dport map @z4
+               dnat ip to numgen inc mod 2 map @t1v4
+               meta l4proto tcp dnat ip addr . port to numgen inc mod 2 map @t2v4
                dnat ip6 to ip6 daddr map @x6
                ip6 saddr dead::1 dnat to feed::1
                ip6 saddr dead::2 tcp dport 42 dnat to [c0::1a]:4242
                meta l4proto tcp dnat ip6 addr . port to ip6 saddr map @y6
                meta l4proto tcp dnat ip6 addr . port to ip6 saddr . tcp dport map @z6
+               dnat ip6 to numgen inc mod 2 map @t1v6
+               meta l4proto tcp dnat ip6 addr . port to numgen inc mod 2 map @t2v6
        }
 }
 EOF