From patchwork Tue Jun 27 09:30:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1800490 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::138; helo=smtp1.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=GL2xMXyL; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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 4Qqzwc1KlQz242G for ; Tue, 27 Jun 2023 19:30:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CB1B48215B; Tue, 27 Jun 2023 09:30:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CB1B48215B Authentication-Results: smtp1.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=GL2xMXyL X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oaTOwSpwmewI; Tue, 27 Jun 2023 09:30:52 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id E1BF98212D; Tue, 27 Jun 2023 09:30:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E1BF98212D Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D042FC0DD8; Tue, 27 Jun 2023 09:30:49 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 79E8AC0037 for ; Tue, 27 Jun 2023 09:30:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 47ECB60C05 for ; Tue, 27 Jun 2023 09:30:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 47ECB60C05 Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GL2xMXyL X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tB56EVSFiw5X for ; Tue, 27 Jun 2023 09:30:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 6D50A60B78 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 6D50A60B78 for ; Tue, 27 Jun 2023 09:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687858245; 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=A6wn9JVXNBjKeGjUXVj242MeeE+Qjaz9iF/rpWq8z78=; b=GL2xMXyL66XmA9QxPPZftHsoU8m9pUKJOWHSLHuBVkDmeFNoIG/IiH1bzk9eqU9YPYK11L ip8kvnUX6/cQM6gv9nbFeOdXbmSOKlbk1V3a5EG/ZByh/HxsHh+QRDkG2KCUFQfP/RpKBT TwVwTz7N6hH2qd8Qr9/CoAkDvCUzzHM= 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-178-Zzya4DUvMxSeK_Fjvo9WIA-1; Tue, 27 Jun 2023 05:30:44 -0400 X-MC-Unique: Zzya4DUvMxSeK_Fjvo9WIA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2455A381494B for ; Tue, 27 Jun 2023 09:30:44 +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 0D25214682F7; Tue, 27 Jun 2023 09:30:44 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Tue, 27 Jun 2023 11:30:34 +0200 Message-Id: <20230627093043.1465206-5-xsimonar@redhat.com> In-Reply-To: <20230627093043.1465206-1-xsimonar@redhat.com> References: <20230627093043.1465206-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 04/13] tests: fixed "Load balancer health checks - IPv4 and IPv6" 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" Signed-off-by: Xavier Simonart --- tests/ovn.at | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index ca0069132..1dc09a168 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -25065,13 +25065,14 @@ OVS_WAIT_FOR_OUTPUT( svc_mon_src_mac=`ovn-nbctl get NB_Global . options:svc_monitor_mac | \ sed s/":"//g | sed s/\"//g` +# If the system is overloaded and the test runs slowly, we might get multiple similar packets (just varying by src port) OVS_WAIT_UNTIL( - [test 1 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \ + [test 1 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \ grep "505400000003${svc_mon_src_mac}" | wc -l`] ) OVS_WAIT_UNTIL( - [test 1 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \ + [test 1 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \ grep "405400000003${svc_mon_src_mac}" | wc -l`] ) @@ -25079,12 +25080,12 @@ check ovn-nbctl set load_balancer_health_check 10.0.0.10:80 options:failure_coun wait_row_count Service_Monitor 2 status=offline OVS_WAIT_UNTIL( - [test 2 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \ + [test 2 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \ grep "505400000003${svc_mon_src_mac}" | wc -l`] ) OVS_WAIT_UNTIL( - [test 2 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \ + [test 2 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \ grep "405400000003${svc_mon_src_mac}" | wc -l`] ) @@ -25264,12 +25265,12 @@ svc_mon_src_mac=`ovn-nbctl get NB_Global . options:svc_monitor_mac | \ sed s/":"//g | sed s/\"//g` OVS_WAIT_UNTIL( - [test 1 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \ + [test 1 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \ grep "505400000003${svc_mon_src_mac}" | wc -l`] ) OVS_WAIT_UNTIL( - [test 1 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \ + [test 1 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \ grep "405400000003${svc_mon_src_mac}" | wc -l`] ) @@ -25277,12 +25278,12 @@ check ovn-nbctl set load_balancer_health_check [[2001::a]]:80 options:failure_co wait_row_count Service_Monitor 2 status=offline OVS_WAIT_UNTIL( - [test 2 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \ + [test 2 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \ grep "505400000003${svc_mon_src_mac}" | wc -l`] ) OVS_WAIT_UNTIL( - [test 2 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \ + [test 2 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \ grep "405400000003${svc_mon_src_mac}" | wc -l`] )