From patchwork Thu Mar 21 23:03:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1914644 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=dQv/nDWB; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V11Mg2m8tz1yXy for ; Fri, 22 Mar 2024 10:07:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9F97E822E5; Thu, 21 Mar 2024 23:07:56 +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 SwWrKYt-93IJ; Thu, 21 Mar 2024 23:07:55 +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 7B6A4822E7 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=dQv/nDWB Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7B6A4822E7; Thu, 21 Mar 2024 23:07:55 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 608EAC0077; Thu, 21 Mar 2024 23:07:55 +0000 (UTC) X-Original-To: ovs-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 57B5EC0077 for ; Thu, 21 Mar 2024 23:07:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 41C4D417BA for ; Thu, 21 Mar 2024 23:07: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 Tw-CJNETF-xn for ; Thu, 21 Mar 2024 23:07:53 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dceara@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 1DB82417BE 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 1DB82417BE 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=dQv/nDWB 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 1DB82417BE for ; Thu, 21 Mar 2024 23:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711062472; 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=GwrJIWHVMkIg9UJlH3A3g6FnQ3jk8n0aYlukWUJOaYc=; b=dQv/nDWBQt82bVsmw/7AkoM7hMdlrRl3JLo8CjNmrEZ0C3kRSTE9kXIB0Ueu5fSarG3y7+ EQWazxdrJFN8xOsugOzNSitjd6hnT5zzR3UoTL7x+M7xQL/Lr1EWZJPKp4Z/U7mCpeMk/H Jfq/D2K90tX1JtPQR7J0JhvW/kr1Km0= 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-117-G53a91alN2qHrZ5VPUMR_w-1; Thu, 21 Mar 2024 19:07:50 -0400 X-MC-Unique: G53a91alN2qHrZ5VPUMR_w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 59B06185A783; Thu, 21 Mar 2024 23:07:50 +0000 (UTC) Received: from cecil-rh.redhat.com (unknown [10.39.194.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFB5AC1576F; Thu, 21 Mar 2024 23:07:49 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Fri, 22 Mar 2024 00:03:51 +0100 Message-ID: <20240321230734.694333-3-dceara@redhat.com> In-Reply-To: <20240321230734.694333-1-dceara@redhat.com> References: <20240321230734.694333-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn v2 1/8] Documentation: Fix reference to the default branch. 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: Dumitru Ceara --- Documentation/intro/install/general.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/intro/install/general.rst b/Documentation/intro/install/general.rst index ab62094828..e8c312b5cb 100644 --- a/Documentation/intro/install/general.rst +++ b/Documentation/intro/install/general.rst @@ -37,7 +37,7 @@ repository, which you can clone into a directory named "ovn" with:: $ git clone https://github.com/ovn-org/ovn.git -Cloning the repository leaves the "master" branch initially checked +Cloning the repository leaves the "main" branch initially checked out. This is the right branch for general development. If, on the other hand, if you want to build a particular released version, you can check it out by running a command such as the From patchwork Thu Mar 21 23:03:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1914646 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=ifSp0JBX; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V11Mn5LwYz1yXy for ; Fri, 22 Mar 2024 10:08:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C66B2416A4; Thu, 21 Mar 2024 23:07:59 +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 GbozRu72dPiQ; Thu, 21 Mar 2024 23:07:58 +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 smtp4.osuosl.org 67EEB4160A Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ifSp0JBX Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 67EEB4160A; Thu, 21 Mar 2024 23:07:58 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 349E6C0037; Thu, 21 Mar 2024 23:07:58 +0000 (UTC) X-Original-To: ovs-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 314CEC0DD4 for ; Thu, 21 Mar 2024 23:07:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0F00E60F25 for ; Thu, 21 Mar 2024 23:07: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 he62havU9fzb for ; Thu, 21 Mar 2024 23:07:55 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dceara@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org ADCE160793 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 ADCE160793 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=ifSp0JBX 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 ADCE160793 for ; Thu, 21 Mar 2024 23:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711062473; 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=dkpUZbQ+0ODT6mPF3+jMNHQLAnaZ3bOFO7wB14qbYXA=; b=ifSp0JBXs7qOsZYM5Bxt35XfCXDsDCQV8DXBB0BYFR0MVzKb7kz7BEKOlp/JAQgyZsmRR0 UFi9INKL1wwoe4evBSKrym4O2HTmrHy7QQjR4DlqeCmulKi0AcN6ZDu1i9jJMTV5QHOA7k b36hpTZZTAEXvO0g8LR1VupIHpmyONM= 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-517-jjepVTGGPNaqLAkEDxTRig-1; Thu, 21 Mar 2024 19:07:52 -0400 X-MC-Unique: jjepVTGGPNaqLAkEDxTRig-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 D3EAB383009F; Thu, 21 Mar 2024 23:07:51 +0000 (UTC) Received: from cecil-rh.redhat.com (unknown [10.39.194.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 659A6C1576F; Thu, 21 Mar 2024 23:07:51 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Fri, 22 Mar 2024 00:03:52 +0100 Message-ID: <20240321230734.694333-4-dceara@redhat.com> In-Reply-To: <20240321230734.694333-1-dceara@redhat.com> References: <20240321230734.694333-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn v2 2/8] ovn-sandbox: Rename script from ovs-sandbox to ovn-sandbox. 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" Update documentation. To avoid completely duplicating the contents of the OVS repo sandbox documentation point to it instead where applicable (similar links already existed). It's probably simpler to keep a (renamed) copy of the OVS ovs-sandbox script in our repo than to use the one from the OVS submodule and build on top. Remove the post-split TODO item that suggested we do the latter. Signed-off-by: Dumitru Ceara --- Documentation/tutorials/ovn-sandbox.rst | 19 ++++++++++--------- NEWS | 1 + TODO_SPLIT.rst | 8 -------- tutorial/automake.mk | 4 ++-- tutorial/{ovs-sandbox => ovn-sandbox} | 0 5 files changed, 13 insertions(+), 19 deletions(-) rename tutorial/{ovs-sandbox => ovn-sandbox} (100%) diff --git a/Documentation/tutorials/ovn-sandbox.rst b/Documentation/tutorials/ovn-sandbox.rst index decc8abb39..4e40a96eb2 100644 --- a/Documentation/tutorials/ovn-sandbox.rst +++ b/Documentation/tutorials/ovn-sandbox.rst @@ -25,7 +25,7 @@ OVN Sandbox =========== -This tutorial shows you how to explore features using ``ovs-sandbox`` as a +This tutorial shows you how to explore features using ``ovn-sandbox`` as a simulated test environment. It's assumed that you have an understanding of OVS before going through this tutorial. Detail about OVN is covered in ovn-architecture_, but this tutorial lets you quickly see it in action. @@ -33,10 +33,11 @@ ovn-architecture_, but this tutorial lets you quickly see it in action. Getting Started --------------- -For some general information about ``ovs-sandbox``, see the Open vSwitch -documentaion on ``ovs-sandbox``. +``ovn-sandbox`` is derived from the Open vSwitch ``ovs-sandbox`` utility. +For some general information about it, see the "Getting Started" section of +`ovs-advanced`_ in the Open vSwitch documentation. -``ovs-sandbox`` in the OVN repo includes OVN support by default. To start it, +``ovn-sandbox`` in the OVN repo includes OVN support by default. To start it, you would simply need to run:: $ make sandbox @@ -62,7 +63,7 @@ Using GDB --------- GDB support is not required to go through the tutorial. See the "Using GDB" -section of `ovs-advanced`_ in Open vSwitch documentation for more info. +section of `ovs-advanced`_ in the Open vSwitch documentation for more info. Additional flags exist for launching the debugger for the OVN programs:: --gdb-ovn-northd @@ -72,9 +73,9 @@ Additional flags exist for launching the debugger for the OVN programs:: Creating OVN Resources ---------------------- -Once you have ``ovs-sandbox`` running with OVN enabled, you can start using OVN -utilities to create resources in OVN. As an example, we will create an -environment that has two logical switches connected by a logical router. +Once you have ``ovn-sandbox`` running, you can start using OVN utilities to +create resources. As an example, we will create an environment that has two +logical switches connected by a logical router. Create the first logical switch with one port:: @@ -123,7 +124,7 @@ View a summary of OVN's current logical configuration:: mac: "00:00:00:00:ff:02" networks: ["11.0.0.1/24"] -The ``tutorial`` directory of the OVS source tree includes a script +The ``tutorial`` directory of the OVN source tree includes a script that runs all of the commands for you:: $ ./ovn-setup.sh diff --git a/NEWS b/NEWS index 4d6ebea89e..141f1831c0 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ Post v24.03.0 flow table id. "lflow-stage-to-oftable STAGE_NAME" that converts stage name into OpenFlow table id. + - Rename the ovs-sandbox script to ovn-sandbox. OVN v24.03.0 - 01 Mar 2024 -------------------------- diff --git a/TODO_SPLIT.rst b/TODO_SPLIT.rst index 5f11205bab..9c65f77d87 100644 --- a/TODO_SPLIT.rst +++ b/TODO_SPLIT.rst @@ -50,14 +50,6 @@ Immediate to Short-term tasks be removed from the tests/ directory, and we could reference the version in the ovs repo instead. There are many other files that this could be done with. -* The ovs-sandbox is in a similar state to the tests directory. That is, the - tutorial/ directory contains a copy of the ovs-sandbox script. Rather than - copying the script wholesale, it probably makes more sense to refer to the - ovs version of the script from the ovn repo. Running the sandbox should - also be altered so that the base ovs-sandbox script doesn't do anything - ovn-related. Rather, the ovn repo can start the sandbox by calling into - ovs and then start the ovn parts after. - * OVN code needs to be removed from the OVS repo. This should be mostly straightforward with a couple of exceptions. There is an include/ovn/ directory in the ovs repo that should be moved to the ovn repo instead of diff --git a/tutorial/automake.mk b/tutorial/automake.mk index 29b1e006d2..631208639e 100644 --- a/tutorial/automake.mk +++ b/tutorial/automake.mk @@ -1,8 +1,8 @@ EXTRA_DIST += \ - tutorial/ovs-sandbox \ + tutorial/ovn-sandbox \ tutorial/ovn-setup.sh \ tutorial/ovn-lb-benchmark.sh \ tutorial/ovn-lb-benchmark.py sandbox: all cd $(srcdir)/tutorial && MAKE=$(MAKE) HAVE_OPENSSL=$(HAVE_OPENSSL) \ - ./ovs-sandbox -b $(abs_builddir) --ovs-src $(ovs_srcdir) --ovs-build $(ovs_builddir) $(SANDBOXFLAGS) + ./ovn-sandbox -b $(abs_builddir) --ovs-src $(ovs_srcdir) --ovs-build $(ovs_builddir) $(SANDBOXFLAGS) diff --git a/tutorial/ovs-sandbox b/tutorial/ovn-sandbox similarity index 100% rename from tutorial/ovs-sandbox rename to tutorial/ovn-sandbox From patchwork Thu Mar 21 23:03:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1914648 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=SG3rsRjw; 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 4V11Mt3w3Hz1yXy for ; Fri, 22 Mar 2024 10:08:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id AD117822FC; Thu, 21 Mar 2024 23:08: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 geEWhqOKsk0n; Thu, 21 Mar 2024 23:08:02 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 568088231C 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=SG3rsRjw Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 568088231C; Thu, 21 Mar 2024 23:08:01 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 06684C0077; Thu, 21 Mar 2024 23:08:01 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2F31AC0DD5 for ; Thu, 21 Mar 2024 23:07:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EC321417CA for ; Thu, 21 Mar 2024 23:07:58 +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 0thaoO8-83R3 for ; Thu, 21 Mar 2024 23:07:57 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dceara@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org B7939417C3 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 B7939417C3 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=SG3rsRjw 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 B7939417C3 for ; Thu, 21 Mar 2024 23:07:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711062475; 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=f7rYRp/bsiWdkb6rraeOqjkdcPM5BZfuBK0AQFeAefY=; b=SG3rsRjwUxpKXdKzEVLy+8OzHkzNPZkKi20xb2s4/1T7FY9FLGKHX3yJoY+TfI01EbpAHx zT5lpDc34TWCcaGy4P1xFH1yh9A9BH/rKu8KmX/yQAEhwTxHE8g7O/lJSDiFvUMi3oXmEY UCFfDQ+/88sMNdz9mhNpVBM3uqGZ77I= 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-673-gYFf1skUOkufQqgxzV4jMg-1; Thu, 21 Mar 2024 19:07:53 -0400 X-MC-Unique: gYFf1skUOkufQqgxzV4jMg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 86B20800267; Thu, 21 Mar 2024 23:07:53 +0000 (UTC) Received: from cecil-rh.redhat.com (unknown [10.39.194.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id EECBCC1576F; Thu, 21 Mar 2024 23:07:52 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Fri, 22 Mar 2024 00:03:53 +0100 Message-ID: <20240321230734.694333-5-dceara@redhat.com> In-Reply-To: <20240321230734.694333-1-dceara@redhat.com> References: <20240321230734.694333-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn v2 3/8] rhel: Update docs. 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" Remove openvswitch related left overs. Remove documentation about installation on older RHEL versions. RHEL 6.x will reach the end of its ELS, Extended Life Cycle Support on July 1st: https://access.redhat.com/articles/4665701#1-can-you-describe-the-red-hat-enterprise-linux-6-life-cycle-1 Signed-off-by: Dumitru Ceara --- Documentation/automake.mk | 1 - Documentation/howto/docker.rst | 2 +- Documentation/index.rst | 1 - Documentation/intro/install/fedora.rst | 7 +- Documentation/intro/install/index.rst | 1 - Documentation/intro/install/rhel.rst | 237 ---------------- rhel/.gitignore | 7 - rhel/README.RHEL.rst | 359 ------------------------- rhel/automake.mk | 1 - 9 files changed, 2 insertions(+), 614 deletions(-) delete mode 100644 Documentation/intro/install/rhel.rst delete mode 100644 rhel/README.RHEL.rst diff --git a/Documentation/automake.mk b/Documentation/automake.mk index b00876737b..673b24a062 100644 --- a/Documentation/automake.mk +++ b/Documentation/automake.mk @@ -12,7 +12,6 @@ DOC_SOURCE = \ Documentation/intro/install/fedora.rst \ Documentation/intro/install/general.rst \ Documentation/intro/install/ovn-upgrades.rst \ - Documentation/intro/install/rhel.rst \ Documentation/intro/install/windows.rst \ Documentation/tutorials/index.rst \ Documentation/tutorials/ovn-openstack.rst \ diff --git a/Documentation/howto/docker.rst b/Documentation/howto/docker.rst index f47fa7850f..15bf07c947 100644 --- a/Documentation/howto/docker.rst +++ b/Documentation/howto/docker.rst @@ -296,7 +296,7 @@ The "underlay" mode Depending on your VM, you can make the above step persistent across reboots. For example, if your VM is Debian/Ubuntu-based, read `openvswitch-switch.README.Debian` found in `debian` folder. If your VM is - RHEL-based, refer to :doc:`/intro/install/rhel`. + RHEL-based, refer to :doc:`/intro/install/fedora`. 3. Start the Open vSwitch network driver diff --git a/Documentation/index.rst b/Documentation/index.rst index 730595c050..98bfd5894a 100644 --- a/Documentation/index.rst +++ b/Documentation/index.rst @@ -65,7 +65,6 @@ Deeper Dive - **Testing** :doc:`topics/testing` - **Packaging:** :doc:`intro/install/debian` | - :doc:`intro/install/rhel` | :doc:`intro/install/fedora` The Open Virtual Network (OVN) Project diff --git a/Documentation/intro/install/fedora.rst b/Documentation/intro/install/fedora.rst index 5b2a37cffd..a0c372251c 100644 --- a/Documentation/intro/install/fedora.rst +++ b/Documentation/intro/install/fedora.rst @@ -22,7 +22,7 @@ Avoid deeper levels because they do not render well. =========================================== -Fedora, RHEL 7.x Packaging for OVN +Fedora, RHEL 7.x+ Packaging for OVN =========================================== This document provides instructions for building and installing OVN @@ -129,11 +129,6 @@ Installing RPM packages can be installed by using the command ``rpm -i``. Package installation requires superuser privileges. -Refer to the `RHEL README`__ for additional usage and configuration -information. - -__ https://github.com/openvswitch/ovs/blob/master/rhel/README.RHEL.rst - Reporting Bugs -------------- diff --git a/Documentation/intro/install/index.rst b/Documentation/intro/install/index.rst index 3e2e415f90..b94a1e1b47 100644 --- a/Documentation/intro/install/index.rst +++ b/Documentation/intro/install/index.rst @@ -55,7 +55,6 @@ provided below. distributions debian fedora - rhel Upgrades -------- diff --git a/Documentation/intro/install/rhel.rst b/Documentation/intro/install/rhel.rst deleted file mode 100644 index d68709a704..0000000000 --- a/Documentation/intro/install/rhel.rst +++ /dev/null @@ -1,237 +0,0 @@ -.. - Licensed under the Apache License, Version 2.0 (the "License"); you may - not use this file except in compliance with the License. You may obtain - a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - License for the specific language governing permissions and limitations - under the License. - - Convention for heading levels in OVN documentation: - - ======= Heading 0 (reserved for the title in a document) - ------- Heading 1 - ~~~~~~~ Heading 2 - +++++++ Heading 3 - ''''''' Heading 4 - - Avoid deeper levels because they do not render well. - -======================================== -RHEL 5.6, 6.x Packaging for Open vSwitch -======================================== - -This document describes how to build and install Open vSwitch on a Red Hat -Enterprise Linux (RHEL) host. If you want to install Open vSwitch on a generic -Linux host, refer to :doc:`general` instead. - -We have tested these instructions with RHEL 5.6 and RHEL 6.0. - -For RHEL 7.x (or derivatives, such as CentOS 7.x), you should follow the -instructions in the :doc:`fedora`. The Fedora spec files are used for RHEL -7.x. - -.. _rhel-prerequisites: - -Prerequisites -------------- - -You may build from an Open vSwitch distribution tarball or from an Open vSwitch -Git tree. - -The default RPM build directory, ``_topdir``, has five directories in the -top-level. - -BUILD/ - where the software is unpacked and built -RPMS/ - where the newly created binary package files are written -SOURCES/ - contains the original sources, patches, and icon files -SPECS/ - contains the spec files for each package to be built -SRPMS/ - where the newly created source package files are written - -Before you begin, note the RPM sources directory on your version of RHEL. The -command ``rpmbuild --showrc`` will show the configuration for each of those -directories. Alternatively, the command ``rpm --eval '%{_topdir}'`` shows the -current configuration for the top level directory and the command ``rpm --eval -'%{_sourcedir}'`` does the same for the sources directory. On RHEL 5, the -default RPM ``_topdir`` is ``/usr/src/redhat`` and the default RPM sources -directory is ``/usr/src/redhat/SOURCES``. On RHEL 6, the default ``_topdir`` is -``$HOME/rpmbuild`` and the default RPM sources directory is -``$HOME/rpmbuild/SOURCES``. - -Build Requirements ------------------- - -You will need to install all required packages to build the RPMs. -The command below will install RPM tools and generic build dependencies:: - - $ yum install @'Development Tools' rpm-build yum-utils - -Then it is necessary to install Open vSwitch specific build dependencies. -The dependencies are listed in the SPEC file, but first it is necessary -to replace the VERSION tag to be a valid SPEC. - -The command below will create a temporary SPEC file:: - - $ sed -e 's/@VERSION@/0.0.1/' rhel/openvswitch.spec.in > /tmp/ovs.spec - -And to install specific dependencies, use yum-builddep tool:: - - $ yum-builddep /tmp/ovs.spec - -Once that is completed, remove the file ``/tmp/ovs.spec``. - -If python-sphinx package is not available in your version of RHEL, you can -install it via pip with 'pip install sphinx'. - -Open vSwitch requires python 2.7 or newer which is not available in older -distributions. In the case of RHEL 6.x and its derivatives, one option is -to install python34 from `EPEL`_. - -.. _EPEL: https://fedoraproject.org/wiki/EPEL - -.. _rhel-bootstrapping: - -Bootstrapping and Configuring ------------------------------ - -If you are building from a distribution tarball, skip to :ref:`rhel-building`. -If not, you must be building from an Open vSwitch Git tree. Determine what -version of Autoconf is installed (e.g. run ``autoconf --version``). If it is -not at least version 2.63, then you must upgrade or use another machine to -build the packages. - -Assuming all requirements have been met, build the tarball by running:: - - $ ./boot.sh - $ ./configure - $ make dist - -You must run this on a machine that has the tools listed in -:ref:`general-build-reqs` as prerequisites for building from a Git tree. -Afterward, proceed with the rest of the instructions using the distribution -tarball. - -Now you have a distribution tarball, named something like -``openvswitch-x.y.z.tar.gz``. Copy this file into the RPM sources directory, -e.g.:: - - $ cp openvswitch-x.y.z.tar.gz $HOME/rpmbuild/SOURCES - -Broken ``build`` symlink -~~~~~~~~~~~~~~~~~~~~~~~~ - -Some versions of the RHEL 6 kernel-devel package contain a broken ``build`` -symlink. If you are using such a version, you must fix the problem before -continuing. - -To find out whether you are affected, run:: - - $ cd /lib/modules/ - $ ls -l build/ - -where ```` is the version number of the RHEL 6 kernel. - -.. note:: - The trailing slash in the final command is important. Be sure to include - it. - -If the ``ls`` command produces a directory listing, your kernel-devel package -is OK. If it produces a ``No such file or directory`` error, your kernel-devel -package is buggy. - -If your kernel-devel package is buggy, then you can fix it with:: - - $ cd /lib/modules/ - $ rm build - $ ln -s /usr/src/kernels/ build - -where ```` is the name of an existing directory under -``/usr/src/kernels``, whose name should be similar to ```` but may -contain some extra parts. Once you have done this, verify the fix with the -same procedure you used above to check for the problem. - -.. _rhel-building: - -Building --------- - -You should have a distribution tarball named something like -openvswitch-x.y.z.tar.gz. Copy this file into the RPM sources directory:: - - $ cp openvswitch-x.y.z.tar.gz $HOME/rpmbuild/SOURCES - -Make another copy of the distribution tarball in a temporary directory. Then -unpack the tarball and ``cd`` into its root:: - - $ tar xzf openvswitch-x.y.z.tar.gz - $ cd openvswitch-x.y.z - -Userspace -~~~~~~~~~ - -To build Open vSwitch userspace, run:: - - $ rpmbuild -bb rhel/openvswitch.spec - -This produces two RPMs: "openvswitch" and "openvswitch-debuginfo". - -The above command automatically runs the Open vSwitch unit tests. To disable -the unit tests, run:: - - $ rpmbuild -bb --without check rhel/openvswitch.spec - -.. note:: - If the build fails with ``configure: error: source dir - /lib/modules/2.6.32-279.el6.x86_64/build doesn't exist`` or similar, then - the kernel-devel package is missing or buggy. - -Kernel Module -~~~~~~~~~~~~~ - -On RHEL 6, to build the Open vSwitch kernel module run:: - - $ rpmbuild -bb rhel/kmod-openvswitch-rhel6.spec - -You might have to specify a kernel version and/or variants, e.g.: - - $ rpmbuild -bb \ - -D "kversion 2.6.32-131.6.1.el6.x86_64" \ - -D "kflavors default debug kdump" \ - rhel/kmod-openvswitch-rhel6.spec - -This produces an "kmod-openvswitch" RPM for each kernel variant, in this -example: "kmod-openvswitch", "kmod-openvswitch-debug", and -"kmod-openvswitch-kdump". - -.. _rhel-script-integrations: - -Red Hat Network Scripts Integration ------------------------------------ - -A RHEL host has default firewall rules that prevent any Open vSwitch tunnel -traffic from passing through. If a user configures Open vSwitch tunnels like -Geneve, GRE, VXLAN, LISP etc., they will either have to manually add iptables -firewall rules to allow the tunnel traffic or add it through a startup script -Refer to the "enable-protocol" command in the ovs-ctl(8) manpage for more -information. - -In addition, simple integration with Red Hat network scripts has been -implemented. Refer to `README.RHEL.rst`__ in the source tree or -/usr/share/doc/openvswitch/README.RHEL.rst in the installed openvswitch package -for details. - -__ https://github.com/openvswitch/ovs/blob/master/rhel/README.RHEL.rst - -Reporting Bugs --------------- - -Report problems to bugs@openvswitch.org. diff --git a/rhel/.gitignore b/rhel/.gitignore index e6f72859f3..0881d1c842 100644 --- a/rhel/.gitignore +++ b/rhel/.gitignore @@ -1,8 +1 @@ -openvswitch-dkms.spec -openvswitch-kmod-rhel5.spec -kmod-openvswitch-rhel6.spec -openvswitch-kmod-fedora.spec -openvswitch.spec -openvswitch-fedora.spec ovn-fedora.spec -usr_lib_systemd_system_ovs-vswitchd.service diff --git a/rhel/README.RHEL.rst b/rhel/README.RHEL.rst deleted file mode 100644 index 1cd2065eff..0000000000 --- a/rhel/README.RHEL.rst +++ /dev/null @@ -1,359 +0,0 @@ -=================================== -Red Hat network scripts integration -=================================== - -The RPM packages for Open vSwitch provide some integration with Red Hat's -network scripts. Using this integration is optional. - -To use the integration for a Open vSwitch bridge or interface named ````, -create or edit ``/etc/sysconfig/network-scripts/ifcfg-``. This is a -shell script that consists of a series of ``VARIABLE=VALUE`` assignments. The -following OVS-specific variable names are supported: - -DEVICETYPE - Always set to "ovs". - -TYPE - If this is "OVSBridge", then this file represents an OVS bridge named . - Otherwise, it represents a port on an OVS bridge and TYPE must have one of - the following values: - - * ``OVSPort``, if ```` is a physical port (e.g. eth0) or - virtual port (e.g. vif1.0). - - * ``OVSIntPort``, if ```` is an internal port (e.g. a tagged - VLAN). - - * ``OVSBond``, if ```` is an OVS bond. - - * ``OVSTunnel``, if ```` is an OVS tunnel. - - * ``OVSPatchPort``, if ```` is a patch port - - Additionally the following DPDK port types may be available, depends on OVS - build- and runtime configuration: - - * ``OVSDPDKPort``, if ```` is a physical DPDK NIC port (name must start - with ``dpdk`` and end with portid, eg ``dpdk0``) - - * ``OVSDPDKRPort``, if ```` is a DPDK ring port (name must start with - ``dpdkr`` and end with portid, e.g. ``dpdkr0``) - - * ``OVSDPDKVhostUserPort`` if ```` is a DPDK vhost-user port - - * ``OVSDPDKBond`` if ```` is an OVS DPDK bond. - -OVS_BRIDGE - If TYPE is anything other than "OVSBridge", set to the name of the OVS bridge - to which the port should be attached. - -OVS_OPTIONS - Optionally, extra options to set in the "Port" table when adding the port to - the bridge, as a sequence of column[:key]=value options. For example, - "tag=100" to make the port an access port for VLAN 100. See the - documentation of "add-port" in ovs-vsctl(8) for syntax and the section on the - Port table in ovs-vswitchd.conf.db(5) for available options. - -OVS_EXTRA - Optionally, additional ovs-vsctl commands, separated by ``--`` (double dash). - -BOND_IFACES - For "OVSBond" and "OVSDPDKBond" interfaces, a list of physical interfaces to - bond together. - -OVS_TUNNEL_TYPE - For "OVSTunnel" interfaces, the type of the tunnel. For example, "gre", - "vxlan", etc. - -OVS_TUNNEL_OPTIONS - For "OVSTunnel" interfaces, this field should be used to specify the tunnel - options like remote_ip, key, etc. - -OVS_PATCH_PEER - For "OVSPatchPort" devices, this field specifies the patch's peer on the - other bridge. - -OVS_PORT_MODE - For "OVSDPDKVhostUserPort" devices, this field can be set to "client" which - indicates that the port will be used in client mode. - -OVS_PORT_PATH - For "OVSDPDKVhostUserPort" devices, this field specifies the path to the - vhost-user server socket. It will only be used if OVS_PORT_MODE is set to - "client". - -Note ----- - -* ``ifdown`` on a bridge will not bring individual ports on the bridge down. - "ifup" on a bridge will not add ports to the bridge. This behavior should be - compatible with standard bridges (with ``TYPE=Bridge``). - -* If ``ifup`` on an interface is called multiple times, one can see ``RTNETLINK - answers: File exists`` printed on the console. This comes from ifup-eth - trying to add zeroconf route multiple times and is harmless. - -* ``ifup`` on OVSDPDKPort or OVSDPDKBond may result in change of bridge mac address. - Since OVS changes the device state to DOWN before changing its mac address this - result in loss of bridge configuration (e.g. routes). ``ifup-ovs`` perform post-up - operation on the bridge again to restore configuration. - -Examples --------- - -Standalone bridge: - -:: - - ==> ifcfg-ovsbridge0 <== - DEVICE=ovsbridge0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSBridge - BOOTPROTO=static - IPADDR=A.B.C.D - NETMASK=X.Y.Z.0 - HOTPLUG=no - -Enable DHCP on the bridge: - -* Needs ``OVSBOOTPROTO`` instead of ``BOOTPROTO``. -* All the interfaces that can reach the DHCP server as a space separated list - in ``OVSDHCPINTERFACES``. - -:: - - DEVICE=ovsbridge0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSBridge - OVSBOOTPROTO="dhcp" - OVSDHCPINTERFACES="eth0" - HOTPLUG=no - - -Adding Internal Port to ovsbridge0: - -:: - - ==> ifcfg-intbr0 <== - DEVICE=intbr0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSIntPort - OVS_BRIDGE=ovsbridge0 - HOTPLUG=no - -Internal Port with fixed IP address: - -:: - - DEVICE=intbr0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSIntPort - OVS_BRIDGE=ovsbridge0 - BOOTPROTO=static - IPADDR=A.B.C.D - NETMASK=X.Y.Z.0 - HOTPLUG=no - -Internal Port with DHCP: - -* Needs ``OVSBOOTPROTO`` or ``BOOTPROTO``. -* All the interfaces that can reach the DHCP server as a space separated list - in ``OVSDHCPINTERFACES``. - -:: - - DEVICE=intbr0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSIntPort - OVS_BRIDGE=ovsbridge0 - OVSBOOTPROTO="dhcp" - OVSDHCPINTERFACES="eth0" - HOTPLUG=no - -Adding physical ``eth0`` to ``ovsbridge0`` described above: - -:: - - ==> ifcfg-eth0 <== - DEVICE=eth0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSPort - OVS_BRIDGE=ovsbridge0 - BOOTPROTO=none - HOTPLUG=no - -Tagged VLAN interface on top of ``ovsbridge0``: - -:: - - ==> ifcfg-vlan100 <== - DEVICE=vlan100 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSIntPort - BOOTPROTO=static - IPADDR=A.B.C.D - NETMASK=X.Y.Z.0 - OVS_BRIDGE=ovsbridge0 - OVS_OPTIONS="tag=100" - OVS_EXTRA="set Interface $DEVICE external-ids:iface-id=$(hostname -s)-$DEVICE-vif" - HOTPLUG=no - -Bonding: - -:: - - ==> ifcfg-bond0 <== - DEVICE=bond0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSBond - OVS_BRIDGE=ovsbridge0 - BOOTPROTO=none - BOND_IFACES="gige-1b-0 gige-1b-1 gige-21-0 gige-21-1" - OVS_OPTIONS="bond_mode=balance-tcp lacp=active" - HOTPLUG=no - -:: - - ==> ifcfg-gige-* <== - DEVICE=gige-* - ONBOOT=yes - HOTPLUG=no - -An Open vSwitch Tunnel: - -:: - - ==> ifcfg-gre0 <== - DEVICE=ovs-gre0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSTunnel - OVS_BRIDGE=ovsbridge0 - OVS_TUNNEL_TYPE=gre - OVS_TUNNEL_OPTIONS="options:remote_ip=A.B.C.D" - -Patch Ports: - -:: - - ==> ifcfg-patch-ovs-0 <== - DEVICE=patch-ovs-0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSPatchPort - OVS_BRIDGE=ovsbridge0 - OVS_PATCH_PEER=patch-ovs-1 - -:: - - ==> ifcfg-patch-ovs-1 <== - DEVICE=patch-ovs-1 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSPatchPort - OVS_BRIDGE=ovsbridge1 - OVS_PATCH_PEER=patch-ovs-0 - -User bridge: - -:: - - ==> ifcfg-obr0 <== - DEVICE=obr0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSUserBridge - BOOTPROTO=static - IPADDR=A.B.C.D - NETMASK=X.Y.Z.0 - HOTPLUG=no - -DPDK NIC port: - -:: - - ==> ifcfg-dpdk0 <== - DPDK vhost-user port: - DEVICE=dpdk0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSDPDKPort - OVS_BRIDGE=obr0 - -:: - - ==> ifcfg-vhu0 <== - DEVICE=vhu0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSDPDKVhostUserPort - OVS_BRIDGE=obr0 - -:: - - ==> ifcfg-bond0 <== - DEVICE=bond0 - ONBOOT=yes - DEVICETYPE=ovs - TYPE=OVSDPDKBond - OVS_BRIDGE=ovsbridge0 - BOOTPROTO=none - BOND_IFACES="dpdk0 dpdk1" - OVS_OPTIONS="bond_mode=active-backup" - HOTPLUG=no - - -Red Hat systemd integration ---------------------------- - -The RPM packages for Open vSwitch provide support for systemd integration. It's -recommended to use the openvswitch.service to start and stop the Open vSwitch -daemons. The below table shows systemd's behavior: - -=============================== ============== ============== ============== =============== =============== - - Process Status systemctl <> status -------------------------------- ----------------------------- ---------------------------------------------- -Action ovs-vswitch ovsdb-server openvswitch ovs-vswitchd ovsdb-server -=============================== ============== ============== ============== =============== =============== -systemctl start openvswitch* started started active, exited active, running active, running -crash of vswitchd crash, started re-started active, exited active, running active, running -crash of ovsdb re-started crash, started active, exited active, running active, running -systemctl restart openvswitch re-started re-started active, exited active, running active, running -systemctl restart ovs-vswitchd re-started re-started active, exited active, running active, running -systemctl restart ovsdb-server re-started re-started active, exited active, running active, running -systemctl stop openvswitch stopped stopped inactive, dead inactive, dead inactive, dead -systemctl stop ovs-vswitchd stopped stopped inactive, dead inactive, dead inactive, dead -systemctl stop ovsdb-server stopped stopped inactive, dead inactive, dead inactive, dead -systemctl start ovs-vswitchd* started started inactive, dead active, running active, running -systemctl start ovsdb-server* not started started inactive, dead inactive, dead active, running -=============================== ============== ============== ============== =============== =============== - - -\* These commands where executed when no Open vSwitch related processes where -running. All other commands where executed when Open vSwitch was successfully -running. - - -Non-root User Support ------------------------ -Fedora and RHEL support running the Open vSwitch daemons as a non-root user. -By default, a fresh installation will create an *openvswitch* user, along -with any additional support groups needed (such as *hugetlbfs* for DPDK -support). - -This is controlled by modifying the ``OVS_USER_ID`` option. Setting this -to 'root:root', or commenting the variable out will revert this behavior. - - -Reporting Bugs --------------- - -Please report problems to bugs@openvswitch.org. diff --git a/rhel/automake.mk b/rhel/automake.mk index 992de3dc70..445dcd2fd4 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -6,7 +6,6 @@ # without warranty of any kind. EXTRA_DIST += \ - rhel/README.RHEL.rst \ rhel/automake.mk \ rhel/etc_logrotate.d_ovn \ rhel/ovn-fedora.spec \ From patchwork Thu Mar 21 23:03:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1914647 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=GodNQ3hc; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V11Ms0xKDz1yXy for ; Fri, 22 Mar 2024 10:08:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 59AAD41684; Thu, 21 Mar 2024 23:08:07 +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 8TerR2lr820X; Thu, 21 Mar 2024 23:08:05 +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 smtp4.osuosl.org A30E541609 Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GodNQ3hc Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id A30E541609; Thu, 21 Mar 2024 23:08:04 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 53A64C0DD4; Thu, 21 Mar 2024 23:08:04 +0000 (UTC) X-Original-To: ovs-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 11FD0C0DD4 for ; Thu, 21 Mar 2024 23:08:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8C9EE6081D for ; Thu, 21 Mar 2024 23:08:01 +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 Hbh2NFXP7uJ0 for ; Thu, 21 Mar 2024 23:08:00 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dceara@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org A73F260F39 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 A73F260F39 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=GodNQ3hc 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 A73F260F39 for ; Thu, 21 Mar 2024 23:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711062478; 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=mbTf/YAQTcDxgiBqBPwma5qqXq1UOwvA35XM4i4ubbc=; b=GodNQ3hcaL9Ttyoj2TDK8dPqXvVt/HseEyKRldNgP/zf93lQisdp2flCvx/Z4ldKGNz5sj pJyl+hpF4L1Y057AWzf0jOvd12KwC3LIPwl3iZCzbNq6ZBC7yrWM78sdgPh2weFPVNaTbh IgG6d5bvIyGPqbQSVu1JKEVD8aiUssE= 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-591-PFgS1uxhNz2RhGIyaVHwSQ-1; Thu, 21 Mar 2024 19:07:55 -0400 X-MC-Unique: PFgS1uxhNz2RhGIyaVHwSQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 0B8483830098; Thu, 21 Mar 2024 23:07:55 +0000 (UTC) Received: from cecil-rh.redhat.com (unknown [10.39.194.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90149C1576F; Thu, 21 Mar 2024 23:07:54 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Fri, 22 Mar 2024 00:03:54 +0100 Message-ID: <20240321230734.694333-6-dceara@redhat.com> In-Reply-To: <20240321230734.694333-1-dceara@redhat.com> References: <20240321230734.694333-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn v2 4/8] treewide: Remove some of the post OVS-OVN split leftovers. 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" A few still remain and need to be addressed in the future. Signed-off-by: Dumitru Ceara --- Documentation/automake.mk | 1 - Documentation/index.rst | 4 +- .../internals/contributing/coding-style.rst | 6 - .../internals/contributing/index.rst | 1 - .../contributing/libopenvswitch-abi.rst | 119 ------------------ Documentation/internals/patchwork.rst | 9 +- Documentation/topics/testing.rst | 2 +- 7 files changed, 7 insertions(+), 135 deletions(-) delete mode 100644 Documentation/internals/contributing/libopenvswitch-abi.rst diff --git a/Documentation/automake.mk b/Documentation/automake.mk index 673b24a062..c6cc37e495 100644 --- a/Documentation/automake.mk +++ b/Documentation/automake.mk @@ -58,7 +58,6 @@ DOC_SOURCE = \ Documentation/internals/contributing/backporting-patches.rst \ Documentation/internals/contributing/coding-style.rst \ Documentation/internals/contributing/documentation-style.rst \ - Documentation/internals/contributing/libopenvswitch-abi.rst \ Documentation/internals/contributing/submitting-patches.rst \ Documentation/requirements.txt \ $(addprefix Documentation/ref/,$(RST_MANPAGES) $(RST_MANPAGES_NOINST)) diff --git a/Documentation/index.rst b/Documentation/index.rst index 98bfd5894a..04e7575058 100644 --- a/Documentation/index.rst +++ b/Documentation/index.rst @@ -33,8 +33,8 @@ How the Documentation is Organised The Open Virtual Network (OVN) documentation is organised into multiple sections: - :doc:`Installation guides ` guide you through - installing Open vSwitch (OVS) and Open Virtual Network (OVN) on a variety of - different platforms + installing Open Open Virtual Network (OVN) on a variety of different + platforms - :doc:`Tutorials ` take you through a series of steps to configure OVS and OVN in sandboxed environments - :doc:`Topic guides ` provide a high level overview of OVS and diff --git a/Documentation/internals/contributing/coding-style.rst b/Documentation/internals/contributing/coding-style.rst index 7e93f0881b..bec8bc102a 100644 --- a/Documentation/internals/contributing/coding-style.rst +++ b/Documentation/internals/contributing/coding-style.rst @@ -647,9 +647,3 @@ Python When introducing new Python code, try to follow Python's `PEP 8 `__ style. Consider running the ``pep8`` or ``flake8`` tool against your code to find issues. - -Libraries ---------- - -When introducing a new library, follow -:doc:`Open vSwitch Library ABI guide ` diff --git a/Documentation/internals/contributing/index.rst b/Documentation/internals/contributing/index.rst index 77b52964b7..ba6b6094e1 100644 --- a/Documentation/internals/contributing/index.rst +++ b/Documentation/internals/contributing/index.rst @@ -34,4 +34,3 @@ The below guides provide information on contributing to OVN itself. backporting-patches coding-style documentation-style - libopenvswitch-abi diff --git a/Documentation/internals/contributing/libopenvswitch-abi.rst b/Documentation/internals/contributing/libopenvswitch-abi.rst deleted file mode 100644 index 8710271301..0000000000 --- a/Documentation/internals/contributing/libopenvswitch-abi.rst +++ /dev/null @@ -1,119 +0,0 @@ -.. - Copyright (c) 2017 Red Hat, Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); you may - not use this file except in compliance with the License. You may obtain - a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - License for the specific language governing permissions and limitations - under the License. - - Convention for heading levels in OVN documentation: - - ======= Heading 0 (reserved for the title in a document) - ------- Heading 1 - ~~~~~~~ Heading 2 - +++++++ Heading 3 - ''''''' Heading 4 - - Avoid deeper levels because they do not render well. - -=================================== -Open vSwitch Library ABI Updates -=================================== - -This file describes the manner in which the Open vSwitch shared library -manages different ABI and API revisions. This document aims to describe -the background, goals, and concrete mechanisms used to export code-space -functionality so that it may be shared between multiple applications. - -.. _definitions: - -Definitions ------------ - -.. csv-table:: Definitions for terms appearing in this document - :header: "Term", "Definition" - - "ABI", "Abbreviation of Application Binary Interface" - "API", "Abbreviation of Application Programming Interface" - "Application Binary Interface", "The low-level runtime interface exposed - by an object file." - "Application Programming Interface", "The source-code interface descriptions - intended for use in multiple translation units when compiling." - "Code library", "A collection of function implementations and definitions - intended to be exported and called through a well-defined interface." - "Shared Library", "A code library which is imported at run time." - -.. _overview: - -Overview ----------- - -C and C++ applications often use 'external' functionality, such as printing -specialized data types or parsing messages, which has been exported for common -use. There are many possible ways for applications to call such external -functionality, for instance by including an appropriate inline definition which -the compiler can emit as code in each function it appears. One such way of -exporting and importing such functionality is through the use of a library -of code. - -When a compiler builds object code from source files to produce object code, -the results are binary data arranged with specific calling conventions, -alignments, and order suitable for a run-time environment or linker. This -result defines a specific ABI. - -As library of code develops and its exported interfaces change over time, the -resulting ABI may change as well. Therefore, care must be taken to ensure the -changes made to libraries of code are effectively communicated to applications -which use them. This includes informing the applications when incompatible -changes are made. - -The Open vSwitch project exports much of its functionality through multiple -such libraries of code. These libraries are intended for multiple applications -to import and use. As the Open vSwitch project continues to evolve and change, -its exported code will evolve as well. To ensure that applications linking to -these libraries are aware of these changes, Open vSwitch employs libtool -version stamps. - -.. _policies: - -ABI Policy ----------- - -Open vSwitch will export the ABI version at the time of release, such that the -library name will be the major.minor version, and the rest of the release -version information will be conveyed with a libtool interface version. - -The intent is for Open vSwitch to maintain an ABI stability for each minor -revision only (so that Open vSwitch release 2.5 carries a guarantee for all -2.5.ZZ micro-releases). This means that any porting effort to stable branches -must take not to disrupt the existing ABI. - -In the event that a bug must be fixed in a backwards-incompatible way, -developers must bump the libtool 'current' version to inform the linker of the -ABI breakage. This will signal that libraries exposed by the subsequent release -will not maintain ABI stability with the previous version. - -Coding -------- - -At build time, if building shared libraries by passing the `--enable-shared` -arguments to `./configure`, version information is extracted from -the ``$PACKAGE_VERSION`` automake variable and formatted into the appropriate -arguments. These get exported for use in Makefiles as ``$OVS_LTINFO``, and -passed to each exported library along with other ``LDFLAGS``. - -Therefore, when adding a new library to the build system, these version flags -should be included with the ``$LDFLAGS`` variable. Nothing else needs to be -done. - -Changing an exported function definition (from a file in, for instance -`lib/*.h`) is only permitted from minor release to minor release. Likewise -changes to library data structures should only occur from minor release to -minor release. diff --git a/Documentation/internals/patchwork.rst b/Documentation/internals/patchwork.rst index 52898dbc30..c27e8a54bc 100644 --- a/Documentation/internals/patchwork.rst +++ b/Documentation/internals/patchwork.rst @@ -27,12 +27,11 @@ Patchwork ========= -Open vSwitch and OVN use `Patchwork`__ to track the status of patches -sent to the :doc:`ovs-dev mailing list `. Our Patchwork -instance can be found on `ozlabs.org`__. +OVN uses `Patchwork`__ to track the status of patches sent to the +:doc:`ovs-dev mailing list `. Our Patchwork instance can be +found on `ozlabs.org`__. -Patchwork provides a number of useful features for developers working on -Open vSwitch and OVN: +Patchwork provides a number of useful features for developers working on OVN: - Tracking the lifecycle of patches (accepted, rejected, under-review, ...) - Assigning reviewers (delegates) to patches diff --git a/Documentation/topics/testing.rst b/Documentation/topics/testing.rst index 14dbaa2cbc..d093bc23d1 100644 --- a/Documentation/topics/testing.rst +++ b/Documentation/topics/testing.rst @@ -82,7 +82,7 @@ report test failures as bugs and include the ``testsuite.log`` in your report. .. note:: Sometimes a few tests may fail on some runs but not others. This is usually a - bug in the testsuite, not a bug in Open vSwitch itself. If you find that a + bug in the testsuite, not a bug in OVN itself. If you find that a test fails intermittently, please report it, since the developers may not have noticed. You can make the testsuite automatically rerun tests that fail, by adding ``RECHECK=yes`` to the ``make`` command line, e.g.:: From patchwork Thu Mar 21 23:03:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1914649 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=bAo57VnV; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V11My4JRlz1yXy for ; Fri, 22 Mar 2024 10:08:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8E78F416E5; Thu, 21 Mar 2024 23:08:12 +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 aZh_afUYxmze; Thu, 21 Mar 2024 23:08:10 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 74B00416F8 Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bAo57VnV Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 74B00416F8; Thu, 21 Mar 2024 23:08:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id F07A1C0DD5; Thu, 21 Mar 2024 23:08:09 +0000 (UTC) X-Original-To: ovs-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 14D05C0DD5 for ; Thu, 21 Mar 2024 23:08:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5B1CC82318 for ; Thu, 21 Mar 2024 23:08:02 +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 ZVo5r57DDAx5 for ; Thu, 21 Mar 2024 23:08:01 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dceara@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org AB25A82313 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 AB25A82313 Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bAo57VnV Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id AB25A82313 for ; Thu, 21 Mar 2024 23:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711062478; 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=f5j1Mqth6qfV3PzXqxdyeNowGjsZ920Lslz6U6NphEA=; b=bAo57VnVt1uMfoU9BOpKlHRTzWvoHXl74AMk5MTnRa3Zj/9T8cpvIbu/lhgZR300PwOc36 D/3ypltPZrW/XwNLfOD4lm2OrHATVnw/AtRytCRyM09MH59c2vNAvQKH2nM/AyqThki76m Uk7zmspR4R3laKcA2pI4JouAt9Ovdwg= 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-17-ONJ1bFltNgq-Qw4bEDcqSA-1; Thu, 21 Mar 2024 19:07:56 -0400 X-MC-Unique: ONJ1bFltNgq-Qw4bEDcqSA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 A2BFB800262; Thu, 21 Mar 2024 23:07:56 +0000 (UTC) Received: from cecil-rh.redhat.com (unknown [10.39.194.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32426C1576F; Thu, 21 Mar 2024 23:07:56 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Fri, 22 Mar 2024 00:03:55 +0100 Message-ID: <20240321230734.694333-7-dceara@redhat.com> In-Reply-To: <20240321230734.694333-1-dceara@redhat.com> References: <20240321230734.694333-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn v2 5/8] Documentation: Remove references to TravisCI. 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" OVN doesn't use TravisCI for a while. Instead GitHub Actions are preferred. Signed-off-by: Dumitru Ceara --- .../contributing/submitting-patches.rst | 8 ++-- Documentation/topics/testing.rst | 40 ------------------- 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/Documentation/internals/contributing/submitting-patches.rst b/Documentation/internals/contributing/submitting-patches.rst index 31a3ca747b..aef8bcd700 100644 --- a/Documentation/internals/contributing/submitting-patches.rst +++ b/Documentation/internals/contributing/submitting-patches.rst @@ -68,11 +68,9 @@ Testing is also important: feature. A bug fix patch should preferably add a test that would fail if the bug recurs. -If you are using GitHub, then you may utilize the travis-ci.org CI build system -by linking your GitHub repository to it. This will run some of the above tests -automatically when you push changes to your repository. See the "Continuous -Integration with Travis-CI" in :doc:`/topics/testing` for details on how to set -it up. +If you are using GitHub, then you may utilize the GitHub Actions CI system. +This will run the above tests automatically when you push changes to your +repository. Email Subject ------------- diff --git a/Documentation/topics/testing.rst b/Documentation/topics/testing.rst index d093bc23d1..d85dc50c6f 100644 --- a/Documentation/topics/testing.rst +++ b/Documentation/topics/testing.rst @@ -176,46 +176,6 @@ You should invoke scan-view to view analysis results. The last line of output from ``clang-analyze`` will list the command (containing results directory) that you should invoke to view the results on a browser. -Continuous Integration with Travis CI -------------------------------------- - -A .travis.yml file is provided to automatically build OVN with various -build configurations and run the testsuite using Travis CI. Builds will be -performed with gcc, sparse and clang with the -Werror compiler flag included, -therefore the build will fail if a new warning has been introduced. - -The CI build is triggered via git push (regardless of the specific branch) or -pull request against any Open vSwitch GitHub repository that is linked to -travis-ci. - -Instructions to setup travis-ci for your GitHub repository: - -1. Go to https://travis-ci.org/ and sign in using your GitHub ID. -2. Go to the "Repositories" tab and enable the ovs repository. You may disable - builds for pushes or pull requests. -3. In order to avoid forks sending build failures to the upstream mailing list, - the notification email recipient is encrypted. If you want to receive email - notification for build failures, replace the the encrypted string: - - 1. Install the travis-ci CLI (Requires ruby >=2.0): gem install travis - 2. In your Open vSwitch repository: travis encrypt mylist@mydomain.org - 3. Add/replace the notifications section in .travis.yml and fill in the - secure string as returned by travis encrypt:: - - notifications: - email: - recipients: - - secure: "....." - - .. note:: - You may remove/omit the notifications section to fall back to default - notification behaviour which is to send an email directly to the author and - committer of the failing commit. Note that the email is only sent if the - author/committer have commit rights for the particular GitHub repository. - -4. Pushing a commit to the repository which breaks the build or the - testsuite will now trigger a email sent to mylist@mydomain.org - Datapath testing ~~~~~~~~~~~~~~~~ From patchwork Thu Mar 21 23:03:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1914650 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=hdqB0fdW; 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 4V11Mz0GqRz23r9 for ; Fri, 22 Mar 2024 10:08:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E96D660F8E; Thu, 21 Mar 2024 23:08:12 +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 H0l7wvit9OIf; Thu, 21 Mar 2024 23:08:10 +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 9826960F7B 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=hdqB0fdW Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9826960F7B; Thu, 21 Mar 2024 23:08:08 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 581ADC008E; Thu, 21 Mar 2024 23:08:08 +0000 (UTC) X-Original-To: ovs-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 15EC8C0DD4 for ; Thu, 21 Mar 2024 23:08:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8AD1160F4B for ; Thu, 21 Mar 2024 23:08:04 +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 zSX1qhzyWNYd for ; Thu, 21 Mar 2024 23:08:03 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dceara@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org CD9B460F3F 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 CD9B460F3F 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 CD9B460F3F for ; Thu, 21 Mar 2024 23:08:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711062481; 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=3wUg3iIRvnVDbdqcZ4iM0xG9Yo5tkGmaUjZN7VUC6Cw=; b=hdqB0fdW+exT278JTkDX1xWwlnQm/WfxUf1W2jLYnwPcNJbjL82NhCuTxz9ZBHiUMd0Mhy LWK/PmSXVf45omdr00GRPq4l3IIbHF7jMIyPml9k2GHI5yJR+QCjDCqYzsp5FFKzJL96es DnF5RdY1OQwiph5UspdVKQTM4D8yadg= 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-684-L8ZlC0bLOjeMFeGI3J0Xzw-1; Thu, 21 Mar 2024 19:07:58 -0400 X-MC-Unique: L8ZlC0bLOjeMFeGI3J0Xzw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 25E2E185A781; Thu, 21 Mar 2024 23:07:58 +0000 (UTC) Received: from cecil-rh.redhat.com (unknown [10.39.194.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB999C1576F; Thu, 21 Mar 2024 23:07:57 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Fri, 22 Mar 2024 00:03:56 +0100 Message-ID: <20240321230734.694333-8-dceara@redhat.com> In-Reply-To: <20240321230734.694333-1-dceara@redhat.com> References: <20240321230734.694333-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn v2 6/8] Update post OVS-OVN split TODO list. 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" As Ilya commented in the review of the V1 of this series the statement that "all the TODO items listed in it have been addressed" is indeed "a bold statement". However quite a few don't seem applicable anymore. Signed-off-by: Dumitru Ceara --- TODO_SPLIT.rst | 73 -------------------------------------------------- 1 file changed, 73 deletions(-) diff --git a/TODO_SPLIT.rst b/TODO_SPLIT.rst index 9c65f77d87..cdc2d25ba7 100644 --- a/TODO_SPLIT.rst +++ b/TODO_SPLIT.rst @@ -25,9 +25,6 @@ OVN/OVS Split To-do List ======================== -Immediate tasks ---------------------------- - * There are likely many unused files throughout the source tree since they pertain to OVS rather than OVN. These can also be removed from the repo. @@ -36,73 +33,3 @@ Immediate tasks polish (or even just rewrite it. I won't be offended). * Cleanup the acinclude.m4 and m4 folder - -Immediate to Short-term tasks ------------------------------ - -* The Documentation/ directory can use an overhaul. Non-OVN content can be - removed. The installation guide and tutorials should be reworked to be - geared towards OVN specifically instead of OVS. - -* The tests/ directory contains copies of all "utility" files from the ovs - repo. These files could be removed in favor of using the files directly - from the ovs repo instead of the copy. As an example, ofproto-macros.at could - be removed from the tests/ directory, and we could reference the version in - the ovs repo instead. There are many other files that this could be done with. - -* OVN code needs to be removed from the OVS repo. This should be mostly - straightforward with a couple of exceptions. There is an include/ovn/ - directory in the ovs repo that should be moved to the ovn repo instead of - being removed. The other challenge is updating the ovsdb clustering tests. - They currently make use of the OVN database schemas. They will need to be - updated not to rely on something from OVN. - -* The rhel/ and debian/ directories need updating and testing so that they can - build ovn. They also need to be modified so that they no longer can build ovs - packages. - -Short to Medium-term tasks --------------------------- - -* There are several non-code subdirectories in the ovn repo that have not - been updated from how they existed in the OVS repo. It should be evaluated - if there is potential use to modify these to be useful for OVN or if they - should just be removed. Examples include the poc/ and xenserver/ directories. - -Medium to Long-term tasks -------------------------- - -* The goal is to eventually not require having ovs as a subtree in the ovn - repo. Using variables in Makefiles goes a short way towards realizing - this goal, but it only partially gets us there. We still - refer to the ovs subtree directly in certain areas, most notably the - tests/ directory. Getting rid of the ovs subtree can be thought of as a - two-step process: - - 1) Remove all direct references to the ovs subtree from the build system. By - doing this, it will be possible to have an ovs source repo checked out at - some other location and have ovn refer to that by using variables. - - 2) Alter ovs's build so that it places headers, utilities, etc. in known - locations on disk when it installs. This way, rather than referring to - an ovs source repo, we can refer to installation directories in the ovn - build system. This way, it could be possible to build ovn just by installing - the development package of ovs as a prerequisite. - -* A plan needs to be developed for compatibility between OVN and OVS. There - are several facets to this - - 1) We need to try to determine a policy with regards to what OVS versions - OVN will be compatible with. - - 2) The ovs subtree in ovn currently is the master branch of ovs at the time - that the ovn repo was split off. It likely will result in a more stable - environment to use a released version of ovs as our basis instead of an - arbitrary commit from mid-release. - - 3) While ovn was housed in the ovs repo, it was sometimes necessary to - update ovs or ovsdb code in order to facilitate a new ovn feature. Or it - might be necessary to fix a bug in ovs in order to fix a bug in ovn. With ovn - split away, there needs to be a way that ovn developers can contribute changes - to ovs when necessary but also not have to wait for those changes to be - available in an ovs release to be able to use them in ovn. From patchwork Thu Mar 21 23:03:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1914652 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=L+R44ggM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V11NL1QXQz1yXy for ; Fri, 22 Mar 2024 10:08:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 650D8823F6; Thu, 21 Mar 2024 23:08:32 +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 aR4iBziN2Lgf; Thu, 21 Mar 2024 23:08:30 +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 BAD0882400 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=L+R44ggM Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id BAD0882400; Thu, 21 Mar 2024 23:08:27 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7BD16C0077; Thu, 21 Mar 2024 23:08:27 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 158DDC0077 for ; Thu, 21 Mar 2024 23:08:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4A17941859 for ; Thu, 21 Mar 2024 23:08:17 +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 6347NbwDNHzU for ; Thu, 21 Mar 2024 23:08:15 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dceara@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 62143417D5 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 62143417D5 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=L+R44ggM 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 62143417D5 for ; Thu, 21 Mar 2024 23:08:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711062487; 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=u/4+rsEL4qfZwf+Y6dWIS3AuTVvB1rfUFXV7NtXccvY=; b=L+R44ggMMlh/MSWZ3z1pRFP6RUcRwQR5tePW+vW+nTCVY/90w4Xx7HXHXDUkbrg337eYxp 7RQACe7UcpZd5kpKl7df+5jH8wMjzPUEpqjK5gXu431uSizjsiX4Te6fN6Oin52Zytla4A UoKKPluHSEUqkuW7kdY/WnQPpa79TEc= 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-407-pjUhcCuDNaKZFGYZRH4tTQ-1; Thu, 21 Mar 2024 19:08:04 -0400 X-MC-Unique: pjUhcCuDNaKZFGYZRH4tTQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 B3C041C0419F; Thu, 21 Mar 2024 23:08:03 +0000 (UTC) Received: from cecil-rh.redhat.com (unknown [10.39.194.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42F5DC1576F; Thu, 21 Mar 2024 23:08:03 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Fri, 22 Mar 2024 00:03:59 +0100 Message-ID: <20240321230734.694333-11-dceara@redhat.com> In-Reply-To: <20240321230734.694333-1-dceara@redhat.com> References: <20240321230734.694333-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn v2 7/8] utilities/docker: Fix up container build. 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" Most of the steps were inaccurate. Instead, use latest Ubuntu, use OVS from the submodule inside the OVN repo. Signed-off-by: Dumitru Ceara --- utilities/docker/Makefile | 4 ++-- utilities/docker/debian/Dockerfile | 2 +- utilities/docker/debian/build.sh | 2 ++ utilities/docker/install_ovn.sh | 31 ++++++++++++++---------------- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/utilities/docker/Makefile b/utilities/docker/Makefile index 57e95651cb..aad9c3482c 100644 --- a/utilities/docker/Makefile +++ b/utilities/docker/Makefile @@ -1,5 +1,5 @@ -#export OVN_BRANCH=master -#export OVN_VERSION=2.12 +#export OVN_BRANCH=main +#export OVN_VERSION=24.03.90 #export DISTRO=debian #export GITHUB_SRC=https://github.com/ovn-org/ovn.git #export DOCKER_REPO=ovn-org/ovn diff --git a/utilities/docker/debian/Dockerfile b/utilities/docker/debian/Dockerfile index 366ad6d4f3..a89ef46c9f 100644 --- a/utilities/docker/debian/Dockerfile +++ b/utilities/docker/debian/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:22.04 MAINTAINER "Aliasgar Ginwala" ARG OVN_BRANCH diff --git a/utilities/docker/debian/build.sh b/utilities/docker/debian/build.sh index 57ace5f505..6edb5b85e4 100755 --- a/utilities/docker/debian/build.sh +++ b/utilities/docker/debian/build.sh @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +set -e + OVN_BRANCH=$1 GITHUB_SRC=$2 diff --git a/utilities/docker/install_ovn.sh b/utilities/docker/install_ovn.sh index 55c189aaee..5157da1497 100755 --- a/utilities/docker/install_ovn.sh +++ b/utilities/docker/install_ovn.sh @@ -12,29 +12,26 @@ # See the License for the specific language governing permissions and # limitations under the License. +set -e + OVN_BRANCH=$1 GITHUB_SRC=$2 -# get ovs source always from master as its needed as dependency -mkdir /build; cd /build -git clone --depth 1 -b master https://github.com/openvswitch/ovs.git -cd ovs; -mkdir _gcc; +# Get ovn source. +git clone --depth 1 -b $OVN_BRANCH $GITHUB_SRC +cd ovn -# build and install +# Get OVS submodule, build and install OVS. +git submodule update --init +cd ovs ./boot.sh -cd _gcc -../configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr" \ +./configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr" \ --enable-ssl -cd ..; make -C _gcc install; cd .. - +make -j8 install +cd .. -# get ovn source -git clone --depth 1 -b $OVN_BRANCH $GITHUB_SRC -cd ovn - -# build and install +# Build and install OVN. ./boot.sh ./configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr" \ ---enable-ssl --with-ovs-source=/build/ovs/ --with-ovs-build=/build/ovs/_gcc -make -j8; make install +--enable-ssl +make -j8 install