From patchwork Fri Jun 11 10:10:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1490885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: 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=HgWXIsJf; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G1c7M1Sw6z9sXL for ; Fri, 11 Jun 2021 20:11:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id DD2BD83D0F; Fri, 11 Jun 2021 10:11:08 +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 wg-IWDBeqSCN; Fri, 11 Jun 2021 10:11:07 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 22E3583CA1; Fri, 11 Jun 2021 10:11:06 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E6A5AC000D; Fri, 11 Jun 2021 10:11:05 +0000 (UTC) X-Original-To: ovs-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 19FB8C000D for ; Fri, 11 Jun 2021 10:11:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1DECF41586 for ; Fri, 11 Jun 2021 10:11:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com 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 5gbOGa6m0eA5 for ; Fri, 11 Jun 2021 10:11:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id F01E7414BF for ; Fri, 11 Jun 2021 10:11:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623406259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vA2dhkOdBnmY5mGsnid/ZZAki1bhU/GGMBLrK7v6diU=; b=HgWXIsJfwgMLa7gJ5QMzCNIaFacg1zUs4eTstAXXVWrvc1AvDcq/jEQ+GQxOOSAp/tZY2g 4RxGHwFiCX1WqRK/xOuHaG6TIlNIbZJiTl3HJLbhRmQvq3taD/uFYuwJ25qpP8uVOcV63W mWCK7+NZxbimDyIgUQGINXalP6/lpRE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-269-n83KTtK4NM2HYo1zXooP0g-1; Fri, 11 Jun 2021 06:10:58 -0400 X-MC-Unique: n83KTtK4NM2HYo1zXooP0g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4689CCC624; Fri, 11 Jun 2021 10:10:57 +0000 (UTC) Received: from dceara.remote.csb (ovpn-114-153.ams2.redhat.com [10.36.114.153]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8837919814; Fri, 11 Jun 2021 10:10:55 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Fri, 11 Jun 2021 12:10:52 +0200 Message-Id: <20210611101050.16527.21569.stgit@dceara.remote.csb> In-Reply-To: <20210611101021.16527.62193.stgit@dceara.remote.csb> References: <20210611101021.16527.62193.stgit@dceara.remote.csb> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dceara@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: dceara@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn v3 2/5] system-ovn.at: Use ADD_BR macro instead of bare ovs-vsctl. 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" br-int and br-ex are patched together by ovn-controller. They must have the same datapath type. I.e., it won't work if br-int uses the netdev (userspace) datapath and br-ext uses the system (kernel) datapath; system is the default. This ensures the datapath type is properly set for the br-ext bridge. a8362ff85dee ("northd: Fix the missing force_snat_for_lb flows when router_ip is configured.") Acked-by: Mark D. Gray Signed-off-by: Dumitru Ceara --- tests/system-ovn.at | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 8bc0c2257..0bebd9fb6 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -2312,8 +2312,7 @@ CHECK_CONNTRACK_NAT() ovn_start OVS_TRAFFIC_VSWITCHD_START() ADD_BR([br-int]) -check ovs-vsctl add-br br-ext - +ADD_BR([br-ext], [set Bridge br-ext fail-mode=standalone]) # Set external-ids in br-int needed for ovn-controller ovs-vsctl \