From patchwork Fri Oct 1 13:26:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1535335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=MY+A2jI/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HLW9B1dW1z9sR4 for ; Fri, 1 Oct 2021 23:26:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2346E4044B; Fri, 1 Oct 2021 13:26:36 +0000 (UTC) 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 SlfafC7sWAeO; Fri, 1 Oct 2021 13:26:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 1E87540278; Fri, 1 Oct 2021 13:26:34 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D7F6AC000F; Fri, 1 Oct 2021 13:26:33 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2968FC000D for ; Fri, 1 Oct 2021 13:26:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1975C614CA for ; Fri, 1 Oct 2021 13:26:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com 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 7s3iajrFp5ZG for ; Fri, 1 Oct 2021 13:26:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 3BB49606A8 for ; Fri, 1 Oct 2021 13:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633094791; 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; bh=Z53J2kot3uRotehWdWvDdY2rFEvfj+88GTrMT6J4mQo=; b=MY+A2jI/cB9XCM1Cz9RAN8UDHro9PgzKUIBJ3yErZAe693LYQtSqZtKJ/biz1xaSVBAHa3 XoRzO9rqV818Igqx3AC4Ms7jz1OY3ZgxL1qQimyFks/oCFj9r5y+t0Wxt9ueQtlF3w0e9R jF7+xJsQkkcBwteinUaL5HKm0jjOLMs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-6Eap3M3oOQ-lWfWbZknBOw-1; Fri, 01 Oct 2021 09:26:27 -0400 X-MC-Unique: 6Eap3M3oOQ-lWfWbZknBOw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4C8D801E72 for ; Fri, 1 Oct 2021 13:26:26 +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 72D6A608BA; Fri, 1 Oct 2021 13:26:26 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Fri, 1 Oct 2021 09:26:24 -0400 Message-Id: <20211001132624.3248475-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=xsimonar@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn] ovn.at: Fix flaky tests "VLAN transparency, passthru=true, multiple hosts" 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" Tests were waiting for ports to be reported up before sending packets. However, waiting for both ports to be up is not enough to guarantee that all flows are installed for both ports. We now wait for last flows (implementing switching to localnet port) are installed. Following tests were are fixed: - VLAN transparency, passthru=true, multiple hosts - VLAN transparency, passthru=true, multiple hosts, custom ethtype - VLAN transparency, passthru=true, multiple hosts, flat/untagged Signed-off-by: Xavier Simonart --- tests/ovn.at | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/tests/ovn.at b/tests/ovn.at index fc8f31d06..cc940701f 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3413,6 +3413,14 @@ for i in 1 2; do options:rxq_pcap=vif$i-rx.pcap \ ofport-request=$i OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp$i` = xup]) + # Waiting for both ports to be up is not enough to guarantee that all flows are installed. + # Wait for flows implementing switching to localnet port. + OVS_WAIT_UNTIL([ + test $(as hv-$i ovs-ofctl dump-flows br-int | \ + grep "table=38" | \ + grep "resubmit(,38)" -c) -eq 1 + ]) + done test_packet() { @@ -3478,8 +3486,13 @@ for i in 1 2; do options:rxq_pcap=vif$i-rx.pcap \ ofport-request=$i wait_for_ports_up lsp$i -done + OVS_WAIT_UNTIL([ + test $(ovs-ofctl dump-flows br-int | \ + grep "table=38" | \ + grep "resubmit(,38)" -c) -eq 1 + ]) +done # create taps on fabric to check vlan encapsulation there for i in 1 2; do as hv-$i @@ -3561,6 +3574,12 @@ for i in 1 2; do options:rxq_pcap=vif$i-rx.pcap \ ofport-request=$i OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp$i` = xup]) + OVS_WAIT_UNTIL([ + test $(ovs-ofctl dump-flows br-int | \ + grep "table=38" | \ + grep "resubmit(,38)" -c) -eq 1 + ]) + done for i in 1 2; do