From patchwork Mon Feb 12 17:55:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897897 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=W/uP5gUW; 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 4TYXF12pFqz23r3 for ; Tue, 13 Feb 2024 04:55:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 893E240A7F; Mon, 12 Feb 2024 17:55:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zppKNkC75-pe; Mon, 12 Feb 2024 17:55:46 +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 7A7A3409D6 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=W/uP5gUW Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 7A7A3409D6; Mon, 12 Feb 2024 17:55:44 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6FDE8C0DCF; Mon, 12 Feb 2024 17:55:44 +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 7A367C0037 for ; Mon, 12 Feb 2024 17:55:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5D63C60623 for ; Mon, 12 Feb 2024 17:55:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8Nvv04kk14RB for ; Mon, 12 Feb 2024 17:55:41 +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 B2C9460622 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 B2C9460622 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=W/uP5gUW 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 B2C9460622 for ; Mon, 12 Feb 2024 17:55:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760540; 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=aMyA5cpEOuJV2H+y6tZPc/HkvWqjJc0U20c2yqJmc84=; b=W/uP5gUWl2E8xDYOqShObjFmFUswKKbU46PS6quavGLyIAJmFcbgLK10og8Q826cEn9WrJ XnOO0w7UvAtDxi2WICxI/RqUa3V96+D8JLHRrqwgvKjUU6gv42RaXQA+eXdrKnhKVCXMEo b77+GPzpuIhdlCemXNL411U1MRHHrG0= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-423-W7JRzud3Ole4e4ZUXHBIqg-1; Mon, 12 Feb 2024 12:55:39 -0500 X-MC-Unique: W7JRzud3Ole4e4ZUXHBIqg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2032A29AC00C for ; Mon, 12 Feb 2024 17:55:39 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3E7EAC17; Mon, 12 Feb 2024 17:55:38 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:28 +0100 Message-ID: <20240212175537.1356073-2-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 01/10] tests: Have tests fail when adding veth peer fails. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Before this patch, the test was seen as "skipped" if ip link was failing. Signed-off-by: Xavier Simonart --- tests/system-common-macros.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at index 4bfc74582..177178067 100644 --- a/tests/system-common-macros.at +++ b/tests/system-common-macros.at @@ -59,7 +59,7 @@ m4_define([ADD_BR], [ovs-vsctl _ADD_BR([$1]) -- $2]) # The existing 'port' or 'ovs-port' will be removed before new ones are added. # m4_define([ADD_VETH], - [ AT_CHECK([ip link add $1 type veth peer name ovs-$1 || return 77]) + [ AT_CHECK([ip link add $1 type veth peer name ovs-$1]) CONFIGURE_VETH_OFFLOADS([$1]) AT_CHECK([ip link set $1 netns $2]) AT_CHECK([ip link set dev ovs-$1 up]) From patchwork Mon Feb 12 17:55:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897899 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=dOcArh3N; 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 4TYXF363N3z23r3 for ; Tue, 13 Feb 2024 04:55:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D53A840A84; Mon, 12 Feb 2024 17:55:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D5FQilGYmP4t; Mon, 12 Feb 2024 17:55:46 +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 ACAF840568 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dOcArh3N Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id ACAF840568; Mon, 12 Feb 2024 17:55:45 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 689D9C0DD0; Mon, 12 Feb 2024 17:55:45 +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 A2867C0DCF for ; Mon, 12 Feb 2024 17:55:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 794FF405FB for ; Mon, 12 Feb 2024 17:55:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3dlquZjnd9FG for ; Mon, 12 Feb 2024 17:55:43 +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 AF93140207 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 AF93140207 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=dOcArh3N 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 AF93140207 for ; Mon, 12 Feb 2024 17:55:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760541; 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=QDXezNlIqkadsAcaqRHg0mjnz7LHxuG/6H7TViJrqR8=; b=dOcArh3NKBoLUATndp0D0oNd6K+FIfzgNhZa6RhqpMjPgF5J5165lBql+0UQlVRxarntN9 xaWn0NZx9c419wtrqNsXxT4UX8igtyK+5a+OgVxN114jnGJ4DFun6uCvFHFLbmql+HnXYZ zbSZQcAxExVbqSIMeiGoUeTEN10Ejkg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-507-YrANRXkzMHWCObhhOo3Wyg-1; Mon, 12 Feb 2024 12:55:40 -0500 X-MC-Unique: YrANRXkzMHWCObhhOo3Wyg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id C40963C11C64 for ; Mon, 12 Feb 2024 17:55:39 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 545DFAD6A; Mon, 12 Feb 2024 17:55:39 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:29 +0100 Message-ID: <20240212175537.1356073-3-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 02/10] tests: Fix typos in tests. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Test was using ovs-sbctl instead of ovn-sbctl for some debugging purposes. Signed-off-by: Xavier Simonart --- tests/ovn.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 902dd3793..291c6bca5 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -6222,7 +6222,7 @@ ovs-vsctl -- add-port br-int vif2 -- \ wait_for_ports_up check ovn-nbctl --wait=hv sync -ovs-sbctl dump-flows > sbflows +ovn-sbctl dump-flows > sbflows AT_CAPTURE_FILE([sbflows]) # Send ip packets between the two ports. @@ -6240,7 +6240,7 @@ as hv1 ovs-appctl netdev-dummy/receive vif1 $packet #Disable router R1 ovn-nbctl --wait=hv set Logical_Router R1 enabled=false -ovs-sbctl dump-flows > sbflows2 +ovn-sbctl dump-flows > sbflows2 AT_CAPTURE_FILE([sbflows2]) as hv1 ovs-appctl netdev-dummy/receive vif1 $packet From patchwork Mon Feb 12 17:55:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897898 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=Rvne6ucU; 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 4TYXF20w0bz23yB for ; Tue, 13 Feb 2024 04:55:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id DA82781CDC; Mon, 12 Feb 2024 17:55:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iH_1hXj4Vphq; Mon, 12 Feb 2024 17:55:46 +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 78C8181C44 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=Rvne6ucU Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 78C8181C44; Mon, 12 Feb 2024 17:55:46 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 33732C0DD0; Mon, 12 Feb 2024 17:55:46 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2A51BC0DCF for ; Mon, 12 Feb 2024 17:55:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1A42D81C44 for ; Mon, 12 Feb 2024 17:55:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7HOx1-rmihPF for ; Mon, 12 Feb 2024 17:55:43 +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 2DF0581C38 Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 2DF0581C38 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 2DF0581C38 for ; Mon, 12 Feb 2024 17:55:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760542; 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=O8kdtDDuGBf60z2KwdPnIOWC08Uoo1vwWQ/sWkoEcwI=; b=Rvne6ucUysNZC9fTHwzn51gv2AUs7CDagnRAJobKJLNhHbJMbDjpYlg+1uNRaYRJBxfeed DkUBATbpxoVqpQrQKNcWspARiamKNEvvPx4i0QIbp2MhBzQHaaOd6nFjBIQXj7X3eeLgK/ mB1Mp/NS9uOnduYskl2h9dL648XkWFE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-88-q_ZDMGazNFakhReIgG-iYA-1; Mon, 12 Feb 2024 12:55:40 -0500 X-MC-Unique: q_ZDMGazNFakhReIgG-iYA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 73298811E79 for ; Mon, 12 Feb 2024 17:55:40 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03891AD6D; Mon, 12 Feb 2024 17:55:39 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:30 +0100 Message-ID: <20240212175537.1356073-4-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 03/10] tests: Fix flaky "options:requested-chassis ...". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The test was failing due to the following race condition. By using ofport-request, there is the risk that the ofport is initially not assigned the expected value, and hence that the ofport changes. This happens for instance if the geneve interface gets the ofport expected for the vif. In that case, both the geneve and the vif see their ofports changing. An ofport change for the geneve interface is not I+P handled. If this change is handled within the same loop as the iface-id setting for the vif, then a runtime data recompute happened for the vif, and the expected log was not produced. Signed-off-by: Xavier Simonart --- tests/ovn.at | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 291c6bca5..6ed764ace 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -16246,15 +16246,13 @@ sim_add hv1 as hv1 ovs-vsctl add-br br-phys ovn_attach n1 br-phys 192.168.0.11 -ovs-vsctl -- add-port br-int hv1-vif0 -- \ -set Interface hv1-vif0 ofport-request=1 +ovs-vsctl -- add-port br-int hv1-vif0 sim_add hv2 as hv2 ovs-vsctl add-br br-phys ovn_attach n1 br-phys 192.168.0.12 -ovs-vsctl -- add-port br-int hv2-vif0 -- \ -set Interface hv2-vif0 ofport-request=1 +ovs-vsctl -- add-port br-int hv2-vif0 # Allow only chassis hv1 to bind logical port lsp0. ovn-nbctl lsp-set-options lsp0 requested-chassis=hv1 @@ -16262,6 +16260,16 @@ ovn-nbctl lsp-set-options lsp0 requested-chassis=hv1 # Allow some time for ovn-northd and ovn-controller to catch up. check ovn-nbctl --wait=hv sync +OVS_WAIT_UNTIL([ + hv1_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=hv1-vif0) + test 1 -le $hv1_ofport +]) + +OVS_WAIT_UNTIL([ + hv2_ofport=$(as hv2 ovs-vsctl --bare --columns ofport find Interface name=hv2-vif0) + test 1 -le $hv2_ofport +]) + # Retrieve hv1 and hv2 chassis UUIDs from southbound database wait_row_count Chassis 1 name=hv1 wait_row_count Chassis 1 name=hv2 @@ -16277,7 +16285,7 @@ OVS_WAIT_UNTIL([test 1 = $(grep -c "Not claiming lport lsp0" hv2/ovn-controller. wait_row_count Port_Binding 1 logical_port=lsp0 'chassis=[[]]' # (2) Chassis hv2 should not add flows in OFTABLE_PHY_TO_LOG and OFTABLE_LOG_TO_PHY tables. -AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [1], []) +AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=$hv2_ofport], [1], []) AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep output], [1], []) # (3) Chassis hv1 should bind lsp0 when physical to logical mapping exists on hv1. @@ -16290,8 +16298,8 @@ wait_column "$hv1_uuid" Port_Binding chassis logical_port=lsp0 # (4) Chassis hv1 should add flows in OFTABLE_PHY_TO_LOG and OFTABLE_LOG_TO_PHY tables. as hv1 ovs-ofctl dump-flows br-int -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [0], [ignore]) -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep actions=output:1], [0], [ignore]) +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=$hv1_ofport], [0], [ignore]) +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep actions=output:$hv1_ofport], [0], [ignore]) # (5) Chassis hv1 should release lsp0 binding and chassis hv2 should bind lsp0 when # the requested chassis for lsp0 is changed from hv1 to hv2. @@ -16304,10 +16312,10 @@ OVS_WAIT_UNTIL([test 1 -le $(grep -c "Releasing lport lsp0" hv1/ovn-controller.l wait_column "$hv2_uuid" Port_Binding chassis logical_port=lsp0 # (6) Chassis hv2 should add flows and hv1 should not. -AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [0], [ignore]) -AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep actions=output:1], [0], [ignore]) +AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=$hv2_ofport], [0], [ignore]) +AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep actions=output:$hv2_ofport], [0], [ignore]) -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [1], []) +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=$hv1_ofport], [1], []) AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep output], [1], []) OVN_CLEANUP([hv1],[hv2]) From patchwork Mon Feb 12 17:55:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897900 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=FG5RC4y0; 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 4TYXF528Xqz23r3 for ; Tue, 13 Feb 2024 04:55:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E8D966063F; Mon, 12 Feb 2024 17:55:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NOUP7y1EpFCo; Mon, 12 Feb 2024 17:55:49 +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 50A2360648 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=FG5RC4y0 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 50A2360648; Mon, 12 Feb 2024 17:55:48 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 03629C0DD8; Mon, 12 Feb 2024 17:55:48 +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 0E73EC0037 for ; Mon, 12 Feb 2024 17:55:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F1DD54060B for ; Mon, 12 Feb 2024 17:55:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NXJ1OBfMAKSG for ; Mon, 12 Feb 2024 17:55:44 +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 3B4B240600 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 3B4B240600 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=FG5RC4y0 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 3B4B240600 for ; Mon, 12 Feb 2024 17:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760543; 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=kyChRl7iMNvkdt4AyYtCcD0H1FBCkOdg8fY4TM+XJ1U=; b=FG5RC4y0ACOIcsqtbnQIxWMh5VvNgpSDYtNwsiJtdtVLQA9EcVbOjBmQUGoULXYKMuBLYd F+GG5Sm4YGzs8t9QHHeztBGwfwqkpbO/2OfEiixufj1dlECsMsZEbXmhbiZKfZroDASETR SGmfsj5BTdNde7mIvHmvevyMHPvt9SY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-255-U76Id5A3OsCxmjYGx7r_kg-1; Mon, 12 Feb 2024 12:55:41 -0500 X-MC-Unique: U76Id5A3OsCxmjYGx7r_kg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2203585CEEC for ; Mon, 12 Feb 2024 17:55:41 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5C81AD60; Mon, 12 Feb 2024 17:55:40 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:31 +0100 Message-ID: <20240212175537.1356073-5-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 04/10] tests: Fix flaky "ovn-controller-vtep - binding 1". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Xavier Simonart --- tests/ovn-controller-vtep.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ovn-controller-vtep.at b/tests/ovn-controller-vtep.at index 462e858f1..d35dbbd05 100644 --- a/tests/ovn-controller-vtep.at +++ b/tests/ovn-controller-vtep.at @@ -50,7 +50,7 @@ m4_define([OVN_CONTROLLER_VTEP_START], [ /vlog|INFO|opened log file/d' dnl Wait until ovs-vtep starts up. - OVS_WAIT_UNTIL([test -n "`vtep-ctl show | grep Physical_Port`"]) + OVS_WAIT_UNTIL([test 2 -eq "`vtep-ctl show | grep -c Physical_Port`"]) dnl Start ovn-controller-vtep. start_daemon ovn-controller-vtep --vtep-db=unix:"$ovs_dir"/db.sock \ From patchwork Mon Feb 12 17:55:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897905 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=TnrREM2H; 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 4TYXFM6Q4Hz23r3 for ; Tue, 13 Feb 2024 04:56:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1610781DEB; Mon, 12 Feb 2024 17:56:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1DrR1_wDqB36; Mon, 12 Feb 2024 17:56:02 +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 81DF981E45 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=TnrREM2H Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 81DF981E45; Mon, 12 Feb 2024 17:56:00 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 41EDBC0DDA; Mon, 12 Feb 2024 17:55: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 174F0C0DCF for ; Mon, 12 Feb 2024 17:55:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D4EB340AE9 for ; Mon, 12 Feb 2024 17:55:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JON0nsRUo3gX for ; Mon, 12 Feb 2024 17:55:47 +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 BE5E440A07 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 BE5E440A07 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=TnrREM2H 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 BE5E440A07 for ; Mon, 12 Feb 2024 17:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760543; 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=LcdvlAamMVcZswHiKiC1AjtIaM44iCVGltL+yO7SCBo=; b=TnrREM2HmKqBwJBAfXnFJX//D4jMPk2YFyQ3J5ft/5HwKQcPSJDiKsxEP84bx7XzEpxeoT qYf7tvD6EL5Ngj4YYm1A13cVeYuxQdMg988nMosntZ5uppOC4+cRel/XzIjqRQVBrlTnAe qGqpgJEmZNk/HlDtNTLoydxc0KqFees= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-38-NCh4GUjMNi-fViOL0uC_dA-1; Mon, 12 Feb 2024 12:55:42 -0500 X-MC-Unique: NCh4GUjMNi-fViOL0uC_dA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5DE310665A6 for ; Mon, 12 Feb 2024 17:55:41 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55EAEAC1F; Mon, 12 Feb 2024 17:55:41 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:32 +0100 Message-ID: <20240212175537.1356073-6-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 05/10] tests: Fix "ofctrl wait before clearing flows". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" - The test was sometimes failing if ofctrl was too slow to reconnect. - Also, the test was not really verifying that flows were not installed before expiry of wait-before-clear. - Finally, use grep -F to avoid catching unexpected flows. Signed-off-by: Xavier Simonart --- tests/ovn-controller.at | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index f77e032d4..8dda85f53 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -2193,14 +2193,14 @@ check ovn-nbctl --wait=hv sync AT_CHECK([ovn-appctl -t ovn-controller group-table-list | awk '{print $2}' | sort | uniq | wc -l], [0], [2 ]) -# Set 5 seconds wait time before clearing OVS flows. -check ovs-vsctl set open . external_ids:ovn-ofctrl-wait-before-clear=5000 - # Stop ovn-controller OVS_APP_EXIT_AND_WAIT([ovn-controller]) +# Set 5 seconds wait time before clearing OVS flows. +check ovs-vsctl set open . external_ids:ovn-ofctrl-wait-before-clear=5000 + # The old OVS flows should remain (this is regardless of the configuration) -AT_CHECK([ovs-ofctl dump-flows br-int | grep 10.1.2.3], [0], [ignore]) +AT_CHECK([ovs-ofctl dump-flows br-int | grep -F 10.1.2.3], [0], [ignore]) # We should have 2 flows with groups. AT_CHECK([ovs-ofctl dump-flows br-int | grep group -c], [0], [2 @@ -2212,11 +2212,16 @@ check ovn-nbctl --wait=sb lsp-set-addresses ls1-lp1 "f0:00:00:00:00:01 10.1.2.4" # Start ovn-controller, which should compute new flows but not apply them # until the wait time is completed. start_daemon ovn-controller -sleep 2 + +# Wait for octrl to run - it will handle the wait-before-clear +OVS_WAIT_UNTIL([grep -q 'wait-before-clear' hv1/ovn-controller.log]) + +# Check that there is no flow using 10.1.2.4 except the lb one (using 2.2.2.2) +OVS_WAIT_UNTIL([test 0 = $(ovs-ofctl dump-flows br-int | grep -F 10.1.2.4 | grep -cvF 2.2.2.2)]) # Check in the middle of the wait. lflow_run_1=$(ovn-appctl -t ovn-controller coverage/read-counter lflow_run) -AT_CHECK([ovs-ofctl dump-flows br-int | grep 10.1.2.3], [0], [ignore]) +AT_CHECK([ovs-ofctl dump-flows br-int | grep -F 10.1.2.3], [0], [ignore]) # We should have 2 flows with groups. AT_CHECK([ovs-ofctl dump-flows br-int | grep group -c], [0], [2 @@ -2225,7 +2230,7 @@ AT_CHECK([ovs-ofctl dump-flows br-int | grep group -c], [0], [2 sleep 5 # Check after the wait -OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int | grep 10.1.2.4]) +OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int | grep -F 10.1.2.4 | grep -vF 2.2.2.2]) # We should have 2 flows with groups. AT_CHECK([ovs-ofctl dump-flows br-int | grep group -c], [0], [2 @@ -2240,7 +2245,7 @@ AT_CHECK_UNQUOTED([echo $lflow_run_1], [0], [$lflow_run_2 # Restart OVS this time, and wait until flows are reinstalled OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) start_daemon ovs-vswitchd --enable-dummy=system -vvconn -vofproto_dpif -vunixctl -OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int | grep 10.1.2.4]) +OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int | grep -F 10.1.2.4 | grep -vF 2.2.2.2]) check ovn-nbctl --wait=hv lb-add lb3 3.3.3.3 10.1.2.5 \ -- ls-lb-add ls1 lb3 From patchwork Mon Feb 12 17:55:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897901 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=iTYg9F26; 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 4TYXF83D5cz23r3 for ; Tue, 13 Feb 2024 04:55:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EEDCA40B28; Mon, 12 Feb 2024 17:55:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8ITXnM3s6Jtb; Mon, 12 Feb 2024 17:55:50 +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 3D4F640AC3 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iTYg9F26 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 3D4F640AC3; Mon, 12 Feb 2024 17:55:49 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B219FC0DD0; Mon, 12 Feb 2024 17:55:48 +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 9D7DAC0DD7 for ; Mon, 12 Feb 2024 17:55:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 63B9D40620 for ; Mon, 12 Feb 2024 17:55:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 446_pOMNlWq5 for ; Mon, 12 Feb 2024 17:55:45 +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 4AB07405FB 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 4AB07405FB 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=iTYg9F26 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 4AB07405FB for ; Mon, 12 Feb 2024 17:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760544; 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=G+PTbNe7Ku3Dg68OcaO9lkuCT4MX+iG/TYQWR02IAzQ=; b=iTYg9F269yiIFOsOIoUcUdBgXSIsqoNtPDGM339GGoMi3qm2D/wZy5ASrII99Lt3CzvbYv LwMi8J5T297r0kO69l+NX8mSUBq92PnOtaq06BfuntAKSLrX/9VP6xFs9UoB0R8+OyzuwN Cdimb34eWixkPC7x8OQnKBadJIj9Hvg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-177-vct___evPsWXbsbIe1xqvA-1; Mon, 12 Feb 2024 12:55:42 -0500 X-MC-Unique: vct___evPsWXbsbIe1xqvA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 72A69293248B for ; Mon, 12 Feb 2024 17:55:42 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0451DAC17; Mon, 12 Feb 2024 17:55:41 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:33 +0100 Message-ID: <20240212175537.1356073-7-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 06/10] tests: Fix "ovn-controller - Chassis other_config". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Xavier Simonart --- tests/ovn-controller.at | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index 8dda85f53..3089aea9d 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -213,6 +213,13 @@ if test X$HAVE_OPENSSL = Xyes; then # TODO implement check for change of certificates in ovn-controller # and remove this workaround. ovs-vsctl set Open_vSwitch . external-ids:ovn-remote=unix:/dev/null + # Make sure that the ovn-remote change is handled by ovn-controller. + # Without this, ovn-controller could handle both this change and next ovn-remote change within the same loop, + # resulting in no change. + # Use 2 ovn-appctl to guarentee that ovn-controller run the full loop, and not just the unixctl handling + OVS_WAIT_UNTIL([test x$(ovn-appctl -t ovn-controller debug/status) = "xrunning"]) + OVS_WAIT_UNTIL([test x$(ovn-appctl -t ovn-controller debug/status) = "xrunning"]) + fi ovs-vsctl -- set Open_vSwitch . external-ids:hostname="${sysid}" \ -- set Open_vSwitch . external-ids:system-id="${sysid}" \ From patchwork Mon Feb 12 17:55:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897902 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=StkyThl2; 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 4TYXFB5RyKz23r3 for ; Tue, 13 Feb 2024 04:55:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D77C040B3D; Mon, 12 Feb 2024 17:55:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id htdrLAgGVtVS; Mon, 12 Feb 2024 17:55:51 +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 B9ABB40AE4 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=StkyThl2 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id B9ABB40AE4; Mon, 12 Feb 2024 17:55:50 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C37ACC0DDF; Mon, 12 Feb 2024 17:55:49 +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 3BFAAC0DD7 for ; Mon, 12 Feb 2024 17:55:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9DEF740AC4 for ; Mon, 12 Feb 2024 17:55:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FOQvAefodZif for ; Mon, 12 Feb 2024 17:55:47 +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 EB9E540A4C 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 EB9E540A4C 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 EB9E540A4C for ; Mon, 12 Feb 2024 17:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760544; 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=EVa1x8Q9IlF28g2IXd+MFiOkolPzFexuQRrRKb7o0Jw=; b=StkyThl2MgZO2TvH80tg16ScpH4MPbwMWoZ4VcHTn4Nf/VVUYepf3avZ3Jbv9gaEmHGyaS +E9nIAK6B/ymEJmLUYuSW3mVu5lO+AJXqIa2FzetGKqz7PYYL2HSqUx0NUinAn3IfyVDAK oWc+IKLBFQUDjT0w25omubJD2KJi1/o= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-258-DsK_5WlRMjGsm2wuVltn6g-1; Mon, 12 Feb 2024 12:55:43 -0500 X-MC-Unique: DsK_5WlRMjGsm2wuVltn6g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 22BAD185A786 for ; Mon, 12 Feb 2024 17:55:43 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A59CBAD6A; Mon, 12 Feb 2024 17:55:42 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:34 +0100 Message-ID: <20240212175537.1356073-8-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 07/10] tests: Fix "Load balancer incremental processing". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Xavier Simonart --- tests/ovn-northd.at | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 591ad5aad..33f71d673 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -10762,6 +10762,8 @@ ovn_start # Test I-P for load balancers. # Presently ovn-northd handles I-P for NB LBs in northd_lb_data engine node # only. +# Wait for sb to be connected before clearing stats. +check ovn-nbctl --wait=sb sync check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats check ovn-nbctl --wait=sb lb-add lb1 10.0.0.10:80 10.0.0.3:80 From patchwork Mon Feb 12 17:55:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897903 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=WzFYyaFy; 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 4TYXFF5d3Tz23r3 for ; Tue, 13 Feb 2024 04:56:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 14DDB40B6F; Mon, 12 Feb 2024 17:55:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8_w7WEFSZFbl; Mon, 12 Feb 2024 17:55: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 smtp2.osuosl.org 084CD40AC0 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WzFYyaFy Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 084CD40AC0; Mon, 12 Feb 2024 17:55:53 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id AB1D9C0077; Mon, 12 Feb 2024 17:55:52 +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 2009AC008E for ; Mon, 12 Feb 2024 17:55:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 54F1E409A6 for ; Mon, 12 Feb 2024 17:55:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hbw5JBVDwIgH for ; Mon, 12 Feb 2024 17:55:48 +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 7BCDD40A5E 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 7BCDD40A5E 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 7BCDD40A5E for ; Mon, 12 Feb 2024 17:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760545; 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=rvuQnZei2CsChhy2woZ29RfQuMYcbP/zxTpQk1cgZ50=; b=WzFYyaFyIl6hMBi+E/WLuLI2Kyb3hMFFcM8/Nv6s/iuYwRBjTR0JhyaRiPKvpJolBukLDB 5n8hXNaz6pPiOfB2oNHz+6E+CltTTjLXGSbrmR7AAxcOY2EqNQAAZWQWjo9xWi0o3Fbad/ h8+FRXVeNbqNPXoWXxAE/FBo+vmjGjw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-313-Fqf9sY97PHaatvqcv-pEww-1; Mon, 12 Feb 2024 12:55:44 -0500 X-MC-Unique: Fqf9sY97PHaatvqcv-pEww-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id C63FC185A789 for ; Mon, 12 Feb 2024 17:55:43 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 54E9BAD60; Mon, 12 Feb 2024 17:55:43 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:35 +0100 Message-ID: <20240212175537.1356073-9-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 08/10] tests: Fix "router port type update and then ...". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Flow parsing was failing and causing some lex errors ...eth.dst == 00:00:00:00:00:1 ...: Invalid numeric constant Signed-off-by: Xavier Simonart --- tests/ovn.at | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 6ed764ace..dd3cb4c66 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -35002,8 +35002,8 @@ check ovn-nbctl lsp-add sw0 sw0-p1 check ovn-nbctl lsp-add sw0 lsp check ovn-nbctl lsp-set-type lsp router check ovn-nbctl lsp-set-options lsp router-port=lrp -check ovn-nbctl lsp-set-addresses lsp 00:00:00:00:00:1 -check ovn-nbctl lrp-add ro0 lrp 00:00:00:00:00:1 aef0:0:0:0:0:0:0:1/64 +check ovn-nbctl lsp-set-addresses lsp 00:00:00:00:00:01 +check ovn-nbctl lrp-add ro0 lrp 00:00:00:00:00:01 aef0:0:0:0:0:0:0:1/64 check ovn-nbctl set Logical_Router_Port lrp ipv6_ra_configs:send_periodic=true \ -- set Logical_Router_Port lrp ipv6_ra_configs:address_mode=slaac \ -- set Logical_Router_Port lrp ipv6_ra_configs:mtu=1280 \ @@ -35098,8 +35098,8 @@ check ovn-nbctl lsp-add sw0 sw0-p1 check ovn-nbctl lsp-add sw0 lsp check ovn-nbctl lsp-set-type lsp router check ovn-nbctl lsp-set-options lsp router-port=lrp -check ovn-nbctl lsp-set-addresses lsp 00:00:00:00:00:1 -check ovn-nbctl --wait=hv lrp-add ro0 lrp 00:00:00:00:00:1 aef0:0:0:0:0:0:0:1/64 +check ovn-nbctl lsp-set-addresses lsp 00:00:00:00:00:01 +check ovn-nbctl --wait=hv lrp-add ro0 lrp 00:00:00:00:00:01 aef0:0:0:0:0:0:0:1/64 check ovn-nbctl --wait=hv lsp-del lsp check ovn-nbctl lrp-del lrp check ovn-nbctl --wait=hv sync From patchwork Mon Feb 12 17:55:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897904 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=bQxyRsla; 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 4TYXFH0cGKz23r3 for ; Tue, 13 Feb 2024 04:56:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 01D9581E3F; Mon, 12 Feb 2024 17:56:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0TO7OkDx61h2; Mon, 12 Feb 2024 17:55:59 +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 92E6881E3B 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=bQxyRsla Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 92E6881E3B; Mon, 12 Feb 2024 17:55:58 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 53172C0077; Mon, 12 Feb 2024 17:55:58 +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 089F4C0077 for ; Mon, 12 Feb 2024 17:55:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E37EB40644 for ; Mon, 12 Feb 2024 17:55:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 54Rc3FLwKz4n for ; Mon, 12 Feb 2024 17:55:49 +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 8D8CA40620 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 8D8CA40620 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=bQxyRsla 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 8D8CA40620 for ; Mon, 12 Feb 2024 17:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760547; 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=bpxMdtMcZhbQiXAJKZd7hGZ2kTiaQoi9iyiIzZWRprE=; b=bQxyRslaU+RSwSMYAax2CdWScgrqW2P4kRcTpiqZVa0o8g71rmpd4LsqZ+AAzuZ1i6m1JW Uz6gkFpAITRl1orwiLlZBDpMQZ9GUtRNMSOgRBPdOPPI2qSS08v3yMLJNmdcA+Q2r626TR z4xzTX3PLSOGmcQ+DitQqBzPx5/8fDM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-213-l9h8N9MGNKmAOJMXwAS5Pw-1; Mon, 12 Feb 2024 12:55:44 -0500 X-MC-Unique: l9h8N9MGNKmAOJMXwAS5Pw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7451E811E79 for ; Mon, 12 Feb 2024 17:55:44 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04CD8AD70; Mon, 12 Feb 2024 17:55:43 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:36 +0100 Message-ID: <20240212175537.1356073-10-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 09/10] tests: Speed up "multicast group buffer split". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Xavier Simonart --- tests/ovn-controller.at | 14 ++++++++------ tests/ovn-macros.at | 11 +++++++++++ tests/ovn.at | 8 +++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index 3089aea9d..c10bc155b 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -2693,19 +2693,20 @@ ovs-vsctl add-br br-phys ovn_attach n1 br-phys 192.168.0.1 for i in $(seq 1 320); do - ovs-vsctl -- add-port br-int hv1-vif$i -- \ + OVS_VSCTL(add-port br-int hv1-vif$i -- \ set interface hv1-vif$i external-ids:iface-id=sw0-p$i \ options:tx_pcap=hv1/vif${i}-tx.pcap \ options:rxq_pcap=hv1/vif${i}-rx.pcap \ - ofport-request=$i + ofport-request=$i) done - +RUN_OVS_VSCTL check ovn-nbctl ls-add sw0 for i in $(seq 1 320); do - check ovn-nbctl lsp-add sw0 sw0-p$i - check ovn-nbctl lsp-set-addresses sw0-p$i "unknown" + OVN_NBCTL(lsp-add sw0 sw0-p$i) + OVN_NBCTL(lsp-set-addresses sw0-p$i "unknown") done +RUN_OVN_NBCTL wait_for_ports_up ovn-nbctl --wait=hv sync @@ -2715,8 +2716,9 @@ OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOCAL_OUTP ]) for i in $(seq 1 280); do - check ovn-nbctl lsp-del sw0-p$i + OVN_NBCTL(lsp-del sw0-p$i) done +RUN_OVN_NBCTL ovn-nbctl --wait=hv sync AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOCAL_OUTPUT | grep -q controller], [1]) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 84e50d76f..a35c0ff80 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -984,6 +984,17 @@ m4_define([RUN_OVN_NBCTL], [ unset command ]) +# OVS_VSCTL(VSCTL_COMMAND) adds VSCTL_COMMAND to list of commands to be run by RUN_OVS_VSCTL(). +m4_define([OVS_VSCTL], [ + command="${command} -- $1" +]) + +# RUN_OVS_VSCTL() executes list of commands built by the OVS_VSCTL() macro. +m4_define([RUN_OVS_VSCTL], [ + check ovs-vsctl ${command} + unset command +]) + m4_define([TAG_UNSTABLE], [ AT_KEYWORDS([unstable]) AT_SKIP_IF([test X"$SKIP_UNSTABLE" = Xyes]) diff --git a/tests/ovn.at b/tests/ovn.at index dd3cb4c66..5eaaa76a2 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -37245,19 +37245,21 @@ ovn_attach n br-phys 192.168.0.1 check ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys for i in $(seq 1 320); do - check ovs-vsctl -- add-port br-int hv1-vif$i -- \ + OVS_VSCTL( add-port br-int hv1-vif$i -- \ set interface hv1-vif$i external-ids:iface-id=sw0-port$i \ options:tx_pcap=hv1/vif$i-tx.pcap \ - options:rxq_pcap=hv1/vif$i-rx.pcap + options:rxq_pcap=hv1/vif$i-rx.pcap) done +RUN_OVS_VSCTL check ovn-nbctl ls-add sw0 check ovn-nbctl lsp-add sw0 sw0-port1 check ovn-nbctl lsp-set-addresses sw0-port1 "50:54:00:00:00:01 10.0.0.2" for i in $(seq 2 320); do - check ovn-nbctl lsp-add sw0 sw0-port$i -- lsp-set-addresses sw0-port$i "unknown" + OVN_NBCTL(lsp-add sw0 sw0-port$i -- lsp-set-addresses sw0-port$i "unknown") done +RUN_OVN_NBCTL check ovn-nbctl --wait=hv sync wait_for_ports_up From patchwork Mon Feb 12 17:55:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1897906 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=HpwBW1CD; 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 4TYXFl3GH1z23r3 for ; Tue, 13 Feb 2024 04:56:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8356F60ABD; Mon, 12 Feb 2024 17:56:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1BrVexc9ne0r; Mon, 12 Feb 2024 17:56:19 +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 5EFC560A36 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=HpwBW1CD Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 5EFC560A36; Mon, 12 Feb 2024 17:56:12 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2584FC0DD2; Mon, 12 Feb 2024 17:56:12 +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 1DBC8C0DCF for ; Mon, 12 Feb 2024 17:56:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CE77B608ED for ; Mon, 12 Feb 2024 17:55:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WUKViCasaUav for ; Mon, 12 Feb 2024 17:55: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 smtp3.osuosl.org 5AFC0608B1 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 5AFC0608B1 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 5AFC0608B1 for ; Mon, 12 Feb 2024 17:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707760547; 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=jxmou8Na1TSLusuO51y74SSiNSiIOMfXhR3KZ/JLlFM=; b=HpwBW1CD8/xDe8I6Qa8iT7zhJQ77lSWo1xXafcySBcCmtFPhegU6BGBh1xCRvigb6rOU9k a+ZmDkBvL3jyKq1ghYV/tJ0qJeobW6U3Lo0CPm45RFq9BHpre00WRbXBmdZFOpf8g8dxaQ IivSHMnTo/Fq+iYL2y+Qk+UpvkKwv3c= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-450-X6-HziZUMlGeD_XXfXHf9A-1; Mon, 12 Feb 2024 12:55:45 -0500 X-MC-Unique: X6-HziZUMlGeD_XXfXHf9A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 868F21C0512A for ; Mon, 12 Feb 2024 17:55:45 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.193.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A783DAD6A; Mon, 12 Feb 2024 17:55:44 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Mon, 12 Feb 2024 18:55:37 +0100 Message-ID: <20240212175537.1356073-11-xsimonar@redhat.com> In-Reply-To: <20240212175537.1356073-1-xsimonar@redhat.com> References: <20240212175537.1356073-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 10/10] tests: Check unit tests logs for errors. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" System tests are checking for errors in logs at the end of the tests. This patch implements the same feature for Unit tests. However, many unit tests display errors in the logs. Hence this patch also: - fixes a few tests, when the error cause was identified to be due to the test. - add exceptions to ignore most common errors (in the macro, common for all tests) - add exceptions to ignore some errors unique to some tests. Future patches should investigate those errors, and either fix ovn, fix the test or add exceptions (some errors are expected, such as purposely passing wrong parameters). Signed-off-by: Xavier Simonart --- tests/ovn-controller.at | 66 +++++++++-- tests/ovn-ic.at | 4 +- tests/ovn-macros.at | 50 ++++++-- tests/ovn.at | 250 +++++++++++++++++++++++++++++++++------- 4 files changed, 309 insertions(+), 61 deletions(-) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index c10bc155b..ded10f81d 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -74,7 +74,7 @@ check_patches # won't be created until there's a localnet port on a logical switch with # another logical port bound to this chassis. ovn-sbctl \ - -- --id=@dp101 create Datapath_Binding tunnel_key=101 \ + -- --id=@dp101 create Datapath_Binding tunnel_key=101 external_ids:name=dp101 \ -- create Port_Binding datapath=@dp101 logical_port=localnet1 tunnel_key=1 \ type=localnet options:network_name=physnet1 check_patches @@ -82,7 +82,7 @@ check_patches # Create a localnet port on a logical switch with a port bound to this chassis. # Now we should get some patch ports created. ovn-sbctl \ - -- --id=@dp102 create Datapath_Binding tunnel_key=102 \ + -- --id=@dp102 create Datapath_Binding tunnel_key=102 external_ids:name=dp102 \ -- create Port_Binding datapath=@dp102 logical_port=localnet2 tunnel_key=1 \ type=localnet options:network_name=physnet1 \ -- create Port_Binding datapath=@dp102 logical_port=localvif2 tunnel_key=2 @@ -96,8 +96,8 @@ check_patches \ # OVN no longer uses OVS patch ports to implement logical patch ports, so # the set of OVS patch ports doesn't change. AT_CHECK([ovn-sbctl \ - -- --id=@dp1 create Datapath_Binding tunnel_key=1 \ - -- --id=@dp2 create Datapath_Binding tunnel_key=2 \ + -- --id=@dp1 create Datapath_Binding tunnel_key=1 external_ids:name=dp1 \ + -- --id=@dp2 create Datapath_Binding tunnel_key=2 external_ids:name=dp2 \ -- create Port_Binding datapath=@dp1 logical_port=foo tunnel_key=1 type=patch options:peer=bar \ -- create Port_Binding datapath=@dp2 logical_port=bar tunnel_key=2 type=patch options:peer=foo \ -- create Port_Binding datapath=@dp1 logical_port=dp1vif tunnel_key=3 \ @@ -241,7 +241,20 @@ wait_row_count Chassis_Private 1 wait_row_count Chassis 1 # Gracefully terminate daemons -OVN_CLEANUP_SBOX([hv]) +# Ignore following errors: +# - Invalid ovn-bridge-mappings configuration: 'foo-mapping' +# - unknown datapath type foo +# - could not create datapath br-int of unknown type foo +# - could not create datapath br-int of unknown type foobar +# - unknown datapath type bar +# - could not create datapath br-int of unknown type bar +# - Transaction causes multiple rows ... +# - failed to create bridge br-int: Address family not supported by protocol # due to previous errors. +OVN_CLEANUP_SBOX([hv], ["/foo/d +/bar/d +/Transaction causes multiple rows/d +/failed to create bridge/d"]) + OVN_CLEANUP_VSWITCH([main]) as ovn-sb OVS_APP_EXIT_AND_WAIT([ovsdb-server]) @@ -319,6 +332,8 @@ OVN_CLEANUP_SBOX([hv]) OVN_CLEANUP_VSWITCH([main]) as ovn-sb OVS_APP_EXIT_AND_WAIT([ovsdb-server]) +as ovn-nb +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) AT_CLEANUP ]) @@ -355,6 +370,8 @@ OVN_CLEANUP_SBOX([hv]) OVN_CLEANUP_VSWITCH([main]) as ovn-sb OVS_APP_EXIT_AND_WAIT([ovsdb-server]) +as ovn-nb +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) AT_CLEANUP ]) @@ -386,6 +403,8 @@ OVN_CLEANUP_SBOX([hv]) OVN_CLEANUP_VSWITCH([main]) as ovn-sb OVS_APP_EXIT_AND_WAIT([ovsdb-server]) +as ovn-nb +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) AT_CLEANUP @@ -647,7 +666,9 @@ primary lport : [[lsp1]] done done -OVN_CLEANUP([hv1]) +check as northd ovn-appctl -t ovn-northd resume +OVN_CLEANUP([hv1 +/No distributed-port option set for chassisredirect port lsp1/d]) AT_CLEANUP AT_SETUP([ovn-controller - ssl files change when using command line options]) @@ -704,7 +725,16 @@ OVS_WAIT_FOR_OUTPUT([ovn-appctl -t ovn-controller connection-status], [0], [conn cat hv1/ovn-controller.log -OVN_CLEANUP([hv1]) +# Expect different errors as trying to connect with wrong keys/certificates, or with keys/certificates deleted +OVN_CLEANUP([hv1 +/SSL_use_PrivateKey_file/d +/SSL_use_certificate_file/d +/Private key must be configured to use SSL/d +/Certificate must be configured to use SSL/d +/SSL_read: error/d +/receive error: Input/d +/connection dropped/d +]) AT_CLEANUP OVN_FOR_EACH_NORTHD([ @@ -832,10 +862,13 @@ tos_option=$(ovs-vsctl get interface ovn-fakech-0 options) AT_CHECK([test "$tos_option" = "$no_tos_options"], [0], []) # Gracefully terminate daemons -OVN_CLEANUP_SBOX([hv]) +# Expect invalid TOS 61 +OVN_CLEANUP_SBOX([hv], ["/invalid TOS 61/d"]) OVN_CLEANUP_VSWITCH([main]) as ovn-sb OVS_APP_EXIT_AND_WAIT([ovsdb-server]) +as ovn-nb +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) AT_CLEANUP ]) @@ -2120,6 +2153,8 @@ for i in $(seq 10); do OVS_WAIT_UNTIL([test $(as hv1 ovs-ofctl dump-flows br-int table=46 | grep -c "priority=1100") = "$(($i + 1))"]) done +# Resume northd to be able to properly cleanup +check as northd ovn-appctl -t ovn-northd resume OVN_CLEANUP([hv1]) AT_CLEANUP @@ -2294,7 +2329,9 @@ AT_CHECK([grep "Parsing of ovn-chassis-mac-mappings failed" hv1/ovn-controller.l AT_CHECK([grep "Parsing of ovn-chassis-mac-mappings failed" hv1/ovn-controller.log | grep -q invalid2]) AT_CHECK([grep "Parsing of ovn-chassis-mac-mappings failed" hv1/ovn-controller.log | grep -q br1], [1]) -OVN_CLEANUP([hv1]) +OVN_CLEANUP([hv1 +/Parsing of ovn-chassis-mac-mappings failed/d +]) AT_CLEANUP AT_SETUP([ovn-controller - localport can be recreated]) @@ -2631,7 +2668,10 @@ OVS_WAIT_UNTIL([grep -q 'Removing unsupported key "unsupported" from chassis rec AT_CHECK([ovn-sbctl get chassis $chassis_id other_config:unsupported], [1], [ignore], [ignore]) -OVN_CLEANUP([hv1]) +OVN_CLEANUP([hv1 +/Removing unsupported key/d +]) + AT_CLEANUP ]) @@ -2723,7 +2763,11 @@ ovn-nbctl --wait=hv sync AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOCAL_OUTPUT | grep -q controller], [1]) -OVN_CLEANUP([hv1]) +# Since we add many ports in one nbctl command, we might get some warnings on slow systems. +OVN_CLEANUP([hv1 +/Unreasonably long/d +/faults:/d +/context switches/d]) AT_CLEANUP ]) diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at index dc32eaa7f..44dbf8ab1 100644 --- a/tests/ovn-ic.at +++ b/tests/ovn-ic.at @@ -136,9 +136,9 @@ AT_CHECK([ovn-ic-sbctl show | grep -A2 lsp1], [0], [dnl # remove transit switch and check if port_binding is deleted check ovn-ic-nbctl ts-del ts1 wait_row_count ic-sb:Port_Binding 0 logical_port=lsp1 - for i in 1 2; do az=az$i + ovn_as $az OVN_CLEANUP_SBOX(gw-$az) OVN_CLEANUP_AZ([$az]) done @@ -213,6 +213,7 @@ ovn-ic-sbctl list route for i in 1 2; do az=az$i + ovn_as $az OVN_CLEANUP_SBOX(gw-$az) OVN_CLEANUP_AZ([$az]) done @@ -273,6 +274,7 @@ wait_row_count ic-sb:route 1 ip_prefix=1.1.1.1/32 for i in 1 2; do az=az$i + ovn_as $az OVN_CLEANUP_SBOX(gw-$az) OVN_CLEANUP_AZ([$az]) done diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index a35c0ff80..269023ca8 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -10,23 +10,51 @@ m4_define([OVN_CLEANUP_VSWITCH],[ OVS_APP_EXIT_AND_WAIT([ovsdb-server]) ]) -# OVN_CLEANUP_SBOX(sbox) +# OVN_CLEANUP_CONTROLLER(sbox) # -# Gracefully terminate OVN daemons in the specified +# Gracefully terminate ovn-controller in the specified # sandbox instance. The sandbox name "vtep" is treated # as a special case, and is assumed to have ovn-controller-vtep # and ovs-vtep daemons running instead of ovn-controller. -m4_define([OVN_CLEANUP_SBOX],[ - echo - echo "$1: clean up sandbox" - as $1 - if test "$1" = "vtep"; then +m4_define([OVN_CLEANUP_CONTROLLER],[ + hv=$1 + sbox=$2 + + ovn-nbctl --wait=hv sync + as $sbox + if test "$hv" = "vtep"; then OVS_APP_EXIT_AND_WAIT([ovn-controller-vtep]) OVS_APP_EXIT_AND_WAIT([ovs-vtep]) else OVS_APP_EXIT_AND_WAIT([ovn-controller]) fi - OVN_CLEANUP_VSWITCH([$1]) +]) + +# OVN_CLEANUP_SBOX(sbox) +# +# Gracefully terminate OVN daemons in the specified +# sandbox instance. The sandbox name "vtep" is treated +# as a special case, and is assumed to have ovn-controller-vtep +# and ovs-vtep daemons running instead of ovn-controller. +m4_define([OVN_CLEANUP_SBOX],[ + sbox=$1 + error=$2 + echo "$sbox: clean up sandbox" + OVN_CLEANUP_CONTROLLER([$sbox], [$sbox]) + OVN_CLEANUP_VSWITCH([$sbox]) + + # Check for errors in logs. Ignore following errors: + # "connection failed (No such file or directory)" as happens everytime we restart ovs-vswitchd. + # "has no network name*" as localnet network_name is often set "after" creating localnet. + # "receive tunnel port not found*" happening when closing other hv. + # "Failed to locate tunnel to reach main chassis" happening when controller started e.g. before ovn-bridge-mappings is set + AT_CHECK([check_logs " + $error + /connection failed (No such file or directory)/d + /has no network name*/d + /receive tunnel port not found*/d + /Failed to locate tunnel to reach main chassis/d + " $sbox]) ]) # OVN_CLEANUP(sim [, sim ...]) @@ -34,8 +62,10 @@ m4_define([OVN_CLEANUP_SBOX],[ # Gracefully terminate all OVN daemons, including those in the # specified sandbox instances. m4_define([OVN_CLEANUP],[ - m4_foreach([sbox], [$@], [ - OVN_CLEANUP_SBOX([sbox]) + m4_foreach([sbox_and_error], [$@], [ + sbox=$(echo "sbox_and_error" |sed -n '1p') + error=$(echo "sbox_and_error" | sed -n '2,$p') + OVN_CLEANUP_SBOX([$sbox], [$error]) ]) echo diff --git a/tests/ovn.at b/tests/ovn.at index 5eaaa76a2..4c10dadda 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -2416,6 +2416,7 @@ for i in 1 2; do OVN_CHECK_PACKETS_REMOVE_BROADCAST([vif$i-tx.pcap], [$i.expected]) done +OVN_CLEANUP([hv-1],[hv-2]) AT_CLEANUP ]) @@ -3424,7 +3425,18 @@ for hv in 1 2; do OVN_CHECK_PACKETS_REMOVE_BROADCAST([hv-$hv/br-phys${hv}1_n-${hv}1-tx.pcap], [out-$hv.expected]) done -OVN_CLEANUP([hv-1],[hv-2]) +# ovn-controller started twice (through ovn_attach) for each hv => expect "already running" error. +OVN_CLEANUP([hv-1 +/ovn-controller.pid: already running as pid/d +/attempting to add tunnel port with same config as port 'ovn-hv-2-0'/d +/br-int: could not add port ovn-hv-2-1 (File exists)/d +/could not add network device ovn-hv-2-1 to ofproto/d +],[hv-2 +/ovn-controller.pid: already running as pid/d +/attempting to add tunnel port with same config as port 'ovn-hv-1-0'/d +/br-int: could not add port ovn-hv-1-1 (File exists)/d +/could not add network device ovn-hv-1-1 to ofproto/d +]) AT_CLEANUP ]) @@ -3563,7 +3575,19 @@ for hv in 1 2; do OVN_CHECK_PACKETS_CONTAIN([hv-$hv/br-phys${hv}1_n-${hv}1-tx.pcap], [out-$hv.expected]) done -OVN_CLEANUP([hv-1],[hv-2]) +# ovn-controller started twice (through ovn_attach) for each hv => expect "already running" error. +OVN_CLEANUP([hv-1 +/ovn-controller.pid: already running as pid/d +/attempting to add tunnel port with same config as port 'ovn-hv-2-0'/d +/br-int: could not add port ovn-hv-2-1 (File exists)/d +/could not add network device ovn-hv-2-1 to ofproto/d +],[hv-2 +/ovn-controller.pid: already running as pid/d +/attempting to add tunnel port with same config as port 'ovn-hv-1-0'/d +/br-int: could not add port ovn-hv-1-1 (File exists)/d +/could not add network device ovn-hv-1-1 to ofproto/d +]) + AT_CLEANUP ]) @@ -3771,6 +3795,7 @@ for i in 1 2; do OVN_CHECK_PACKETS([vif$i-tx.pcap], [$i.expected]) done +OVN_CLEANUP([hv-1],[hv-2]) AT_CLEANUP ]) @@ -3899,6 +3924,7 @@ for i in 1 2; do OVN_CHECK_PACKETS_REMOVE_BROADCAST([vif$i-tx.pcap], [$i.expected]) done +OVN_CLEANUP([hv-1],[hv-2]) AT_CLEANUP ]) @@ -3986,6 +4012,7 @@ for i in 1 2; do OVN_CHECK_PACKETS_REMOVE_BROADCAST([tap$i-tx.pcap], [tap.expected]) done +OVN_CLEANUP([hv-1],[hv-2]) AT_CLEANUP ]) @@ -4057,6 +4084,7 @@ for i in 1 2; do OVN_CHECK_PACKETS_REMOVE_BROADCAST([vif$i-tx.pcap], [$i.expected]) done +OVN_CLEANUP([hv-1],[hv-2]) AT_CLEANUP ]) @@ -4809,6 +4837,10 @@ as hv3 ovs-ofctl -O OpenFlow13 dump-flows br-phys for i in 1 2 3; do OVN_CHECK_PACKETS([hv$i/vif$i-tx.pcap], [$i.expected]) done +as hv3 +OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) +OVN_CLEANUP([hv1],[hv2],[hv_gw +/bridge not found for l2gateway port/d]) AT_CLEANUP ]) @@ -6452,7 +6484,12 @@ OVN_CHECK_PACKETS_UNIQ([hv/snoopvif-tx.pcap], [expected]) AT_CHECK([ovs-vsctl del-port localvif1]) AT_CHECK([ovn-nbctl lsp-del ln_port]) -OVN_CLEANUP([hv]) +# Errors "Trying to release unknown interface localvif1" are unexpected and should be investigated +# Probably due to the fact all ifaces deleted from ifstatus module when ofctrl_is_connected detects disconnect, +# as a recompute does not recreate ifaces in ifstatus when port is already claimed and up +OVN_CLEANUP([hv +/Trying to release unknown interface localvif1/d +]) AT_CLEANUP ]) @@ -7338,7 +7375,6 @@ OVS_APP_EXIT_AND_WAIT([ovsdb-server]) as ovn-nb OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - AT_CLEANUP ]) @@ -9067,7 +9103,9 @@ OVS_WAIT_UNTIL([ test "${total_flows}" = "${total_flows_after_restart}" ]) -OVN_CLEANUP([hv1]) +OVN_CLEANUP([hv1 +/Connection refused/d +]) AT_CLEANUP ]) @@ -9513,8 +9551,8 @@ ovn-nbctl lr-add lr0 ovn-nbctl lrp-add lr0 lrp0 f0:00:00:00:00:01 192.168.0.1/24 ovn-nbctl lrp-add lr0 lrp1 f0:00:00:00:00:02 192.168.1.1/24 dp_uuid=$(fetch_column Datapath_Binding _uuid) -ovn-sbctl create MAC_Binding ip=10.0.0.1 datapath=$dp_uuid logical_port=lrp0 mac="mac1" -ovn-sbctl create MAC_Binding ip=10.0.0.1 datapath=$dp_uuid logical_port=lrp1 mac="mac2" +ovn-sbctl create MAC_Binding ip=10.0.0.1 datapath=$dp_uuid logical_port=lrp0 mac="00:00:00:01:00:01" +ovn-sbctl create MAC_Binding ip=10.0.0.1 datapath=$dp_uuid logical_port=lrp1 mac="00:00:00:01:00:02" ovn-sbctl find MAC_Binding # Delete port lrp0 and check that its MAC_Binding is deleted. ovn-nbctl lrp-del lrp0 @@ -9525,7 +9563,10 @@ ovn-nbctl lr-del lr0 ovn-sbctl find MAC_Binding wait_row_count MAC_Binding 0 -OVN_CLEANUP([hv1]) +# Ignore warning from mac_cache trying to remove mb while aging mechanism is disabled and lr0 is not local +OVN_CLEANUP([hv1 +/parse MAC binding: ip=10.0.0.1/d +]) AT_CLEANUP ]) @@ -11738,7 +11779,9 @@ as gw2 OVS_APP_EXIT_AND_WAIT([ovn-controller]) OVS_APP_EXIT_AND_WAIT([ovsdb-server]) -OVN_CLEANUP([hv1],[gw1],[ext1]) +OVN_CLEANUP([hv1],[gw1 +/transaction error/d +],[ext1]) AT_CLEANUP ]) @@ -12302,7 +12345,12 @@ check ovn-nbctl --wait=sb lrp-del-gateway-chassis alice hv2 check_row_count Port_Binding 0 logical_port=cr-alice -OVN_CLEANUP([hv1],[hv2],[hv3]) +# Expect some potential transaction errors for MAC_Binding +OVN_CLEANUP([hv1 +/transaction error/d +],[hv2 +/transaction error/d +],[hv3]) AT_CLEANUP ]) @@ -12729,7 +12777,14 @@ sleep 2 $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/br-ex_n2-tx.pcap > empty AT_CHECK([cat empty], [0], []) -OVN_CLEANUP([hv1],[hv2],[hv3], [hv4]) +# Expect "Bridge not found" error as creating the bridge after creating the ovn mapping. +OVN_CLEANUP([hv1 +/Bridge 'br-ex' not found for network 'public'/d +],[hv2 +/Bridge 'br-ex' not found for network 'public'/d +],[hv3],[hv4 +/Bridge 'br-ex' not found for network 'public'/d +]) AT_CLEANUP ]) @@ -14101,8 +14156,11 @@ OVN_CHECK_PACKETS_CONTAIN([hv3/br-phys_n1-tx.pcap], [expected_out], "trim_zeros" $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/br-phys_n1-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv2_br_phys_tx AT_CHECK([grep $garp hv2_br_phys_tx | sort], [0], []) -OVN_CLEANUP([hv1],[hv2],[hv3]) - +OVN_CLEANUP([hv1],[hv2 +/No tunnel endpoint found for HA chassis in HA chassis group/d +],[hv3 +/No tunnel endpoint found for HA chassis in HA chassis group/d +]) AT_CLEANUP ]) @@ -14191,7 +14249,14 @@ wait_row_count Chassis 1 name=gw2 gw1_chassis=$(fetch_column Chassis _uuid name=gw1) wait_row_count Port_Binding 1 logical_port=cr-outside chassis=$gw1_chassis -OVN_CLEANUP([gw1],[gw2],[hv1]) +OVN_CLEANUP([gw1 +/Incorrect your_disc/d +/No tunnel endpoint found for HA chassis in HA chassis group/d +],[gw2 +/Incorrect your_disc/d +],[hv1 +/Incorrect your_disc/d +]) AT_CLEANUP ]) @@ -14540,7 +14605,7 @@ $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/br-phys_n1-tx.pcap | \ grep -v ffffffffffff | trim_zeros > 2.packets AT_CHECK([cat 2.packets], [0], []) -OVN_CLEANUP([hv1]) +OVN_CLEANUP([hv1], [hv2]) AT_CLEANUP ]) @@ -17355,7 +17420,10 @@ OVS_WAIT_UNTIL([ovs-vsctl list port ovn-mirror0 | grep ovn-mirror0]) ovs-vsctl del-port ovn-mirror0 -- del-port vif1 OVS_WAIT_UNTIL([test 0 = $(as hv1 ovs-vsctl list Mirror | wc -l)]) -OVN_CLEANUP([hv1], [hv2]) +# Expect mirror related erroras we delete ovn-mirror0 +OVN_CLEANUP([hv1 +/mirror mirror0 does not specify output/d +], [hv2]) AT_CLEANUP ]) @@ -20399,7 +20467,12 @@ for i in 1 2 3; do done # Gracefully terminate daemons -OVN_CLEANUP([hv1]) +# Ignore errors "Syntax error at \`$as1\' expecting address set name". +# Need to investigate whteher those errors are expected +OVN_CLEANUP([hv1 +/Syntax error at/d +]) + AT_CLEANUP ]) @@ -21516,7 +21589,7 @@ ovn-hv3-0 ovn-hv4-0 ]]) -OVN_CLEANUP([hv1], [hv2], [hv3]) +OVN_CLEANUP([hv1], [hv2], [hv3], [hv4], [hv5]) AT_CLEANUP ]) @@ -21723,7 +21796,11 @@ as hv2 ovs-appctl fdb/show br-phys OVN_CHECK_PACKETS([hv2/vif22-tx.pcap], [vif22.expected]) -OVN_CLEANUP([hv1],[hv2]) +OVN_CLEANUP([hv1 +/transaction error/d +],[hv2 +/transaction error/d +]) AT_CLEANUP ]) @@ -23937,7 +24014,11 @@ OVS_WAIT_UNTIL( 'hv2/br-phys-1_n1-tx.pcap expected_empty' ], [$at_diff -F'^---' exp rcv]) -OVN_CLEANUP([hv1], [hv2]) +OVN_CLEANUP([hv1 +/left allocated/d +], [hv2 +/left allocated/d +]) AT_CLEANUP ]) @@ -24227,7 +24308,14 @@ m4_define([DVR_N_S_ARP_HANDLING], as hv4 ovs-ofctl -O OpenFlow13 dump-flows br-int as hv4 ovs-appctl fdb/show br-phys - OVN_CLEANUP([hv1],[hv2],[hv3],[hv4]) + # Expect some potential transaction errors for MAC_Binding + OVN_CLEANUP([hv1 + /transaction error/d + ],[hv2 + /transaction error/d + ],[hv3 + /transaction error/d + ],[hv4]) AT_CLEANUP])]) @@ -24531,7 +24619,13 @@ m4_define([DVR_N_S_PING], as hv4 ovs-ofctl show br-phys as hv4 ovs-appctl fdb/show br-phys - OVN_CLEANUP([hv1],[hv2],[hv3],[hv4]) + OVN_CLEANUP([hv1 + /transaction error/d + ],[hv2 + /transaction error/d + ],[hv3 + /transaction error/d + ],[hv4]) AT_CLEANUP])]) @@ -25132,7 +25226,14 @@ as hv4 ovs-ofctl dump-flows br-int as hv4 ovs-ofctl show br-phys as hv4 ovs-appctl fdb/show br-phys -OVN_CLEANUP([hv1],[hv2],[hv3],[hv4]) +# Expect some potential transaction errors for MAC_Binding +OVN_CLEANUP([hv1 +/transaction error/d +],[hv2 +/transaction error/d +],[hv3 +/transaction error/d +],[hv4]) AT_CLEANUP ]) @@ -25648,6 +25749,7 @@ check_row_count Service_Monitor 0 AT_CHECK([test 1 = `grep -c "SCTP load balancers do not currently support health checks" northd/ovn-northd.log`]) +OVN_CLEANUP([hv1],[hv2]) AT_CLEANUP ]) @@ -26590,6 +26692,13 @@ OVS_WAIT_UNTIL( 'hv2/vif3-tx.pcap expected_az2_switched'], [$at_diff -F'^---' exp rcv]) +OVN_CLEANUP_SBOX([hv1],["/IGMP Querier enabled without a valid IPv4 or IPv6 address/d +/IGMP Querier enabled with invalid ETH src address/d"]) + +OVN_CLEANUP_SBOX([hv2],["/IGMP Querier enabled without a valid IPv4 or IPv6 address/d +/IGMP Querier enabled with invalid ETH src address/d"]) + +OVN_CLEANUP_IC([az1],[az2]) AT_CLEANUP ]) @@ -26839,6 +26948,13 @@ OVS_WAIT_UNTIL( 'hv2/vif2-tx.pcap expected_az2'], [$at_diff -F'^---' exp rcv]) +OVN_CLEANUP_SBOX([hv1], ["/IGMP Querier enabled without a valid IPv4/d +/IGMP Querier enabled with invalid ETH src/d"]) + +OVN_CLEANUP_SBOX([hv2], ["/IGMP Querier enabled without a valid IPv4/d +/IGMP Querier enabled with invalid ETH src/d"]) + +OVN_CLEANUP_IC([az1],[az2]) AT_CLEANUP ]) @@ -28122,7 +28238,11 @@ ovn_attach n1 br-phys 192.168.0.1 # Port_Binding should be released. OVS_WAIT_UNTIL([test 0 = $(ovn-sbctl show | grep Port_Binding -c)]) -OVN_CLEANUP([hv1]) +# Port was not really bound/claimed, so it is expected to have some warnings trying to release it +OVN_CLEANUP([hv1 +/Trying to release unknown interface lsp1/d +]) + AT_CLEANUP ]) @@ -29389,7 +29509,12 @@ check ovn-nbctl --wait=hv sync AT_CHECK([test "$expr_cnt" = "$(get_cache_count cache-expr)"], [0], []) AT_CHECK([test "$matches_cnt" = "$(get_cache_count cache-matches)"], [0], []) -OVN_CLEANUP([hv1]) +# Ignore errors "Syntax error at \`\@pg2\' expecting port group name" +# Need to investigate whteher those errors are expected +OVN_CLEANUP([hv1 +/Syntax error at/d +]) + AT_CLEANUP ]) @@ -30075,7 +30200,17 @@ OVS_WAIT_UNTIL([ test_arp_response 000030303233 $(ip_to_hex 172 16 0 200) hv1 hv2 hv3 test_arp_response 000030303233 $(ip_to_hex 172 16 0 201) hv1 hv2 hv3 -OVN_CLEANUP([hv1],[hv2],[hv3]) +OVN_CLEANUP([hv1 +/parse MAC binding/d +/unknown logical port/d +],[hv2 +/parse MAC binding/d +/unknown logical port/d +],[hv3 +/parse MAC binding/d +/unknown logical port/d +]) + AT_CLEANUP ]) @@ -33528,6 +33663,7 @@ test_ip vif11 f00000000010 06ac10010001 $sip $dip vif-north3 # Confirm that South to North traffic works fine. OVN_CHECK_PACKETS_REMOVE_BROADCAST([hv5/vif-north3-tx.pcap], [vif-north3.expected]) +OVN_CLEANUP([hv1],[hv2],[hv3],[hv4],[hv5]) AT_CLEANUP ]) @@ -33964,14 +34100,14 @@ check ovn-nbctl lsp-set-addresses lsp1 "f0:00:00:00:00:01 172.16.0.101" check ovn-nbctl lsp-set-options lsp1 \ requested-chassis=hv1 \ vif-plug-type=dummy \ - vif-plug-mtu-request=42 + vif-plug-mtu-request=420 check ovn-nbctl lsp-add lsw0 lsp2 check ovn-nbctl lsp-set-addresses lsp2 "f0:00:00:00:00:02 172.16.0.102" check ovn-nbctl lsp-set-options lsp2 \ requested-chassis=hv2 \ vif-plug-type=dummy \ - vif-plug-mtu-request=42 + vif-plug-mtu-request=420 wait_for_ports_up lsp1 lsp2 @@ -33983,22 +34119,22 @@ iface2_uuid=$(as hv2 ovs-vsctl --bare --columns _uuid find Interface name=lsp2) # Check that the lport was plugged AT_CHECK([test xvalue = x$(as hv1 ovs-vsctl get Interface ${iface1_uuid} options:vif-plug-dummy-option)], [0], []) -AT_CHECK([test x42 = x$(as hv1 ovs-vsctl get Interface ${iface1_uuid} mtu_request)], [0], []) +AT_CHECK([test x420 = x$(as hv1 ovs-vsctl get Interface ${iface1_uuid} mtu_request)], [0], []) # Check that updating the lport updates the local iface check ovn-nbctl --wait=hv lsp-set-options lsp1 \ requested-chassis=hv1 \ vif-plug-type=dummy \ - vif-plug-mtu-request=43 + vif-plug-mtu-request=430 OVS_WAIT_UNTIL([ - test x43 = x$(as hv1 ovs-vsctl get Interface ${iface1_uuid} mtu_request) + test x430 = x$(as hv1 ovs-vsctl get Interface ${iface1_uuid} mtu_request) ]) # Check that local modification of iface will trigger ovn-controller to update # the iface record -check as hv1 ovs-vsctl set interface ${iface1_uuid} mtu_request=44 +check as hv1 ovs-vsctl set interface ${iface1_uuid} mtu_request=440 OVS_WAIT_UNTIL([ - test x43 = x$(as hv1 ovs-vsctl get Interface ${iface1_uuid} mtu_request) + test x430 = x$(as hv1 ovs-vsctl get Interface ${iface1_uuid} mtu_request) ]) as hv1 check ovn-appctl -t ovn-controller debug/ignore-startup-delay @@ -34061,7 +34197,9 @@ OVS_WAIT_UNTIL([ grep -q "CMS requested plugging of lport lsp3" hv2/ovn-controller.log ]) -OVN_CLEANUP([hv1],[hv2]) +OVN_CLEANUP([hv1],[hv2 +/CMS requested plugging of lport lsp3/d +]) AT_CLEANUP ]) @@ -34136,7 +34274,10 @@ check ovn-nbctl meter-del meter2 check ovn-nbctl --wait=hv sync AT_CHECK([as hv1 ovs-ofctl -OOpenFlow15 dump-meters br-int | grep -q rate=100], [1]) -OVN_CLEANUP([hv1]) +# Expect error on meter2 not found as meter added after using it. +OVN_CLEANUP([hv1 +/could not find meter named \"meter2\"/d +]) AT_CLEANUP ]) @@ -35450,7 +35591,9 @@ m4_define([MULTIPLE_OVS_INT], flows_after_deletion=$(get_flows $COOKIE) check test "$flows_lpnew" = "$flows_after_deletion" - OVN_CLEANUP([hv1]) + OVN_CLEANUP([hv1 + /Invalid configuration: iface-id is configured on interface/d + ]) AT_CLEANUP ])]) @@ -35719,7 +35862,12 @@ dnl Remove the mapping and expect OpenFlows to be removed. check ovn-nbctl --wait=hv clear Chassis_Template_Var hv1 variables AT_CHECK([ovs-ofctl dump-flows br-int | grep '42\.42\.42\.42'], [1], []) -OVN_CLEANUP([hv1]) +# Ignore errors "Syntax error at `CONDITION' expecting field name" for now +# Need to investigate whteher those errors are expected +OVN_CLEANUP([hv1 +/Syntax error at /d +]) + AT_CLEANUP ]) @@ -35890,7 +36038,13 @@ AT_CHECK([ovs-ofctl dump-groups br-int | grep 'nat'], [1], []) as hv1 AT_CHECK([ovs-ofctl dump-flows br-int | grep table=OFTABLE_CHK_LB_HAIRPIN | ofctl_strip_all], [0], []) -OVN_CLEANUP([hv1]) +# Ignore errors such as "Syntax error at `BACKENDS31' expecting IP address" +# Need to investigate whteher those errors are expected +OVN_CLEANUP([hv1 +/bad port number/d +/Syntax error at/d +]) + AT_CLEANUP ]) @@ -36422,7 +36576,20 @@ current_id=$(ovs-vsctl --bare --columns _uuid find port external_ids:ovn-chassis # The tunnel should be the same after restart check test "$current_id" = "$prev_id" -OVN_CLEANUP([hv1],[hv2]) +# Expect "fail-mode changed" error as br-int1 not set to secure. +OVN_CLEANUP([hv1 +/attempting to add tunnel port with same config/d +/could not add port ovn-hv2-0/d +/could not add network device ovn-hv2-0/d +/Integration bridge fail-mode changed/d +], +[hv2 +/attempting to add tunnel port with same config/d +/could not add port ovn-hv1-0/d +/could not add network device ovn-hv1-0/d +/Integration bridge fail-mode changed/d +]) + AT_CLEANUP ]) @@ -36703,6 +36870,9 @@ OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'min-rate="6000000 OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'max-rate="7000000000"') -eq 0]) OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list queue | grep -c 'burst="8000000000"') -eq 0]) +# Ignore error due to public one added w/o network_name=phys +OVN_CLEANUP([hv-1 +/Physical network not configured for datapath/d],[hv-2]) AT_CLEANUP ]) @@ -36900,6 +37070,7 @@ packet=$(fmt_pkt "Ether(dst='50:54:00:00:00:88', src='00:00:20:20:12:13')/ echo $packet > expected OVN_CHECK_PACKETS_REMOVE_BROADCAST([hv2/vif1-tx.pcap], [expected]) +OVN_CLEANUP([hv1],[hv2]) AT_CLEANUP ]) @@ -36969,6 +37140,7 @@ wake_up_controller hv-1 # Make sure ovn-controller is still OK ovn-nbctl --wait=hv sync OVS_WAIT_UNTIL([test $(as hv-1 ovs-vsctl list qos | grep -c linux-htb) -eq 1]) +OVN_CLEANUP([hv-1],[hv-2]) AT_CLEANUP ])