tests: shell: adjust tests to new nat concatenation syntax

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/shell/testcases/maps/dumps/nat_addr_port.nft b/tests/shell/testcases/maps/dumps/nat_addr_port.nft
index bd20ae7e65c755e2eecb3cf9439105db366eca41..210cab7f6b00de1f658b10d6096c322ec17d72fc 100644 (file)
--- a/tests/shell/testcases/maps/dumps/nat_addr_port.nft
+++ b/tests/shell/testcases/maps/dumps/nat_addr_port.nft
@@ -19,8 +19,8 @@ table ip ipfoo {
                dnat to ip daddr map @x
                ip saddr 10.1.1.1 dnat to 10.2.3.4
                ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242
-               meta l4proto tcp dnat to ip saddr map @y
-               dnat to ip saddr . tcp dport map @z
+               meta l4proto tcp dnat ip addr . port to ip saddr map @y
+               dnat ip addr . port to ip saddr . tcp dport map @z
        }
 }
 table ip6 ip6foo {
@@ -42,8 +42,8 @@ table ip6 ip6foo {
                dnat to ip6 daddr map @x
                ip6 saddr dead::1 dnat to feed::1
                ip6 saddr dead::2 tcp dport 42 dnat to [c0::1a]:4242
-               meta l4proto tcp dnat to ip6 saddr map @y
-               dnat to ip6 saddr . tcp dport map @z
+               meta l4proto tcp dnat ip6 addr . port to ip6 saddr map @y
+               dnat ip6 addr . port to ip6 saddr . tcp dport map @z
        }
 }
 table inet inetfoo {
@@ -78,12 +78,12 @@ table inet inetfoo {
                dnat ip to ip daddr map @x4
                ip saddr 10.1.1.1 dnat ip to 10.2.3.4
                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 to ip saddr map @y4
-               meta nfproto ipv4 dnat ip to ip saddr . tcp dport map @z4
+               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 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 to ip6 saddr map @y6
-               meta nfproto ipv6 dnat ip6 to ip6 saddr . tcp dport map @z6
+               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
        }
 }

diff --git a/tests/shell/testcases/maps/nat_addr_port b/tests/shell/testcases/maps/nat_addr_port
index 58bb8942720c15f61dee6e742c21e4ecf9ce0420..a8d970e5e5ef597e8b409b15f0a460a59f6b6026 100755 (executable)
--- a/tests/shell/testcases/maps/nat_addr_port
+++ b/tests/shell/testcases/maps/nat_addr_port
@@ -21,8 +21,8 @@ table ip ipfoo {
                dnat to ip daddr map @x
                ip saddr 10.1.1.1 dnat to 10.2.3.4
                ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242
-               meta l4proto tcp dnat to ip saddr map @y
-               meta l4proto tcp dnat to ip saddr . tcp dport map @z
+               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
        }
 }
 EOF
@@ -52,8 +52,8 @@ table ip6 ip6foo {
                dnat to ip6 daddr map @x
                ip6 saddr dead::1 dnat to feed::1
                ip6 saddr dead::2 tcp dport 42 dnat to [c0::1a]:4242
-               meta l4proto tcp dnat to ip6 saddr map @y
-               meta l4proto tcp dnat to ip6 saddr . tcp dport map @z
+               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
        }
 }
 EOF
@@ -93,13 +93,13 @@ table inet inetfoo {
                dnat ip to ip daddr map @x4
                ip saddr 10.1.1.1 dnat to 10.2.3.4
                ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242
-               meta l4proto tcp dnat ip to ip saddr map @y4
-               meta l4proto tcp dnat ip to ip saddr . tcp dport map @z4
+               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 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 to ip6 saddr map @y6
-               meta l4proto tcp dnat ip6 to ip6 saddr . tcp dport map @z6
+               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
        }
 }
 EOF