I have adapted this test to the new syntax, but it stills fails here:
# ./run-tests.sh testcases/maps/nat_addr_port
I: using nft binary ./../../src/nft
W: [FAILED] testcases/maps/nat_addr_port: got 1
/dev/stdin:6:20-28: Error: datatype mismatch: expected concatenation of (IPv4 address, internet network service), expression has type IPv4 address
type ipv4_addr : ipv4_addr . inet_service
^^^^^^^^^
Attaching the patch to update it.
diff --git a/tests/shell/testcases/maps/dumps/nat_addr_port.nft b/tests/shell/testcases/maps/dumps/nat_addr_port.nft
index bd20ae7e..210cab7f 100644
--- 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 58bb8942..1a0c8521 100755
--- 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
@@ -31,7 +31,7 @@ EOF
$NFT add rule 'ip ipfoo c ip saddr 10.1.1.2 dnat to 10.2.3.4:4242' && exit 1
# should fail: rule has no test for l4 protocol, but map has inet_service
-$NFT add rule 'ip ipfoo c dnat to ip daddr map @y' && exit 1
+$NFT add rule 'ip ipfoo c dnat ip addr . port to ip daddr map @y' && exit 1
# skeleton 6
$NFT -f /dev/stdin <<EOF || exit 1
@@ -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 ip 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
