tests: shell: make testcases which using tcp/udp port more rubost

In my mechain, port 12345 is mapped to italk in /etc/services:
  italk           12345/tcp               # Italk Chat System

So when we add nft rule with udp port "12345", nft list ruleset
will displayed it as "italk", that cause the result is not same
with expected, then testcase fail.

Add "-nn" option when dump the rulesets from the kernel, make
testcases which using tcp/udp port more rubost.

Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Acked-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/shell/testcases/netns/0001nft-f_0 b/tests/shell/testcases/netns/0001nft-f_0
index e616363e358cfdc9c8203603a0f6955c818284bb..663167d741c57c821f4a31e6a9c637a968d3ec6e 100755 (executable)
--- a/tests/shell/testcases/netns/0001nft-f_0
+++ b/tests/shell/testcases/netns/0001nft-f_0
@@ -99,7 +99,7 @@ if [ $? -ne 0 ] ; then
        exit 1
 fi
 
-KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)"
+KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset -nn)"
 $IP netns del $NETNS_NAME
 if [ "$RULESET" != "$KERNEL_RULESET" ] ; then
         DIFF="$(which diff)"

diff --git a/tests/shell/testcases/netns/0002loosecommands_0 b/tests/shell/testcases/netns/0002loosecommands_0
index 1600d946d976e3ed3ea486520eb8a84c0744e7fc..fbaa38658de6abbced2ce473319c4f8c045980ad 100755 (executable)
--- a/tests/shell/testcases/netns/0002loosecommands_0
+++ b/tests/shell/testcases/netns/0002loosecommands_0
@@ -53,7 +53,7 @@ RULESET="table ip t {
        }
 }"
 
-KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)"
+KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset -nn)"
 $IP netns del $NETNS_NAME
 if [ "$RULESET" != "$KERNEL_RULESET" ] ; then
         DIFF="$(which diff)"

diff --git a/tests/shell/testcases/netns/0003many_0 b/tests/shell/testcases/netns/0003many_0
index ad71ae37992caf9c92f6a8962460c3e6721175e9..f8853ee5a98c2cde2ea499390889e624946b965d 100755 (executable)
--- a/tests/shell/testcases/netns/0003many_0
+++ b/tests/shell/testcases/netns/0003many_0
@@ -104,7 +104,7 @@ function test_netns()
                exit 1
        fi
 
-       KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset)"
+       KERNEL_RULESET="$($IP netns exec $NETNS_NAME $NFT list ruleset -nn)"
        if [ "$RULESET" != "$KERNEL_RULESET" ] ; then
                echo "E: ruleset in netns $NETNS_NAME differs from the loaded" >&2
                DIFF="$(which diff)"

diff --git a/tests/shell/testcases/nft-f/0002rollback_rule_0 b/tests/shell/testcases/nft-f/0002rollback_rule_0
index b1e224c3d19e7e2c4bc3f113a03f959aa4dc99ef..5518c0b2de46b4bbde6b941a6c14a453f22fc3ec 100755 (executable)
--- a/tests/shell/testcases/nft-f/0002rollback_rule_0
+++ b/tests/shell/testcases/nft-f/0002rollback_rule_0
@@ -49,7 +49,7 @@ if [ $? -eq 0 ]       ; then
        exit 1
 fi
 
-KERNEL_RULESET="$($NFT list ruleset)"
+KERNEL_RULESET="$($NFT list ruleset -nn)"
 
 if [ "$GOOD_RULESET" != "$KERNEL_RULESET" ] ; then
         DIFF="$(which diff)"

diff --git a/tests/shell/testcases/nft-f/0003rollback_jump_0 b/tests/shell/testcases/nft-f/0003rollback_jump_0
index 567a70e749617e0b0310b063f91af65c888952c9..5c8c6852bc98c4eaba595251b94fbbce96fff9f0 100755 (executable)
--- a/tests/shell/testcases/nft-f/0003rollback_jump_0
+++ b/tests/shell/testcases/nft-f/0003rollback_jump_0
@@ -49,7 +49,7 @@ if [ $? -eq 0 ]       ; then
        exit 1
 fi
 
-KERNEL_RULESET="$($NFT list ruleset)"
+KERNEL_RULESET="$($NFT list ruleset -nn)"
 
 if [ "$GOOD_RULESET" != "$KERNEL_RULESET" ] ; then
         DIFF="$(which diff)"

diff --git a/tests/shell/testcases/nft-f/0004rollback_set_0 b/tests/shell/testcases/nft-f/0004rollback_set_0
index 3521aebdb09344dca7244de473f319be057a782c..db1c84cb1b349645b8d4a292fd9d3728e718873a 100755 (executable)
--- a/tests/shell/testcases/nft-f/0004rollback_set_0
+++ b/tests/shell/testcases/nft-f/0004rollback_set_0
@@ -49,7 +49,7 @@ if [ $? -eq 0 ]       ; then
        exit 1
 fi
 
-KERNEL_RULESET="$($NFT list ruleset)"
+KERNEL_RULESET="$($NFT list ruleset -nn)"
 
 if [ "$GOOD_RULESET" != "$KERNEL_RULESET" ] ; then
         DIFF="$(which diff)"

diff --git a/tests/shell/testcases/nft-f/0005rollback_map_0 b/tests/shell/testcases/nft-f/0005rollback_map_0
index 21b6a6371554838ebd593ed7ffcef7f579464354..13bb90752ffc1dadec1ec87d07973f6e529ecc67 100755 (executable)
--- a/tests/shell/testcases/nft-f/0005rollback_map_0
+++ b/tests/shell/testcases/nft-f/0005rollback_map_0
@@ -52,7 +52,7 @@ if [ $? -eq 0 ]       ; then
        exit 1
 fi
 
-KERNEL_RULESET="$($NFT list ruleset)"
+KERNEL_RULESET="$($NFT list ruleset -nn)"
 
 if [ "$GOOD_RULESET" != "$KERNEL_RULESET" ] ; then
         DIFF="$(which diff)"