From patchwork Fri Dec 2 13:51:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1711413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LsbR4dMt; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NNvWD4x5Rz23mf for ; Sat, 3 Dec 2022 00:51:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B58BE4160E; Fri, 2 Dec 2022 13:51:49 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B58BE4160E Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LsbR4dMt X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XeSeZ2Asq23V; Fri, 2 Dec 2022 13:51:47 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id D035E4160C; Fri, 2 Dec 2022 13:51:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D035E4160C Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6100DC0082; Fri, 2 Dec 2022 13:51:43 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 34D33C0033 for ; Fri, 2 Dec 2022 13:51:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EEF9D415FE for ; Fri, 2 Dec 2022 13:51:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org EEF9D415FE X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2aJIays2-Sx4 for ; Fri, 2 Dec 2022 13:51:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B9DED4016B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id B9DED4016B for ; Fri, 2 Dec 2022 13:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669989098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aoFYs+LuOdTMInYPEEhYivWbfTofVPNq/+wXMm/VQxc=; b=LsbR4dMt5AA45nyGpxKojzLFtuvnl1psK9phIrEVWWqvW7+AzfTfLJVxLRfFdUmlqxSW+p JznLbPoQaoc7B5eoLBcJH53GnaMdiFQetJAYkU1LnL7xICsEcO04p7WVq3zJJY2Sw4tVJA FUb7AHdNQE/FrYp/ZT0ZhD6knlbWuxU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-636-Xjyx-hALODaZ8egb9bmkMg-1; Fri, 02 Dec 2022 08:51:37 -0500 X-MC-Unique: Xjyx-hALODaZ8egb9bmkMg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E2492A59563 for ; Fri, 2 Dec 2022 13:51:37 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.ntdv.lab.eng.bos.redhat.com [10.19.188.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4260A111E3FA; Fri, 2 Dec 2022 13:51:37 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Fri, 2 Dec 2022 08:51:26 -0500 Message-Id: <20221202135137.1728564-2-xsimonar@redhat.com> In-Reply-To: <20221202135137.1728564-1-xsimonar@redhat.com> References: <20221202135137.1728564-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 01/12] tests: Fixed flaky system tests "ACL reject" and "ACL after lb - reject" X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The tests were flaky as not handling the potential reception of ICMP6 router solicitation. Sleeps have also been removed, which speeds up the tests. Signed-off-by: Xavier Simonart --- tests/system-ovn.at | 104 ++++++++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 42 deletions(-) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 01049c8fd..f29de4887 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -4871,12 +4871,11 @@ ADD_NAMESPACES(sw1-p1-rej) ADD_VETH(sw1-p1-rej, sw1-p1-rej, br-int, "20.0.0.3/24", "40:54:00:00:00:03", \ "20.0.0.1") -sleep 1 - # Capture packets in sw0-p1-rej. -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 4 -i sw0-p1-rej tcp > sw0-p1-rej-ip4.pcap &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej tcp > sw0-p1-rej-ip4.pcap 2> err &], [0]) -sleep 1 +#Wait for tcpdump to get started before generating first packets +OVS_WAIT_UNTIL([test 1 = $(cat err | grep -c listening)]) OVS_WAIT_UNTIL([ ip netns exec sw0-p1-rej nc -vz 10.0.0.4 80 2>&1 | grep -i 'connection refused' @@ -4894,17 +4893,20 @@ grep controller | grep tp_dst=84 -c) ]) OVS_WAIT_UNTIL([ - total=`cat sw0-p1-rej-ip4.pcap | wc -l` + total=`cat sw0-p1-rej-ip4.pcap | grep "10\.0\.0\.3" | wc -l` echo "total = $total" test "${total}" = "4" ]) -# Without this sleep, test case fails intermittently. -sleep 3 +kill $(pidof tcpdump) + +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej tcp port 80 > sw0-p2-rej-ip6.pcap 2> err &], [0]) -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 2 -i sw0-p2-rej tcp port 80 > sw0-p2-rej-ip6.pcap &], [0]) +#Wait for tcpdump to get started before generating first packets +OVS_WAIT_UNTIL([test 1 = $(cat err | grep -c listening)]) -sleep 1 +OVS_WAIT_UNTIL([test "$(ip netns exec sw0-p1-rej ip a | grep aef0::3 | grep tentative)" = ""]) +OVS_WAIT_UNTIL([test "$(ip netns exec sw0-p2-rej ip a | grep aef0::4 | grep tentative)" = ""]) OVS_WAIT_UNTIL([ ip netns exec sw0-p2-rej nc -vz6 aef0::3 80 2>&1 | grep -i 'connection refused' @@ -4912,11 +4914,10 @@ OVS_WAIT_UNTIL([ OVS_WAIT_UNTIL([ - total=`cat sw0-p2-rej-ip6.pcap | wc -l` + total=`cat sw0-p2-rej-ip6.pcap | grep "aef0::3\.80" |wc -l` echo "total = $total" test "${total}" = "2" ]) - ovn-nbctl acl-add sw1 from-lport 1004 "ip" allow-related ovn-nbctl acl-add sw1 to-lport 1004 "ip" allow-related ovn-nbctl --log acl-add pg0 to-lport 1004 "outport == @pg0 && ip && tcp && tcp.dst == 84" reject @@ -4925,9 +4926,12 @@ OVS_WAIT_UNTIL([ ip netns exec sw1-p1-rej nc -vz 10.0.0.4 84 2>&1 | grep -i 'connection refused' ]) +kill $(pidof tcpdump) + + # Now test for IPv4 UDP. -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej udp port 90 > sw0-p1-rej-udp.pcap &], [0]) -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej udp port 90 > sw0-p1-rej-udp.pcap 2> err &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap 2> err &], [0]) printf '.%.0s' {1..100} > foo OVS_WAIT_UNTIL([ @@ -4937,10 +4941,11 @@ OVS_WAIT_UNTIL([ test $c -eq 1 ]) +kill $(pidof tcpdump) rm -f *.pcap -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej udp port 94 > sw0-p1-rej-udp.pcap &], [0]) -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej udp port 94 > sw0-p1-rej-udp.pcap 2> err &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap 2> err &], [0]) OVS_WAIT_UNTIL([ ip netns exec sw0-p1-rej nc -u 10.0.0.4 94 < foo @@ -4948,10 +4953,11 @@ OVS_WAIT_UNTIL([ "10.0.0.4 > 10.0.0.3: ICMP 10.0.0.4 udp port 94 unreachable" | uniq | wc -l) test $c -eq 1 ]) +kill $(pidof tcpdump) # Now test for IPv6 UDP. -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej udp port 90 > sw0-p2-rej-ip6-udp.pcap &], [0]) -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej udp port 90 > sw0-p2-rej-ip6-udp.pcap 2> err &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap 2> err &], [0]) OVS_WAIT_UNTIL([ ip netns exec sw0-p2-rej nc -u -6 aef0::3 90 < foo @@ -4961,10 +4967,11 @@ aef0::3 udp port 90" | uniq | wc -l) test $c -eq 1 ]) +kill $(pidof tcpdump) rm -f *.pcap -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej udp port 94 > sw0-p2-rej-ip6-udp.pcap &], [0]) -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej udp port 94 > sw0-p2-rej-ip6-udp.pcap 2> err &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap 2> err &], [0]) OVS_WAIT_UNTIL([ ip netns exec sw0-p2-rej nc -u -6 aef0::3 94 < foo @@ -4973,6 +4980,7 @@ OVS_WAIT_UNTIL([ aef0::3 udp port 94" | uniq | wc -l) test $c -eq 1 ]) +kill $(pidof tcpdump) # Delete all the ACLs of pg0 and add the ACL with a generic match with reject action. ovn-nbctl pg-del pg0 @@ -4989,7 +4997,7 @@ OVS_WAIT_UNTIL([ rm -f *.pcap -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap 2> err &], [0]) printf '.%.0s' {1..100} > foo OVS_WAIT_UNTIL([ @@ -4999,9 +5007,10 @@ OVS_WAIT_UNTIL([ test $c -eq 1 ]) +kill $(pidof tcpdump) rm -f *.pcap # Now test for IPv6 UDP. -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap 2> err &], [0]) OVS_WAIT_UNTIL([ ip netns exec sw0-p2-rej nc -u -6 aef0::3 90 < foo @@ -5010,7 +5019,7 @@ OVS_WAIT_UNTIL([ aef0::3 udp port 90" | uniq | wc -l) test $c -eq 1 ]) - +kill $(pidof tcpdump) OVS_APP_EXIT_AND_WAIT([ovn-controller]) @@ -5112,12 +5121,11 @@ ADD_NAMESPACES(sw1-p1-rej) ADD_VETH(sw1-p1-rej, sw1-p1-rej, br-int, "20.0.0.3/24", "40:54:00:00:00:03", \ "20.0.0.1") -sleep 1 - # Capture packets in sw0-p1-rej. -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 4 -i sw0-p1-rej tcp > sw0-p1-rej-ip4.pcap &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej tcp > sw0-p1-rej-ip4.pcap 2> err &], [0]) -sleep 1 +#Wait for tcpdump to get started before generating first packets +OVS_WAIT_UNTIL([test 1 = $(cat err | grep -c listening)]) OVS_WAIT_UNTIL([ ip netns exec sw0-p1-rej nc -vz 10.0.0.4 80 2>&1 | grep -i 'connection refused' @@ -5135,17 +5143,20 @@ grep controller | grep tp_dst=84 -c) ]) OVS_WAIT_UNTIL([ - total=`cat sw0-p1-rej-ip4.pcap | wc -l` + total=`cat sw0-p1-rej-ip4.pcap | grep "10\.0\.0\.4" | wc -l` echo "total = $total" test "${total}" = "4" ]) -# Without this sleep, test case fails intermittently. -sleep 3 +kill $(pidof tcpdump) -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 2 -i sw0-p2-rej tcp port 80 > sw0-p2-rej-ip6.pcap &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej tcp port 80 > sw0-p2-rej-ip6.pcap 2> err &], [0]) -sleep 1 +#Wait for tcpdump to get started before generating first packets +OVS_WAIT_UNTIL([test 1 = $(cat err | grep -c listening)]) + +OVS_WAIT_UNTIL([test "$(ip netns exec sw0-p1-rej ip a | grep aef0::3 | grep tentative)" = ""]) +OVS_WAIT_UNTIL([test "$(ip netns exec sw0-p2-rej ip a | grep aef0::4 | grep tentative)" = ""]) OVS_WAIT_UNTIL([ ip netns exec sw0-p2-rej nc -vz6 aef0::3 80 2>&1 | grep -i 'connection refused' @@ -5153,11 +5164,13 @@ OVS_WAIT_UNTIL([ OVS_WAIT_UNTIL([ - total=`cat sw0-p2-rej-ip6.pcap | wc -l` + total=`cat sw0-p2-rej-ip6.pcap | grep "aef0::3\.80" | wc -l` echo "total = $total" test "${total}" = "2" ]) +kill $(pidof tcpdump) + ovn-nbctl --apply-after-lb acl-add sw1 from-lport 1004 "ip" allow-related ovn-nbctl acl-add sw1 to-lport 1004 "ip" allow-related ovn-nbctl --log acl-add pg0 to-lport 1004 "outport == @pg0 && ip && tcp && tcp.dst == 84" reject @@ -5167,8 +5180,8 @@ OVS_WAIT_UNTIL([ ]) # Now test for IPv4 UDP. -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej udp port 90 > sw0-p1-rej-udp.pcap &], [0]) -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej udp port 90 > sw0-p1-rej-udp.pcap 2> err &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap 2> err &], [0]) printf '.%.0s' {1..100} > foo OVS_WAIT_UNTIL([ @@ -5178,10 +5191,11 @@ OVS_WAIT_UNTIL([ test $c -eq 1 ]) +kill $(pidof tcpdump) rm -f *.pcap -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej udp port 94 > sw0-p1-rej-udp.pcap &], [0]) -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej udp port 94 > sw0-p1-rej-udp.pcap 2> err &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap 2> err &], [0]) OVS_WAIT_UNTIL([ ip netns exec sw0-p1-rej nc -u 10.0.0.4 94 < foo @@ -5190,9 +5204,11 @@ OVS_WAIT_UNTIL([ test $c -eq 1 ]) +kill $(pidof tcpdump) + # Now test for IPv6 UDP. -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej udp port 90 > sw0-p2-rej-ip6-udp.pcap &], [0]) -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej udp port 90 > sw0-p2-rej-ip6-udp.pcap 2> err &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap 2> err &], [0]) OVS_WAIT_UNTIL([ ip netns exec sw0-p2-rej nc -u -6 aef0::3 90 < foo @@ -5202,10 +5218,11 @@ aef0::3 udp port 90" | uniq | wc -l) test $c -eq 1 ]) +kill $(pidof tcpdump) rm -f *.pcap -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej udp port 94 > sw0-p2-rej-ip6-udp.pcap &], [0]) -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej udp port 94 > sw0-p2-rej-ip6-udp.pcap 2> err &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap 2> err &], [0]) OVS_WAIT_UNTIL([ ip netns exec sw0-p2-rej nc -u -6 aef0::3 94 < foo @@ -5228,9 +5245,10 @@ OVS_WAIT_UNTIL([ ip netns exec sw0-p2-rej nc -vz6 aef0::3 80 2>&1 | grep -i 'connection refused' ]) +kill $(pidof tcpdump) rm -f *.pcap -NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -nn -c 1 -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap &], [0]) +NS_CHECK_EXEC([sw0-p1-rej], [tcpdump -l -nn -i sw0-p1-rej icmp > sw0-p1-rej-icmp.pcap 2> err &], [0]) printf '.%.0s' {1..100} > foo OVS_WAIT_UNTIL([ @@ -5240,9 +5258,10 @@ OVS_WAIT_UNTIL([ test $c -eq 1 ]) +kill $(pidof tcpdump) rm -f *.pcap # Now test for IPv6 UDP. -NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -nn -c 1 -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap &], [0]) +NS_CHECK_EXEC([sw0-p2-rej], [tcpdump -l -nn -i sw0-p2-rej icmp6 > sw0-p2-rej-icmp6.pcap 2> err &], [0]) OVS_WAIT_UNTIL([ ip netns exec sw0-p2-rej nc -u -6 aef0::3 90 < foo @@ -5252,6 +5271,7 @@ aef0::3 udp port 90" | uniq | wc -l) test $c -eq 1 ]) +kill $(pidof tcpdump) OVS_APP_EXIT_AND_WAIT([ovn-controller])