From patchwork Thu Jul 10 15:33:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109427 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=bjfTXXfC; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.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 4bdJlw3PMdz1xqg for ; Fri, 11 Jul 2025 01:33:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id ECAF66125D; Thu, 10 Jul 2025 15:33:57 +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 TtmprOxWaZoc; Thu, 10 Jul 2025 15:33:57 +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 smtp3.osuosl.org 24FA161246 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=bjfTXXfC Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 24FA161246; Thu, 10 Jul 2025 15:33:57 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id F3D2CC0012; Thu, 10 Jul 2025 15:33:56 +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 1003CC0011 for ; Thu, 10 Jul 2025 15:33:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9E85940A10 for ; Thu, 10 Jul 2025 15:33:51 +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 70EyFvQ9vke4 for ; Thu, 10 Jul 2025 15:33:51 +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 045A6409EA Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 045A6409EA Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bjfTXXfC 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 045A6409EA for ; Thu, 10 Jul 2025 15:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161630; 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=CD+4zXnMqvkthGNxScV7NPNQ2LAXnUFdagQNha0Ko9k=; b=bjfTXXfCVYdbAZ0qo9401z5ZuhMSus5acP8O6e1hVSIYPQPV88Q9c+rh5xd6XfQkdYSpw8 Wh8Ahe3lJoX1Lfwz1RYhz1E7pHTPo+Rsl3Hi/lslzsHVLEQseuogwV4TjkC2RWv8+aNH8p r+Ol4ygCEsKBD5aQytRzv0M0j3ae40E= 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-393-wxZmhH0GMGKLgqV4iwCgnA-1; Thu, 10 Jul 2025 11:33:48 -0400 X-MC-Unique: wxZmhH0GMGKLgqV4iwCgnA-1 X-Mimecast-MFC-AGG-ID: wxZmhH0GMGKLgqV4iwCgnA_1752161627 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 ABEBE195609E for ; Thu, 10 Jul 2025 15:33:47 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2C2A5180035E; Thu, 10 Jul 2025 15:33:47 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:34 -0400 Message-ID: <20250710153345.104954-2-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 8CoO359IAnaaJef_DdvyLMQv6xpVmC63e18kDw5U9rk_1752161627 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 01/11] tests: Fix ovn-macro when ovn_check_packets__ fails. 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" When ovn_check_packets__ was failing because not enough packets were received, dump_diff was not printing any packet diff but something like "sort: cannot read: hv1/vif-tx.packets: No such file or directory". This did not cause any tests failure as such, but made it difficult to debug existing tests failures. sort: cannot read: hv1/vif11-tx.packets: No such file or directory Signed-off-by: Xavier Simonart Acked-by: Mark Michelson --- tests/ovn-macros.at | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index d0f1c0bf4..13cff5c38 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -33,6 +33,7 @@ m4_divert_text([PREPARE_TESTS], [$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" $rcv_pcap > rcv_tmp rcv_n=`wc -l < rcv_tmp` echo "rcv_n=$rcv_n exp_n=$exp_n" + cat rcv_tmp > $rcv_text test $rcv_n -ge $exp_n], [dump_diff__ "$rcv_pcap" "$exp_text"]) sort $exp_text | $cmd > expout @@ -50,6 +51,7 @@ m4_divert_text([PREPARE_TESTS], sed -i '/ffffffffffff/d' rcv_tmp rcv_n=`wc -l < rcv_tmp` echo "rcv_n=$rcv_n exp_n=$exp_n" + cat rcv_tmp > $rcv_text test $rcv_n -ge $exp_n], [dump_diff__ "$rcv_pcap" "$exp_text"]) sort $exp_text | $cmd > expout From patchwork Thu Jul 10 15:33:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109429 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=WZvyN/hM; 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 4bdJm03sGRz1xqg for ; Fri, 11 Jul 2025 01:33:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3FC30612D6; Thu, 10 Jul 2025 15:34:02 +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 49yrtBXJ1W2L; Thu, 10 Jul 2025 15:34:00 +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 D92D260F04 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=WZvyN/hM Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id D92D260F04; Thu, 10 Jul 2025 15:33:59 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6800BC0014; Thu, 10 Jul 2025 15:33:59 +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 028E7C0011 for ; Thu, 10 Jul 2025 15:33:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1A37D40A15 for ; Thu, 10 Jul 2025 15:33:52 +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 SdTZMlixfv0d for ; Thu, 10 Jul 2025 15:33:51 +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 6E11240A0C Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6E11240A0C Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WZvyN/hM 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 6E11240A0C for ; Thu, 10 Jul 2025 15:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161630; 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=UZ389J6cDBQTHfRj4CxKniFRCHIqczwHXaYsCSmD2ss=; b=WZvyN/hMHBT221dUCRTHom473kATsXZWOkIkb0XD09kBguRmokHfbleACfsx+MPhS6vsF8 TyKus3qRTQ1KqnePcT/pUSpDh9AjRJgTDMgiGrQDL0V9mn4kw6fD/l8k7tRivOg5SvsEE2 v/q77R5CNI95TxvDA+XUNe4vUDJH+wE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-77-SDnJM6AONB2yIDHwuGHe2w-1; Thu, 10 Jul 2025 11:33:49 -0400 X-MC-Unique: SDnJM6AONB2yIDHwuGHe2w-1 X-Mimecast-MFC-AGG-ID: SDnJM6AONB2yIDHwuGHe2w_1752161628 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6BA7E1801210 for ; Thu, 10 Jul 2025 15:33:48 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E02DD180035E; Thu, 10 Jul 2025 15:33:47 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:35 -0400 Message-ID: <20250710153345.104954-3-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: GsUcywy4bERtmiz2_OhZ_OOu7bD2bLiTR8_dQ2r540Y_1752161628 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 02/11] tests: Avoid unloading not existing modules. 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Do not try to remove a module if it failed to load. This caused errors in logs when running tests. Signed-off-by: Xavier Simonart --- tests/system-kmod-macros.at | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 41a8b7914..7771146f0 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -64,8 +64,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], m4_define([CHECK_CONNTRACK], m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], [nf_nat_ftp], [nf_nat_tftp]], - [modprobe mod || echo "Module mod not loaded." - on_exit 'modprobe -r mod' + [modprobe mod && on_exit 'modprobe -r mod' || echo "Module mod not loaded." ]) sysctl -w net.netfilter.nf_conntrack_helper=0 on_exit "${ovs_builddir}/tests/ovstest test-netlink-conntrack flush" From patchwork Thu Jul 10 15:33:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109426 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=Ly5wEhSy; 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 4bdJls6KpNz1xqg for ; Fri, 11 Jul 2025 01:33:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5194A83C07; Thu, 10 Jul 2025 15:33:55 +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 ZNSdkmyGttuh; Thu, 10 Jul 2025 15:33:54 +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 smtp1.osuosl.org 65F2181E8C 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=Ly5wEhSy Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 65F2181E8C; Thu, 10 Jul 2025 15:33:54 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 437A7C0011; Thu, 10 Jul 2025 15:33:54 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 57744C0012 for ; Thu, 10 Jul 2025 15:33:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id EE83083639 for ; Thu, 10 Jul 2025 15:33:52 +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 exzdlygKx9Ha for ; Thu, 10 Jul 2025 15:33:52 +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 smtp1.osuosl.org 5914B83B73 Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5914B83B73 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5914B83B73 for ; Thu, 10 Jul 2025 15:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161631; 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=h/Bom4nLQbyrI7jSn5ellMp54ogCu+qV0ii9ZcHkWKo=; b=Ly5wEhSynjK6Abv3wTwSEy+T9PkRGHk/kDGvMXYqIbm/WlTH2DPgTSABzw/GC1ul5jA1kN 4IR7rhKLmrSLfWejBQ6kwbG8W0KWIa+/7uEJY4jCFVvQyRh3LFpKexLRhNr45mOWYlM3YH YoMXNyOOn/UlScMAKLSpYSHWO0a91DM= 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-8-9BH8NvCTMtOX86oLtHF-hg-1; Thu, 10 Jul 2025 11:33:49 -0400 X-MC-Unique: 9BH8NvCTMtOX86oLtHF-hg-1 X-Mimecast-MFC-AGG-ID: 9BH8NvCTMtOX86oLtHF-hg_1752161629 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 2497119560B6 for ; Thu, 10 Jul 2025 15:33:49 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A0BA618002B6; Thu, 10 Jul 2025 15:33:48 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:36 -0400 Message-ID: <20250710153345.104954-4-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: BEiOZPXI_NA01IP8jbJS9SMniSGlQDeAr6DpxsG1IqU_1752161629 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 03/11] tests: Avoid calling ovs/ovn commands when ovs/ovn are stopped. 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Multiple tests call ovn commands such as ovn-nbctl or ovn-sbctl or ovs commands such as ovs-ofctl or ovs-dpctl within on_exit. Avoid issuing those commands when ovn/ovs has been stopped. When tests succeed, this was causing extra unnecessary error messages (when a test succeeds, ovn and ovs are stopped before on_exit is executed), which made debugging/understanding tests more difficult. Signed-off-by: Xavier Simonart --- tests/ovs-macros.at | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at index 25b34791a..e344d22c8 100644 --- a/tests/ovs-macros.at +++ b/tests/ovs-macros.at @@ -382,7 +382,19 @@ dnl Cleanup commands are executed in the reverse order of calls to this dnl function. m4_divert_text([PREPARE_TESTS], [dnl on_exit () { - (echo "$1"; cat cleanup) > cleanup.tmp + if [ echo "$1" | grep -qe '^ovn-nbctl' ] ; then + (echo "test -e ovn-nb/ovn-nb.sock && $1"; cat cleanup;) > cleanup.tmp + else + if [ echo "$1" | grep -qe '^ovn-sbctl' ]; then + (echo "test -e ovn-sb/ovn-sb.sock && $1"; cat cleanup) > cleanup.tmp + else + if [ echo "$1" | grep -qe '^ovs-ofctl' -qe '^ovs-dpctl' ]; then + (echo "test -e $OVS_RUNDIR/ovs-vswitchd.pid && $1"; cat cleanup) > cleanup.tmp + else + (echo "$1"; cat cleanup) > cleanup.tmp + fi + fi + fi mv cleanup.tmp cleanup } ]) From patchwork Thu Jul 10 15:33:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109430 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=CjpL9LCy; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4bdJm24dC5z1xqg for ; Fri, 11 Jul 2025 01:33:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4ECA94109D; Thu, 10 Jul 2025 15:34:04 +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 QximNkbxuZ7D; Thu, 10 Jul 2025 15:34:01 +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 smtp4.osuosl.org 5305841055 Authentication-Results: smtp4.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=CjpL9LCy Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 5305841055; Thu, 10 Jul 2025 15:34:01 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B604EC0013; Thu, 10 Jul 2025 15:34:00 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 16242C0013 for ; Thu, 10 Jul 2025 15:33:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2347981F34 for ; Thu, 10 Jul 2025 15:33:54 +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 ll3_d2ahFys7 for ; Thu, 10 Jul 2025 15:33:53 +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 smtp1.osuosl.org 4E55381E8C Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4E55381E8C Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=CjpL9LCy Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4E55381E8C for ; Thu, 10 Jul 2025 15:33:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161632; 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=ELgCfLHarVJPi3K17Do67bqGT8/j+J3NpXYdmsPhkWI=; b=CjpL9LCy04AiParjcI4qy85LU988vUo0cu3jqQsgzrYhGc15OJw7yLfkzHMaG1l3RzaY/u Ud3/7JRKX2ukh2rDzCI1Wp8aXsTaXRpQKET8t9kuE9uS2zvyX8xRm4qsS/Rft2NQSVhYHf bRcqmGT9Bx7XBxkhfhIvv/sD12BTgGI= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-297-GqNS9BLPP-6wFI4Q2KGtFg-1; Thu, 10 Jul 2025 11:33:50 -0400 X-MC-Unique: GqNS9BLPP-6wFI4Q2KGtFg-1 X-Mimecast-MFC-AGG-ID: GqNS9BLPP-6wFI4Q2KGtFg_1752161629 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CE69B18002E4 for ; Thu, 10 Jul 2025 15:33:49 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 581A1180035E; Thu, 10 Jul 2025 15:33:49 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:37 -0400 Message-ID: <20250710153345.104954-5-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pplOil2e_IlREG9JQYsQNfA0CML4jXBSxWI224S_v60_1752161629 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 04/11] tests: Fix flaky "NAT on a provider network with no localnet ports". 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Test was occasionally failing as using "grep -e 20.0.0.3" was unexpectedly matching expression such as datapth uuid (e.g. bfd52d48-93f5-4f9b-aefc-4d2207020e31). Signed-off-by: Xavier Simonart Acked-by: Mark Michelson --- tests/ovn-northd.at | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 8204a5cc3..a65d8eb10 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -13972,7 +13972,7 @@ AT_CHECK([grep "ls_in_l2_lkup" publicflows | ovn_strip_lflows], [0], [dnl table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && nd_ns && nd.target == fe80::200:ff:fe00:ff02), action=(clone {outport = "public-lr0"; output; }; outport = "_MC_flood_l2"; output;) ]) -AT_CHECK([grep -e "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" lr0flows | ovn_strip_lflows], [0], [dnl +AT_CHECK([grep -Fe "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" lr0flows | ovn_strip_lflows], [0], [dnl table=??(lr_in_admission ), priority=50 , match=(eth.dst == 30:54:00:00:00:03 && inport == "lr0-public" && is_chassis_resident("sw0-port1")), action=(xreg0[[0..47]] = 00:00:00:00:ff:02; next;) table=??(lr_in_arp_resolve ), priority=100 , match=(outport == "lr0-public" && reg0 == 172.168.0.110), action=(eth.dst = 30:54:00:00:00:03; next;) table=??(lr_in_arp_resolve ), priority=100 , match=(outport == "lr0-public" && reg0 == 172.168.0.120), action=(eth.dst = 00:00:00:00:ff:02; next;) @@ -13997,7 +13997,7 @@ AT_CHECK([grep -e "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" table=??(lr_out_undnat ), priority=100 , match=(ip && ip4.src == 20.0.0.3 && outport == "lr0-public" && is_chassis_resident("cr-lr0-public")), action=(ct_dnat;) ]) -AT_CHECK([grep -e "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" publicflows | ovn_strip_lflows], [0], [dnl +AT_CHECK([grep -Fe "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" publicflows | ovn_strip_lflows], [0], [dnl table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 30:54:00:00:00:03 && is_chassis_resident("sw0-port1")), action=(outport = "public-lr0"; output;) table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:ff:02, 30:54:00:00:00:03} && eth.dst == ff:ff:ff:ff:ff:ff && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 172.168.0.110), action=(clone {outport = "public-lr0"; output; }; outport = "_MC_flood_l2"; output;) @@ -14147,7 +14147,7 @@ AT_CHECK([grep "ls_in_l2_lkup" publicflows | ovn_strip_lflows], [0], [dnl table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && nd_ns && nd.target == fe80::200:ff:fe00:ff02 && is_chassis_resident("cr-public-lr0")), action=(clone {outport = "public-lr0"; output; }; outport = "_MC_flood_l2"; output;) ]) -AT_CHECK([grep -e "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" lr0flows | ovn_strip_lflows], [0], [dnl +AT_CHECK([grep -Fe "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" lr0flows | ovn_strip_lflows], [0], [dnl table=??(lr_in_arp_resolve ), priority=100 , match=(outport == "lr0-public" && reg0 == 172.168.0.110), action=(eth.dst = 00:00:00:00:ff:02; next;) table=??(lr_in_arp_resolve ), priority=100 , match=(outport == "lr0-public" && reg0 == 172.168.0.120), action=(eth.dst = 00:00:00:00:ff:02; next;) table=??(lr_in_arp_resolve ), priority=150 , match=(inport == "lr0-public" && outport == "lr0-public" && ip4.dst == 172.168.0.110), action=(drop;) @@ -14166,7 +14166,7 @@ AT_CHECK([grep -e "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" table=??(lr_out_undnat ), priority=100 , match=(ip && ip4.src == 20.0.0.3 && outport == "lr0-public" && is_chassis_resident("cr-lr0-public")), action=(ct_dnat;) ]) -AT_CHECK([grep -e "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" publicflows | ovn_strip_lflows], [0], [dnl +AT_CHECK([grep -Fe "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" publicflows | ovn_strip_lflows], [0], [dnl table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 30:54:00:00:00:03 && is_chassis_resident("sw0-port1")), action=(outport = "public-lr0"; output;) table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:ff:02, 30:54:00:00:00:03} && eth.dst == ff:ff:ff:ff:ff:ff && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 172.168.0.110 && !is_chassis_resident("cr-public-lr0")), action=(clone {outport = "cr-public-lr0"; output; }; outport = "_MC_flood_l2"; output;) @@ -14208,7 +14208,7 @@ check_row_count Port_Binding 0 logical_port=cr-public-lr0 ovn-sbctl dump-flows lr0 > lr0flows ovn-sbctl dump-flows public > publicflows -AT_CHECK([grep -e "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" lr0flows | ovn_strip_lflows], [0], [dnl +AT_CHECK([grep -Fe "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" lr0flows | ovn_strip_lflows], [0], [dnl table=??(lr_in_admission ), priority=50 , match=(eth.dst == 30:54:00:00:00:03 && inport == "lr0-public" && is_chassis_resident("sw0-port1")), action=(xreg0[[0..47]] = 00:00:00:00:ff:02; next;) table=??(lr_in_arp_resolve ), priority=100 , match=(outport == "lr0-public" && reg0 == 172.168.0.110), action=(eth.dst = 30:54:00:00:00:03; next;) table=??(lr_in_arp_resolve ), priority=100 , match=(outport == "lr0-public" && reg0 == 172.168.0.120), action=(eth.dst = 00:00:00:00:ff:02; next;) @@ -14233,7 +14233,7 @@ AT_CHECK([grep -e "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" table=??(lr_out_undnat ), priority=100 , match=(ip && ip4.src == 20.0.0.3 && outport == "lr0-public" && is_chassis_resident("cr-lr0-public")), action=(ct_dnat;) ]) -AT_CHECK([grep -e "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" publicflows | ovn_strip_lflows], [0], [dnl +AT_CHECK([grep -Fe "172.168.0.110" -e "172.168.0.120" -e "10.0.0.3" -e "20.0.0.3" -e "30:54:00:00:00:03" -e "sw0-port1" publicflows | ovn_strip_lflows], [0], [dnl table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst == 30:54:00:00:00:03 && is_chassis_resident("sw0-port1")), action=(outport = "public-lr0"; output;) table=??(ls_in_l2_lkup ), priority=75 , match=(eth.src == {00:00:00:00:ff:02, 30:54:00:00:00:03} && eth.dst == ff:ff:ff:ff:ff:ff && (arp.op == 1 || rarp.op == 3 || nd_ns)), action=(outport = "_MC_flood_l2"; output;) table=??(ls_in_l2_lkup ), priority=80 , match=(flags[[1]] == 0 && arp.op == 1 && arp.tpa == 172.168.0.110), action=(clone {outport = "public-lr0"; output; }; outport = "_MC_flood_l2"; output;) From patchwork Thu Jul 10 15:33:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109431 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=QRSvdMYb; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.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 4bdJm26rmxz1xqn for ; Fri, 11 Jul 2025 01:33:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BCAA383C7D; Thu, 10 Jul 2025 15:34:03 +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 PMaE4weKCARa; Thu, 10 Jul 2025 15:34:02 +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 9950E83C66 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=QRSvdMYb Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 9950E83C66; Thu, 10 Jul 2025 15:34:02 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 70376C0013; Thu, 10 Jul 2025 15:34:02 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2D430C0018 for ; Thu, 10 Jul 2025 15:33:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1293483B96 for ; Thu, 10 Jul 2025 15:33:56 +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 l1F040VlMJZR for ; Thu, 10 Jul 2025 15:33:55 +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 smtp1.osuosl.org 41A5783B9A Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 41A5783B9A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 41A5783B9A for ; Thu, 10 Jul 2025 15:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161634; 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=ghWlP+rYWR0/+zUtvh0WqqNULcipu1U9GIFoPavNCPM=; b=QRSvdMYbLvnBg9/rTNnSDIVGhmqCaoalNVqrp3Qjjs4W2yyC7fd/JFy4ESxqLEI7IoHjzk nXpi8rOwxi1sCd0JOtHrhjG7LK8hbVf5pkYvZbbTnwt+FaFRIL5UzaG6e2bxwQ2fFtYSKM TKmsWVwxk+fsTMwjwh2blc/dX8bFIBc= Received: from mx-prod-mc-04.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-668-nCjLvFwyMRWi48nCwUGN-Q-1; Thu, 10 Jul 2025 11:33:51 -0400 X-MC-Unique: nCjLvFwyMRWi48nCwUGN-Q-1 X-Mimecast-MFC-AGG-ID: nCjLvFwyMRWi48nCwUGN-Q_1752161631 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D1CA819560AD for ; Thu, 10 Jul 2025 15:33:50 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 44D321803AF2; Thu, 10 Jul 2025 15:33:49 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:38 -0400 Message-ID: <20250710153345.104954-6-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: r0SNdjhBClCQ4_3tZst9UmyoP5ZVlOarQEA2bhefQzI_1752161631 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 05/11] tests: Fix flaky tests not properly waiting for ovn-controller exit. 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This caused ovn-controller restart to sometimes fail due with an error: "already running as pid xxx, aborting". Signed-off-by: Xavier Simonart --- tests/ovn-controller.at | 12 +++++++++--- tests/ovn-macros.at | 5 +++-- tests/system-ovn.at | 10 ++++------ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index 6007a7454..28189b049 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -3729,12 +3729,14 @@ start_controller() { } # Stop ovn-controller, without any argument it will cleanup resources. +TMPPID=$(cat hv1/ovn-controller.pid) check ovn-appctl -t ovn-controller exit check grep -q "Exiting ovn-controller, resource cleanup: True" hv1/ovn-controller.log +OVS_WAIT_WHILE([kill -0 $TMPPID 2>/dev/null]) # Stop ovn-controller without cleanup. start_controller -check ovn-appctl -t ovn-controller exit --restart +OVN_CONTROLLER_EXIT([hv1]) check grep -q "Exiting ovn-controller, resource cleanup: False (--restart)" hv1/ovn-controller.log # Set cleanup on exit. @@ -3742,12 +3744,14 @@ check ovs-vsctl set open . external-ids:ovn-cleanup-on_exit=true # Stop ovn-controller, without any argument it will cleanup resources. start_controller +TMPPID=$(cat hv1/ovn-controller.pid) check ovn-appctl -t ovn-controller exit check grep -q "Exiting ovn-controller, resource cleanup: True" hv1/ovn-controller.log +OVS_WAIT_WHILE([kill -0 $TMPPID 2>/dev/null]) # Stop ovn-controller, --restart flag has priority over external-ids, no cleanup. start_controller -check ovn-appctl -t ovn-controller exit --restart +OVN_CONTROLLER_EXIT([hv1]) check grep -q "Exiting ovn-controller, resource cleanup: False (--restart)" hv1/ovn-controller.log # Set cleanup on exit to false. @@ -3755,12 +3759,14 @@ check ovs-vsctl set open . external-ids:ovn-cleanup-on-exit=false # Stop ovn-controller, without any argument it won't cleanup due to the external-ids. start_controller +TMPPID=$(cat hv1/ovn-controller.pid) check ovn-appctl -t ovn-controller exit check grep -q "Exiting ovn-controller, resource cleanup: False (--restart)" hv1/ovn-controller.log +OVS_WAIT_WHILE([kill -0 $TMPPID 2>/dev/null]) # Stop ovn-controller without cleanup. start_controller -check ovn-appctl -t ovn-controller exit --restart +OVN_CONTROLLER_EXIT([hv1]) check grep -q "Exiting ovn-controller, resource cleanup: False (--restart)" hv1/ovn-controller.log # Start the controller so the test cleanup routing doesn't get stuck. diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 13cff5c38..20755942b 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -1460,8 +1460,9 @@ m4_define([OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT], ]) m4_define([OVN_CONTROLLER_EXIT], - [TMPPID=$(cat $1/ovn-controller.pid) - AT_CHECK([as $1 ovn-appctl -t ovn-controller exit --restart]) + [TMPPID=$(cat ./$1/ovn-controller.pid) + AT_CHECK([as $1 +check ovn-appctl -t ovn-controller exit --restart]) # Make sure ovn-controller stopped so that a future restart will not fail. # Checking debug/status is running is not enough as there might be a small race condition. echo "Waiting for pid $TMPPID" diff --git a/tests/system-ovn.at b/tests/system-ovn.at index c2b70d3a1..d0888badf 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -16266,9 +16266,8 @@ blackhole 198.51.100.0/24 proto ovn metric 1000 233.252.0.0/24 via 192.168.10.10 dev lo onlink 233.253.0.0/24 via 192.168.20.20 dev hv1-mll onlink]) -# Stoping with --restart will not touch the routes. -check ovn-appctl -t ovn-controller exit --restart -OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" != "running"]) +# Stopping with --restart will not touch the routes. +OVN_CONTROLLER_EXIT([]) OVN_ROUTE_EQUAL([ovnvrf1338], [dnl blackhole 192.0.2.1 proto ovn metric 1000 blackhole 192.0.2.2 proto ovn metric 100 @@ -16610,9 +16609,8 @@ blackhole 198.51.100.0/24 proto ovn metric 1000 233.252.0.0/24 via 192.168.10.10 dev lo onlink 233.253.0.0/24 via 192.168.20.20 dev hv1-mll onlink]) -# Stoping with --restart will not touch the routes. -check ovn-appctl -t ovn-controller exit --restart -OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" != "running"]) +# Stopping with --restart will not touch the routes. +OVN_CONTROLLER_EXIT([]) OVN_ROUTE_EQUAL([ovnvrf1337], [dnl blackhole 192.0.2.1 proto ovn metric 100 blackhole 192.0.2.2 proto ovn metric 100 From patchwork Thu Jul 10 15:33:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109434 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=XSrElgPB; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4bdJm917fTz1xqg for ; Fri, 11 Jul 2025 01:34:01 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DF58941124; Thu, 10 Jul 2025 15:34:10 +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 j2GKaTTkkBw2; Thu, 10 Jul 2025 15:34:08 +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 smtp4.osuosl.org B4015410A8 Authentication-Results: smtp4.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=XSrElgPB Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id B4015410A8; Thu, 10 Jul 2025 15:34:05 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A1B9DC0013; Thu, 10 Jul 2025 15:34:05 +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 15CA8C001D for ; Thu, 10 Jul 2025 15:34:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9F50961229 for ; Thu, 10 Jul 2025 15:33:55 +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 bb0tfWGsulaD for ; Thu, 10 Jul 2025 15:33:55 +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 smtp3.osuosl.org D257761247 Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D257761247 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=XSrElgPB 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 D257761247 for ; Thu, 10 Jul 2025 15:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161633; 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=7vyS6r+Xs/txxH2ooZKGPp55ruQmA4kAl4JmiA5DTuM=; b=XSrElgPBzM2/k8XP4PWFPhXnL2XiZJ/H9MSKY6+cPGd7k5HMXttNXOOJCRw4K1oxOMxb2e +ISQC3vFviXD4m595wSjRtvpGHFsBzhpuwHS1PO8Docbs3kOR4TrHBZropM23MS3EwBIAM 5jNOHgNPa0hhq6fuNT9FgxR6tko53bg= Received: from mx-prod-mc-02.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-124-BagQouZLNjKwOEdg2BVguA-1; Thu, 10 Jul 2025 11:33:52 -0400 X-MC-Unique: BagQouZLNjKwOEdg2BVguA-1 X-Mimecast-MFC-AGG-ID: BagQouZLNjKwOEdg2BVguA_1752161631 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 91412195608E for ; Thu, 10 Jul 2025 15:33:51 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 11D2B180035E; Thu, 10 Jul 2025 15:33:50 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:39 -0400 Message-ID: <20250710153345.104954-7-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 62SGsP3Gr4vklfJHF-Rb0s92YOszvoB53CUE9E7KpOw_1752161631 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 06/11] tests: Fix flaky "tag allocation". 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" When a container port is added to a ls, with a new tag allocation being requested (e.g. ovn-nbctl lsp-add ls1 c1 parent1 0), this is done by northd in two iterations: the sb pb is created, and then the tag is allocated. Hence, there is no guarantee that the tag is allocated in sb when ovn-nbctl --wait=sb returns. Before [1], this was not causing any issue, as the second transaction (writing the tag in the sb db) was initiated before ovn-nbctl --wait=sb returned. But this is not the case anymore. [1] e1495fbc86bb: "northd: Remove delay in sb_cfg propagation.". Signed-off-by: Xavier Simonart --- tests/ovn.at | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/ovn.at b/tests/ovn.at index 108de260e..01221a264 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -10247,6 +10247,7 @@ AT_CHECK([ovn-nbctl ls-add ls1]) AS_BOX([requested tag for parent1]) AT_CHECK([ovn-nbctl --wait=sb lsp-add ls1 c0 parent1 3]) +check ovn-nbctl --wait=sb sync c0_tag=$(ovn-nbctl lsp-get-tag c0) echo c0_tag=$c0_tag check test "$c0_tag" = 3 @@ -10255,6 +10256,7 @@ check_row_count Port_Binding 1 logical_port=c0 tag=$c0_tag AS_BOX([tag allocation 1 for parent1]) AT_CHECK([ovn-nbctl --wait=sb lsp-add ls1 c1 parent1 0]) +check ovn-nbctl --wait=sb sync c1_tag=$(ovn-nbctl lsp-get-tag c1) echo c1_tag=$c1_tag check test "$c1_tag" != "$c0_tag" @@ -10262,6 +10264,7 @@ check_row_count Port_Binding 1 logical_port=c1 tag=$c1_tag AS_BOX([tag allocation 2 for parent1]) AT_CHECK([ovn-nbctl --wait=sb lsp-add ls1 c2 parent1 0]) +check ovn-nbctl --wait=sb sync c2_tag=$(ovn-nbctl lsp-get-tag c2) echo c2_tag=$c2_tag check test "$c2_tag" != "$c0_tag" @@ -10270,6 +10273,7 @@ check_row_count Port_Binding 1 logical_port=c2 tag=$c2_tag AS_BOX([tag allocation 3 for parent1]) AT_CHECK([ovn-nbctl --wait=sb lsp-add ls1 c3 parent1 0]) +check ovn-nbctl --wait=sb sync c3_tag=$(ovn-nbctl lsp-get-tag c3) echo c3_tag=$c3_tag check test "$c3_tag" != "$c0_tag" @@ -10279,12 +10283,14 @@ check_row_count Port_Binding 1 logical_port=c3 tag=$c3_tag AS_BOX([tag allocation 1 for parent2]) AT_CHECK([ovn-nbctl --wait=sb lsp-add ls1 c4 parent2 0]) +check ovn-nbctl --wait=sb sync c4_tag=$(ovn-nbctl lsp-get-tag c4) echo c4_tag=$c4_tag check_row_count Port_Binding 1 logical_port=c4 tag=$c4_tag AS_BOX([tag allocation 2 for parent2]) AT_CHECK([ovn-nbctl --wait=sb lsp-add ls1 c5 parent2 0]) +check ovn-nbctl --wait=sb sync c5_tag=$(ovn-nbctl lsp-get-tag c5) echo c5_tag=$c5_tag check test "$c5_tag" != "$c4_tag" @@ -10293,6 +10299,7 @@ check_row_count Port_Binding 1 logical_port=c5 tag=$c5_tag AS_BOX([delete and add tag allocation for parent1]) AT_CHECK([ovn-nbctl --wait=sb lsp-del c1]) AT_CHECK([ovn-nbctl --wait=sb lsp-add ls1 c6 parent1 0]) +check ovn-nbctl --wait=sb sync c6_tag=$(ovn-nbctl lsp-get-tag c6) echo c6_tag=$c6_tag check_row_count Port_Binding 1 logical_port=c6 tag=$c6_tag From patchwork Thu Jul 10 15:33:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109433 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=GCiuUlEr; 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 4bdJm664lrz1xqg for ; Fri, 11 Jul 2025 01:33:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E1974612F7; Thu, 10 Jul 2025 15:34:07 +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 k7rTPOA7Lhol; Thu, 10 Jul 2025 15:34:06 +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 smtp3.osuosl.org C6D6A61331 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=GCiuUlEr Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id C6D6A61331; Thu, 10 Jul 2025 15:34:04 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A1BC6C0011; Thu, 10 Jul 2025 15:34:04 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 15C43C0013 for ; Thu, 10 Jul 2025 15:34:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1D4B783639 for ; Thu, 10 Jul 2025 15:33:58 +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 LWh1o5jHYCzh for ; Thu, 10 Jul 2025 15:33:56 +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 smtp1.osuosl.org 4842E83B9A Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4842E83B9A Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GCiuUlEr Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4842E83B9A for ; Thu, 10 Jul 2025 15:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161635; 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=crSSoZRkhlQHEZdVoaO9sCRxcdIBaHLxDNpm9wJhmP4=; b=GCiuUlErmOkeclhLBJ+9Ivk5pOoYH5ccg3uEQepIx5OQuLmzQu/lIUBNrKtqsoxZr8Kr5o HZvJr9kGoi/4h8QppcyuYy/zMrtdIsO3QLxH7zi/SWIbX7qlhTPA4oEciqDPrWENXJ4Whv YBEeIYlpd0o4Z07wcfK+kEo3le2HSMw= Received: from mx-prod-mc-04.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-672-IFrHWN4LP3ezdINAy3zU-w-1; Thu, 10 Jul 2025 11:33:53 -0400 X-MC-Unique: IFrHWN4LP3ezdINAy3zU-w-1 X-Mimecast-MFC-AGG-ID: IFrHWN4LP3ezdINAy3zU-w_1752161632 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5A76519560AE for ; Thu, 10 Jul 2025 15:33:52 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C52B018002B6; Thu, 10 Jul 2025 15:33:51 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:40 -0400 Message-ID: <20250710153345.104954-8-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hCSSfHaJVBUtYpvXLwjExitXtl5eIn-lJHGllUcIm1o_1752161632 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 07/11] tests: Fix flaky "send arp for nexthop". 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Xavier Simonart Acked-by: Mark Michelson --- tests/ovn.at | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 01221a264..274b77d70 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -9786,10 +9786,9 @@ as hv1 ovs-appctl netdev-dummy/receive hv1-ls1lp2 $packet # ARP packet should be received with Target IP Address set to 192.168.1.254 and # not 8.8.8.8 -$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/ls2lp2-tx.pcap | trim_zeros > packets expected="fffffffffffff0000000000208060001080006040001f00000000002c0a80101000000000000c0a801fe" -echo $expected > expout -AT_CHECK([cat packets], [0], [expout]) +echo $expected > expected +OVN_CHECK_PACKETS([hv1/ls2lp2-tx.pcap], [expected]) cat packets OVN_CLEANUP([hv1]) From patchwork Thu Jul 10 15:33:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109432 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=hcleXBF2; 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 4bdJm52DfRz1xqg for ; Fri, 11 Jul 2025 01:33:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 085DE83C89; Thu, 10 Jul 2025 15:34:06 +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 r-5f00cCWLvg; Thu, 10 Jul 2025 15:34:04 +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 1E48D83C85 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=hcleXBF2 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1E48D83C85; Thu, 10 Jul 2025 15:34:04 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A4D56C0014; Thu, 10 Jul 2025 15:34:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 176C5C0015 for ; Thu, 10 Jul 2025 15:33:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E2C4983661 for ; Thu, 10 Jul 2025 15:33:56 +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 4hFQpfOS7xmh for ; Thu, 10 Jul 2025 15:33:56 +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 smtp1.osuosl.org 479A381F34 Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 479A381F34 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 479A381F34 for ; Thu, 10 Jul 2025 15:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161635; 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=HYOPL1geNpwf7ukKBunJPojmr70tWa43ifFAagYQktA=; b=hcleXBF2nxzewgyfav1SYqBB16QcMeAiIFfyul3veRI6TnXbUYtdSz0unW8W945dys/4HD +RV3iWvmkkDhHcLolrisF6zXJp3g5adzM0T562mptjdXBIHF+RJL56sq17scs/kZEtJgqy nqCnbASEuAsrffgwTzdV+moZekedLm4= 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-684-O4uK_XEVPzajKKOmW03UjA-1; Thu, 10 Jul 2025 11:33:54 -0400 X-MC-Unique: O4uK_XEVPzajKKOmW03UjA-1 X-Mimecast-MFC-AGG-ID: O4uK_XEVPzajKKOmW03UjA_1752161633 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 113F01955D48 for ; Thu, 10 Jul 2025 15:33:53 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8E89218002B6; Thu, 10 Jul 2025 15:33:52 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:41 -0400 Message-ID: <20250710153345.104954-9-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: zvgVAZJghpgBUf5B0gJJIG38kRCsX4olfNONON6TUwU_1752161633 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 08/11] tests: Remove unused commands from mac-binding 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Xavier Simonart --- tests/ovn.at | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 274b77d70..e81d4e32a 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -36719,15 +36719,6 @@ send_icmp6_echo_req() { as $hv ovs-appctl netdev-dummy/receive $dev $packet } -send_na() { - local hv=$1 dev=$2 hdst=$3 hsrc=$4 idst=$5 isrc=$6 - local packet=$(fmt_pkt "Ether(dst='${hdst}', src='${hsrc}')/ \ - IPv6(dst='${idst}', src='${isrc}')/ \ - ICMPv6ND_NA(tgt='${isrc}')/ \ - ICMPv6NDOptDstLLAddr(lladdr='${hsrc}')") - as $hv ovs-appctl netdev-dummy/receive $dev $packet -} - dump_icmp() { local hdst=$1 hsrc=$2 idst=$3 isrc=$4 ttl=$5 type=$6 chksum=$7 local packet=$(fmt_pkt "Ether(dst='${hdst}', src='${hsrc}')/ \ @@ -36795,7 +36786,6 @@ dump_icmp 00:00:00:00:10:1a 00:00:00:00:10:00 192.168.10.100 192.168.20.2 253 0 OVN_CHECK_PACKETS_CONTAIN([hv1/public-tx.pcap], [expected]) wait_row_count mac_binding 1 ip="192.168.20.2" logical_port="gw-join" -n_arp=$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE |awk '/arp_spa=192.168.20.2/{print substr($4,11,1)}') OVS_WAIT_UNTIL([$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_BINDING | \ sed 's/reg15=0x.,metadata=0x./reg15=,metadata=/g' | \ @@ -36824,7 +36814,6 @@ check ovn-nbctl --wait=hv acl-del join wait_row_count mac_binding 0 send_icmp6_echo_req hv1 public 00:00:00:00:10:00 00:00:00:00:50:01 fd12::2 fd11::64 -send_na hv1 vif1 00:00:00:00:10:00 00:00:00:00:50:01 fd11::1 fd11::64 check_row_count mac_binding 1 mac=\"00:00:00:00:30:00\" ip=\"fd12::2\" n_ipv6=$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE |awk '/ipv6_src=fd12::2/{print substr($4,11,1)}') From patchwork Thu Jul 10 15:33:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109437 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=T+jrYVYS; 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 4bdJmG1fRtz1xqg for ; Fri, 11 Jul 2025 01:34:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 60B2983C7F; Thu, 10 Jul 2025 15:34:14 +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 BYVnQRmkif9P; Thu, 10 Jul 2025 15:34:12 +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 smtp1.osuosl.org 71BB183CF5 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=T+jrYVYS Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 71BB183CF5; Thu, 10 Jul 2025 15:34:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 07BC1C0017; Thu, 10 Jul 2025 15:34:10 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0B1E7C0017 for ; Thu, 10 Jul 2025 15:34:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 74ECB4103C for ; Thu, 10 Jul 2025 15:33:57 +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 wyny_wgd53cD for ; Thu, 10 Jul 2025 15:33:57 +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 smtp4.osuosl.org DB28D4101F Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org DB28D4101F 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=T+jrYVYS Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id DB28D4101F for ; Thu, 10 Jul 2025 15:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161635; 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=7BLf8LXec6iMjJaxlRi7fEvFem+/ltV50U8bPR6FkKo=; b=T+jrYVYSPC1AxBNXK6LUGOm6QJkFms4JTqz9uxYj4dmd9iwf5LqrhIDt5FqOwrUIS4qLVz +1ST3Yo9J597QS4rPu2VD/XD7gJ346BeUMxzf+VCI1py4jpUzz9ZLj6YmlL2TUZbvkGggN CyBdNawHE3DqdaIcwNHtCalobTXYHVI= Received: from mx-prod-mc-04.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-554-Uw9IUr3ZMNCGya8dMbMw-Q-1; Thu, 10 Jul 2025 11:33:54 -0400 X-MC-Unique: Uw9IUr3ZMNCGya8dMbMw-Q-1 X-Mimecast-MFC-AGG-ID: Uw9IUr3ZMNCGya8dMbMw-Q_1752161633 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C5EEC19560AE for ; Thu, 10 Jul 2025 15:33:53 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 459E018046C5; Thu, 10 Jul 2025 15:33:53 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:42 -0400 Message-ID: <20250710153345.104954-10-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: m7usSuNiRcKnhcvC8hLLhpw6mz17j6bBUpZTEoEUBV0_1752161633 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 09/11] tests: Add missing check for scapy. 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Xavier Simonart Acked-by: Mark Michelson --- tests/ovn-macros.at | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 20755942b..06fa28070 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -1253,6 +1253,7 @@ hex_to_mac() { } send_garp() { + AT_SKIP_IF([test $HAVE_SCAPY = no]) local hv=$1 inport=$2 op=$3 eth_src=$4 eth_dst=$5 spa=$6 tpa=$7 local packet=$(fmt_pkt "Ether(dst='${eth_dst}', src='${eth_src}')/ \ From patchwork Thu Jul 10 15:33:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109435 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=dyFxCQ2y; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4bdJmC2FwBz1xqg for ; Fri, 11 Jul 2025 01:34:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C94F04113F; Thu, 10 Jul 2025 15:34:12 +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 kWaxW9mlPi_j; Thu, 10 Jul 2025 15:34:11 +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 smtp4.osuosl.org 3C4134103C Authentication-Results: smtp4.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=dyFxCQ2y Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 3C4134103C; Thu, 10 Jul 2025 15:34:07 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D662CC0013; Thu, 10 Jul 2025 15:34:06 +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 1053AC0011 for ; Thu, 10 Jul 2025 15:34:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id AE4B940A51 for ; Thu, 10 Jul 2025 15:33:59 +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 mPUeOxkF7lFW for ; Thu, 10 Jul 2025 15:33:58 +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 D8C3440A24 Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D8C3440A24 Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dyFxCQ2y 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 D8C3440A24 for ; Thu, 10 Jul 2025 15:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161636; 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=WKlVzQFg2lXSi5L/Oar2kS3W6xcrWbKwolllCSQV/9g=; b=dyFxCQ2yOAx0iWHfVge3kW56grmuz2C2+Xw2gVz3RSxSLBRFctVSHC6jMFghHFyY58B/te NX8Ch32NSRcuRElgpDZS+Z5SYzfK6HNgxzRl/sD2LQfA7CFPpazv+9z6x3uhpkYcOdmUES mr5b+UEkKaaxWD9Xw3X7qObf2tp8RPk= Received: from mx-prod-mc-04.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-210-YIXMRTInNxmOoYCzkVCcLg-1; Thu, 10 Jul 2025 11:33:55 -0400 X-MC-Unique: YIXMRTInNxmOoYCzkVCcLg-1 X-Mimecast-MFC-AGG-ID: YIXMRTInNxmOoYCzkVCcLg_1752161634 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A304119560B7 for ; Thu, 10 Jul 2025 15:33:54 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 06046180035E; Thu, 10 Jul 2025 15:33:53 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:43 -0400 Message-ID: <20250710153345.104954-11-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ng2xsslh6Dq-atLhQxT0Q07xLPuFsBzf-C8T_3gM-7U_1752161634 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 10/11] tests: Fix flaky "ovn-ic -- route sync -- loadbalancer". 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The test was sometimes failing as matching parts of uuids. Signed-off-by: Xavier Simonart Acked-by: Mark Michelson --- tests/ovn-ic.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at index 37d7bc1b6..30220c12e 100644 --- a/tests/ovn-ic.at +++ b/tests/ovn-ic.at @@ -912,7 +912,7 @@ check ovn_as az1 ovn-nbctl lb-add lb_v6 [[4242::1]]:80 "[[4242::2]]:80" check ovn_as az1 ovn-nbctl lr-lb-add lr1 lb_v6 OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 4242]) -AT_CHECK([ovn-ic-sbctl list route | grep 4242 -A 2], [0], [dnl +AT_CHECK([ovn-ic-sbctl list route | grep 'ip_prefix.*4242' -A 2], [0], [dnl ip_prefix : "4242::1/128" nexthop : "2001:db8:1::1" origin : loadbalancer From patchwork Thu Jul 10 15:33:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109436 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=Erk3/ZmQ; 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 4bdJmC548hz1xqn for ; Fri, 11 Jul 2025 01:34:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5996483D22; Thu, 10 Jul 2025 15:34:13 +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 YPIvj_uRLsSG; Thu, 10 Jul 2025 15:34:10 +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 smtp1.osuosl.org 6F44F83CE4 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=Erk3/ZmQ Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 6F44F83CE4; Thu, 10 Jul 2025 15:34:09 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 59DF5C0012; Thu, 10 Jul 2025 15:34:09 +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 07BE5C0013 for ; Thu, 10 Jul 2025 15:34:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E81F640A7B for ; Thu, 10 Jul 2025 15:33:59 +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 x77rkbP_Z4JF for ; Thu, 10 Jul 2025 15:33:59 +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 33FF940A31 Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 33FF940A31 Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Erk3/ZmQ 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 33FF940A31 for ; Thu, 10 Jul 2025 15:33:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161638; 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=dVAYiY/UxZ//n4+l3rAiwoZfUXd0QajG5D2WiH/4CnI=; b=Erk3/ZmQrBF8BTWhE0TytdRfOL1Pnn+LZzF96D2QO7Dnl5C6h3LfWwP0iwJCGacV2Y7ry0 EAyAqRhwe6dzjnQShO1LscLNe7jk3afYS6KBSod2rxA+L/sOrYmZwVo79bZbiSVVCdoe50 t4j5QCZ4ic1T+tbCtFvyFcsLI07ieXY= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-564-SiXDkcz6MwGoVG7yQFmRyQ-1; Thu, 10 Jul 2025 11:33:56 -0400 X-MC-Unique: SiXDkcz6MwGoVG7yQFmRyQ-1 X-Mimecast-MFC-AGG-ID: SiXDkcz6MwGoVG7yQFmRyQ_1752161635 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3D179180028A for ; Thu, 10 Jul 2025 15:33:55 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BAFD6180035E; Thu, 10 Jul 2025 15:33:54 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:44 -0400 Message-ID: <20250710153345.104954-12-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 4NTwvm50cDWj4NrunNfGkftQZrJcx-0bPEWFXAT6YwE_1752161635 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 11/11] tests: Fix flaky "interconnection". 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: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" When comparing flows before and after recompute, flows corresponding tp datapath which became local temporarily should be ignored. Instead of listing all ts and ports in this case, configure the system so that such datapath and ports are not temporarily local. Signed-off-by: Xavier Simonart Acked-by: Mark Michelson --- tests/ovn-ic.at | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at index 30220c12e..49a409015 100644 --- a/tests/ovn-ic.at +++ b/tests/ovn-ic.at @@ -1897,12 +1897,12 @@ for az in `seq 1 $n_az`; do check ovn-nbctl lsp-set-type lsp-ls$az-$i-lr$az-$i router check ovn-nbctl lsp-set-options lsp-ls$az-$i-lr$az-$i router-port=lrp-lr$az-$i-ls$az-$i - check ovn-nbctl lrp-add lr$az-$i lrp-lr$az-$i-ts$i $lrp_ts_mac $lrp_ts_ip/24 - check ovn-nbctl lsp-add ts$i lsp-ts$i-lr$az-$i - check ovn-nbctl lsp-set-addresses lsp-ts$i-lr$az-$i router - check ovn-nbctl lsp-set-type lsp-ts$i-lr$az-$i router - check ovn-nbctl lsp-set-options lsp-ts$i-lr$az-$i router-port=lrp-lr$az-$i-ts$i - check ovn-nbctl lrp-set-gateway-chassis lrp-lr$az-$i-ts$i gw$az + check ovn-nbctl -- lrp-add lr$az-$i lrp-lr$az-$i-ts$i $lrp_ts_mac $lrp_ts_ip/24 \ + -- lsp-add ts$i lsp-ts$i-lr$az-$i \ + -- lsp-set-addresses lsp-ts$i-lr$az-$i router \ + -- lsp-set-type lsp-ts$i-lr$az-$i router \ + -- lsp-set-options lsp-ts$i-lr$az-$i router-port=lrp-lr$az-$i-ts$i \ + -- lrp-set-gateway-chassis lrp-lr$az-$i-ts$i gw$az done check ovn-nbctl --wait=hv sync ovn-sbctl list Port_Binding > az$az.ports @@ -2017,21 +2017,9 @@ for s_az in $(seq 1 $n_az); do done OVS_WAIT_UNTIL([check_packets], [$at_diff -F'^---' expected received]) -# ts[i] become local datapaths in hv[az] right before we lrp-set the -# gateway-chassis on lrp-lr$az-$i-ts$i. -# For ts1 & ts2, there are recomputes after the gateway-chassis has been set -# (e.g. when some tunnel_keys get added), and hence they get removed from -# local datapaths. -# However this is not the case for ts3: there is no recompute, and local -# datapaths are usually not removed in I+P. Ignore this. -# Also, ts3 remaining a local datapath, and lsp-ts3-lr[x]-3 being remote port, it -# is a related port. Ignore this also -ovn_as az1 OVN_CLEANUP_SBOX([hv1], [], ["lsp-ts3-lr2-3 -lsp-ts3-lr3-3"], [ts3]) -ovn_as az2 OVN_CLEANUP_SBOX([hv2], [], ["lsp-ts3-lr1-3 -lsp-ts3-lr3-3"], [ts3]) -ovn_as az3 OVN_CLEANUP_SBOX([hv3], [], ["lsp-ts3-lr1-3 -lsp-ts3-lr2-3"], [ts3]) +ovn_as az1 OVN_CLEANUP_SBOX([hv1]) +ovn_as az2 OVN_CLEANUP_SBOX([hv2]) +ovn_as az3 OVN_CLEANUP_SBOX([hv3]) for az in `seq 1 $n_az`; do ovn_as az$az