From patchwork Fri Jun 22 15:10:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 933437 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 41C28F4ykYz9s2L for ; Sat, 23 Jun 2018 01:11:06 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 541C23E60E2 for ; Fri, 22 Jun 2018 17:11:04 +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 [IPv6:2001:4b78:1:20::6]) by picard.linux.it (Postfix) with ESMTP id 31ACF3E608B for ; Fri, 22 Jun 2018 17:10:59 +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 42CD31400993 for ; Fri, 22 Jun 2018 17:10:56 +0200 (CEST) Received: from relay1.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D4E1AAF7C; Fri, 22 Jun 2018 15:10:55 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 22 Jun 2018 17:10:40 +0200 Message-Id: <20180622151047.13002-2-pvorel@suse.cz> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180622151047.13002-1-pvorel@suse.cz> References: <20180622151047.13002-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 v2 1/8] net/ipsec: Improve log info messages 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" * Log all IPsec tst_ipsec_setup calls. * Remove redundant log output from icmp-uni-basic.sh to make it similar to icmp-uni-vti.sh. Signed-off-by: Petr Vorel --- testcases/network/stress/icmp/icmp-uni-basic.sh | 14 +------------- testcases/network/stress/icmp/icmp-uni-vti.sh | 2 +- testcases/network/stress/ipsec/ipsec_lib.sh | 1 + 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/testcases/network/stress/icmp/icmp-uni-basic.sh b/testcases/network/stress/icmp/icmp-uni-basic.sh index fc84899dd..3099b6caa 100755 --- a/testcases/network/stress/icmp/icmp-uni-basic.sh +++ b/testcases/network/stress/icmp/icmp-uni-basic.sh @@ -25,23 +25,11 @@ TST_CLEANUP="tst_ipsec_cleanup" . ipsec_lib.sh -# Test description -tst_resm TINFO "Sending ICMP messages with the following conditions" -tst_resm TINFO "- Version of IP is IPv${TST_IPV6:-4}" -tst_resm TINFO "- Size of packets are ( $IPSEC_SIZE_ARRAY )" - -if [ -n "$IPSEC_MODE" -a -n "$IPSEC_PROTO" ]; then - case $IPSEC_PROTO in - ah) tst_resm TINFO "- IPsec [ AH / $IPSEC_MODE ]" ;; - esp) tst_resm TINFO "- IPsec [ ESP / $IPSEC_MODE ]" ;; - comp) tst_resm TINFO "- IPcomp [ $IPSEC_MODE ]" ;; - esac -fi - tst_ipsec_setup PING_MAX="$IPSEC_REQUESTS" +tst_resm TINFO "Sending ICMP messages" tst_ping $(tst_iface) $(tst_ipaddr rhost) $IPSEC_SIZE_ARRAY tst_exit diff --git a/testcases/network/stress/icmp/icmp-uni-vti.sh b/testcases/network/stress/icmp/icmp-uni-vti.sh index 7fa211d7f..ea8b5c828 100755 --- a/testcases/network/stress/icmp/icmp-uni-vti.sh +++ b/testcases/network/stress/icmp/icmp-uni-vti.sh @@ -26,7 +26,7 @@ do_test() { PING_MAX="$IPSEC_REQUESTS" - tst_resm TINFO "Sending ICMP messages..." + tst_resm TINFO "Sending ICMP messages" tst_ping $tst_vti $ip_rmt_tun $IPSEC_SIZE_ARRAY } diff --git a/testcases/network/stress/ipsec/ipsec_lib.sh b/testcases/network/stress/ipsec/ipsec_lib.sh index 2e001c718..9c293ca3e 100644 --- a/testcases/network/stress/ipsec/ipsec_lib.sh +++ b/testcases/network/stress/ipsec/ipsec_lib.sh @@ -115,6 +115,7 @@ tst_ipsec_setup() { # Configure SAD/SPD if [ -n "$IPSEC_MODE" -a -n "$IPSEC_PROTO" ]; then + tst_resm TINFO "IPsec[$IPSEC_PROTO/$IPSEC_MODE]" tst_ipsec lhost $(tst_ipaddr) $(tst_ipaddr rhost) tst_ipsec rhost $(tst_ipaddr rhost) $(tst_ipaddr) fi