test: shell: Don't use system nft binary

Use the defined $NFT variable instead of calling the system nft binary directly.
Add a nat_ftp.nodump file to avoid the following check-tree.sh error:
ERR: "tests/shell/testcases/packetpath/nat_ftp" has no "tests/shell/testcases/packetpath/dumps/nat_ftp.{nft,nodump}" file.

Signed-off-by: Yi Chen <yiche@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/tests/shell/testcases/packetpath/dumps/nat_ftp.nodump b/tests/shell/testcases/packetpath/dumps/nat_ftp.nodump
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/shell/testcases/packetpath/flowtables b/tests/shell/testcases/packetpath/flowtables
index b68c5dd4e8e224d9c8eec0a2bc6279c4fb5ed3aa..ab11431f93a5062f3f7ad17faf83dee4cccf00f7 100755 (executable)
--- a/tests/shell/testcases/packetpath/flowtables
+++ b/tests/shell/testcases/packetpath/flowtables
@@ -67,7 +67,7 @@ sleep 3
 ip netns exec $C ping -q -6 2001:db8:ffff:22::1 -c1
 assert_pass "topo initialization"
 
-ip netns exec $R nft -f - <<EOF
+ip netns exec $R $NFT -f - <<EOF
 table ip6 filter {
         flowtable f1 {
                 hook ingress priority -100
@@ -88,7 +88,7 @@ assert_pass "apply nft ruleset"
 
 if [ ! -r /proc/net/nf_conntrack ]
 then
-       echo "E: nf_conntrack unreadable, skipping" >&2 
+       echo "E: nf_conntrack unreadable, skipping" >&2
        exit 77
 fi
 

diff --git a/tests/shell/testcases/packetpath/nat_ftp b/tests/shell/testcases/packetpath/nat_ftp
index 327047b81b434f10612d8a21e9320d1c9414a178..738bcb9808782953b37b67ffa406636aaef63cc6 100755 (executable)
--- a/tests/shell/testcases/packetpath/nat_ftp
+++ b/tests/shell/testcases/packetpath/nat_ftp
@@ -20,7 +20,7 @@ assert_pass()
        if [ $ret != 0 ]
        then
                echo "FAIL: ${@}"
-               ip netns exec $R nft list ruleset
+               ip netns exec $R $NFT list ruleset
                tcpdump -nnr ${PCAP}
                test -r /proc/net/nf_conntrack && ip netns exec $R cat /proc/net/nf_conntrack
                ip netns exec $R conntrack -S
@@ -82,7 +82,7 @@ assert_pass "topo initialization"
 reload_ruleset()
 {
        ip netns exec $R conntrack -F 2> /dev/null
-       ip netns exec $R nft -f - <<-EOF
+       ip netns exec $R $NFT -f - <<-EOF
        flush ruleset
        table ip6 ftp_helper_nat_test {
                ct helper ftp-standard {