From patchwork Fri Jun 1 11:49:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 923967 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y2hG1zZQz9s1b for ; Fri, 1 Jun 2018 21:50:22 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 86FC73E798A for ; Fri, 1 Jun 2018 13:50:19 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) by picard.linux.it (Postfix) with ESMTP id 0EC703E78CE for ; Fri, 1 Jun 2018 13:50:18 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 7EF471000A8C for ; Fri, 1 Jun 2018 13:50:17 +0200 (CEST) Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DD1D5AE64; Fri, 1 Jun 2018 11:50:16 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 1 Jun 2018 13:49:50 +0200 Message-Id: <20180601114956.17265-2-pvorel@suse.cz> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180601114956.17265-1-pvorel@suse.cz> References: <20180601114956.17265-1-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH 1/7] tst_net.sh: Simplify ipver settings code X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Petr Vorel --- testcases/lib/tst_net.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh index dc612a794..fd2eacf2f 100644 --- a/testcases/lib/tst_net.sh +++ b/testcases/lib/tst_net.sh @@ -29,11 +29,12 @@ TST_SETUP="tst_net_setup" # Blank for an IPV4 test; 6 for an IPV6 test. TST_IPV6=${TST_IPV6:-} +ipver=${TST_IPV6:-4} tst_net_parse_args() { case $1 in - 6) TST_IPV6=6;; + 6) TST_IPV6=6 ipver=6;; *) $TST_PARSE_ARGS_CALLER "$1" "$2";; esac } @@ -68,7 +69,6 @@ tst_net_remote_tmpdir() tst_net_setup() { - ipver=${TST_IPV6:-4} tst_net_remote_tmpdir [ -n "$TST_SETUP_CALLER" ] && $TST_SETUP_CALLER } @@ -79,7 +79,6 @@ fi if [ -n "$TST_USE_LEGACY_API" ]; then tst_net_read_opts "$@" - ipver=${TST_IPV6:-4} fi # old vs. new API compatibility layer From patchwork Fri Jun 1 11:49:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 923968 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y2hN1tP1z9ry1 for ; Fri, 1 Jun 2018 21:50:28 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 800D13E7A55 for ; Fri, 1 Jun 2018 13:50:25 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id 699E83E78CE for ; Fri, 1 Jun 2018 13:50:18 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id E4DB120101B for ; Fri, 1 Jun 2018 13:50:17 +0200 (CEST) Received: from relay1.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 9584EAEC9; Fri, 1 Jun 2018 11:50:17 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 1 Jun 2018 13:49:51 +0200 Message-Id: <20180601114956.17265-3-pvorel@suse.cz> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180601114956.17265-1-pvorel@suse.cz> References: <20180601114956.17265-1-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH 2/7] tst_net.sh: Rename ipver to TST_IPVER X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" + rename variable in network interface and multicast tests, where it's used from tst_net.sh (other tests set it in setup functions, these not changed). Signed-off-by: Petr Vorel --- testcases/lib/tst_net.sh | 4 ++-- testcases/lib/tst_test.sh | 2 +- testcases/network/stress/interface/if-addr-adddel | 2 +- testcases/network/stress/interface/if-addr-addlarge | 2 +- testcases/network/stress/interface/if-route-addlarge | 2 +- .../stress/multicast/grp-operation/mcast-group-multiple-socket | 2 +- .../network/stress/multicast/grp-operation/mcast-group-same-group | 2 +- .../network/stress/multicast/grp-operation/mcast-group-single-socket | 2 +- .../network/stress/multicast/grp-operation/mcast-group-source-filter | 2 +- testcases/network/stress/multicast/grp-operation/mcast-lib.sh | 2 +- testcases/network/stress/ns-tools/tst_net_stress.sh | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh index fd2eacf2f..aad701952 100644 --- a/testcases/lib/tst_net.sh +++ b/testcases/lib/tst_net.sh @@ -29,12 +29,12 @@ TST_SETUP="tst_net_setup" # Blank for an IPV4 test; 6 for an IPV6 test. TST_IPV6=${TST_IPV6:-} -ipver=${TST_IPV6:-4} +TST_IPVER=${TST_IPV6:-4} tst_net_parse_args() { case $1 in - 6) TST_IPV6=6 ipver=6;; + 6) TST_IPV6=6 TST_IPVER=6;; *) $TST_PARSE_ARGS_CALLER "$1" "$2";; esac } diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index d8d60c156..1130c462c 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -255,7 +255,7 @@ tst_run() OPTS|USAGE|PARSE_ARGS|POS_ARGS);; NEEDS_ROOT|NEEDS_TMPDIR|NEEDS_DEVICE|DEVICE);; NEEDS_CMDS|NEEDS_MODULE|MODPATH|DATAROOT);; - IPV6);; + IPV6|IPVER);; *) tst_res TWARN "Reserved variable TST_$tst_i used!";; esac done diff --git a/testcases/network/stress/interface/if-addr-adddel b/testcases/network/stress/interface/if-addr-adddel index 6728e2758..8e3990f93 100644 --- a/testcases/network/stress/interface/if-addr-adddel +++ b/testcases/network/stress/interface/if-addr-adddel @@ -37,7 +37,7 @@ test_body() local netmask=24 fi - tst_res TINFO "'$cmd' add/del IPv$ipver '$new_ip' $NS_TIMES times" + tst_res TINFO "'$cmd' add/del IPv$TST_IPVER '$new_ip' $NS_TIMES times" if ! restore_ipaddr; then tst_res TBROK "Failed to set default IP addresses" diff --git a/testcases/network/stress/interface/if-addr-addlarge b/testcases/network/stress/interface/if-addr-addlarge index b773dddf0..78641e462 100644 --- a/testcases/network/stress/interface/if-addr-addlarge +++ b/testcases/network/stress/interface/if-addr-addlarge @@ -31,7 +31,7 @@ test_body() local iface=$(tst_iface) [ "$TST_IPV6" ] && local netmask=64 || local netmask=16 - tst_res TINFO "'$cmd' add $IP_TOTAL IPv$ipver addresses" + tst_res TINFO "'$cmd' add $IP_TOTAL IPv$TST_IPVER addresses" tst_res TINFO "check interval that $iface is working: $CHECK_INTERVAL" if ! restore_ipaddr; then diff --git a/testcases/network/stress/interface/if-route-addlarge b/testcases/network/stress/interface/if-route-addlarge index ec22f9d2a..f522f9a16 100644 --- a/testcases/network/stress/interface/if-route-addlarge +++ b/testcases/network/stress/interface/if-route-addlarge @@ -35,7 +35,7 @@ test_body() opt_rt='/32' fi - tst_res TINFO "'$cmd' add IPv$ipver $ROUTE_TOTAL routes" + tst_res TINFO "'$cmd' add IPv$TST_IPVER $ROUTE_TOTAL routes" if ! restore_ipaddr; then tst_res TBROK "Failed to set default IP addresses" diff --git a/testcases/network/stress/multicast/grp-operation/mcast-group-multiple-socket b/testcases/network/stress/multicast/grp-operation/mcast-group-multiple-socket index 2939a68e6..7b79b42df 100644 --- a/testcases/network/stress/multicast/grp-operation/mcast-group-multiple-socket +++ b/testcases/network/stress/multicast/grp-operation/mcast-group-multiple-socket @@ -34,7 +34,7 @@ do_setup() do_test() { - tst_res TINFO "joining $MCASTNUM_HEAVY IPv$ipver multicast groups on multiple sockets" + tst_res TINFO "joining $MCASTNUM_HEAVY IPv$TST_IPVER multicast groups on multiple sockets" do_multicast_test_multiple_join $MCASTNUM_HEAVY true } diff --git a/testcases/network/stress/multicast/grp-operation/mcast-group-same-group b/testcases/network/stress/multicast/grp-operation/mcast-group-same-group index cfdc114f4..e10f16c09 100644 --- a/testcases/network/stress/multicast/grp-operation/mcast-group-same-group +++ b/testcases/network/stress/multicast/grp-operation/mcast-group-same-group @@ -28,7 +28,7 @@ do_setup() do_test() { - tst_res TINFO "joining and leaving the same IPv$ipver multicast group on $MCASTNUM_NORMAL sockets in $NS_TIMES times" + tst_res TINFO "joining and leaving the same IPv$TST_IPVER multicast group on $MCASTNUM_NORMAL sockets in $NS_TIMES times" do_multicast_test_join_leave $MCASTNUM_NORMAL } diff --git a/testcases/network/stress/multicast/grp-operation/mcast-group-single-socket b/testcases/network/stress/multicast/grp-operation/mcast-group-single-socket index 9334072fb..ff58152cb 100644 --- a/testcases/network/stress/multicast/grp-operation/mcast-group-single-socket +++ b/testcases/network/stress/multicast/grp-operation/mcast-group-single-socket @@ -28,7 +28,7 @@ do_setup() do_test() { - tst_res TINFO "joining $MCASTNUM_HEAVY IPv$ipver multicast groups on a single socket" + tst_res TINFO "joining $MCASTNUM_HEAVY IPv$TST_IPVER multicast groups on a single socket" do_multicast_test_multiple_join $MCASTNUM_HEAVY } diff --git a/testcases/network/stress/multicast/grp-operation/mcast-group-source-filter b/testcases/network/stress/multicast/grp-operation/mcast-group-source-filter index a14bded29..df70344da 100644 --- a/testcases/network/stress/multicast/grp-operation/mcast-group-source-filter +++ b/testcases/network/stress/multicast/grp-operation/mcast-group-source-filter @@ -28,7 +28,7 @@ do_setup() do_test() { - tst_res TINFO "joining and leaving the same IPv$ipver multicast group with a different source filters on $MCASTNUM_NORMAL sockets in $NS_TIMES times" + tst_res TINFO "joining and leaving the same IPv$TST_IPVER multicast group with a different source filters on $MCASTNUM_NORMAL sockets in $NS_TIMES times" do_multicast_test_join_leave $MCASTNUM_NORMAL true } diff --git a/testcases/network/stress/multicast/grp-operation/mcast-lib.sh b/testcases/network/stress/multicast/grp-operation/mcast-lib.sh index 6796f59f9..8e9420ed2 100644 --- a/testcases/network/stress/multicast/grp-operation/mcast-lib.sh +++ b/testcases/network/stress/multicast/grp-operation/mcast-lib.sh @@ -61,7 +61,7 @@ mcast_setup() { local max="$1" - MCAST_LCMD="ns-mcast_join -f $ipver -I $(tst_iface)" + MCAST_LCMD="ns-mcast_join -f $TST_IPVER -I $(tst_iface)" local cmd="ns-igmp_querier" [ "$TST_IPV6" ] && cmd="ns-icmpv6_sender" diff --git a/testcases/network/stress/ns-tools/tst_net_stress.sh b/testcases/network/stress/ns-tools/tst_net_stress.sh index 9b02fd9ca..e5c2672a3 100644 --- a/testcases/network/stress/ns-tools/tst_net_stress.sh +++ b/testcases/network/stress/ns-tools/tst_net_stress.sh @@ -115,7 +115,7 @@ make_background_tcp_traffic() pgrep -x netstress > /dev/null && return local ip="${1:-$(tst_ipaddr)}" - local port=$(tst_get_unused_port ipv${ipver} stream) + local port=$(tst_get_unused_port ipv${TST_IPVER} stream) netstress -R 3 -g $port > /dev/null 2>&1 & tst_rhost_run -b -c "netstress -l -H $ip -g $port" From patchwork Fri Jun 1 11:49:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 923969 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y2hT3C7cz9ry1 for ; Fri, 1 Jun 2018 21:50:33 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id CEAE53E7A76 for ; Fri, 1 Jun 2018 13:50:30 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) by picard.linux.it (Postfix) with ESMTP id F04923E78F2 for ; Fri, 1 Jun 2018 13:50:18 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 997712010A1 for ; Fri, 1 Jun 2018 13:50:18 +0200 (CEST) Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 4AB0CAECD; Fri, 1 Jun 2018 11:50:18 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 1 Jun 2018 13:49:52 +0200 Message-Id: <20180601114956.17265-4-pvorel@suse.cz> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180601114956.17265-1-pvorel@suse.cz> References: <20180601114956.17265-1-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH 3/7] net/dns: Replace $ipver by $TST_IPVER from tst_net.sh X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" NOTE: remote tests still use $ip_ver, as IP version is passed to them as $1. Signed-off-by: Petr Vorel --- testcases/network/stress/dns/dns-stress | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testcases/network/stress/dns/dns-stress b/testcases/network/stress/dns/dns-stress index c0c397d4e..2c8d8a91f 100755 --- a/testcases/network/stress/dns/dns-stress +++ b/testcases/network/stress/dns/dns-stress @@ -45,8 +45,6 @@ common_setup() tst_require_root tst_check_cmds named dig - ipver=${TST_IPV6:-'4'} - if [ "$TST_IPV6" ]; then record="AAAA" net="fd00:cafe" @@ -165,10 +163,10 @@ start_named() chmod 770 . chmod 660 ./* - port=$(tst_get_unused_port ipv${ipver} dgram) + port=$(tst_get_unused_port ipv${TST_IPVER} dgram) tst_resm TINFO "Start named daemon, port $port" - named -$ipver -c named.conf -p $port || \ + named -$TST_IPVER -c named.conf -p $port || \ tst_brkm TBROK "Failed to run named daemon" # Make sure named.pid is created. @@ -182,7 +180,7 @@ test01() { tst_resm TINFO "Handling name lookup queries '$NS_TIMES' times" - tst_rhost_run -s -c "dns-stress01-rmt $ipver $(tst_ipaddr) $port \ + tst_rhost_run -s -c "dns-stress01-rmt $TST_IPVER $(tst_ipaddr) $port \ $DOMAIN $MIN_ID $MAX_ID $NS_TIMES" tst_resm TPASS "Test is finished successfully" @@ -192,7 +190,7 @@ test02() { tst_resm TINFO "Handling reverse lookup queries '$NS_TIMES' times" - tst_rhost_run -s -c "dns-stress02-rmt $ipver $(tst_ipaddr) $port $net \ + tst_rhost_run -s -c "dns-stress02-rmt $TST_IPVER $(tst_ipaddr) $port $net \ $MIN_ID $MAX_ID $NS_TIMES" tst_resm TPASS "Test is finished successfully" @@ -200,7 +198,7 @@ test02() common_setup -setup_$ipver +setup_$TST_IPVER start_named From patchwork Fri Jun 1 11:49:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 923970 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y2hY0xjCz9ry1 for ; Fri, 1 Jun 2018 21:50:37 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 530A23E7A55 for ; Fri, 1 Jun 2018 13:50:34 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id C034A3E790E for ; Fri, 1 Jun 2018 13:50:19 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 6E1322010A1 for ; Fri, 1 Jun 2018 13:50:19 +0200 (CEST) Received: from relay1.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id EA738AED1; Fri, 1 Jun 2018 11:50:18 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 1 Jun 2018 13:49:53 +0200 Message-Id: <20180601114956.17265-5-pvorel@suse.cz> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180601114956.17265-1-pvorel@suse.cz> References: <20180601114956.17265-1-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH 4/7] net/ftp: Replace $ipver by $TST_IPVER from tst_net.sh X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Petr Vorel --- testcases/network/stress/ftp/ftp-download-stress | 3 +-- testcases/network/stress/ftp/ftp-upload-stress | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/testcases/network/stress/ftp/ftp-download-stress b/testcases/network/stress/ftp/ftp-download-stress index 13ecbd067..159529ff6 100644 --- a/testcases/network/stress/ftp/ftp-download-stress +++ b/testcases/network/stress/ftp/ftp-download-stress @@ -45,8 +45,7 @@ setup() tst_check_cmds pkill vsftpd tst_tmpdir - ipver=${TST_IPV6:-'4'} - tst_resm TINFO "run FTP over IPv$ipver" + tst_resm TINFO "run FTP over IPv$TST_IPVER" trap "tst_brkm TBROK 'test interrupted'" INT diff --git a/testcases/network/stress/ftp/ftp-upload-stress b/testcases/network/stress/ftp/ftp-upload-stress index 402f50f65..8dc2219b3 100644 --- a/testcases/network/stress/ftp/ftp-upload-stress +++ b/testcases/network/stress/ftp/ftp-upload-stress @@ -45,8 +45,7 @@ setup() tst_check_cmds pkill vsftpd tst_tmpdir - ipver=${TST_IPV6:-'4'} - tst_resm TINFO "run FTP over IPv$ipver" + tst_resm TINFO "run FTP over IPv$TST_IPVER" trap "tst_brkm TBROK 'test interrupted'" INT From patchwork Fri Jun 1 11:49:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 923972 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y2hm1XW9z9ry1 for ; Fri, 1 Jun 2018 21:50:48 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 7A3113E7847 for ; Fri, 1 Jun 2018 13:50:45 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) by picard.linux.it (Postfix) with ESMTP id 8326D3E7A29 for ; Fri, 1 Jun 2018 13:50:20 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 63C81600BE4 for ; Fri, 1 Jun 2018 13:50:20 +0200 (CEST) Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A5B6BAF07; Fri, 1 Jun 2018 11:50:19 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 1 Jun 2018 13:49:54 +0200 Message-Id: <20180601114956.17265-6-pvorel@suse.cz> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180601114956.17265-1-pvorel@suse.cz> References: <20180601114956.17265-1-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH 5/7] net/http: Replace $ipver by $TST_IPVER from tst_net.sh X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Petr Vorel --- testcases/network/stress/http/http-stress | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testcases/network/stress/http/http-stress b/testcases/network/stress/http/http-stress index 211cd90aa..ff617a212 100644 --- a/testcases/network/stress/http/http-stress +++ b/testcases/network/stress/http/http-stress @@ -35,8 +35,7 @@ setup() { tst_require_root - ipver=${TST_IPV6:-'4'} - tst_resm TINFO "run over IPv$ipver" + tst_resm TINFO "run over IPv$TST_IPVER" trap "tst_brkm TBROK 'test interrupted'" INT From patchwork Fri Jun 1 11:49:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 923971 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y2hd3s4wz9s1b for ; Fri, 1 Jun 2018 21:50:41 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 1CA8A3E7A97 for ; Fri, 1 Jun 2018 13:50:38 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) by picard.linux.it (Postfix) with ESMTP id 004813E7A0E for ; Fri, 1 Jun 2018 13:50:20 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id AFF91600D03 for ; Fri, 1 Jun 2018 13:50:20 +0200 (CEST) Received: from relay1.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5EE5AAF0A; Fri, 1 Jun 2018 11:50:20 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 1 Jun 2018 13:49:55 +0200 Message-Id: <20180601114956.17265-7-pvorel@suse.cz> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180601114956.17265-1-pvorel@suse.cz> References: <20180601114956.17265-1-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH 6/7] net/ssh: Replace $ipver by $TST_IPVER from tst_net.sh X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" NOTE: remote tests still use $ip_ver, as IP version is passed to them as $1. Signed-off-by: Petr Vorel --- testcases/network/stress/ssh/ssh-stress | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/testcases/network/stress/ssh/ssh-stress b/testcases/network/stress/ssh/ssh-stress index 00b47c27f..afedaaa49 100644 --- a/testcases/network/stress/ssh/ssh-stress +++ b/testcases/network/stress/ssh/ssh-stress @@ -48,16 +48,14 @@ setup() tst_require_root tst_check_cmds pkill sshd ssh od - ipver=${TST_IPV6:-"4"} - # Get the sshd command with absolute path SSHD=$(which sshd) test "$SSHD" || tst_brkm TBROK "sshd daemon is not found" - check_icmpv${ipver}_connectivity $(tst_iface) $(tst_ipaddr rhost) || \ + check_icmpv${TST_IPVER}_connectivity $(tst_iface) $(tst_ipaddr rhost) || \ tst_brkm TBROK "Failed to ping to $(tst_ipaddr rhost)" - port=$(tst_rhost_run -c "tst_get_unused_port ipv${ipver} stream") + port=$(tst_rhost_run -c "tst_get_unused_port ipv${TST_IPVER} stream") tst_tmpdir @@ -108,7 +106,7 @@ test01() { tst_resm TINFO "Creating '$CONNECTION_TOTAL' ssh sessions" - tst_rhost_run -s -c "ssh-stress01-rmt $ipver $(tst_ipaddr) \ + tst_rhost_run -s -c "ssh-stress01-rmt $TST_IPVER $(tst_ipaddr) \ $rconfig $CONNECTION_TOTAL" tst_resm TPASS "Test is finished successfully" @@ -119,7 +117,7 @@ test02() tst_resm TINFO "Log in/out by many clients asynchronously" tst_resm TINFO "'$CONNECTION_TOTAL' clients, time $NS_DURATION sec" - tst_rhost_run -s -c "ssh-stress02-rmt $ipver $(tst_ipaddr) \ + tst_rhost_run -s -c "ssh-stress02-rmt $TST_IPVER $(tst_ipaddr) \ $rconfig $CONNECTION_TOTAL $NS_DURATION" tst_resm TPASS "Test is finished successfully" @@ -130,11 +128,11 @@ test03() tst_resm TINFO "Forwarding TCP traffic with $NS_TIMES requests" # Run a TCP traffic server - port=$(tst_get_unused_port ipv${ipver} stream) + port=$(tst_get_unused_port ipv${TST_IPVER} stream) netstress -R 3 -g $port > tcp_server.log 2>&1 & - tst_rhost_run -s -c "ssh-stress03-rmt $ipver $(tst_ipaddr) \ + tst_rhost_run -s -c "ssh-stress03-rmt $TST_IPVER $(tst_ipaddr) \ $rconfig $port $NS_TIMES" tst_resm TPASS "Test is finished successfully" From patchwork Fri Jun 1 11:49:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 923973 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y2hx0WCmz9ry1 for ; Fri, 1 Jun 2018 21:50:57 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 9C1863E7656 for ; Fri, 1 Jun 2018 13:50:54 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) by picard.linux.it (Postfix) with ESMTP id 16B703E7A1F for ; Fri, 1 Jun 2018 13:50:22 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id B093F1401B67 for ; Fri, 1 Jun 2018 13:50:21 +0200 (CEST) Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3C995AF0D; Fri, 1 Jun 2018 11:50:21 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 1 Jun 2018 13:49:56 +0200 Message-Id: <20180601114956.17265-8-pvorel@suse.cz> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180601114956.17265-1-pvorel@suse.cz> References: <20180601114956.17265-1-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH 7/7] net/virt: Replace $ipver by $TST_IPVER from tst_net.sh X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Petr Vorel --- testcases/network/virt/virt_lib.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testcases/network/virt/virt_lib.sh b/testcases/network/virt/virt_lib.sh index 00978a062..77f129894 100644 --- a/testcases/network/virt/virt_lib.sh +++ b/testcases/network/virt/virt_lib.sh @@ -289,8 +289,8 @@ virt_compare_netperf() case "$virt_type" in vxlan|geneve) - tst_resm TINFO "IP4 $virt_type over IP$ipver slower by $per %" - tst_resm TINFO "IP6 $virt_type over IP$ipver slower by $per6 %" + tst_resm TINFO "IP4 $virt_type over IP$TST_IPVER slower by $per %" + tst_resm TINFO "IP6 $virt_type over IP$TST_IPVER slower by $per6 %" ;; *) tst_resm TINFO "IP4 $virt_type slower by $per %" @@ -420,8 +420,6 @@ vxlan|geneve) ;; esac -ipver=${TST_IPV6:-'4'} - tst_check_cmds "ip" virt_add ltp_v0 || \