tests: shell: remove redundant payload expressions

Now that we keep track of more payload dependencies, more redundant
payloads are eliminated.  Remove these from the shell test-cases.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/tests/shell/testcases/maps/dumps/0010concat_map_0.nft b/tests/shell/testcases/maps/dumps/0010concat_map_0.nft
index b6bc338c55b7395945d708f45b8412d3b2079535..2f796b51d46b784bb1ac12b67f87be9266b35398 100644 (file)
--- a/tests/shell/testcases/maps/dumps/0010concat_map_0.nft
+++ b/tests/shell/testcases/maps/dumps/0010concat_map_0.nft
@@ -6,6 +6,6 @@ table inet x {
 
        chain y {
                type nat hook prerouting priority dstnat; policy accept;
-               meta nfproto ipv4 dnat ip to ip saddr . ip protocol . tcp dport map @z
+               dnat ip to ip saddr . ip protocol . tcp dport map @z
        }
 }

diff --git a/tests/shell/testcases/maps/dumps/nat_addr_port.nft b/tests/shell/testcases/maps/dumps/nat_addr_port.nft
index cf6b957f0a9ba5098112052c344b52c1a0871458..c8493b3adbf26943a39b73bac74b134b6df49df6 100644 (file)
--- a/tests/shell/testcases/maps/dumps/nat_addr_port.nft
+++ b/tests/shell/testcases/maps/dumps/nat_addr_port.nft
@@ -114,15 +114,15 @@ 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 dnat ip to ip saddr map @y4
+               dnat ip to ip saddr . tcp dport map @z4
                dnat ip to numgen inc mod 2 map @t1v4
                meta l4proto tcp dnat ip 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 to ip6 saddr map @y6
-               meta nfproto ipv6 dnat ip6 to ip6 saddr . tcp dport map @z6
+               meta l4proto tcp dnat ip6 to ip6 saddr map @y6
+               dnat ip6 to ip6 saddr . tcp dport map @z6
                dnat ip6 to numgen inc mod 2 map @t1v6
                meta l4proto tcp dnat ip6 to numgen inc mod 2 map @t2v6
        }