From: Petr Vorel <pvorel@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH] network/iptables: add ipv6 support
Date: Fri, 3 Jan 2020 13:48:51 +0100 [thread overview]
Message-ID: <20200103124851.GA24603@dell5510> (raw)
In-Reply-To: <20191226135801.11839-1-alexey.kodanev@oracle.com>
Hi Alexey,
> New tests: ip6tables, nft6.
great idea, just there is a regression in nft01.sh, see below.
> Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
> --- a/testcases/network/iptables/iptables_lib.sh
...
> init()
> {
> + if [ "$use_iptables" = 1 ]; then
> + toolname=ip${TST_IPV6}tables
> + cmds="$toolname"
> + tst_require_drivers ip${TST_IPV6}_tables
> + else
> + toolname=nft
> + cmds="$toolname ip${TST_IPV6}tables-translate"
> + fi
> +
> + if [ "$TST_IPV6" ];then
> + loc_addr="::1"
> + proto="icmpv6"
> + else
> + loc_addr="127.0.0.1"
> + proto="icmp"
> + fi
> +
> + ping_cmd="ping$TST_IPV6"
> + tst_require_cmds $cmds $ping_cmd
change to tst_require_cmds() does not catch missing nft:
nft check broke, original:
nft01 1 TCONF: 'nft' not found
now:
/bin/sh: 1: nft: not found
nft01 1 TBROK: nft add table ip filter failed
one of these fixes it (take whatever you like. Both variants check nft twice,
I'd ignore it).
* use TST_NEEDS_CMDS
diff --git testcases/network/iptables/iptables_lib.sh testcases/network/iptables/iptables_lib.sh
index ad2a894b6..8d220bc0e 100755
--- testcases/network/iptables/iptables_lib.sh
+++ testcases/network/iptables/iptables_lib.sh
@@ -12,7 +12,7 @@ TST_NEEDS_TMPDIR=1
TST_NEEDS_ROOT=1
TST_SETUP="${TST_SETUP:-init}"
TST_CLEANUP="${TST_CLEANUP:-cleanup}"
-TST_NEEDS_CMDS="grep telnet"
+TST_NEEDS_CMDS="$TST_NEEDS_CMDS grep telnet"
. tst_net.sh
diff --git testcases/network/iptables/nft01.sh testcases/network/iptables/nft01.sh
index 1ae086678..225f59bc5 100755
--- testcases/network/iptables/nft01.sh
+++ testcases/network/iptables/nft01.sh
@@ -5,6 +5,7 @@
TST_SETUP="do_setup"
TST_CLEANUP="do_cleanup"
TST_NEEDS_DRIVERS="nf_tables"
+TST_NEEDS_CMDS="nft"
use_iptables=0
cleanup_table=0
cleanup_chain=0
* use tst_require_cmds
diff --git testcases/network/iptables/nft01.sh testcases/network/iptables/nft01.sh
index 1ae086678..e5799b918 100755
--- testcases/network/iptables/nft01.sh
+++ testcases/network/iptables/nft01.sh
@@ -15,6 +15,7 @@ do_setup()
{
local ip_table="ip${TST_IPV6}"
+ tst_require_cmds nft
if ! nft list table $ip_table filter > /dev/null 2>&1; then
ROD nft add table $ip_table filter
cleanup_table=1
Kind regards,
Petr
next prev parent reply other threads:[~2020-01-03 12:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-26 13:58 [LTP] [PATCH] network/iptables: add ipv6 support Alexey Kodanev
2020-01-03 12:48 ` Petr Vorel [this message]
2020-01-09 10:17 ` Alexey Kodanev
2020-01-09 10:51 ` Petr Vorel
2020-01-09 14:16 ` Alexey Kodanev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200103124851.GA24603@dell5510 \
--to=pvorel@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox