From patchwork Fri Aug 30 07:41:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1978792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=Emh50x/k; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ww97w3bcVz1yfn for ; Fri, 30 Aug 2024 17:41:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2ADEA410EE; Fri, 30 Aug 2024 07:41:27 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id sdhTusu0Exqp; Fri, 30 Aug 2024 07:41:25 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2EB2A410DD Authentication-Results: smtp2.osuosl.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=Emh50x/k Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2EB2A410DD; Fri, 30 Aug 2024 07:41:25 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CD7CEC0012; Fri, 30 Aug 2024 07:41:23 +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 7D469C0014 for ; Fri, 30 Aug 2024 07:41:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 57B2F611C2 for ; Fri, 30 Aug 2024 07:41:19 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id wX5XZKNOS371 for ; Fri, 30 Aug 2024 07:41:18 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=xsimonar@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 7D0CA606C0 Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 7D0CA606C0 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=Emh50x/k Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 7D0CA606C0 for ; Fri, 30 Aug 2024 07:41:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725003677; 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=W7GDGpfm8MtSJk/hgjhNExyQHG8Y3llVdtL1UPQOAXI=; b=Emh50x/kxFx28acfnC1vOu6mny8yzMARJVhKtPVAOH10VaLFMqVaRWFEHlZnvergJiuBng 7Fi+fvh7eGENEvrJGkt0YJVpOFNSBJHLOeIMCxSRBdeB/0ATOZ7GBFvTpt9DVbasnsTU5X nusDHMfRA/y+TRhF1ISKjFo8jMcVUJs= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-335-ABiQTzjjNneeCoKr7eSDeg-1; Fri, 30 Aug 2024 03:41:12 -0400 X-MC-Unique: ABiQTzjjNneeCoKr7eSDeg-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7BBEE1955BF4 for ; Fri, 30 Aug 2024 07:41:11 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EFA4419560A3; Fri, 30 Aug 2024 07:41:10 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Fri, 30 Aug 2024 09:41:04 +0200 Message-Id: <20240830074109.1798553-2-xsimonar@redhat.com> In-Reply-To: <20240830074109.1798553-1-xsimonar@redhat.com> References: <20240830074109.1798553-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 1/6] tests: Fix flaky "MAC binding aging". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Different port keys might result in the expected flows to not be properly sorted. Fixes: 7abae8142841 ("northd: Fix an issue wrt mac binding aging.") Signed-off-by: Xavier Simonart --- tests/ovn.at | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index acf18c4e0..4b6e8132f 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -34709,11 +34709,13 @@ port_key_1=$(printf "0x%x" $(as hv1 fetch_column port_binding tunnel_key logical dp_key_2=$(printf "0x%x" $(as hv1 fetch_column datapath tunnel_key external_ids:name=gw-2)) port_key_2=$(printf "0x%x" $(as hv1 fetch_column port_binding tunnel_key logical_port=gw-2-public)) -AT_CHECK_UNQUOTED([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE --no-stats | strip_cookie | sort], [0], [dnl - table=OFTABLE_MAC_CACHE_USE, priority=100,ip,reg14=${port_key_1},metadata=${dp_key_1},dl_src=00:00:00:00:10:10,nw_src=192.168.10.10 actions=drop +table=" table=OFTABLE_MAC_CACHE_USE, priority=100,ip,reg14=${port_key_1},metadata=${dp_key_1},dl_src=00:00:00:00:10:10,nw_src=192.168.10.10 actions=drop table=OFTABLE_MAC_CACHE_USE, priority=100,ip,reg14=${port_key_1},metadata=${dp_key_1},dl_src=00:00:00:00:10:20,nw_src=192.168.10.20 actions=drop table=OFTABLE_MAC_CACHE_USE, priority=100,ip,reg14=${port_key_2},metadata=${dp_key_2},dl_src=00:00:00:00:10:10,nw_src=192.168.10.10 actions=drop - table=OFTABLE_MAC_CACHE_USE, priority=100,ip,reg14=${port_key_2},metadata=${dp_key_2},dl_src=00:00:00:00:10:20,nw_src=192.168.10.20 actions=drop + table=OFTABLE_MAC_CACHE_USE, priority=100,ip,reg14=${port_key_2},metadata=${dp_key_2},dl_src=00:00:00:00:10:20,nw_src=192.168.10.20 actions=drop" +sorted_table=$(printf '%s\n' "$table" | sort) +AT_CHECK_UNQUOTED([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE --no-stats | strip_cookie | sort], [0], [dnl +$sorted_table ]) timestamp=$(fetch_column mac_binding timestamp ip="192.168.10.20") From patchwork Fri Aug 30 07:41:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1978789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=dTX8Zh6G; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ww97l4GmPz1yfn for ; Fri, 30 Aug 2024 17:41:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 7B86D611C2; Fri, 30 Aug 2024 07:41:21 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id XGOgi_I-O2Zl; Fri, 30 Aug 2024 07:41:20 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E1BD1611CE Authentication-Results: smtp3.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=dTX8Zh6G Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id E1BD1611CE; Fri, 30 Aug 2024 07:41:19 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 80836C0015; Fri, 30 Aug 2024 07:41:19 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6721EC0011 for ; Fri, 30 Aug 2024 07:41:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 55B1B41DD6 for ; Fri, 30 Aug 2024 07:41:17 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id F9u7w9MlSV9K for ; Fri, 30 Aug 2024 07:41:16 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=xsimonar@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 7D40841DD8 Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7D40841DD8 Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dTX8Zh6G Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 7D40841DD8 for ; Fri, 30 Aug 2024 07:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725003675; 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=DvWbRiQ5MijhW+uRlx2Gdb6hq3zHaZZ5O/j3VTDVlLA=; b=dTX8Zh6GBLbAvAq7JulVie+gf5Q0RDZEVjV+p+1ZKtZxRB5rcrVibWzA4tPIkk4iKZjzAJ XyP/AL0aMLS/JJkz90n4Ub7sG+VzsRNNbHXdeMtOf+DdBt7K1dwJhqaT3/700sD4I+LtI5 Cli1tTx/7FwYGbidvYM4I9o2INMdTrc= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-r49y1bTPMa-oG3nV4VXyhA-1; Fri, 30 Aug 2024 03:41:13 -0400 X-MC-Unique: r49y1bTPMa-oG3nV4VXyhA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 477EA1954B01 for ; Fri, 30 Aug 2024 07:41:12 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AF83719560AA; Fri, 30 Aug 2024 07:41:11 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Fri, 30 Aug 2024 09:41:05 +0200 Message-Id: <20240830074109.1798553-3-xsimonar@redhat.com> In-Reply-To: <20240830074109.1798553-1-xsimonar@redhat.com> References: <20240830074109.1798553-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 2/6] tests: Fix flaky "Sampling_App incremental processing". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Wait for northd to have completed initialization (e.g. set mac_prefix) before clearing stats. Signed-off-by: Xavier Simonart --- tests/ovn-northd.at | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index fddf222b3..dcc3dbbc3 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -12624,6 +12624,7 @@ AT_SETUP([Sampling_App incremental processing]) ovn_start +ovn-nbctl --wait=sb sync check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats ovn-nbctl create Sampling_App type="acl-new" id="42" From patchwork Fri Aug 30 07:41:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1978790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=CKHPBdPA; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ww97p0mP5z1yfn for ; Fri, 30 Aug 2024 17:41:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E2AE9410C2; Fri, 30 Aug 2024 07:41:23 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id K5FpoOJ2C_dc; Fri, 30 Aug 2024 07:41:22 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C576540AFD Authentication-Results: smtp2.osuosl.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=CKHPBdPA Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id C576540AFD; Fri, 30 Aug 2024 07:41:22 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A5B4CC0013; Fri, 30 Aug 2024 07:41:22 +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 064F4C0011 for ; Fri, 30 Aug 2024 07:41:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D812B4031F for ; Fri, 30 Aug 2024 07:41:17 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ENYn-lrzVbdT for ; Fri, 30 Aug 2024 07:41:16 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=xsimonar@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 995C1400FF Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 995C1400FF 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 995C1400FF for ; Fri, 30 Aug 2024 07:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725003675; 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=w0vkap5v1ZWmW8L/YqAHaQ96VZ+rmmSHvUm/8NztIno=; b=CKHPBdPACKbtU8xDhHVOwuKRT2cDiuYumwS1G0ygC68PQ71lLB7R4K3lNVpiF7WkG3RPj/ P1cHimQS4t9MgEVvXXI6KcL2qZKPUQ0oLGrPDYLRCU6oIHgqfFPVikKz2SfrujmlPpXWrF Mk+DzHc4lKZG16gyeqW94Rr2sEDp8wc= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-410-HGvsMzh0P6aPWGOTZ4SbTQ-1; Fri, 30 Aug 2024 03:41:13 -0400 X-MC-Unique: HGvsMzh0P6aPWGOTZ4SbTQ-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 28E7D1955BF6 for ; Fri, 30 Aug 2024 07:41:13 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7ACDB19560AD; Fri, 30 Aug 2024 07:41:12 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Fri, 30 Aug 2024 09:41:06 +0200 Message-Id: <20240830074109.1798553-4-xsimonar@redhat.com> In-Reply-To: <20240830074109.1798553-1-xsimonar@redhat.com> References: <20240830074109.1798553-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 3/6] tests: Fix flaky "load-balancer template IPv4". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Avoid having tcpdump trying to print protocol information, as this might fail for some ports. For instance a packet with port 49152 would be decoded as length 44: 42.42.42.3.49152 > 42.42.42.2.4343: (length 2 < 4) (invalid) Signed-off-by: Xavier Simonart --- tests/system-ovn.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 0831a2108..463081721 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -9353,7 +9353,7 @@ name: 'vport4' value: '999' NETNS_DAEMONIZE([vm1], [nc -k -l 42.42.42.2 4242], [nc-vm1.pid]) NETNS_START_TCPDUMP([vm1], - [-n -i vm1 -nnleX -c6 udp and dst 42.42.42.2 and dst port 4343], + [-n -i vm1 -nnqleX -c6 udp and dst 42.42.42.2 and dst port 4343], [vm1]) # Make sure connecting to the VIP works (hairpin, via ls and via lr). @@ -9504,7 +9504,7 @@ name: 'vport4' value: '999' NETNS_DAEMONIZE([vm1], [nc -k -l 4242::2 4242], [nc-vm1.pid]) NETNS_START_TCPDUMP([vm1], - [-n -i vm1 -nnleX -c6 udp and dst 4242::2 and dst port 4343], + [-n -i vm1 -nnqleX -c6 udp and dst 4242::2 and dst port 4343], [vm1]) # Make sure connecting to the VIP works (hairpin, via ls and via lr). From patchwork Fri Aug 30 07:41:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1978794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=BbHVDBcD; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ww9801574z1yfn for ; Fri, 30 Aug 2024 17:41:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7DF66840B0; Fri, 30 Aug 2024 07:41:34 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 14-SWXy49u1Z; Fri, 30 Aug 2024 07:41:31 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 2623184081 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=BbHVDBcD Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2623184081; Fri, 30 Aug 2024 07:41:30 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 77279C0014; Fri, 30 Aug 2024 07:41:30 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8D641C0011 for ; Fri, 30 Aug 2024 07:41:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 72A62423C7 for ; Fri, 30 Aug 2024 07:41:22 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 5cX_htdMpvtn for ; Fri, 30 Aug 2024 07:41:21 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=xsimonar@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org B0E5A423C5 Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B0E5A423C5 Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BbHVDBcD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id B0E5A423C5 for ; Fri, 30 Aug 2024 07:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725003679; 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=goHjeINwIOqwjj7f3d+tXdwR1B0M6BqgacAhljF8OD8=; b=BbHVDBcDe8LwNxnZMPTA8uE6fwbrYjKC9gkHTinJNNrfQBvqX6gaK8Ey6ko3srxj5KilHm Fn/5IJmZgkldCSM2/YNFnNSbJqy6Sl7SSB3cgJlhU4vjO9s1NFh1jJjiRWhaLC6EaXFx3g vEn5bLYpaEsqgh4g8G6vFYuQYrgDg5U= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-581-9IPcqWfeNaWNzNfpn8g1kA-1; Fri, 30 Aug 2024 03:41:14 -0400 X-MC-Unique: 9IPcqWfeNaWNzNfpn8g1kA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D52781955BEE for ; Fri, 30 Aug 2024 07:41:13 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3E5F819560AA; Fri, 30 Aug 2024 07:41:13 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Fri, 30 Aug 2024 09:41:07 +0200 Message-Id: <20240830074109.1798553-5-xsimonar@redhat.com> In-Reply-To: <20240830074109.1798553-1-xsimonar@redhat.com> References: <20240830074109.1798553-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 4/6] tests: Fix multiple ovn-ic race conditions. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Multiple ovn-ic tests were failing flakily in the following cases: - There are two availability zones (az1 & az2) - Ports and routes are added in az2 ovn_as az2 ovn-nbctl lrp-add lr.. lrp.. ovn_as az2 ovn-nbctl lr-route-add ... - We run check ovn-ic-nbctl --wait=sb sync - We expect route to be learned on az1 (ovn_as az1 ovn-nbctl lr-route-list ...). We have a few race conditions: A) The wait=sb sync wait for the seq_nb to be written in ic-nb, read by az1/ovn-ic and az2/ovn-ic, which both update their az/seq_nb. When both are updated, one az/ovn-ic updates ic-sb/seq_nb. There is no check on az2/sb. If az2/sb is slow, ovn-ic-nbctl --wait=sb sync (and as az1 ovn-nbctl lr-route-list) might be completed before the route update is notified to ic-sb and learned by az1. -> This can be avoided/fixed by 1) Adding ovn-nbctl --wait=sb in ovn-nbctl lrp-add 2) Implementing a ovn-ic-nbctl --wait=hv sync which would go until az/sb. This is not really necessary here as [1] is fine. B) When ovn-nbctl lrp-add lr12 returns, it's in az2/nb (i.e. a new LRP in az2/nb) - After ovn-ic-nbctl --wait=sb sync, if az1/ovn-ic runs first: az1/ic write az1/seq_nb in ic/sb Next time az2/ovn-ic runs (when handling ovn-ic-nbctl --wait=sb sync), it reads the route related info and writes in (as well as seq_nb) in ic-sb ovn-ic-nbctl --wait=sb sync returns, but route related info is only in ic/sb. No guarantee it has been handled by az1/ovn-ic. -> This can be handled/fixed by 3) Calling twice wait=sb sync 4) Implementing a ovn-ic-nbctl --wait=sb sync making sure an update from one az is handled by the other az (implementing [3]). [4] is not really necessary here as [3] is fine. Signed-off-by: Xavier Simonart --- tests/ovn-ic.at | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at index 8497cb194..9fa41200e 100644 --- a/tests/ovn-ic.at +++ b/tests/ovn-ic.at @@ -173,7 +173,7 @@ done create_ic_infra() { az_id=$1 ts_id=$2 - az=az$i + az=az$1 lsp=lsp${az_id}-${ts_id} lrp=lrp${az_id}-${ts_id} @@ -184,7 +184,7 @@ create_ic_infra() { check ovn-ic-nbctl --wait=sb ts-add $ts check ovn-nbctl lr-add $lr - check ovn-nbctl lrp-add $lr $lrp 00:00:00:00:00:0$az_id 10.0.$az_id.1/24 + check ovn-nbctl --wait=sb lrp-add $lr $lrp 00:00:00:00:00:0$az_id 10.0.$az_id.1/24 check ovn-nbctl lrp-set-gateway-chassis $lrp gw-$az check ovn-nbctl lsp-add $ts $lsp -- \ @@ -192,7 +192,7 @@ create_ic_infra() { lsp-set-type $lsp router -- \ lsp-set-options $lsp router-port=$lrp - check ovn-nbctl lr-route-add $lr 192.168.0.0/16 10.0.$az_id.10 + check ovn-nbctl --wait=sb lr-route-add $lr 192.168.0.0/16 10.0.$az_id.10 } create_ic_infra 1 1 @@ -209,7 +209,7 @@ check_row_count ic-sb:Route 3 ip_prefix=192.168.0.0/16 check ovn-ic-nbctl --wait=sb ts-del ts1-1 ovn-ic-sbctl list route ovn-ic-nbctl list transit_switch -checl_row_count ic-sb:route 2 ip_prefix=192.168.0.0/16 +check_row_count ic-sb:route 2 ip_prefix=192.168.0.0/16 ovn-ic-sbctl list route for i in 1 2; do @@ -255,7 +255,7 @@ for i in 1 2; do check ovn-nbctl lrp-add lr1 lrp$i 00:00:00:00:0$i:01 10.0.$i.1/24 check ovn-nbctl lrp-set-gateway-chassis lrp$i gw-az$i - check ovn-nbctl lsp-add ts1 lsp$i -- \ + check ovn-nbctl --wait=sb lsp-add ts1 lsp$i -- \ lsp-set-addresses lsp$i router -- \ lsp-set-type lsp$i router -- \ lsp-set-options lsp$i router-port=lrp$i @@ -263,13 +263,11 @@ done ovn_as az1 -ovn-nbctl \ - --id=@id create logical-router-static-route ip_prefix=1.1.1.1/32 nexthop=10.0.1.10 -- \ - add logical-router lr1 static_routes @id ovn-nbctl \ --id=@id create logical-router-static-route ip_prefix=1.1.1.1/32 nexthop=10.0.1.10 -- \ add logical-router lr1 static_routes @id +check ovn-ic-nbctl --wait=sb sync check ovn-ic-nbctl --wait=sb sync check_row_count ic-sb:route 1 ip_prefix=1.1.1.1/32 @@ -455,6 +453,7 @@ Route Table
: # Delete route in AZ1, AZ2's learned route should be deleted. ovn_as az1 ovn-nbctl lr-route-del lr1 10.11.1.0/24 ovn-ic-nbctl --wait=sb sync +ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep -c learned], [1], [dnl 0 ]) @@ -462,6 +461,7 @@ AT_CHECK([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep -c learned], [1], [dnl # Add the route back ovn_as az1 ovn-nbctl lr-route-add lr1 10.11.1.0/24 169.254.0.1 ovn-ic-nbctl --wait=sb sync +ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep -c learned], [0], [dnl 1 ]) @@ -485,6 +485,7 @@ ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=false # AZ2 shouldn't have the route learned, because AZ1 should have stopped # advertising. check ovn-ic-nbctl --wait=sb sync +check ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az2 ovn-nbctl lr-route-list lr2], [0], [dnl IPv4 Routes Route Table
: @@ -499,6 +500,7 @@ ovn_as az1 ovn-nbctl lr-route-add lr1 0.0.0.0/0 169.254.0.3 ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=true ovn_as az1 ovn-nbctl set nb_global . options:ic-route-learn=true check ovn-ic-nbctl --wait=sb sync +check ovn-ic-nbctl --wait=sb sync # Default route should NOT get advertised or learned, by default. AT_CHECK([ovn_as az2 ovn-nbctl lr-route-list lr2], [0], [dnl @@ -576,7 +578,7 @@ for i in 1 2; do done # Create directly-connected routes -ovn_as az2 ovn-nbctl lrp-add lr12 lrp-lr12-ls2 aa:aa:aa:aa:bb:01 "192.168.0.1/24" +ovn_as az2 ovn-nbctl --wait=sb lrp-add lr12 lrp-lr12-ls2 aa:aa:aa:aa:bb:01 "192.168.0.1/24" ovn_as az2 ovn-nbctl lr-route-add lr12 10.10.10.0/24 192.168.0.10 ovn_as az1 ovn-nbctl --wait=sb sync @@ -585,6 +587,7 @@ ovn_as az1 ovn-nbctl show echo az2 ovn_as az2 ovn-nbctl show check ovn-ic-nbctl --wait=sb sync +check ovn-ic-nbctl --wait=sb sync # Test routes from lr12 were learned to lr11 AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr11 | @@ -626,7 +629,7 @@ for i in 1 2; do ovn-nbctl lrp-add lr$i lrp-lr$i-p$i 00:00:00:00:00:0$i 192.168.$i.1/24 # Create static routes - ovn-nbctl lr-route-add lr$i 10.11.$i.0/24 169.254.0.1 + ovn-nbctl --wait=sb lr-route-add lr$i 10.11.$i.0/24 169.254.0.1 # Create a src-ip route, which shouldn't be synced ovn-nbctl --policy=src-ip lr-route-add lr$i 10.22.$i.0/24 169.254.0.2 @@ -665,7 +668,6 @@ ovn-ic-nbctl ts-add ts1 for i in 1 2; do ovn_start az$i ovn_as az$i - # Enable route learning at AZ level ovn-nbctl set nb_global . options:ic-route-learn=true # Enable route advertising at AZ level @@ -680,9 +682,10 @@ for i in 1 2; do -- lsp-set-type lsp-ts1-lr$i router \ -- lsp-set-options lsp-ts1-lr$i router-port=lrp-lr$i-ts1 - ovn-nbctl lrp-add lr$i lrp-lr$i-p$i 00:00:00:00:00:0$i 2002:db8:1::$i/64 + ovn-nbctl --wait=sb lrp-add lr$i lrp-lr$i-p$i 00:00:00:00:00:0$i 2002:db8:1::$i/64 done +check ovn-ic-nbctl --wait=sb sync check ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr1 | awk '/learned/{print $1, $2}'], [0], [dnl 2002:db8:1::/64 2001:db8:1::2 @@ -733,6 +736,7 @@ for i in 1 2; do ovn-nbctl --policy=src-ip --route-table=rtb1 lr-route-add lr$i 10.22.$i.0/24 169.254.0.2 done +check ovn-ic-nbctl --wait=sb sync check ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr1], [0], [dnl IPv4 Routes @@ -750,6 +754,7 @@ for i in 1 2; do ovn_as az$i ovn-nbctl --route-table=rtb1 lr-route-add lr$i 10.11.$i.0/24 169.254.0.1 done +check ovn-ic-nbctl --wait=sb sync check ovn-ic-nbctl --wait=sb sync # ensure route from rtb1 is not learned to any route table as route table is # not set to TS port @@ -975,6 +980,7 @@ ovn_as az2 ovn-nbctl --route-table=rtb3 lr-route-add lr12 10.10.10.0/24 192.168. # Create directly-connected route in VPC2 ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bb:01 "192.168.0.1/24" check ovn-ic-nbctl --wait=sb sync +check ovn-ic-nbctl --wait=sb sync # Test direct routes from lr12 were learned to lr11 OVS_WAIT_FOR_OUTPUT([ovn_as az1 ovn-nbctl lr-route-list lr11 | grep 192.168 | grep learned | awk '{print $1, $2, $5}' | sort ], [0], [dnl @@ -1102,6 +1108,10 @@ ovn_as az2 ovn-nbctl --route-table=rtb3 lr-route-add lr12 2001:db8:aaaa::/64 200 ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bb:01 "2001:db8:200::1/64" # Test direct routes from lr12 were learned to lr11 +# +# We need to wait twice: first time for az2/ic to handle port addition and update ic/sb and +# second time for az1/ic to handle ic/sb update. +check ovn-ic-nbctl --wait=sb sync check ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr11 | grep 2001:db8:200 | grep learned | awk '{print $1, $2, $5}' | sort], [0], [dnl @@ -1177,6 +1187,7 @@ for i in 1 2; do check ovn-nbctl --wait=sb lr-route-add $lr 0.0.0.0/0 192.168.$i.11 done +check ovn-ic-nbctl --wait=sb sync check ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr11 | grep dst-ip | sort] , [0], [dnl 0.0.0.0/0 192.168.1.11 dst-ip @@ -1249,14 +1260,14 @@ for i in 1 2; do -- lsp-set-options $lsp router-port=$lrp done - # Create directly-connected routes ovn_as az1 ovn-nbctl lrp-add lr11 lrp-lr11 aa:aa:aa:aa:bb:01 "192.168.0.1/24" ovn_as az2 ovn-nbctl lrp-add lr21 lrp-lr21 aa:aa:aa:aa:bc:01 "192.168.1.1/24" -ovn_as az2 ovn-nbctl lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bc:02 "192.168.2.1/24" +ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bc:02 "192.168.2.1/24" # Test direct routes from lr21 and lr22 were learned to lr11 check ovn-ic-nbctl --wait=sb sync +check ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr11 | grep 192.168 | grep learned | awk '{print $1, $2}' | sort ], [0], [dnl 192.168.1.0/24 169.254.10.21 @@ -1335,7 +1346,6 @@ check ovn-ic-nbctl ts-add ts1 for i in 1 2; do ovn_start az$i ovn_as az$i - # Enable route learning at AZ level check ovn-nbctl set nb_global . options:ic-route-learn=true # Enable route advertising at AZ level @@ -1369,10 +1379,11 @@ for i in 1 2; do 33:33:33:33:33:3$i 2005:1734:5678::$i/50 # additional not filtered prefix -> different subnet bits - check ovn-nbctl lrp-add lr$i lrp-lr$i-p-ext4$i \ + check ovn-nbctl --wait=sb lrp-add lr$i lrp-lr$i-p-ext4$i \ 44:44:44:44:44:4$i 2005:1834:5678::$i/50 done +check ovn-ic-nbctl --wait=sb sync check ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr1 | awk '/learned/{print $1, $2}' ], [0], [dnl @@ -1387,6 +1398,7 @@ for i in 1 2; do check ovn-nbctl remove nb_global . options ic-route-denylist done +check ovn-ic-nbctl --wait=sb sync check ovn-ic-nbctl --wait=sb sync AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr1 | awk '/learned/{print $1, $2}' | sort ], [0], [dnl @@ -1750,6 +1762,7 @@ check ovn-nbctl lsp-add ts ts-lr3 \ wait_for_ports_up check ovn-ic-nbctl --wait=sb sync +check ovn-ic-nbctl --wait=sb sync ovn_as az1 check ovn-nbctl lsp-set-options ts-lr2 requested-chassis=hv2 @@ -1970,6 +1983,7 @@ check ovn-nbctl lsp-add ts ts-lr3 \ wait_for_ports_up check ovn-ic-nbctl --wait=sb sync +check ovn-ic-nbctl --wait=sb sync ovn_as az1 check ovn-nbctl lsp-set-options ts-lr2 requested-chassis=hv2 check ovn-nbctl lsp-set-options ts-lr3 requested-chassis=hv2 @@ -2223,6 +2237,7 @@ check ovn-nbctl lsp-add ts ts-lr3 \ wait_for_ports_up check ovn-ic-nbctl --wait=sb sync +check ovn-ic-nbctl --wait=sb sync ovn_as az1 check ovn-nbctl lsp-set-options ts-lr2 requested-chassis=hv2 check ovn-nbctl lsp-set-options ts-lr3 requested-chassis=hv2 From patchwork Fri Aug 30 07:41:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1978793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=iEnh5EqX; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ww97y3X8zz1yfn for ; Fri, 30 Aug 2024 17:41:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 644A241103; Fri, 30 Aug 2024 07:41:29 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id P3v7ZAlumgoO; Fri, 30 Aug 2024 07:41:27 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C2E81410F3 Authentication-Results: smtp2.osuosl.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=iEnh5EqX Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id C2E81410F3; Fri, 30 Aug 2024 07:41:26 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CF622C0012; Fri, 30 Aug 2024 07:41:25 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id C565BC0013 for ; Fri, 30 Aug 2024 07:41:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8AF84423C2 for ; Fri, 30 Aug 2024 07:41:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id xhRhEeA5FXDh for ; Fri, 30 Aug 2024 07:41:18 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=xsimonar@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 74F4641DD8 Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 74F4641DD8 Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iEnh5EqX Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 74F4641DD8 for ; Fri, 30 Aug 2024 07:41:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725003677; 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=HeLakEo4P9hJ43NEj7L60WAenFgTbOMsASiZgZ2w53g=; b=iEnh5EqX/FxFWNShZnkSS0/n9YyLjBhZjiMvFmsmO1bpWP6Ak+hw7DXfoZ9nXAwhg6KKLS oXkC8jH0D3zeOdhunttZKTA6ARjnKULSe98b0lKLimPXZQGC6DB55pfLu2dAwIDofru/wU jPv1SxVW19TtAzZMOlDm7D2L1bUhi4k= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-511-JrdU-amaMniKOKGvG71FEQ-1; Fri, 30 Aug 2024 03:41:15 -0400 X-MC-Unique: JrdU-amaMniKOKGvG71FEQ-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9608C1955BF1 for ; Fri, 30 Aug 2024 07:41:14 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EA35A19560A3; Fri, 30 Aug 2024 07:41:13 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Fri, 30 Aug 2024 09:41:08 +0200 Message-Id: <20240830074109.1798553-6-xsimonar@redhat.com> In-Reply-To: <20240830074109.1798553-1-xsimonar@redhat.com> References: <20240830074109.1798553-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 5/6] tests: Fix flaky ACL Sampling system tests. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Waiting for "ovs-ofctl dump-ipfix-flow br-int | grep -q '1 ids'" does not guarantee that sampling related flows are installed in OVS. Fixes: d15b12da6fe6 ("northd: Add ACL Sampling.") Signed-off-by: Xavier Simonart --- tests/system-ovn.at | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 463081721..475a036d4 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -13165,6 +13165,7 @@ ovs-vsctl --id=@br get Bridge br-int \ -- --id=@ipfix create IPFIX targets=\"127.0.0.1:4242\" template_interval=1 \ -- --id=@cs create Flow_Sample_Collector_Set id=100 bridge=@br ipfix=@ipfix +ovn-nbctl --wait=hv sync dnl And wait for it to be up and running. OVS_WAIT_UNTIL([ovs-ofctl dump-ipfix-flow br-int | grep -q '1 ids']) @@ -13333,6 +13334,7 @@ ovs-vsctl --id=@br get Bridge br-int \ -- --id=@ipfix create IPFIX targets=\"127.0.0.1:4242\" template_interval=1 \ -- --id=@cs create Flow_Sample_Collector_Set id=100 bridge=@br ipfix=@ipfix +ovn-nbctl --wait=hv sync dnl And wait for it to be up and running. OVS_WAIT_UNTIL([ovs-ofctl dump-ipfix-flow br-int | grep -q '1 ids']) @@ -13462,6 +13464,7 @@ ovs-vsctl --id=@br get Bridge br-int \ -- --id=@ipfix create IPFIX targets=\"127.0.0.1:4242\" template_interval=1 \ -- --id=@cs create Flow_Sample_Collector_Set id=100 bridge=@br ipfix=@ipfix +ovn-nbctl --wait=hv sync dnl And wait for it to be up and running. OVS_WAIT_UNTIL([ovs-ofctl dump-ipfix-flow br-int | grep -q '1 ids']) From patchwork Fri Aug 30 07:41:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1978795 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=FNO/25cs; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ww9804F35z1ygJ for ; Fri, 30 Aug 2024 17:41:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B611B41116; Fri, 30 Aug 2024 07:41:30 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id KTQQANYa_iu2; Fri, 30 Aug 2024 07:41:29 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 752CB410E4 Authentication-Results: smtp2.osuosl.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=FNO/25cs Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 752CB410E4; Fri, 30 Aug 2024 07:41:28 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0BFB0C0014; Fri, 30 Aug 2024 07:41:28 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8A6E1C0013 for ; Fri, 30 Aug 2024 07:41:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 6C506410AF for ; Fri, 30 Aug 2024 07:41:21 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id WpuevYwDJ2Md for ; Fri, 30 Aug 2024 07:41:19 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=xsimonar@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org CB8CA4031F Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org CB8CA4031F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id CB8CA4031F for ; Fri, 30 Aug 2024 07:41:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725003677; 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=3yhNtvU4FHMqBxJgs7imXkOUnFyKkejZUjHO/5pTEJI=; b=FNO/25csY26CpaFiM7MWczf8C2tVU9xC6mQrXEV0IRtHMM0jQann3yiqt7tplutgkkHe5Q kPljhwnIo/nhBUjx4w0OVJLcPMu+7yoVxNJ7UF20C2h4E/WWwL0FXjLi424ZRdS020rJS9 6ELINuSQqQmbCgGZ22t7IYEIazarrYA= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-209-emaYJIBNMDiXD4QT9m3noQ-1; Fri, 30 Aug 2024 03:41:15 -0400 X-MC-Unique: emaYJIBNMDiXD4QT9m3noQ-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 301FE1955D48 for ; Fri, 30 Aug 2024 07:41:15 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AB0D119560A3; Fri, 30 Aug 2024 07:41:14 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Fri, 30 Aug 2024 09:41:09 +0200 Message-Id: <20240830074109.1798553-7-xsimonar@redhat.com> In-Reply-To: <20240830074109.1798553-1-xsimonar@redhat.com> References: <20240830074109.1798553-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 6/6] tests: Fix flaky BFD system test. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Wait for bfdd-beacon to properly start. Using the NETNS_DAEMONIZE macro, we also guarantee that the last bfdd-beacon is also stopped at exit. Signed-off-by: Xavier Simonart Signed-off-by: Xavier Simonart --- tests/system-ovn.at | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 475a036d4..5d67bb90e 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -6920,7 +6920,8 @@ check ovn-nbctl lsp-add public public1 \ -- lsp-set-type public1 localnet \ -- lsp-set-options public1 network_name=phynet -NS_CHECK_EXEC([server], [bfdd-beacon --listen=172.16.1.50], [0]) +NETNS_DAEMONIZE([server], [bfdd-beacon --nofork --tee --listen=172.16.1.50 >beacon.stdout 2>&1], [beacon.pid]) +OVS_WAIT_UNTIL([grep -q "Listening for BFD connections" beacon.stdout]) NS_CHECK_EXEC([server], [bfdd-control allow 172.16.1.1], [0], [dnl Allowing connections from 172.16.1.1 ]) @@ -6980,7 +6981,8 @@ check ovn-nbctl set logical_router R1 options:chassis=hv1 check ovn-nbctl set logical_router_static_route $route_uuid bfd=$uuid # restart bfdd -NS_CHECK_EXEC([server], [bfdd-beacon --listen=172.16.1.50], [0]) +NETNS_DAEMONIZE([server], [bfdd-beacon --nofork --tee --listen=172.16.1.50 >beacon.stdout 2>&1], [beacon.pid]) +OVS_WAIT_UNTIL([grep -q "Listening for BFD connections" beacon.stdout]) NS_CHECK_EXEC([server], [bfdd-control allow 172.16.1.1], [0], [dnl Allowing connections from 172.16.1.1 ]) @@ -7022,7 +7024,8 @@ check ovn-nbctl lr-route-add R1 2000::/64 1000::b route_uuid_v6=$(fetch_column nb:logical_router_static_route _uuid ip_prefix=\"2000::/64\") ovn-nbctl set logical_router_static_route $route_uuid_v6 bfd=$uuid_v6 check ovn-nbctl --wait=hv sync -NS_CHECK_EXEC([server], [bfdd-beacon --listen=1000::b], [0]) +NETNS_DAEMONIZE([server], [bfdd-beacon --nofork --tee --listen=1000::b >beacon.stdout 2>&1], [beacon.pid]) +OVS_WAIT_UNTIL([grep -q "Listening for BFD connections" beacon.stdout]) NS_CHECK_EXEC([server], [bfdd-control allow 1000::a], [0], [dnl Allowing connections from 1000::a ])