From patchwork Fri Aug 5 20:34:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1664193 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=jSMt920R; dkim-atps=neutral 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=) 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 (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lzy5W1lLHz9s1l for ; Sat, 6 Aug 2022 06:35:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3220083F5B; Fri, 5 Aug 2022 20:35:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3220083F5B Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=jSMt920R 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 8vjQ50BdSGE5; Fri, 5 Aug 2022 20:35:05 +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 41C9783F27; Fri, 5 Aug 2022 20:35:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 41C9783F27 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CEEF5C0089; Fri, 5 Aug 2022 20:35:01 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 41432C002D for ; Fri, 5 Aug 2022 20:34:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0C1F741CBA for ; Fri, 5 Aug 2022 20:34:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0C1F741CBA Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=jSMt920R 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 c3u3EcMkfhih for ; Fri, 5 Aug 2022 20:34:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CE24141A66 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by smtp4.osuosl.org (Postfix) with ESMTPS id CE24141A66 for ; Fri, 5 Aug 2022 20:34:55 +0000 (UTC) Received: from frode-threadripper.. (ti0189a330-0179.bb.online.no [88.91.31.180]) (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 smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id A2DD640DFA for ; Fri, 5 Aug 2022 20:34:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1659731693; bh=lPz6KwLLT5oZVrpNC7bbma0MIcj6c2CprChnX5B8zI4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jSMt920R2hgtZMLb+2qO0ogDn+sC6gWKRKEg6DLjzmjNEbzRP8SqdTqPnPmMM3VIc gQh/E4F5cJme6LGtXNhVw7jZZW4ejuSlmXVPaXIlExH2nQ7Gq+2PVYCyQSOtTq1h9W DIiYZqfLXD2jCupJcNPJCD0Qp7woJKPFW/EWm0D6Al9l9EKIgLia2JCyYS7YNojBOe 0GMQlgAqGfV6X+c0dtiQwl70ckj9deTZuLxg75ZSNk51CVzRBgBfv4vAN8ieTcVhV7 2rE6tvuoD7Ko92swCpS+eYrvq18IYQdls+/ZuLw9Wpu4dyNHLbyVEuhxtQJuW7cUjc z1utm1pW3vv8Q== From: Frode Nordahl To: dev@openvswitch.org Date: Fri, 5 Aug 2022 22:34:48 +0200 Message-Id: <20220805203452.3060165-2-frode.nordahl@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805203452.3060165-1-frode.nordahl@canonical.com> References: <20220805203452.3060165-1-frode.nordahl@canonical.com> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn 1/5] treewide: Fix various typos in manual pages 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 reported by Debian lintian. Signed-off-by: Frode Nordahl --- controller/ovn-controller.8.xml | 2 +- northd/ovn-northd.8.xml | 24 ++++++++++++------------ ovn-architecture.7.xml | 6 +++--- ovn-ic-sb.xml | 2 +- ovn-nb.xml | 4 ++-- ovn-sb.xml | 2 +- utilities/ovn-ctl.8.xml | 3 ++- utilities/ovn-nbctl.8.xml | 8 ++++---- utilities/ovn-sbctl.8.xml | 2 +- 9 files changed, 27 insertions(+), 26 deletions(-) diff --git a/controller/ovn-controller.8.xml b/controller/ovn-controller.8.xml index cb47c9bd1..eb2950723 100644 --- a/controller/ovn-controller.8.xml +++ b/controller/ovn-controller.8.xml @@ -480,7 +480,7 @@ logical port. Its value is the name of the logical port with type set to l3gateway. This patch port is similar to the OVN logical patch port, except that l3gateway - port can only be bound to a paticular chassis. + port can only be bound to a particular chassis.

diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml index 3d1e7357d..40bda7ead 100644 --- a/northd/ovn-northd.8.xml +++ b/northd/ovn-northd.8.xml @@ -449,7 +449,7 @@ datapaths to move traffic to the next table. Where E is the service monitor mac defined in the colum of column of table.

@@ -514,7 +514,7 @@ datapaths to move traffic to the next table. Where E is the service monitor mac defined in the colum of column of table.

@@ -708,7 +708,7 @@ if the logical switch has no ACLs configured, otherwise a priority-0 flow to advance to the next table so that ACLs allow packets by default if colum of column of is false or not set. Otherwise the flow action is set to drop; to implement a default drop behavior. @@ -722,7 +722,7 @@
  • If colum of column of is false or not set, a priority-1 flow that sets the hint to commit IP traffic that is not part of established sessions to the connection tracker (with action @@ -734,7 +734,7 @@
  • If colum of column of is true, a priority-1 flow that drops IP traffic that is not part of established sessions. @@ -808,7 +808,7 @@ with the action next, where E is the service monitor mac defined in the colum of column of table.
@@ -1655,7 +1655,7 @@ output; datapaths and applies the action handle_svc_check(inport). Where E is the service monitor mac defined in the colum of column of table. @@ -1866,7 +1866,7 @@ output; a match of ip and action of reg0[2] = 1; next; to act as a hint for table Pre-stateful to send IP packets to the connection tracker for packet de-fragmentation and possibly DNAT - the destination VIP to one of the selected backend for already commited + the destination VIP to one of the selected backend for already committed load balanced traffic.

@@ -1876,7 +1876,7 @@ output; datapaths to move traffic to the next table. Where E is the service monitor mac defined in the colum of column of table.

@@ -1893,7 +1893,7 @@ output; datapaths to move traffic to the next table. Where E is the service monitor mac defined in the colum of column of table.

@@ -1973,7 +1973,7 @@ output; with the action next, where E is the service monitor mac defined in the colum of column of table. @@ -4498,7 +4498,7 @@ nd_ns { A priority-120 flow to advance the IPv6 Neighbor solicitation packet to next table to skip SNAT. In the case where ovn-controller injects an IPv6 Neighbor Solicitation packet (for nd_ns action) - we don't want the packet to go throught conntrack. + we don't want the packet to go through conntrack. diff --git a/ovn-architecture.7.xml b/ovn-architecture.7.xml index a48757761..b2e00d6e4 100644 --- a/ovn-architecture.7.xml +++ b/ovn-architecture.7.xml @@ -1613,7 +1613,7 @@ 8 to 65 again, this time using the logical datapath representing the logical router. The processing continues as described in the previous section Architectural Physical Life Cycle of a Packet. - When the packet reachs table 65, the logical egress port will once + When the packet reaches table 65, the logical egress port will once again be a logical patch port. In the same manner as described above, this logical patch port will cause the packet to be resubmitted to OpenFlow tables 8 to 65, this time using the logical datapath @@ -2262,7 +2262,7 @@ OVN_Southbound database. Note, the tunnel_key column of VTEP logical switch is not filled at creation. The ovn-controller-vtep will set the column when the - correponding vtep logical switch is bound to an OVN logical network. + corresponding vtep logical switch is bound to an OVN logical network.
  • @@ -2389,7 +2389,7 @@ keys locally assigned for datapaths within each AZ.
  • - Availability zones, which are registerd by ovn-ic + Availability zones, which are registered by ovn-ic from each AZ.
  • diff --git a/ovn-ic-sb.xml b/ovn-ic-sb.xml index 2966975c7..f7e17e113 100644 --- a/ovn-ic-sb.xml +++ b/ovn-ic-sb.xml @@ -117,7 +117,7 @@ - The availabilty zone that the gateway belongs to. + The availability zone that the gateway belongs to. diff --git a/ovn-nb.xml b/ovn-nb.xml index e26afd83c..956b131c3 100644 --- a/ovn-nb.xml +++ b/ovn-nb.xml @@ -167,7 +167,7 @@ Traffic into OVS can raise a 'controller' event that results in a Controller_Event being written to the table in SBDB. When the CMS has seen the event and taken appropriate - action, it can remove the correponding row in + action, it can remove the corresponding row in table. The intention is for a CMS to see the events and take some sort of action. Please see the table in SBDB. @@ -2846,7 +2846,7 @@ Route Info is used to configure Route Info Option sent in Router - Advertisment according to RFC 4191. Route Info is a comma + Advertisement according to RFC 4191. Route Info is a comma separated string where each field provides PRF and prefix for a given route (e.g: HIGH-aef1::11/48,LOW-aef2::11/96) Possible PRF values are: diff --git a/ovn-sb.xml b/ovn-sb.xml index 59ad3aa2d..f7424f144 100644 --- a/ovn-sb.xml +++ b/ovn-sb.xml @@ -3144,7 +3144,7 @@ tcp.flags = RST;
    Represents a logical port with an virtual ip. This virtual ip can be configured on a - logical port (which is refered as virtual parent). + logical port (which is referred as virtual parent).
    diff --git a/utilities/ovn-ctl.8.xml b/utilities/ovn-ctl.8.xml index 42d16fabc..82804096f 100644 --- a/utilities/ovn-ctl.8.xml +++ b/utilities/ovn-ctl.8.xml @@ -308,7 +308,8 @@

    -

    Passing ssl keys when starting OVN dbs will supercede the default ssl values in db

    +

    Passing ssl keys when starting OVN dbs will supersede the default ssl + values in db

    Starting standalone ovn db server passing SSL certificates

    diff --git a/utilities/ovn-nbctl.8.xml b/utilities/ovn-nbctl.8.xml index 040d05227..5f9eb186b 100644 --- a/utilities/ovn-nbctl.8.xml +++ b/utilities/ovn-nbctl.8.xml @@ -226,7 +226,7 @@ connect. The remotes will be shuffled only once to a new order before the first connection attempt. The following retries, if any, will follow the same new order. The default behavior is to make sure - clients of a clustered database can distribute evenly to all memembers + clients of a clustered database can distribute evenly to all members of the cluster. With --no-shuffle-remotes, ovn-nbctl will use the original order specified in the connection string to connect. This allows user to specify the @@ -492,7 +492,7 @@

    If switch and uuid are supplied, then the - QoS rule with sepcified uuid is deleted. + QoS rule with specified uuid is deleted.

    @@ -1127,7 +1127,7 @@

    If router and uuid are supplied, then the - policy with sepcified uuid is deleted. It is an error if + policy with specified uuid is deleted. It is an error if uuid does not exist, unless --if-exists is specified.

    @@ -1237,7 +1237,7 @@ the fields will be deleted. When type is snat, the ip should be logical_ip. When type is dnat or dnat_and_snat, - the ip shoud be external_ip. + the ip should be external_ip.

    diff --git a/utilities/ovn-sbctl.8.xml b/utilities/ovn-sbctl.8.xml index 4d2ea596a..81ab4131d 100644 --- a/utilities/ovn-sbctl.8.xml +++ b/utilities/ovn-sbctl.8.xml @@ -185,7 +185,7 @@ connect. The remotes will be shuffled only once to a new order before the first connection attempt. The following retries, if any, will follow the same new order. The default behavior is to make sure - clients of a clustered database can distribute evenly to all memembers + clients of a clustered database can distribute evenly to all members of the cluster. With --no-shuffle-remotes, ovn-sbctl will use the original order specified in the connection string to connect. This allows user to specify the From patchwork Fri Aug 5 20:34:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1664195 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ES7XCpRX; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lzy5h10MMz9s1l for ; Sat, 6 Aug 2022 06:35:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F25E141E1A; Fri, 5 Aug 2022 20:35:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F25E141E1A Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ES7XCpRX 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 bJUTDjvsHevq; Fri, 5 Aug 2022 20:35:07 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id DCB6D41D89; Fri, 5 Aug 2022 20:35:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org DCB6D41D89 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 176ACC008B; Fri, 5 Aug 2022 20:35:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 72912C002D for ; Fri, 5 Aug 2022 20:34:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3FCA783F08 for ; Fri, 5 Aug 2022 20:34:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3FCA783F08 Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ES7XCpRX 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 dcsFluVtyMYW for ; Fri, 5 Aug 2022 20:34:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CC9A183EC6 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by smtp1.osuosl.org (Postfix) with ESMTPS id CC9A183EC6 for ; Fri, 5 Aug 2022 20:34:55 +0000 (UTC) Received: from frode-threadripper.. (ti0189a330-0179.bb.online.no [88.91.31.180]) (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 smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id F1AA1416B0 for ; Fri, 5 Aug 2022 20:34:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1659731694; bh=eOCTg6CAM4wxm2oWIFxL6WoFh5GPZ6yv6h73iaXC9F4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ES7XCpRXYdW//4Ttqma9CQ7cMCDN1ON2ZEe9C0hRY6GesCnAz/uT7hT3PzMre4Bi1 ztdyQuCCAPnUAV1J8AcR2P9tERIAB9HSGYk1KNLS0Z66ntR0cz7si98lco4Ltmz61C YE1y59hPuK8WWl2MwDNCgDYdKOG2nInHC4BacHrP/UaCeVG3qNmitZ+Ay861YdcMkA 1r+9cYITz4aOqNQ1DaghtVH1Qld5TPMcTxJfQzjOQvibpWe26e0JQ3IeAa9PtosaRc nDbhuM3Dd1jJV7LaxKBGwoQ9VBQBdtvwJnvdttQfJzGgSzGVW6NW+PnXx9GC0+9fWn qWYY9OkffVWCA== From: Frode Nordahl To: dev@openvswitch.org Date: Fri, 5 Aug 2022 22:34:49 +0200 Message-Id: <20220805203452.3060165-3-frode.nordahl@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805203452.3060165-1-frode.nordahl@canonical.com> References: <20220805203452.3060165-1-frode.nordahl@canonical.com> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn 2/5] debian: Archive the debian package source. 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" In an effort to sync the Debian, Ubuntu and upstream package soruces we archive the now historic one from the upstream archive. A updated packaging source will follow in subsequent patches in this series. Signed-off-by: Frode Nordahl --- debian/.gitignore | 14 - debian/automake.mk | 51 +-- debian/compat | 1 - debian/control | 77 ---- debian/copyright.in | 663 ---------------------------- debian/dirs | 2 - debian/ovn-central.dirs | 1 - debian/ovn-central.init | 60 --- debian/ovn-central.install | 6 - debian/ovn-central.manpages | 2 - debian/ovn-central.postinst | 49 -- debian/ovn-central.postrm | 48 -- debian/ovn-central.template | 5 - debian/ovn-common.install | 14 - debian/ovn-common.manpages | 13 - debian/ovn-common.postinst | 25 -- debian/ovn-common.postrm | 24 - debian/ovn-controller-vtep.init | 54 --- debian/ovn-controller-vtep.install | 1 - debian/ovn-controller-vtep.manpages | 1 - debian/ovn-host.dirs | 1 - debian/ovn-host.init | 54 --- debian/ovn-host.install | 1 - debian/ovn-host.manpages | 1 - debian/ovn-host.postinst | 49 -- debian/ovn-host.postrm | 44 -- debian/ovn-host.template | 5 - debian/rules | 72 --- debian/source/format | 1 - 29 files changed, 1 insertion(+), 1338 deletions(-) delete mode 100644 debian/.gitignore delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright.in delete mode 100644 debian/dirs delete mode 100644 debian/ovn-central.dirs delete mode 100755 debian/ovn-central.init delete mode 100644 debian/ovn-central.install delete mode 100644 debian/ovn-central.manpages delete mode 100755 debian/ovn-central.postinst delete mode 100755 debian/ovn-central.postrm delete mode 100644 debian/ovn-central.template delete mode 100644 debian/ovn-common.install delete mode 100644 debian/ovn-common.manpages delete mode 100644 debian/ovn-common.postinst delete mode 100644 debian/ovn-common.postrm delete mode 100755 debian/ovn-controller-vtep.init delete mode 100644 debian/ovn-controller-vtep.install delete mode 100644 debian/ovn-controller-vtep.manpages delete mode 100644 debian/ovn-host.dirs delete mode 100755 debian/ovn-host.init delete mode 100644 debian/ovn-host.install delete mode 100644 debian/ovn-host.manpages delete mode 100755 debian/ovn-host.postinst delete mode 100755 debian/ovn-host.postrm delete mode 100644 debian/ovn-host.template delete mode 100755 debian/rules delete mode 100644 debian/source/format diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 8873d381c..000000000 --- a/debian/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -*.debhelper -*.debhelper.log -*.substvars -/autoreconf.after -/autoreconf.before -/control -/copyright -/files -/ovn-common -/ovn-controller-vtep -/ovn-host -/ovn-central -/ovn-docker -/tmp diff --git a/debian/automake.mk b/debian/automake.mk index 48ef5f96c..ce11fd040 100644 --- a/debian/automake.mk +++ b/debian/automake.mk @@ -1,51 +1,2 @@ EXTRA_DIST += \ - debian/changelog \ - debian/compat \ - debian/control \ - debian/copyright.in \ - debian/dirs \ - debian/ovn-central.dirs \ - debian/ovn-central.init \ - debian/ovn-central.install \ - debian/ovn-central.manpages \ - debian/ovn-central.postinst \ - debian/ovn-central.postrm \ - debian/ovn-central.template \ - debian/ovn-controller-vtep.init \ - debian/ovn-controller-vtep.install \ - debian/ovn-controller-vtep.manpages \ - debian/ovn-common.install \ - debian/ovn-common.manpages \ - debian/ovn-common.postinst \ - debian/ovn-common.postrm \ - debian/ovn-host.dirs \ - debian/ovn-host.init \ - debian/ovn-host.install \ - debian/ovn-host.manpages \ - debian/ovn-host.postinst \ - debian/ovn-host.postrm \ - debian/ovn-host.template \ - debian/rules \ - debian/source/format - -check-debian-changelog-version: - @DEB_VERSION=`echo '$(VERSION)' | sed 's/pre/~pre/'`; \ - if $(FGREP) '($(DEB_VERSION)' $(srcdir)/debian/changelog >/dev/null; \ - then \ - :; \ - else \ - echo "Update debian/changelog to mention version $(VERSION)"; \ - exit 1; \ - fi -ALL_LOCAL += check-debian-changelog-version -DIST_HOOKS += check-debian-changelog-version - -$(srcdir)/debian/copyright: AUTHORS.rst debian/copyright.in - $(AM_V_GEN) \ - { sed -n -e '/%AUTHORS%/q' -e p < $(srcdir)/debian/copyright.in; \ - sed '34,/^$$/d' $(srcdir)/AUTHORS.rst | \ - sed -n -e '/^$$/q' -e 's/^/ /p'; \ - sed -e '34,/%AUTHORS%/d' $(srcdir)/debian/copyright.in; \ - } > $@ - -CLEANFILES += debian/copyright + debian/changelog diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index 6ee2192d0..000000000 --- a/debian/control +++ /dev/null @@ -1,77 +0,0 @@ -Source: ovn -Section: net -Priority: extra -Maintainer: OVN developers -Uploaders: Simon Horman -Build-Depends: graphviz, - autoconf (>= 2.64), - automake (>= 1.10) | automake1.10, - bzip2, - debhelper (>= 8), - dh-autoreconf, - libssl-dev, - libtool, - openssl, - procps, - python3-all, - python3-sphinx, - python3-twisted, - python3-zope.interface, - libunbound-dev, - libunwind-dev -Standards-Version: 3.9.3 -Homepage: http://www.ovn.org/ - -Package: ovn-common -Architecture: linux-any -Depends: ${misc:Depends}, - ${shlibs:Depends} -Description: OVN common components - OVN, the Open Virtual Network, is a system to support virtual network - abstraction. OVN complements the existing capabilities of OVS to add - native support for virtual network abstractions, such as virtual L2 and L3 - overlays and security groups. - . - ovn-common provides components required by other OVN packages. - -Package: ovn-controller-vtep -Architecture: linux-any -Depends: ovn-common (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: OVN vtep controller - ovn-controller-vtep is the local controller daemon in - OVN, the Open Virtual Network, for VTEP enabled physical switches. - It connects up to the OVN Southbound database over the OVSDB protocol, - and down to the VTEP database over the OVSDB protocol. - . - ovn-controller-vtep provides the ovn-controller-vtep binary for controlling - vtep gateways. - -Package: ovn-host -Architecture: linux-any -Depends: ovn-common (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: OVN host components - OVN, the Open Virtual Network, is a system to support virtual network - abstraction. OVN complements the existing capabilities of OVS to add - native support for virtual network abstractions, such as virtual L2 and L3 - overlays and security groups. - . - ovn-host provides the userspace components and utilities for - OVN that can be run on every host/hypervisor. - -Package: ovn-central -Architecture: linux-any -Depends: ovn-common (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: OVN central components - OVN, the Open Virtual Network, is a system to support virtual network - abstraction. OVN complements the existing capabilities of OVS to add - native support for virtual network abstractions, such as virtual L2 and L3 - overlays and security groups. - . - ovn-central provides the userspace daemons, utilities and - databases for OVN that is run at a central location. diff --git a/debian/copyright.in b/debian/copyright.in deleted file mode 100644 index 9ad00340f..000000000 --- a/debian/copyright.in +++ /dev/null @@ -1,663 +0,0 @@ -The original sources for this package can be found at: - - http://openvswitch.org/ - -Upstream Authors (from AUTHORS): - -%AUTHORS% - -Upstream Copyright Holders: - - Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. - Copyright (c) 2010 Jean Tourrilhes - HP-Labs. - Copyright (c) 2008,2009,2010 Citrix Systems, Inc. - and authors listed above. - Copyright (c) 2011 Gaetano Catalli - Copyright (C) 2000-2003 Geoffrey Wossum (gwossum@acm.org) - Copyright (C) 2000 The NetBSD Foundation, Inc. - Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - Copyright (c) 1982, 1986, 1990, 1993 The Regents of the University of California. - Copyright (c) 2008, 2012 Vincent Bernat - Copyright (c) 2014 Michael Chapman - Copyright (c) 2014 WindRiver, Inc. - Copyright (c) 2014 Avaya, Inc. - Copyright (c) 2001 Daniel Hartmeier - Copyright (c) 2002 - 2008 Henning Brauer - Copyright (c) 2012 Gleb Smirnoff - -License: - -* The following components are licensed under the - GNU Lesser General Public License version 2.1 only - with the exception clause below as a pre-amble. - - xenserver/etc_xensource_scripts_vif - xenserver/opt_xensource_libexec_InterfaceReconfigure.py - xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py - xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py - xenserver/opt_xensource_libexec_interface-reconfigure - xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py - - * These components are only distributed in the source package. - They do not appear in any binary packages. - - On Debian systems, the complete text of the - GNU Lesser General Public License version 2.1 can be found in - `/usr/share/common-licenses/LGPL-2.1' - - The exception clause pre-amble reads: - - As a special exception to the GNU Lesser General Public License, you - may link, statically or dynamically, a "work that uses the Library" - with a publicly distributed version of the Library to produce an - executable file containing portions of the Library, and distribute - that executable file under terms of your choice, without any of the - additional requirements listed in clause 6 of the GNU Lesser General - Public License. By "a publicly distributed version of the Library", - we mean either the unmodified Library as distributed, or a - modified version of the Library that is distributed under the - conditions defined in clause 3 of the GNU Library General Public - License. This exception does not however invalidate any other reasons - why the executable file might be covered by the GNU Lesser General - Public License. - -* The following components are licensed under the - GNU Lesser General Public License version 2.1. - - utilities/bugtool/ovs-bugtool - utilities/bugtool/ovs-bugtool-* - utilities/bugtool/plugins/kernel-info/openvswitch.xml - utilities/bugtool/plugins/network-status/openvswitch.xml - utilities/bugtool/plugins/system-configuration.xml - utilities/bugtool/plugins/system-configuration/openvswitch.xml - - On Debian systems, the complete text of the - GNU Lesser General Public License version 2.1 can be found in - `/usr/share/common-licenses/LGPL-2.1' - -* The following component is licensed under the GNU General Public License - version 2. - - datapath/ - - On Debian systems, the complete text of the GNU General Public License - version 2 can be found in `/usr/share/common-licenses/GPL-2' - -* The following file is licensed under the GNU General Public License - version 2. - - build-aux/cccl - -* The following files are licensed under the 2-clause BSD license. - - lib/getopt_long.c - include/windows/getopt.h - datapath-windows/ovsext/Conntrack-tcp.c - lib/conntrack-tcp.c - -* The following files are licensed under the 3-clause BSD-license - - include/windows/netinet/icmp6.h - include/windows/netinet/ip6.h - lib/strsep.c - -* The following components are dual-licensed under the - GNU General Public License version 2 and the Apache License Version 2.0. - - datapath/linux/compat/include/linux/openvswitch.h - - On Debian systems, the complete text of the GNU General Public License - version 2 can be found in `/usr/share/common-licenses/GPL-2'. - On Debian systems, the complete text of the Apache License version 2.0 - can be found in '/usr/share/common-licenses/Apache-2.0'. - -* The following components are licensed under the terms of either the - Sun Industry Standard Source License 1.1 or the InMon sFlow License: - - lib/sflow.h - lib/sflow_agent.c - lib/sflow_api.h - lib/sflow_poller.c - lib/sflow_receiver.c - lib/sflow_sampler.c - - These licenses are available, respectively, the following URLs: - - http://host-sflow.sourceforge.net/sissl.html - http://www.inmon.com/technology/sflowlicense.txt - - The full text of each license is also appended to the end of this - file. - -* The following components are licensed for use as desired without restriction: - - lib/crc32c.c - -* lib/ovs.tmac in the source distribution, and manpages in the - binaries, includes troff macros from groff 1.21 that contain the - following notice: - - .\" an-ext.tmac - .\" - .\" Written by Eric S. Raymond - .\" Werner Lemberg - .\" - .\" Version 2007-Feb-02 - .\" - .\" Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc. - .\" You may freely use, modify and/or distribute this file. - -* m4/absolute-header.m4, by Derek Price, and m4/include_next.m4, by - Paul Eggert and Derek Price bear the following notices: - - Copyright (C) 2006-2013 Free Software Foundation, Inc. - This file is free software; the Free Software Foundation - gives unlimited permission to copy and/or distribute it, - with or without modifications, as long as this notice is preserved. - -* The following files are licensed under the ISC-license - - lib/lldp/aa-structs.h - lib/lldp/lldpd.c - lib/lldp/lldpd.h - lib/lldp/lldpd-structs.c - lib/lldp/lldpd-structs.h - lib/lldp/lldp.c - lib/lldp/lldp-tlv.h - lib/lldp/lldp-const.h - -* All other components of this package are licensed under - The Apache License Version 2.0. - - On Debian systems, the complete text of the Apache License version 2.0 - can be found in '/usr/share/common-licenses/Apache-2.0'. - ----------------------------------------------------------------------- - -Retrieved from http://host-sflow.sourceforge.net/sissl.html, 2011-12-12: - - Sun Industry Standards Source License - Version 1.1 - - 1.0 DEFINITIONS - - 1.1 "Commercial Use" means distribution or otherwise making the - Original Code available to a third party. - - 1.2 "Contributor Version" means the combination of the Original Code, - and the Modifications made by that particular Contributor. - - 1.3 "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.4 "Executable" means Original Code in any form other than Source - Code. - - 1.5 "Initial Developer" means the individual or entity identified as - the Initial Developer in the Source Code notice required by Exhibit A. - - 1.6 "Larger Work" means a work which combines Original Code or portions - thereof with code not governed by the terms of this License. - - 1.7 "License" means this document. - - 1.8 "Licensable" means having the right to grant, to the maximum extent - possible, whether at the time of the initial grant or subsequently - acquired, any and all of the rights conveyed herein. - - 1.9 "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. A Modification is: - - A. Any addition to or deletion from the contents of a file containing - Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or previous - Modifications. - - 1.10 "Original Code" means Source Code of computer software code which - is described in the Source Code notice required by Exhibit A as - Original Code. - - 1.11 "Patent Claims" means any patent claim(s), now owned or hereafter - acquired, including without limitation, method, process, and apparatus - claims, in any patent Licensable by grantor. - - 1.12 "Source Code" means the preferred form of the Original Code for - making modifications to it, including all modules it contains, plus any - associated interface definition files, or scripts used to control - compilation and installation of an Executable. - - 1.13 "Standards" means the standards identified in Exhibit B. - - 1.14 "You" (or "Your") means an individual or a legal entity exercising - rights under, and complying with all of the terms of, this License or a - future version of this License issued under Section 6.1. For legal - entities, "You'' includes any entity which controls, is controlled by, - or is under common control with You. For purposes of this definition, - "control'' means (a) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (b) ownership of more than fifty percent (50%) of the - outstanding shares or beneficial ownership of such entity. - - 2.0 SOURCE CODE LICENSE - - 2.1 The Initial Developer Grant - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - - (a) under intellectual property rights (other than patent or trademark) - Licensable by Initial Developer to use, reproduce, modify, display, - perform, sublicense and distribute the Original Code (or portions - thereof) with or without Modifications, and/or as part of a Larger - Work; and - - (b) under Patents Claims infringed by the making, using or selling of - Original Code, to make, have made, use, practice, sell, and offer for - sale, and/or otherwise dispose of the Original Code (or portions - thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are effective - on the date Initial Developer first distributes Original Code under the - terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is granted: - 1) for code that You delete from the Original Code; 2) separate from - the Original Code; or 3) for infringements caused by: i) the - modification of the Original Code or ii) the combination of the - Original Code with other software or devices, including but not limited - to Modifications. - 3.0 DISTRIBUTION OBLIGATIONS - - 3.1 Application of License. - The Source Code version of Original Code may be distributed only under - the terms of this License or a future version of this License released - under Section 6.1, and You must include a copy of this License with - every copy of the Source Code You distribute. You may not offer or - impose any terms on any Source Code version that alters or restricts - the applicable version of this License or the recipients' rights - hereunder. Your license for shipment of the Contributor Version is - conditioned upon Your full compliance with this Section. The - Modifications which You create must comply with all requirements set - out by the Standards body in effect one hundred twenty (120) days - before You ship the Contributor Version. In the event that the - Modifications do not meet such requirements, You agree to publish - either (i) any deviation from the Standards protocol resulting from - implementation of Your Modifications and a reference implementation of - Your Modifications or (ii) Your Modifications in Source Code form, and - to make any such deviation and reference implementation or - Modifications available to all third parties under the same terms as - this license on a royalty free basis within thirty (30) days of Your - first customer shipment of Your Modifications. - - 3.2 Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely to - look for such a notice. If You created one or more Modification(s) You - may add Your name as a Contributor to the notice described in Exhibit - A. You must also duplicate this License in any documentation for the - Source Code where You describe recipients' rights or ownership rights - relating to Initial Code. You may choose to offer, and to charge a fee - for, warranty, support, indemnity or liability obligations to one or - more recipients of Your version of the Code. However, You may do so - only on Your own behalf, and not on behalf of the Initial Developer. - You must make it absolutely clear than any such warranty, support, - indemnity or liability obligation is offered by You alone, and You - hereby agree to indemnify the Initial Developer for any liability - incurred by the Initial Developer as a result of warranty, support, - indemnity or liability terms You offer. - - 3.3 Distribution of Executable Versions. - You may distribute Original Code in Executable and Source form only if - the requirements of Sections 3.1 and 3.2 have been met for that - Original Code, and if You include a notice stating that the Source Code - version of the Original Code is available under the terms of this - License. The notice must be conspicuously included in any notice in an - Executable or Source versions, related documentation or collateral in - which You describe recipients' rights relating to the Original Code. - You may distribute the Executable and Source versions of Your version - of the Code or ownership rights under a license of Your choice, which - may contain terms different from this License, provided that You are in - compliance with the terms of this License. If You distribute the - Executable and Source versions under a different license You must make - it absolutely clear that any terms which differ from this License are - offered by You alone, not by the Initial Developer. You hereby agree to - indemnify the Initial Developer for any liability incurred by the - Initial Developer as a result of any such terms You offer. - - 3.4 Larger Works. - You may create a Larger Work by combining Original Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Original Code. - - 4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Original Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.2 and must be - included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - - 5.0 APPLICATION OF THIS LICENSE - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Modifications as set - out in Section 3.1. - - 6.0 VERSIONS OF THE LICENSE - - 6.1 New Versions. - Sun may publish revised and/or new versions of the License from time to - time. Each version will be given a distinguishing version number. - - 6.2 Effect of New Versions. - Once Original Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Original Code under the terms - of any subsequent version of the License published by Sun. No one other - than Sun has the right to modify the terms applicable to Original Code. - - 7.0 DISCLAIMER OF WARRANTY - - ORIGINAL CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE ORIGINAL CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE ORIGINAL CODE - IS WITH YOU. SHOULD ANY ORIGINAL CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER) ASSUME THE COST OF ANY NECESSARY - SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY - CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY ORIGINAL - CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - - 8.0 TERMINATION - - 8.1 This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Original Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2 In the event of termination under Section 8.1 above, all end user - license agreements (excluding distributors and resellers) which have - been validly granted by You or any distributor hereunder prior to - termination shall survive termination. - - 9.0 LIMIT OF LIABILITY - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF ORIGINAL CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY - INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS - EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - - 10.0 U.S. GOVERNMENT END USERS - - U.S. Government: If this Software is being acquired by or on behalf of - the U.S. Government or by a U.S. Government prime contractor or - subcontractor (at any tier), then the Government's rights in the - Software and accompanying documentation shall be only as set forth in - this license; this is in accordance with 48 C.F.R. 227.7201 through - 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 - C.F.R. 2.101 and 12.212 (for non-DoD acquisitions). - - 11.0 MISCELLANEOUS - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if any, - provides otherwise), excluding its conflict-of-law provisions. With - respect to disputes in which at least one party is a citizen of, or an - entity chartered or registered to do business in the United States of - America, any litigation relating to this License shall be subject to - the jurisdiction of the Federal Courts of the Northern District of - California, with venue lying in Santa Clara County, California, with - the losing party responsible for costs, including without limitation, - court costs and reasonable attorneys' fees and expenses. The - application of the United Nations Convention on Contracts for the - International Sale of Goods is expressly excluded. Any law or - regulation which provides that the language of a contract shall be - construed against the drafter shall not apply to this License. - - EXHIBIT A - Sun Standards License -"The contents of this file are subject to the Sun Standards -License Version 1.1 (the "License"); -You may not use this file except in compliance with the -License. You may obtain a copy of the -License at _______________________________. - -Software distributed under the License is distributed on -an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either -express or implied. See the License for the specific -language governing rights and limitations under the License. - -The Original Code is ______________________________________. - -The Initial Developer of the Original Code is: -InMon Corp. - -Portions created by: _______________________________________ - -are Copyright (C): _______________________________________ - -All Rights Reserved. - -Contributor(s): _______________________________________ - - EXHIBIT B - Standards - - The Standard is defined as the following: - - sFlow Specification, located at - [1]http://sflow.org/developers/specifications.php - -References - - 1. http://sflow.org/developers/specifications.php - ----------------------------------------------------------------------- - -Retrieved from http://www.inmon.com/technology/sflowlicense.txt, 2011-12-12: - -LICENSE AGREEMENT - -PLEASE READ THIS LICENSE AGREEMENT ("AGREEMENT") CAREFULLY BEFORE REPRODUCING OR IN ANY WAY -UTILIZING THE sFlow(R) SOFTWARE ("SOFTWARE") AND/OR ANY ACCOMPANYING DOCUMENTATION -("DOCUMENTATION") AND/OR THE RELATED SPECIFICATIONS ("SPECIFICATIONS"). YOUR REPRODUCTION -OR USE OF THE SOFTWARE AND/OR THE DOCUMENTATION AND/OR THE SPECIFICATIONS CONSTITUTES YOUR -ACCEPTANCE OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO BE BOUND -BY THE TERMS AND CONDITIONS OF THIS AGREEMENT, YOU MAY NOT REPRODUCE OR IN ANY WAY UTILIZE -THE SOFTWARE OR THE DOCUMENTATION OR THE SPECIFICATIONS. - -1. Definitions. - -"Documentation" means the user manuals, training materials, and operating materials, if any, -InMon provides to Licensee under this Agreement. - -"InMon" means InMon Corporation, its affiliates and subsidiaries. - -"Intellectual Property Rights" means any trade secrets, patents, including without -limitation any patents covering the Software, copyrights, know-how, moral rights and -similar rights of any type under the laws of any governmental authority, domestic or -foreign, including all applications and registrations relating to any of the foregoing. - -"Licensee Hardware" means all computers, routers, or other equipment owned or controlled by -or on behalf of Licensee. - -"Products" means any and all software applications, computers, routers, or other equipment -manufactured by or on behalf of Licensee for the purpose of resale or lease to any other -third party, or otherwise made available by Licensee free of charge. - -"Software" means the sFlow(R) software programs, in source or binary code format, that -Licensee licenses from InMon under this Agreement and any bug fixes or error corrections -which InMon may provide to Licensee. - -"Specifications" means the published specifications provided or otherwise made available by -InMon at: http://www.sflow.org. - -"Trademark" means InMon's "sFlow(R)" trademark. - -2. License Grant. - -2.1 Software, Documentation and Specifications License Grant. InMon hereby grants to -Licensee, under all of InMon's Intellectual Property Rights therein, a perpetual (subject -to InMon's termination rights under Section 7 below), nonexclusive, royalty-free, worldwide, -transferable, sublicensable license, to: (i) use and reproduce the Software, the -Documentation, and the Specifications; (ii) modify the Software; (iii) implement the -Specifications in the Products; (iv) install the Software, or software in which the -Specifications have been implemented, on Licensee Hardware and Products, and (v) distribute -any Products that include the Software, the Documentation, or software in which the -Specifications have been implemented. - -2.2 Trademark License. InMon hereby grants to Licensee a perpetual (subject to InMon's -termination rights under Section 7 below), nonexclusive, royalty-free, worldwide, -transferable, sublicensable license to use the Trademark on or in connection with the -Software, the Documentation, the Specifications and any software that implements the -Specifications. - -2.3 Restrictions. Licensee agrees that it will not use the Software in a way -inconsistent with the license granted in Section 2.1. Further, Licensee agrees that, in -exercising its rights under the license granted to it in this Agreement, Licensee will: -(i) strictly adhere to and fully comply with the Specifications; (ii) use the Trademark, -and no other mark, to identify the Software, the Documentation, the Specifications and any -Products that implement the Specifications; (iii) place, in a font or graphic design -designated by InMon, the phrase "sFlow(R)" on any technical documentation, -sales/marketing materials, catalogs, or other such materials relating to products it -manufactures or markets which it has configured to be compatible with the Software or -otherwise implement the Specifications; (iv) in connection with any Products shipped to or -sold in other countries that include the Software or any software that implements the -Specifications, comply with the patent and trademark laws and practice of such other -country; and (v) not alter or impair any acknowledgment of copyright or trademark rights of -InMon that may appear in or on the Software, the Documentation or the Specifications. In -the event InMon determines that Licensee is not complying with its obligations under -clauses (i)-(v) above, InMon shall notify Licensee of such non-compliance, and if Licensee -fails to correct such non-compliance within three (3) months, InMon may immediately -terminate this Agreement as provided under paragraph 7 below and pursue any and all -actions and remedies as it deems necessary, including, but not limited to breach of -contract. - -3. Ownership. Except for the license expressly granted in Section 2, Inmon hereby -retains all right, title, and interest in and to the Trademark and all its Intellectual -Property Rights in the Software, the Documentation and the Specifications. Licensee -obtains no rights hereunder in the Trademark, Software, Documentation or Specifications by -implication, estoppel or otherwise. Licensee acknowledges that the Trademark, Software, -Documentation and Specifications are being licensed and not sold under this Agreement, and -that this Agreement does not transfer title in the Trademark, Software, Documentation or -Specifications, or any copy thereof, to Licensee. - -4. Support. Inmon shall have no obligation under this Agreement to (a) supply -maintenance or support, bug fixes or error corrections to the Licensed Software, -(b) supply future versions of the Licensed Software or (c) provide Licensed Software -development tools to Licensee. - -5. Warranty. INMON HEREBY DISCLAIMS ALL WARRANTIES, EITHER EXPRESS, IMPLIED OR -STATUTORY, WITH RESPECT TO THE TRADEMARK, THE SOFTWARE, THE DOCUMENTATION, THE -SPECIFICATIONS. OR OTHERWISE, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT OF ANY INTELLECTUAL -PROPERTY RIGHTS. - -6. Limitation of Liability. IN NO EVENT SHALL INMON OR ITS SUPPLIERS OR LICENSORS BE -LIABLE FOR ANY CONSEQUENTIAL, INCIDENTAL, SPECIAL, INDIRECT OR EXEMPLARY DAMAGES WHATSOEVER, -WHETHER RELATED TO OR ARISING OUT OF THIS AGREEMENT, THE TRADEMARK, THE SOFTWARE, THE -DOCUMENTATION, THE SPECIFICATIONS, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, DAMAGES FOR -LOSS OF PROFITS, BUSINESS INTERRUPTION, LOSS OF DATA, COSTS OF PROCUREMENT OF SUBSTITUTE -GOODS OR SERVICES OR FOR ANY CLAIM OR DEMAND AGAINST LICENSEE BY ANY OTHER PARTY, OR OTHER -PECUNIARY LOSS, EVEN IF INMON HAS BEEN ADVISED OF OR KNOWS OF THE POSSIBILITY OF SUCH -DAMAGES. - -7. Term and Termination. The term of this Agreement will begin on the Effective Date, -which shall be deemed to be the date of delivery of the Software and/or Documentation and/or -Specifications to Licensee, and shall continue indefinitely unless and until terminated by -Licensee's giving written notice of termination to InMon, or by InMon pursuant to InMon's -termination rights as set forth in Section 2.3 above. Upon any termination of this -Agreement, Licensee shall cease exercising its license rights under this Agreement, -including the right to distribute Products that incorporate the Software or Documentation -or that implement the Specifications. The rights and obligations contained in Sections 1, -3, 5, 6, 7, and 8 shall survive any termination of this Agreement. - -8. General Provisions. - -8.1 Assignment. This Agreement shall be binding upon and inure to the benefit of the -parties hereto and their permitted successors and permitted assigns. InMon will have the -right to assign this Agreement without notice to Licensee. Licensee may assign or transfer -(whether by merger, operation of law or in any other manner) any of its rights or delegate -any of its obligations hereunder without the prior written consent of InMon, provided the -assignee assumes in writing all of Licensee's obligations hereunder. - -8.2 Notices. All notices permitted or required under this Agreement shall be in -writing and shall be delivered in person or mailed by first class, registered or certified -mail, postage prepaid, to the address of the party specified in this Agreement or such -other address as either party may specify in writing. Such notice shall be deemed to have -been given upon receipt. - -8.3 Non-Waiver. No term or provision hereof shall be deemed waived, and no breach -excused, unless such waiver or consent shall be in writing and signed by the party claimed -to have waived or consented. Any consent or waiver, whether express or implied, shall not -constitute a consent or waiver of, or excuse for any separate, different or subsequent -breach. - -8.4 Independent Contractor. The parties' relationship shall be solely that of -independent contractors, and nothing contained in this Agreement shall be construed to make -either party an agent, partner, representative or principal of the other for any purpose. - -8.5 Choice of Law and Forum. This Agreement shall be governed by and construed under -the laws of the State of California, without giving effect to such state's conflict of laws -principles. The parties hereby submit to the personal jurisdiction of, and agree that any -legal proceeding with respect to or arising under this Agreement shall be brought in, the -United States District Court for the Northern District of California or the state courts -of the State of California for the County of San Francisco. - -8.6 U.S. Government Licenses. The Software and Documentation are considered a -"commercial item" as that term is defined at 48 C.F.R 2.101, or "commercial computer -software" and "commercial computer software documentation" as such terms are used in -48 C.F.R 12.212 of the Federal Acquisition Regulations and its successors, and -48 C.F.R. 227.7202 of the DoD FAR Supplement and its successors. - -8.7 Severability. If any provision of this Agreement is held to be unenforceable under -applicable law, then such provision shall be excluded from this Agreement and the balance -of this Agreement shall be interpreted as if such provision were so excluded and shall be -enforceable in accordance with its terms. The court in its discretion may substitute for -the excluded provision an enforceable provision which in economic substance reasonably -approximates the excluded provision. - -8.8 Compliance With Law. Licensee shall comply with all applicable laws and -regulations (including privacy laws and regulations) having application to or governing its - use and/or operation of the Software and agrees to indemnify and hold InMon harmless from -and against any claims, damages, losses or obligations suffered or incurred by InMon -arising from its failure to so comply. - -8.9 Entire Agreement; Amendment. This Agreement constitutes the final, complete and -entire agreement between the parties with respect to the subject matter hereof, and -supersedes any previous proposals, negotiations, agreements, or arrangements, whether -verbal or written, made between the parties with respect to such subject matter. This -Agreement shall control over any additional or conflicting terms in any of Licensee's -purchase orders or other business forms. This Agreement may only be amended or modified -by mutual agreement of authorized representatives of the parties in writing. - -InMon Corp. -580 California Street, 5th Floor, San Francisco, CA 94104 -Phone: (415) 283-3260 -URL: www.inmon.com -Email: info@inmon.com diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ca882bbb7..000000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/ovn-central.dirs b/debian/ovn-central.dirs deleted file mode 100644 index 6394883ce..000000000 --- a/debian/ovn-central.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/share/ovn/central diff --git a/debian/ovn-central.init b/debian/ovn-central.init deleted file mode 100755 index d956e7110..000000000 --- a/debian/ovn-central.init +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/sh -# -### BEGIN INIT INFO -# Provides: ovn-central -# Required-Start: openvswitch-switch $remote_fs $syslog -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: OVN central components -# Description: ovn-central provides the userspace daemons, -# utilities and databases for OVN that is run at a central -# location. -### END INIT INFO - -test -x /usr/bin/ovn-northd || exit 0 -test -x /usr/share/ovn/scripts/ovn-ctl || exit 0 - -_SYSTEMCTL_SKIP_REDIRECT=yes -SYSTEMCTL_SKIP_REDIRECT=yes - -. /usr/share/ovn/scripts/ovn-lib -if [ -e /etc/default/ovn-central ]; then - . /etc/default/ovn-central -fi - -start () { - set /usr/share/ovn/scripts/ovn-ctl ${1-start_northd} - set "$@" $OVN_CTL_OPTS - "$@" || exit $? -} - -stop_northd () { - set /usr/share/ovn/scripts/ovn-ctl ${1-stop_northd} - set "$@" $OVN_CTL_OPTS - "$@" || exit $? -} - -case $1 in - start) - start - ;; - stop) - stop_northd - ;; - restart) - start restart_northd - ;; - reload | force-reload) - ;; - status) - /usr/share/ovn/scripts/ovn-ctl status_northd - exit $? - ;; - *) - echo "Usage: $0 {start|stop|reload|force-reload|restart|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/ovn-central.install b/debian/ovn-central.install deleted file mode 100644 index da985c468..000000000 --- a/debian/ovn-central.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/bin/ovn-ic -usr/bin/ovn-northd -usr/share/ovn/ovn-ic-nb.ovsschema -usr/share/ovn/ovn-ic-sb.ovsschema -usr/share/ovn/ovn-nb.ovsschema -usr/share/ovn/ovn-sb.ovsschema diff --git a/debian/ovn-central.manpages b/debian/ovn-central.manpages deleted file mode 100644 index e73cc91fd..000000000 --- a/debian/ovn-central.manpages +++ /dev/null @@ -1,2 +0,0 @@ -northd/ovn-northd.8 -ic/ovn-ic.8 diff --git a/debian/ovn-central.postinst b/debian/ovn-central.postinst deleted file mode 100755 index 10e07ece4..000000000 --- a/debian/ovn-central.postinst +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# postinst script for ovn-central -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - DEFAULT=/etc/default/ovn-central - TEMPLATE=/usr/share/ovn/central/default.template - if ! test -e $DEFAULT; then - cp $TEMPLATE $DEFAULT - else - for var in $(awk -F'[ :]' '/^# [_A-Z0-9]+:/{print $2}' $TEMPLATE) - do - if ! grep $var $DEFAULT >/dev/null 2>&1; then - echo >> $DEFAULT - sed -n "/$var:/,/$var=/p" $TEMPLATE >> $DEFAULT - fi - done - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/ovn-central.postrm b/debian/ovn-central.postrm deleted file mode 100755 index 1d5abc384..000000000 --- a/debian/ovn-central.postrm +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# postrm script for ovn-central -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge) - rm -f /etc/default/ovn-central - rm -f /etc/ovn/ovnnb.db* - rm -f /etc/ovn/.ovnnb.db.~lock~ - rm -f /etc/ovn/ovnsb.db* - rm -f /etc/ovn/.ovnsb.db.~lock~ - rm -f /var/log/ovn/ovn-northd.log* || true - ;; - - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/ovn-central.template b/debian/ovn-central.template deleted file mode 100644 index 7cea13e50..000000000 --- a/debian/ovn-central.template +++ /dev/null @@ -1,5 +0,0 @@ -# This is a POSIX shell fragment -*- sh -*- - -# OVN_CTL_OPTS: Extra options to pass to ovs-ctl. This is, for example, -# a suitable place to specify --ovn-northd-wrapper=valgrind. -# OVN_CTL_OPTS= diff --git a/debian/ovn-common.install b/debian/ovn-common.install deleted file mode 100644 index 050d1c63a..000000000 --- a/debian/ovn-common.install +++ /dev/null @@ -1,14 +0,0 @@ -usr/bin/ovn-appctl -usr/bin/ovn-nbctl -usr/bin/ovn-sbctl -usr/bin/ovn-ic-nbctl -usr/bin/ovn-ic-sbctl -usr/bin/ovn-trace -usr/bin/ovn_detrace.py -usr/share/ovn/scripts/ovn-ctl -usr/share/ovn/scripts/ovndb-servers.ocf -usr/share/ovn/scripts/ovn-lib -usr/share/ovn/scripts/ovn-bugtool-nbctl-show -usr/share/ovn/scripts/ovn-bugtool-sbctl-lflow-list -usr/share/ovn/scripts/ovn-bugtool-sbctl-show -usr/lib/*/libovn*.so.* diff --git a/debian/ovn-common.manpages b/debian/ovn-common.manpages deleted file mode 100644 index 1fa3d9cb3..000000000 --- a/debian/ovn-common.manpages +++ /dev/null @@ -1,13 +0,0 @@ -ovn-architecture.7 -ovn-nb.5 -ovn-sb.5 -ovn-ic-nb.5 -ovn-ic-sb.5 -utilities/ovn-appctl.8 -utilities/ovn-ctl.8 -utilities/ovn-nbctl.8 -utilities/ovn-sbctl.8 -utilities/ovn-ic-nbctl.8 -utilities/ovn-ic-sbctl.8 -utilities/ovn-trace.8 -utilities/ovn-detrace.1 diff --git a/debian/ovn-common.postinst b/debian/ovn-common.postinst deleted file mode 100644 index dfddb1f08..000000000 --- a/debian/ovn-common.postinst +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# postinst script for ovn-common -# -# see: dh_installdeb(1) - -set -e - -case "$1" in - configure) - mkdir -p /usr/lib/ocf/resource.d/ovn - ln -sf /usr/share/ovn/scripts/ovndb-servers.ocf /usr/lib/ocf/resource.d/ovn/ovndb-servers - ln -sf /usr/bin/ovn_detrace.py /usr/bin/ovn-detrace - ;; - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/ovn-common.postrm b/debian/ovn-common.postrm deleted file mode 100644 index d607a66d5..000000000 --- a/debian/ovn-common.postrm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# postrm script for openvswitch-testcontroller -# -# see: dh_installdeb(1) - -set -e - -case "$1" in - purge|remove) - rm -rf /usr/lib/ocf/resource.d/ovn - rm -f /usr/bin/ovn-detrace - ;; - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/ovn-controller-vtep.init b/debian/ovn-controller-vtep.init deleted file mode 100755 index 00fac6f53..000000000 --- a/debian/ovn-controller-vtep.init +++ /dev/null @@ -1,54 +0,0 @@ -#! /bin/sh -# -### BEGIN INIT INFO -# Provides: ovn-controller-vtep -# Required-Start: openvswitch-switch $remote_fs $syslog -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: OVN Controller for VTEP enabled devices -# Description: ovn-controller-vtep provides the userspace -# components and utilities for OVN that can be run on -# hosts taht connect to VTEP enabled devices. -### END INIT INFO - -test -x /usr/bin/ovn-controller-vtep || exit 0 -test -x /usr/share/ovn/scripts/ovn-ctl || exit 0 - -_SYSTEMCTL_SKIP_REDIRECT=yes -SYSTEMCTL_SKIP_REDIRECT=yes - -. /usr/share/openvswitch/scripts/ovs-lib -if [ -e /etc/default/ovn-controller-vtep ]; then - . /etc/default/ovn-controller-vtep -fi - -start () { - set /usr/share/ovn/scripts/ovn-ctl ${1-start_controller_vtep} - set "$@" $OVN_CTL_OPTS - "$@" || exit $? -} - -case $1 in - start) - start - ;; - stop | force-stop) - /usr/share/ovn/scripts/ovn-ctl stop_controller_vtep - ;; - restart) - start restart_controller_vtep - ;; - status) - /usr/share/ovn/scripts/ovn-ctl status_controller_vtep - exit $? - ;; - reload | force-reload) - ;; - *) - echo "Usage: $0 {start|stop|reload|force-reload|restart|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/ovn-controller-vtep.install b/debian/ovn-controller-vtep.install deleted file mode 100644 index 1d208f37e..000000000 --- a/debian/ovn-controller-vtep.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ovn-controller-vtep diff --git a/debian/ovn-controller-vtep.manpages b/debian/ovn-controller-vtep.manpages deleted file mode 100644 index b87987016..000000000 --- a/debian/ovn-controller-vtep.manpages +++ /dev/null @@ -1 +0,0 @@ -controller-vtep/ovn-controller-vtep.8 diff --git a/debian/ovn-host.dirs b/debian/ovn-host.dirs deleted file mode 100644 index 7d3c761e1..000000000 --- a/debian/ovn-host.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/share/ovn/host diff --git a/debian/ovn-host.init b/debian/ovn-host.init deleted file mode 100755 index a34d2926c..000000000 --- a/debian/ovn-host.init +++ /dev/null @@ -1,54 +0,0 @@ -#! /bin/sh -# -### BEGIN INIT INFO -# Provides: ovn-host -# Required-Start: openvswitch-switch $remote_fs $syslog -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: OVN host components -# Description: ovn-host provides the userspace -# components and utilities for OVN that can be run on -# every host/hypervisor. -### END INIT INFO - -test -x /usr/bin/ovn-controller || exit 0 -test -x /usr/share/ovn/scripts/ovn-ctl || exit 0 - -_SYSTEMCTL_SKIP_REDIRECT=yes -SYSTEMCTL_SKIP_REDIRECT=yes - -. /usr/share/ovn/scripts/ovs-lib -if [ -e /etc/default/ovn-host ]; then - . /etc/default/ovn-host -fi - -start () { - set /usr/share/ovn/scripts/ovn-ctl ${1-start_controller} - set "$@" $OVN_CTL_OPTS - "$@" || exit $? -} - -case $1 in - start) - start - ;; - stop | force-stop) - /usr/share/ovn/scripts/ovn-ctl stop_controller - ;; - restart) - start restart_controller - ;; - status) - /usr/share/ovn/scripts/ovn-ctl status_controller - exit $? - ;; - reload | force-reload) - ;; - *) - echo "Usage: $0 {start|stop|reload|force-reload|restart|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/ovn-host.install b/debian/ovn-host.install deleted file mode 100644 index d2de82fd9..000000000 --- a/debian/ovn-host.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ovn-controller diff --git a/debian/ovn-host.manpages b/debian/ovn-host.manpages deleted file mode 100644 index aa27066ff..000000000 --- a/debian/ovn-host.manpages +++ /dev/null @@ -1 +0,0 @@ -controller/ovn-controller.8 diff --git a/debian/ovn-host.postinst b/debian/ovn-host.postinst deleted file mode 100755 index 4b3edeb75..000000000 --- a/debian/ovn-host.postinst +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# postinst script for ovn-host -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - DEFAULT=/etc/default/ovn-host - TEMPLATE=/usr/share/ovn/host/default.template - if ! test -e $DEFAULT; then - cp $TEMPLATE $DEFAULT - else - for var in $(awk -F'[ :]' '/^# [_A-Z0-9]+:/{print $2}' $TEMPLATE) - do - if ! grep $var $DEFAULT >/dev/null 2>&1; then - echo >> $DEFAULT - sed -n "/$var:/,/$var=/p" $TEMPLATE >> $DEFAULT - fi - done - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/ovn-host.postrm b/debian/ovn-host.postrm deleted file mode 100755 index 2d0fa6e03..000000000 --- a/debian/ovn-host.postrm +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# postrm script for ovn-host -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge) - rm -f /etc/default/ovn-host - rm -f /var/log/ovn/ovn-controller.log* || true - ;; - - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/ovn-host.template b/debian/ovn-host.template deleted file mode 100644 index 7fd54efda..000000000 --- a/debian/ovn-host.template +++ /dev/null @@ -1,5 +0,0 @@ -# This is a POSIX shell fragment -*- sh -*- - -# OVN_CTL_OPTS: Extra options to pass to ovs-ctl. This is, for example, -# a suitable place to specify --ovn-controller-wrapper=valgrind. -# OVN_CTL_OPTS= diff --git a/debian/rules b/debian/rules deleted file mode 100755 index b25a0b48e..000000000 --- a/debian/rules +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 -#export DH_VERBOSE=1 - -PACKAGE=openvswitch -PACKAGE_DKMS=openvswitch-datapath-dkms -include /usr/share/dpkg/pkg-info.mk - -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) -PARALLEL = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) -else -PARALLEL = -endif - -%: - dh $@ --with autoreconf,python3 --parallel - -# use --as-needed only if supported by dh-autoreconf (to simplify backporting) -DH_AS_NEEDED=$(shell dpkg --compare-versions $$(dpkg --status dh-autoreconf | grep Version | cut -d' ' -f2) ge 6 && echo --as-needed) -override_dh_autoreconf: - dh_autoreconf $(DH_AS_NEEDED) - -override_dh_auto_configure: - dh_auto_configure -- --enable-ssl --enable-shared --with-ovs-source=${OVSDIR} $(EXTRA_CONFIGURE_OPTS) - -override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - if $(MAKE) check TESTSUITEFLAGS='$(PARALLEL)' RECHECK=yes; then :; \ - else \ - cat tests/testsuite.log; \ - exit 1; \ - fi -endif - -override_dh_auto_build: - dh_auto_build -- dist distdir=ovn - -override_dh_auto_clean: - dh_auto_clean - -override_dh_install-arch: - dh_install - - # ovn-host - cp debian/ovn-host.template debian/ovn-host/usr/share/ovn/host/default.template - - # ovn-central - cp debian/ovn-central.template debian/ovn-central/usr/share/ovn/central/default.template - -override_dh_install-indep: - dh_install - - -override_dh_installinit: - dh_installinit -R - -override_dh_strip: - dh_strip - -override_dh_usrlocal: - -override_dh_installman: - dh_installman --language=C diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) From patchwork Fri Aug 5 20:34:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1664192 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=bM4Iulab; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lzy5R40W3z9s1l for ; Sat, 6 Aug 2022 06:35:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C4CEA60FD3; Fri, 5 Aug 2022 20:35:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C4CEA60FD3 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=bM4Iulab 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 YIs1KILhKvXL; Fri, 5 Aug 2022 20:35:03 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 82DF460D51; Fri, 5 Aug 2022 20:35:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 82DF460D51 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6972BC007F; Fri, 5 Aug 2022 20:35:00 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 658CCC0032 for ; Fri, 5 Aug 2022 20:34:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3EB2741CC2 for ; Fri, 5 Aug 2022 20:34:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3EB2741CC2 Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=bM4Iulab 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 DYBTe9LX2ah3 for ; Fri, 5 Aug 2022 20:34:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4C39C41CBA Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4C39C41CBA for ; Fri, 5 Aug 2022 20:34:56 +0000 (UTC) Received: from frode-threadripper.. (ti0189a330-0179.bb.online.no [88.91.31.180]) (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 smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 60796416DF for ; Fri, 5 Aug 2022 20:34:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1659731694; bh=+uRLJoUn39OHBumLVbxvxS0gKU0T/7VQYBR1ZqhAIkQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bM4IulabOco5DU/P+Mf3Gm7mgr0rTrE+x+oS1Sxybj/+SEyrFelCJ26Fs9qLmC6Sj 4Hz320+Divm0Uo/FGb2o6P22Q6+reSD46PwiCashybGFmWXWgLcSOJBzRXqn8KVWXA 6+sXdrzKNG8jT+Wp+WIKmmmKN/zHtGTcMymqv0tZi/Og7Z12QX35Ui909TBJLhYqgT eibu/wRDLH1njb5bkPu4E/R+QJzBc1W426HuHrgeqca93S8oapJDwlziJsaMIUfX6/ AMKi8pA/O+yG/zLi9D3yAMdQS5TWSjWF1HSyg24hcYibXMwuKSd+rr/HBLFb9Z8pk2 8wv1OYA/R4RYg== From: Frode Nordahl To: dev@openvswitch.org Date: Fri, 5 Aug 2022 22:34:50 +0200 Message-Id: <20220805203452.3060165-4-frode.nordahl@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805203452.3060165-1-frode.nordahl@canonical.com> References: <20220805203452.3060165-1-frode.nordahl@canonical.com> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn 3/5] checkpatch Ignore line length and leading whitespace for debian/*. 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" Similar to https://github.com/openvswitch/ovs/commit/9f4f2bb7dc Signed-off-by: Frode Nordahl --- utilities/checkpatch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py index ffb873111..8a4a84398 100755 --- a/utilities/checkpatch.py +++ b/utilities/checkpatch.py @@ -185,13 +185,13 @@ skip_signoff_check = False # # Python isn't checked as flake8 performs these checks during build. line_length_blacklist = re.compile( - r'\.(am|at|etc|in|m4|mk|patch|py|dl)$|debian/rules') + r'\.(am|at|etc|in|m4|mk|patch|py|dl)$|debian/.*$') # Don't enforce a requirement that leading whitespace be all spaces on # files that include these characters in their name, since these kinds # of files need lines with leading tabs. leading_whitespace_blacklist = re.compile( - r'\.(mk|am|at)$|debian/rules|\.gitmodules$') + r'\.(mk|am|at)$|debian/.*$|\.gitmodules$') def is_subtracted_line(line): From patchwork Fri Aug 5 20:34:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1664196 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=r0uO3snw; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lzy5s0Zrhz9s1l for ; Sat, 6 Aug 2022 06:35:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 92BC341E03; Fri, 5 Aug 2022 20:35:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 92BC341E03 Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=r0uO3snw 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 zC7spAGzUDmL; Fri, 5 Aug 2022 20:35:18 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9FA6741D84; Fri, 5 Aug 2022 20:35:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9FA6741D84 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E0DA5C0091; Fri, 5 Aug 2022 20:35:04 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 020DDC0070 for ; Fri, 5 Aug 2022 20:35:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B96EF83EC6 for ; Fri, 5 Aug 2022 20:34:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B96EF83EC6 Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=r0uO3snw 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 RdQLQgYcSNOx for ; Fri, 5 Aug 2022 20:34:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 80BB083EFD Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by smtp1.osuosl.org (Postfix) with ESMTPS id 80BB083EFD for ; Fri, 5 Aug 2022 20:34:56 +0000 (UTC) Received: from frode-threadripper.. (ti0189a330-0179.bb.online.no [88.91.31.180]) (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 smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id A181C41713 for ; Fri, 5 Aug 2022 20:34:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1659731694; bh=z7PcVWphBUC1Pq0U/ukV0o7gZSi3PHXZBmbWdH7dsdg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r0uO3snwm63koU7FzjuexNzuG0aoJOuCXNW+CgrlJSHo3y4830tP+wClED1IS2CQ4 /UoybHZb19wwq0y6tsJaqpgU6JTN9YAuObP4HG/O2KliyKQSbddaJQdmcgyqDfKwsb bPrdkEBElaSF17QFbAW6RYxyahAeVuBNL5SGxqFxS0L0B/WqLK+xB5yIpign/dolNY UtetyINs6y/32E1t0G+9FfpX2+3zlITKvVGPRRKdVVQuO8W0U9hHRZElNaJnF1NQO0 +SMBK9sTGgp87EVMLsWM6+qyP4Y2ShEMfDDISBgrS6m3haCpPIfAjMIORVJg7E4Spq KZ5V2I45L2IyA== From: Frode Nordahl To: dev@openvswitch.org Date: Fri, 5 Aug 2022 22:34:51 +0200 Message-Id: <20220805203452.3060165-5-frode.nordahl@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805203452.3060165-1-frode.nordahl@canonical.com> References: <20220805203452.3060165-1-frode.nordahl@canonical.com> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn 4/5] debian: Update debian package source. 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 debian package source from Debian and Ubuntu. debian/ovn-common.logrotate comes from the RHEL packaging in this tree, and author is credited below. The debian/automake.mk tricks to generate the copyright file while building came from the work on the debian packaging in openvswitch and author is credited below. Signed-off-by: James Page Co-Authored-by: James Page Signed-off-by: Christian Ehrhardt Co-Authored-by: Christian Ehrhardt Signed-off-by: Numan Siddique Co-Authored-by: Numan Siddique Signed-off-by: Ilya Maximets Co-Authored-by: Ilya Maximets Signed-off-by: Frode Nordahl --- build-aux/initial-tab-whitelist | 3 +- debian/.gitignore | 17 ++ debian/automake.mk | 85 ++++++++- debian/control | 176 ++++++++++++++++++ debian/copyright.in | 146 +++++++++++++++ debian/flaky-tests-amd64.txt | 6 + debian/flaky-tests-arm64.txt | 5 + debian/flaky-tests-armel.txt | 7 + debian/flaky-tests-armhf.txt | 9 + debian/flaky-tests-i386.txt | 8 + debian/flaky-tests-mips64el.txt | 5 + debian/flaky-tests-mipsel.txt | 21 +++ debian/flaky-tests-ppc64el.txt | 6 + debian/flaky-tests-riscv64.txt | 6 + debian/flaky-tests-s390x.txt | 5 + debian/gbp.conf | 13 ++ debian/not-installed | 5 + debian/ovn-central.default | 5 + debian/ovn-central.install | 3 + debian/ovn-central.ovn-northd.service | 15 ++ .../ovn-central.ovn-ovsdb-server-nb.service | 18 ++ .../ovn-central.ovn-ovsdb-server-sb.service | 18 ++ debian/ovn-central.postrm | 47 +++++ debian/ovn-central.service | 16 ++ debian/ovn-common.docs | 1 + debian/ovn-common.install | 32 ++++ debian/ovn-common.logrotate | 22 +++ debian/ovn-common.postinst | 24 +++ debian/ovn-common.postrm | 23 +++ debian/ovn-controller-vtep.install | 1 + debian/ovn-controller-vtep.service | 16 ++ debian/ovn-doc.doc-base | 9 + debian/ovn-doc.install | 1 + debian/ovn-docker.install | 2 + debian/ovn-host.default | 5 + debian/ovn-host.install | 1 + debian/ovn-host.ovn-controller.service | 15 ++ debian/ovn-host.postrm | 43 +++++ debian/ovn-host.service | 14 ++ debian/ovn-ic-db.install | 2 + .../ovn-ic-db.ovn-ovsdb-server-ic-nb.service | 15 ++ .../ovn-ic-db.ovn-ovsdb-server-ic-sb.service | 15 ++ debian/ovn-ic-db.service | 15 ++ debian/ovn-ic.install | 1 + debian/ovn-ic.service | 16 ++ debian/rules | 104 +++++++++++ debian/source/format | 1 + debian/source/include-binaries | 1 + debian/testlist.py | 72 +++++++ debian/watch | 5 + 50 files changed, 1098 insertions(+), 3 deletions(-) create mode 100644 debian/.gitignore create mode 100644 debian/control create mode 100644 debian/copyright.in create mode 100644 debian/flaky-tests-amd64.txt create mode 100644 debian/flaky-tests-arm64.txt create mode 100644 debian/flaky-tests-armel.txt create mode 100644 debian/flaky-tests-armhf.txt create mode 100644 debian/flaky-tests-i386.txt create mode 100644 debian/flaky-tests-mips64el.txt create mode 100644 debian/flaky-tests-mipsel.txt create mode 100644 debian/flaky-tests-ppc64el.txt create mode 100644 debian/flaky-tests-riscv64.txt create mode 100644 debian/flaky-tests-s390x.txt create mode 100644 debian/gbp.conf create mode 100644 debian/not-installed create mode 100644 debian/ovn-central.default create mode 100644 debian/ovn-central.install create mode 100644 debian/ovn-central.ovn-northd.service create mode 100644 debian/ovn-central.ovn-ovsdb-server-nb.service create mode 100644 debian/ovn-central.ovn-ovsdb-server-sb.service create mode 100644 debian/ovn-central.postrm create mode 100644 debian/ovn-central.service create mode 100644 debian/ovn-common.docs create mode 100644 debian/ovn-common.install create mode 100644 debian/ovn-common.logrotate create mode 100644 debian/ovn-common.postinst create mode 100644 debian/ovn-common.postrm create mode 100644 debian/ovn-controller-vtep.install create mode 100644 debian/ovn-controller-vtep.service create mode 100644 debian/ovn-doc.doc-base create mode 100644 debian/ovn-doc.install create mode 100644 debian/ovn-docker.install create mode 100644 debian/ovn-host.default create mode 100644 debian/ovn-host.install create mode 100644 debian/ovn-host.ovn-controller.service create mode 100644 debian/ovn-host.postrm create mode 100644 debian/ovn-host.service create mode 100644 debian/ovn-ic-db.install create mode 100644 debian/ovn-ic-db.ovn-ovsdb-server-ic-nb.service create mode 100644 debian/ovn-ic-db.ovn-ovsdb-server-ic-sb.service create mode 100644 debian/ovn-ic-db.service create mode 100644 debian/ovn-ic.install create mode 100644 debian/ovn-ic.service create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/source/include-binaries create mode 100755 debian/testlist.py create mode 100644 debian/watch diff --git a/build-aux/initial-tab-whitelist b/build-aux/initial-tab-whitelist index b2f5a0791..71d4f007d 100644 --- a/build-aux/initial-tab-whitelist +++ b/build-aux/initial-tab-whitelist @@ -6,6 +6,5 @@ ^ovs/ ^third-party/ ^xenserver/ -^debian/rules.modules$ -^debian/rules$ +^debian/ ^\.gitmodules$ diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 000000000..d2393b3fd --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,17 @@ +*.debhelper +*.debhelper.log +*.substvars +/autoreconf.after +/autoreconf.before +/copyright +/files +/ovn-common +/ovn-controller-vtep +/ovn-host +/ovn-central +/ovn-docker +/debhelper-build-stamp +/ovn-doc/ +/ovn-ic-db/ +/ovn-ic/ +/tmp diff --git a/debian/automake.mk b/debian/automake.mk index ce11fd040..d199c925d 100644 --- a/debian/automake.mk +++ b/debian/automake.mk @@ -1,2 +1,85 @@ EXTRA_DIST += \ - debian/changelog + debian/changelog \ + debian/control \ + debian/copyright.in \ + debian/flaky-tests-amd64.txt \ + debian/flaky-tests-arm64.txt \ + debian/flaky-tests-armel.txt \ + debian/flaky-tests-armhf.txt \ + debian/flaky-tests-i386.txt \ + debian/flaky-tests-mips64el.txt \ + debian/flaky-tests-mipsel.txt \ + debian/flaky-tests-ppc64el.txt \ + debian/flaky-tests-riscv64.txt \ + debian/flaky-tests-s390x.txt \ + debian/gbp.conf \ + debian/not-installed \ + debian/ovn-central.default \ + debian/ovn-central.install \ + debian/ovn-central.ovn-northd.service \ + debian/ovn-central.postrm \ + debian/ovn-central.service \ + debian/ovn-common.docs \ + debian/ovn-common.install \ + debian/ovn-common.logrotate \ + debian/ovn-common.postinst \ + debian/ovn-common.postrm \ + debian/ovn-controller-vtep.install \ + debian/ovn-controller-vtep.service \ + debian/ovn-doc.doc-base \ + debian/ovn-doc.install \ + debian/ovn-docker.install \ + debian/ovn-host.default \ + debian/ovn-host.install \ + debian/ovn-host.ovn-controller.service \ + debian/ovn-host.postrm \ + debian/ovn-host.service \ + debian/ovn-ic-db.install \ + debian/ovn-ic-db.service \ + debian/ovn-ic.install \ + debian/ovn-ic.service \ + debian/rules \ + debian/source/format \ + debian/source/include-binaries \ + debian/testlist.py \ + debian/watch + +check-debian-changelog-version: + @DEB_VERSION=`echo '$(VERSION)' | sed 's/pre/~pre/'`; \ + if $(FGREP) '($(DEB_VERSION)' $(srcdir)/debian/changelog >/dev/null; \ + then \ + :; \ + else \ + echo "Update debian/changelog to mention version $(VERSION)"; \ + exit 1; \ + fi +ALL_LOCAL += check-debian-changelog-version +DIST_HOOKS += check-debian-changelog-version + +update_deb_copyright = \ + $(AM_V_GEN) \ + { sed -n -e '/%AUTHORS%/q' -e p < $(srcdir)/debian/copyright.in; \ + tail -n +28 $(srcdir)/AUTHORS.rst | sed '1,/^$$/d' | \ + sed -n -e '/^$$/q' -e 's/^/ /p'; \ + sed -e '1,/%AUTHORS%/d' $(srcdir)/debian/copyright.in; \ + } > debian/copyright + +debian/copyright: AUTHORS.rst debian/copyright.in + $(update_deb_copyright) + +CLEANFILES += debian/copyright + +debian: debian/copyright +.PHONY: debian + +debian-deb: debian + @if test X"$(srcdir)" != X"$(top_builddir)"; then \ + echo "Debian packages should be built from $(abs_srcdir)/"; \ + exit 1; \ + fi + $(MAKE) distclean + $(update_deb_copyright) + $(update_deb_control) + $(AM_V_GEN) fakeroot debian/rules clean + $(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc`" \ + fakeroot debian/rules binary diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..a6f395842 --- /dev/null +++ b/debian/control @@ -0,0 +1,176 @@ +Source: ovn +Section: net +Priority: optional +Maintainer: OVN developers +Build-Depends: + autoconf, + automake, + bzip2, + debhelper-compat (= 10), + dh-python, + graphviz, + libcap-ng-dev, + libnuma-dev [amd64 i386 ppc64el arm64], + libpcap-dev [amd64 i386 ppc64el arm64], + libssl-dev, + libtool, + libudev-dev, + libunbound-dev, + openssl, + openstack-pkg-tools, + openvswitch-source (>= 2.17.2-3~), + pkg-config, + procps, + python3-all-dev, + python3-setuptools, + python3-sortedcontainers, + python3-sphinx, + tcpdump, +Standards-Version: 4.6.1 +Homepage: https://www.ovn.org/ + +Package: ovn-central +Architecture: linux-any +Pre-Depends: ${misc:Pre-Depends}, +Depends: + lsb-base, + lsb-release, + openvswitch-common (>= 2.17.0~), + ovn-common (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: OVN central components + OVN, the Open Virtual Network, is a system to support virtual network + abstraction. OVN complements the existing capabilities of OVS to add native + support for virtual network abstractions, such as virtual L2 and L3 overlays + and security groups. + . + ovn-central provides the userspace daemons, utilities and + databases for OVN that is run at a central location. + +Package: ovn-common +Architecture: linux-any +Depends: + ${misc:Depends}, + ${python3:Depends}, + ${shlibs:Depends}, +Breaks: + ovn-ic-db (<< 22.03~), +Replaces: + ovn-ic-db (<< 22.03~), +Description: OVN common components + OVN, the Open Virtual Network, is a system to support virtual network + abstraction. OVN complements the existing capabilities of OVS to add native + support for virtual network abstractions, such as virtual L2 and L3 overlays + and security groups. + . + ovn-common provides components required by other OVN packages. + +Package: ovn-controller-vtep +Architecture: linux-any +Pre-Depends: ${misc:Pre-Depends}, +Depends: + lsb-base, + ovn-common (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: OVN vtep controller + ovn-controller-vtep is the local controller daemon in OVN, the Open Virtual + Network, for VTEP enabled physical switches. It connects up to the OVN + Southbound database over the OVSDB protocol, and down to the VTEP database + over the OVSDB protocol. + . + ovn-controller-vtep provides the ovn-controller-vtep binary for controlling + vtep gateways. + +Package: ovn-doc +Section: doc +Architecture: all +Depends: + ${misc:Depends}, + ${sphinxdoc:Depends}, +Description: OVN documentation + OVN, the Open Virtual Network, is a system to support virtual network + abstraction. OVN complements the existing capabilities of OVS to add + native support for virtual network abstractions, such as virtual L2 and L3 + overlays and security groups. + . + This package provides documentation for configuration and use + of OVN. + +Package: ovn-docker +Architecture: linux-any +Depends: + openvswitch-common (>= 2.17.0~), + ovn-common (= ${binary:Version}), + python3-openvswitch (>= 2.17.0~), + ${misc:Depends}, + ${python3:Depends}, + ${shlibs:Depends}, +Description: OVN Docker drivers + OVN, the Open Virtual Network, is a system to support virtual network + abstraction. OVN complements the existing capabilities of OVS to add + native support for virtual network abstractions, such as virtual L2 and L3 + overlays and security groups. + . + ovn-docker provides the docker drivers for OVN. + +Package: ovn-host +Architecture: linux-any +Pre-Depends: ${misc:Pre-Depends}, +Depends: + lsb-base, + lsb-release, + openvswitch-switch (>= 2.17.0~), + ovn-common (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: OVN host components + OVN, the Open Virtual Network, is a system to support virtual network + abstraction. OVN complements the existing capabilities of OVS to add + native support for virtual network abstractions, such as virtual L2 and L3 + overlays and security groups. + . + ovn-host provides the userspace components and utilities for + OVN that can be run on every host/hypervisor. + +Package: ovn-ic +Architecture: linux-any +Pre-Depends: ${misc:Pre-Depends}, +Depends: + lsb-base, + lsb-release, + ovn-common (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Enhances: + ovn-central, +Suggests: + ovn-ic-db, +Description: Open Virtual Network interconnection controller + OVN IC, the Open Virtual Network interconnection controller, is a + centralized daemon which communicates with global interconnection + databases to configure and exchange data with local OVN databases for + interconnection with other OVN deployments. + . + This package provides the ovn-ic daemon which should be run alongside + ovn-central services in each OVN deployment zone. + +Package: ovn-ic-db +Architecture: linux-any +Pre-Depends: ${misc:Pre-Depends}, +Depends: + lsb-base, + lsb-release, + openvswitch-common (>= 2.17.0~), + ovn-common (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: Open Virtual Network interconnection controller databases + OVN IC, the Open Virtual Network interconnection controller, is a + centralized daemon which communicates with global interconnection + databases to configure and exchange data with local OVN databases for + interconnection with other OVN deployments. + . + This package provides the global OVN IC southbound and northbound + OVSDB databases. diff --git a/debian/copyright.in b/debian/copyright.in new file mode 100644 index 000000000..911704ae0 --- /dev/null +++ b/debian/copyright.in @@ -0,0 +1,146 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Open Virtual Network (OVN) +Source: https://github.com/ovn-org/ovn +Files-Excluded: debian +Upstream-Authors: +%AUTHORS% + +Files: * +Copyright: 2007-2017 Nicira, Inc. + 2010 Jean Tourrilhes - HP-Labs. + 2008,2009,2010 Citrix Systems, Inc. + 2011 Gaetano Catalli + 2000-2003 Geoffrey Wossum + 2000 The NetBSD Foundation, Inc. + 1995, 1996, 1997, and 1998 WIDE Project. + 1982, 1986, 1990, 1993 The Regents of the University of California. + 2008, 2012 Vincent Bernat + 2014 Michael Chapman + 2014 WindRiver, Inc. + 2014 Avaya, Inc. + 2001 Daniel Hartmeier + 2002 - 2008 Henning Brauer + 2012 Gleb Smirnoff + 2015-2019 Red Hat, Inc. + 2017 DtDream Technology Co., Ltd. + 2018 eBay Inc. +License: Apache-2.0 +Comment: + This package contains code from other projects and authors not + mentioned elsewhere. + . + Open vSwitch + Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013 Nicira, Inc. + . + Open vSwitch BSD port + Copyright (c) 2011 Gaetano Catalli + . + Apache Portable Runtime + Copyright 2008 The Apache Software Foundation. + . + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + . + Portions of this software were developed at the National Center + for Supercomputing Applications (NCSA) at the University of + Illinois at Urbana-Champaign. + . + lib/ovs.tmac includes troff macros written by Eric S. Raymond + and Werner Lemberg. + . + m4/include_next.m4 and m4/absolute-header.m4 + Copyright (C) 2006-2013 Free Software Foundation, Inc. + . + Rapid Spanning Tree Protocol (RSTP) implementation + Copyright (c) 2011-2014 M3S, Srl - Italy + . + LLDP implementation + Copyright (c) 2008, 2012 Vincent Bernat + . + LLDP includes code used from the Net::CDP project based on the ISC license + Copyright (c) 2014 Michael Chapman + . + LLDP includes code used from the ladvd project based on the ISC license + Copyright (c) 2008, 2009, 2010 Sten Spans + . + Auto Attach implementation + Copyright (c) 2014, 2015 WindRiver, Inc + Copyright (c) 2014, 2015 Avaya, Inc + . + TCP connection tracker from FreeBSD pf, BSD licensed + Copyright (c) 2001 Daniel Hartmeier + Copyright (c) 2002 - 2008 Henning Brauer + Copyright (c) 2012 Gleb Smirnoff + +Files: build-aux/cccl +Copyright: 2000-2003 Geoffrey Wossum +License: GPL-2 + +Files: utilities/bugtool/ovn-bugtool-* + utilities/bugtool/plugins/network-status/ovn.xml +Copyright: 2016 Nicira, Inc. +License: LGPL-2.1 + +Files: m4/absolute-header.m4 + m4/include_next.m4 +Copyright: Derek Price + Paul Eggert + 2006-2013 Free Software Foundation, Inc. +License: file-is-free-software + This file is free software; the Free Software Foundation + gives unlimited permission to copy and/or distribute it, + with or without modifications, as long as this notice is preserved. + +Files: ovn-vif/* +Copyright: 2021 Canonical +License: Apache-2.0 + +License: GPL-2 + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General Public License v2 + (GPL) can be found in /usr/share/common-licenses/GPL-2. + +License: LGPL-2.1 + This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free + Software Foundation; either version 2.1 of the License. + . + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. + . + You should have received a copy of the GNU Lesser General Public License along + with this library; if not, write to the Free Software Foundation, Inc., 51 + Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU Lesser General Public License + (LGPL) may be found in /usr/share/common-licenses/LGPL-2. + +License: Apache-2.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. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/flaky-tests-amd64.txt b/debian/flaky-tests-amd64.txt new file mode 100644 index 000000000..cfe5d8c66 --- /dev/null +++ b/debian/flaky-tests-amd64.txt @@ -0,0 +1,6 @@ +send gratuitous arp on localnet +policy-based routing IPv6: 1 HVs, 3 LSs, 1 lport/LS, 1 LR +ACLs on Port Groups +multi-vtep SB Chassis encap updates +ACL with Port Group conjunction flow efficiency +northd ssl file change diff --git a/debian/flaky-tests-arm64.txt b/debian/flaky-tests-arm64.txt new file mode 100644 index 000000000..996d0537e --- /dev/null +++ b/debian/flaky-tests-arm64.txt @@ -0,0 +1,5 @@ +ovn-controller incremental processing +nb_cfg timestamp +multi-vtep SB Chassis encap updates +ACL with Port Group conjunction flow efficiency +ipsec -- basic configuration diff --git a/debian/flaky-tests-armel.txt b/debian/flaky-tests-armel.txt new file mode 100644 index 000000000..6ce03bb10 --- /dev/null +++ b/debian/flaky-tests-armel.txt @@ -0,0 +1,7 @@ +policy-based routing IPv6: 1 HVs, 3 LSs, 1 lport/LS, 1 LR +1 LR with distributed router gateway port +ACL conjunction +IP packet buffering +test transport zones +lflow cache for conjunctions +nb_cfg timestamp diff --git a/debian/flaky-tests-armhf.txt b/debian/flaky-tests-armhf.txt new file mode 100644 index 000000000..43654f3ae --- /dev/null +++ b/debian/flaky-tests-armhf.txt @@ -0,0 +1,9 @@ +policy-based routing IPv6: 1 HVs, 3 LSs, 1 lport/LS, 1 LR +ovn-controller incremental processing +ACL conjunction +neighbor update on same HV +nb_cfg timestamp +multi-vtep SB Chassis encap updates +ACL with Port Group conjunction flow efficiency +ovn-ic -- gateway sync +ipsec -- basic configuration diff --git a/debian/flaky-tests-i386.txt b/debian/flaky-tests-i386.txt new file mode 100644 index 000000000..b82300de9 --- /dev/null +++ b/debian/flaky-tests-i386.txt @@ -0,0 +1,8 @@ +policy-based routing: 1 HVs, 2 LSs, 1 lport/LS, 1 LR +nb_cfg timestamp +ARP replies for SNAT external ips +conflict ACLs with address set +multi-vtep SB Chassis encap updates +ACL with Port Group conjunction flow efficiency +ovn-ic -- gateway sync +ipsec -- basic configuration diff --git a/debian/flaky-tests-mips64el.txt b/debian/flaky-tests-mips64el.txt new file mode 100644 index 000000000..e67e2c4ca --- /dev/null +++ b/debian/flaky-tests-mips64el.txt @@ -0,0 +1,5 @@ +multi-vtep SB Chassis encap updates +ACL with Port Group conjunction flow efficiency +ovn-ic -- gateway sync +ipsec -- basic configuration +nb_cfg timestamp diff --git a/debian/flaky-tests-mipsel.txt b/debian/flaky-tests-mipsel.txt new file mode 100644 index 000000000..00d383572 --- /dev/null +++ b/debian/flaky-tests-mipsel.txt @@ -0,0 +1,21 @@ +vtep: 3 HVs, 1 VIFs/HV, 1 GW, 1 LS +policy-based routing: 1 HVs, 2 LSs, 1 lport/LS, 1 LR +policy-based routing IPv6: 1 HVs, 3 LSs, 1 lport/LS, 1 LR +send gratuitous arp for nat ips in localnet +send gratuitous arp for NAT rules on distributed router +vlan traffic for external network with distributed router gateway port +send gratuitous ARP for NAT rules on HA distributed router +ACL conjunction +router - check packet length - icmp defrag +router - check packet length - icmp defrag +IP packet buffering +test transport zones +Load balancer health checks +interconnection +nb_cfg timestamp +conflict ACLs with address set +multi-vtep SB Chassis encap updates +ACL with Port Group conjunction flow efficiency +northd ssl file change +ovn-ic -- gateway sync +ipsec -- basic configuration diff --git a/debian/flaky-tests-ppc64el.txt b/debian/flaky-tests-ppc64el.txt new file mode 100644 index 000000000..6e089b6cb --- /dev/null +++ b/debian/flaky-tests-ppc64el.txt @@ -0,0 +1,6 @@ +options:requested-chassis for logical port +multi-vtep SB Chassis encap updates +ACL with Port Group conjunction flow efficiency +northd ssl file change +ovn-ic -- gateway sync +ipsec -- basic configuration diff --git a/debian/flaky-tests-riscv64.txt b/debian/flaky-tests-riscv64.txt new file mode 100644 index 000000000..50570ab80 --- /dev/null +++ b/debian/flaky-tests-riscv64.txt @@ -0,0 +1,6 @@ +send gratuitous arp on localnet +1 LR with distributed router gateway port +router - check packet length - icmp defrag +multi-vtep SB Chassis encap updates +ACL with Port Group conjunction flow efficiency +ipsec -- basic configuration diff --git a/debian/flaky-tests-s390x.txt b/debian/flaky-tests-s390x.txt new file mode 100644 index 000000000..a642063d9 --- /dev/null +++ b/debian/flaky-tests-s390x.txt @@ -0,0 +1,5 @@ +options:requested-chassis for logical port +ACLs on Port Groups +multi-vtep SB Chassis encap updates +ACL with Port Group conjunction flow efficiency +ipsec -- basic configuration diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 000000000..438b3fa8d --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,13 @@ +[DEFAULT] +debian-branch = main +upstream-branch = upstream +pristine-tar = True +components = ['ovn-vif'] + +[import-orig] +upstream-vcs-tag = v%(version)s + +[dch] +multimaint-merge = True +customizations=/usr/share/doc/git-buildpackage/examples/wrap_cl.py +git-log=--first-parent diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 000000000..e213b139d --- /dev/null +++ b/debian/not-installed @@ -0,0 +1,5 @@ +# The OVN library and headers are currently not considered ABI/API stable. +# If the need arises to build sibling projects we should probably provide an +# ovn-source package. +usr/include/* +usr/lib/* diff --git a/debian/ovn-central.default b/debian/ovn-central.default new file mode 100644 index 000000000..7cea13e50 --- /dev/null +++ b/debian/ovn-central.default @@ -0,0 +1,5 @@ +# This is a POSIX shell fragment -*- sh -*- + +# OVN_CTL_OPTS: Extra options to pass to ovs-ctl. This is, for example, +# a suitable place to specify --ovn-northd-wrapper=valgrind. +# OVN_CTL_OPTS= diff --git a/debian/ovn-central.install b/debian/ovn-central.install new file mode 100644 index 000000000..095ca7cfa --- /dev/null +++ b/debian/ovn-central.install @@ -0,0 +1,3 @@ +usr/bin/ovn-northd +usr/share/ovn/ovn-nb.ovsschema +usr/share/ovn/ovn-sb.ovsschema diff --git a/debian/ovn-central.ovn-northd.service b/debian/ovn-central.ovn-northd.service new file mode 100644 index 000000000..09c600016 --- /dev/null +++ b/debian/ovn-central.ovn-northd.service @@ -0,0 +1,15 @@ +[Unit] +Description=Open Virtual Network central control daemon +After=network.target ovn-nb-ovsdb.service ovn-sb-ovsdb.service +PartOf=ovn-central.service +DefaultDependencies=no + +[Service] +Type=forking +EnvironmentFile=-/etc/default/ovn-central +PIDFile=%t/ovn/ovn-northd.pid +ExecStart=/usr/share/ovn/scripts/ovn-ctl start_northd --ovn-manage-ovsdb=no --no-monitor $OVN_CTL_OPTS +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_northd --no-monitor +Restart=on-failure +LimitNOFILE=65535 +TimeoutStopSec=15 diff --git a/debian/ovn-central.ovn-ovsdb-server-nb.service b/debian/ovn-central.ovn-ovsdb-server-nb.service new file mode 100644 index 000000000..81f6c75a3 --- /dev/null +++ b/debian/ovn-central.ovn-ovsdb-server-nb.service @@ -0,0 +1,18 @@ +[Unit] +Description=Open vSwitch database server for OVN Northbound database +After=network.target +PartOf=ovn-central.service +DefaultDependencies=no + +[Service] +Type=simple +EnvironmentFile=-/etc/default/ovn-central +PIDFile=%t/ovn/ovnnb_db.pid +ExecStart=/usr/share/ovn/scripts/ovn-ctl run_nb_ovsdb $OVN_CTL_OPTS +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_nb_ovsdb +Restart=on-failure +LimitNOFILE=65535 +TimeoutStopSec=15 + +[Install] +Alias=ovn-nb-ovsdb.service diff --git a/debian/ovn-central.ovn-ovsdb-server-sb.service b/debian/ovn-central.ovn-ovsdb-server-sb.service new file mode 100644 index 000000000..3aa840d2f --- /dev/null +++ b/debian/ovn-central.ovn-ovsdb-server-sb.service @@ -0,0 +1,18 @@ +[Unit] +Description=Open vSwitch database server for OVN Southbound database +After=network.target +PartOf=ovn-central.service +DefaultDependencies=no + +[Service] +Type=simple +EnvironmentFile=-/etc/default/ovn-central +PIDFile=%t/run/ovn/ovnsb_db.pid +ExecStart=/usr/share/ovn/scripts/ovn-ctl run_sb_ovsdb $OVN_CTL_OPTS +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_sb_ovsdb +Restart=on-failure +LimitNOFILE=65535 +TimeoutStopSec=15 + +[Install] +Alias=ovn-sb-ovsdb.service diff --git a/debian/ovn-central.postrm b/debian/ovn-central.postrm new file mode 100644 index 000000000..3b3483fc3 --- /dev/null +++ b/debian/ovn-central.postrm @@ -0,0 +1,47 @@ +#!/bin/sh +# postrm script for ovn-central +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + rm -f /etc/openvswitch/ovnnb.db* + rm -f /etc/openvswitch/.ovnnb.db.~lock~ + rm -f /etc/openvswitch/ovnsb.db* + rm -f /etc/openvswitch/.ovnsb.db.~lock~ + rm -f /var/log/openvswitch/ovn-northd.log* || true + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/ovn-central.service b/debian/ovn-central.service new file mode 100644 index 000000000..aead7eae6 --- /dev/null +++ b/debian/ovn-central.service @@ -0,0 +1,16 @@ +[Unit] +Description=Open Virtual Network central components +After=network.target +Requires=network.target +Wants=ovn-northd.service +Wants=ovn-ovsdb-server-sb.service +Wants=ovn-ovsdb-server-nb.service + +[Service] +Type=oneshot +ExecStart=/bin/true +ExecStop=/bin/true +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/debian/ovn-common.docs b/debian/ovn-common.docs new file mode 100644 index 000000000..6d5ee1d05 --- /dev/null +++ b/debian/ovn-common.docs @@ -0,0 +1 @@ +NOTICE diff --git a/debian/ovn-common.install b/debian/ovn-common.install new file mode 100644 index 000000000..52e9e0050 --- /dev/null +++ b/debian/ovn-common.install @@ -0,0 +1,32 @@ +usr/bin/ovn-appctl +usr/bin/ovn_detrace.py +usr/bin/ovn-detrace +usr/bin/ovn-nbctl +usr/bin/ovn-sbctl +/usr/bin/ovn-ic-nbctl +/usr/bin/ovn-ic-sbctl +usr/bin/ovn-trace +usr/share/ovn/bugtool-plugins/network-status/ovn.xml +usr/share/ovn/scripts/ovn-ctl +usr/share/ovn/scripts/ovn-lib +usr/share/ovn/scripts/ovndb-servers.ocf +usr/share/ovn/scripts/ovn-bugtool-nbctl-show +usr/share/ovn/scripts/ovn-bugtool-sbctl-lflow-list +usr/share/ovn/scripts/ovn-bugtool-sbctl-show +usr/share/man/man1/ovn-detrace.1 +usr/share/man/man5/ovn-ic-nb.5 +usr/share/man/man5/ovn-ic-sb.5 +usr/share/man/man5/ovn-nb.5 +usr/share/man/man5/ovn-sb.5 +usr/share/man/man7/ovn-architecture.7 +usr/share/man/man8/ovn-appctl.8 +usr/share/man/man8/ovn-controller-vtep.8 +usr/share/man/man8/ovn-controller.8 +usr/share/man/man8/ovn-ctl.8 +usr/share/man/man8/ovn-ic-nbctl.8 +usr/share/man/man8/ovn-ic-sbctl.8 +usr/share/man/man8/ovn-ic.8 +usr/share/man/man8/ovn-nbctl.8 +usr/share/man/man8/ovn-northd.8 +usr/share/man/man8/ovn-sbctl.8 +usr/share/man/man8/ovn-trace.8 diff --git a/debian/ovn-common.logrotate b/debian/ovn-common.logrotate new file mode 100644 index 000000000..a351ec303 --- /dev/null +++ b/debian/ovn-common.logrotate @@ -0,0 +1,22 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without warranty of any kind. + +/var/log/ovn/*.log { + su root root + daily + compress + sharedscripts + missingok + postrotate + # Tell OVN daemons to reopen their log files + if [ -d /var/run/ovn ]; then + for ctl in /var/run/ovn/*.ctl; do + ovs-appctl -t "$ctl" vlog/reopen 2>/dev/null || : + done + fi + endscript +} diff --git a/debian/ovn-common.postinst b/debian/ovn-common.postinst new file mode 100644 index 000000000..588044fbc --- /dev/null +++ b/debian/ovn-common.postinst @@ -0,0 +1,24 @@ +#!/bin/sh +# postinst script for ovn-common +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + configure) + mkdir -p /usr/lib/ocf/resource.d/ovn + ln -sf /usr/share/openvswitch/scripts/ovndb-servers.ocf /usr/lib/ocf/resource.d/ovn/ovndb-servers + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/ovn-common.postrm b/debian/ovn-common.postrm new file mode 100644 index 000000000..9face726b --- /dev/null +++ b/debian/ovn-common.postrm @@ -0,0 +1,23 @@ +#!/bin/sh +# postrm script for openvswitch-testcontroller +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + purge|remove) + rm -rf /usr/lib/ocf/resource.d/ovn + ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/ovn-controller-vtep.install b/debian/ovn-controller-vtep.install new file mode 100644 index 000000000..1d208f37e --- /dev/null +++ b/debian/ovn-controller-vtep.install @@ -0,0 +1 @@ +usr/bin/ovn-controller-vtep diff --git a/debian/ovn-controller-vtep.service b/debian/ovn-controller-vtep.service new file mode 100644 index 000000000..d51e75277 --- /dev/null +++ b/debian/ovn-controller-vtep.service @@ -0,0 +1,16 @@ +[Unit] +Description=Open Virtual Network VTEP gateway controller daemon +After=openvswitch-switch.service +Requires=openvswitch-switch.service + +[Service] +Type=forking +PIDFile=%t/ovn/ovn-controller-vtep.pid +ExecStart=/usr/share/ovn/scripts/ovn-ctl start_controller_vtep --no-monitor $OVN_CTL_OPTS +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_controller_vtep --no-monitor +Restart=on-failure +LimitNOFILE=65535 +TimeoutStopSec=15 + +[Install] +WantedBy=multi-user.target diff --git a/debian/ovn-doc.doc-base b/debian/ovn-doc.doc-base new file mode 100644 index 000000000..c7192ebdb --- /dev/null +++ b/debian/ovn-doc.doc-base @@ -0,0 +1,9 @@ +Document: ovn-doc +Title: Open Virtual Network Documentation +Author: N/A +Abstract: Sphinx documentation for Open Virtual Network +Section: Network/Communication + +Format: HTML +Index: /usr/share/doc/ovn-doc/html/index.html +Files: /usr/share/doc/ovn-doc/html/* diff --git a/debian/ovn-doc.install b/debian/ovn-doc.install new file mode 100644 index 000000000..4cfd153cf --- /dev/null +++ b/debian/ovn-doc.install @@ -0,0 +1 @@ +Documentation/_build/html/* /usr/share/doc/ovn-doc/html/ diff --git a/debian/ovn-docker.install b/debian/ovn-docker.install new file mode 100644 index 000000000..583306732 --- /dev/null +++ b/debian/ovn-docker.install @@ -0,0 +1,2 @@ +usr/bin/ovn-docker-overlay-driver +usr/bin/ovn-docker-underlay-driver diff --git a/debian/ovn-host.default b/debian/ovn-host.default new file mode 100644 index 000000000..7fd54efda --- /dev/null +++ b/debian/ovn-host.default @@ -0,0 +1,5 @@ +# This is a POSIX shell fragment -*- sh -*- + +# OVN_CTL_OPTS: Extra options to pass to ovs-ctl. This is, for example, +# a suitable place to specify --ovn-controller-wrapper=valgrind. +# OVN_CTL_OPTS= diff --git a/debian/ovn-host.install b/debian/ovn-host.install new file mode 100644 index 000000000..d2de82fd9 --- /dev/null +++ b/debian/ovn-host.install @@ -0,0 +1 @@ +usr/bin/ovn-controller diff --git a/debian/ovn-host.ovn-controller.service b/debian/ovn-host.ovn-controller.service new file mode 100644 index 000000000..a41e77d75 --- /dev/null +++ b/debian/ovn-host.ovn-controller.service @@ -0,0 +1,15 @@ +[Unit] +Description=Open Virtual Network host control daemon +After=network.target openvswitch-switch.service +PartOf=ovn-host.service +DefaultDependencies=no + +[Service] +Type=forking +EnvironmentFile=-/etc/default/ovn-host +PIDFile=%t/ovn/ovn-controller.pid +ExecStart=/usr/share/ovn/scripts/ovn-ctl start_controller --ovn-manage-ovsdb=no --no-monitor $OVN_CTL_OPTS +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_controller --no-monitor +Restart=on-failure +LimitNOFILE=65535 +TimeoutStopSec=15 diff --git a/debian/ovn-host.postrm b/debian/ovn-host.postrm new file mode 100644 index 000000000..9d17ef966 --- /dev/null +++ b/debian/ovn-host.postrm @@ -0,0 +1,43 @@ +#!/bin/sh +# postrm script for ovn-host +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + rm -f /var/log/openvswitch/ovn-controller.log* || true + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/ovn-host.service b/debian/ovn-host.service new file mode 100644 index 000000000..b524888fd --- /dev/null +++ b/debian/ovn-host.service @@ -0,0 +1,14 @@ +[Unit] +Description=Open Virtual Network host components +After=network.target +Requires=network.target +Wants=ovn-controller.service + +[Service] +Type=oneshot +ExecStart=/bin/true +ExecStop=/bin/true +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/debian/ovn-ic-db.install b/debian/ovn-ic-db.install new file mode 100644 index 000000000..a4d50002e --- /dev/null +++ b/debian/ovn-ic-db.install @@ -0,0 +1,2 @@ +/usr/share/ovn/ovn-ic-nb.ovsschema +/usr/share/ovn/ovn-ic-sb.ovsschema diff --git a/debian/ovn-ic-db.ovn-ovsdb-server-ic-nb.service b/debian/ovn-ic-db.ovn-ovsdb-server-ic-nb.service new file mode 100644 index 000000000..193024daf --- /dev/null +++ b/debian/ovn-ic-db.ovn-ovsdb-server-ic-nb.service @@ -0,0 +1,15 @@ +[Unit] +Description=Open vSwitch database server for OVN IC Northbound database +After=network.target +PartOf=ovn-ic-db.service +DefaultDependencies=no + +[Service] +Type=simple +EnvironmentFile=-/etc/default/ovn-ic +PIDFile=%t/ovn/ovn_ic_nb_db.pid +ExecStart=/usr/share/ovn/scripts/ovn-ctl run_ic_nb_ovsdb $OVN_CTL_OPTS +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_ic_nb_ovsdb +Restart=on-failure +LimitNOFILE=65535 +TimeoutStopSec=15 diff --git a/debian/ovn-ic-db.ovn-ovsdb-server-ic-sb.service b/debian/ovn-ic-db.ovn-ovsdb-server-ic-sb.service new file mode 100644 index 000000000..714748325 --- /dev/null +++ b/debian/ovn-ic-db.ovn-ovsdb-server-ic-sb.service @@ -0,0 +1,15 @@ +[Unit] +Description=Open vSwitch database server for OVN IC Southbound database +After=network.target +PartOf=ovn-ic-db.service +DefaultDependencies=no + +[Service] +Type=simple +EnvironmentFile=-/etc/default/ovn-ic +PIDFile=%t/ovn/ovn_ic_sb_db.pid +ExecStart=/usr/share/ovn/scripts/ovn-ctl run_ic_sb_ovsdb $OVN_CTL_OPTS +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_ic_sb_ovsdb +Restart=on-failure +LimitNOFILE=65535 +TimeoutStopSec=15 diff --git a/debian/ovn-ic-db.service b/debian/ovn-ic-db.service new file mode 100644 index 000000000..b116bc79d --- /dev/null +++ b/debian/ovn-ic-db.service @@ -0,0 +1,15 @@ +[Unit] +Description=Open Virtual Network interconnection databases +After=network.target +Requires=network.target +Wants=ovn-ovsdb-server-ic-sb.service +Wants=ovn-ovsdb-server-ic-nb.service + +[Service] +Type=oneshot +ExecStart=/bin/true +ExecStop=/bin/true +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/debian/ovn-ic.install b/debian/ovn-ic.install new file mode 100644 index 000000000..b15508259 --- /dev/null +++ b/debian/ovn-ic.install @@ -0,0 +1 @@ +/usr/bin/ovn-ic diff --git a/debian/ovn-ic.service b/debian/ovn-ic.service new file mode 100644 index 000000000..07974285f --- /dev/null +++ b/debian/ovn-ic.service @@ -0,0 +1,16 @@ +[Unit] +Description=Open Virtual Network interconnection controller +After=network.target +Requires=network.target + +[Service] +Type=forking +PIDFile=%t/ovn/ovn-ic.pid +ExecStart=/usr/share/ovn/scripts/ovn-ctl start_ic --no-monitor +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_ic +Restart=on-failure +LimitNOFILE=65535 +TimeoutStopSec=15 + +[Install] +WantedBy=multi-user.target diff --git a/debian/rules b/debian/rules new file mode 100755 index 000000000..4596afb49 --- /dev/null +++ b/debian/rules @@ -0,0 +1,104 @@ +#!/usr/bin/make -f +# -*- makefile -*- +#export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ --with autoreconf,python3,sphinxdoc + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +PARALLEL = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else +PARALLEL = +endif + +override_dh_auto_configure: + # Configure OVS before OVN + test -d $(CURDIR)/ovs || mkdir ovs + cd ovs && tar -xzf /usr/src/openvswitch/openvswitch.tar.gz --strip-components=1 + cd ovs && ./configure --enable-ssl --localstatedir=/var --sysconfdir=/etc --prefix=/usr && make $(PARALLEL) + # Configure OVN to allow building OVN VIF + ./boot.sh && ./configure \ + --prefix=/usr \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --with-dbdir=/var/lib/ovn \ + --with-ovs-source=$(CURDIR)/ovs \ + --enable-ssl + # Configure and build OVN VIF + cd ovn-vif && \ + ./boot.sh && \ + ./configure \ + --with-ovs-source=$(CURDIR)/ovs \ + --with-ovn-source=$(CURDIR) \ + --enable-plug-representor && \ + make $(PARALLEL) + # Use dh_auto_configure to build OVN + dh_auto_configure -- \ + --prefix=/usr \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --with-dbdir=/var/lib/ovn \ + --with-ovs-source=$(CURDIR)/ovs \ + --enable-ssl \ + --with-vif-plug-provider=$(CURDIR)/ovn-vif + $(MAKE) debian/copyright + +TEST_LIST = $(shell \ + $(CURDIR)/debian/testlist.py \ + $(CURDIR)/debian/flaky-tests-$(DEB_HOST_ARCH).txt \ + $(CURDIR)/tests/testsuite) + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + if $(MAKE) check TESTSUITEFLAGS='$(PARALLEL) $(TEST_LIST)' || \ + $(MAKE) check TESTSUITEFLAGS='--recheck'; then :; \ + else \ + cat tests/testsuite.log; \ + exit 1; \ + fi +endif # nocheck + +override_dh_auto_build: + cd ovs && $(MAKE) $(PARALLEL) + $(MAKE) $(PARALLEL) + +override_dh_auto_clean: + dh_auto_clean + cd ovn-vif && make distclean | : + rm -rf ovs + +override_dh_installinit: + # Package does not ship any init.d files + dh_installinit --no-scripts + +override_dh_installsystemd: + dh_installsystemd --restart-after-upgrade -povn-central --name=ovn-northd + dh_installsystemd --restart-after-upgrade -povn-central --name=ovn-ovsdb-server-sb + dh_installsystemd --restart-after-upgrade -povn-central --name=ovn-ovsdb-server-nb + dh_installsystemd --restart-after-upgrade -povn-ic-db --name=ovn-ovsdb-server-ic-sb + dh_installsystemd --restart-after-upgrade -povn-ic-db --name=ovn-ovsdb-server-ic-nb + dh_installsystemd --restart-after-upgrade -povn-host --name=ovn-controller + dh_installsystemd --restart-after-upgrade + +override_dh_python3: + dh_python3 --shebang=/usr/bin/python3 + +# Helper target for creating snapshots from upstream git +DATE=$(shell date +%Y%m%d) +# Upstream branch to track +BRANCH=main +VERSION=22.09.0 + +get-orig-snapshot: + rm -Rf ovn-upstream ovn-vif-upstream + git clone --branch $(BRANCH) --depth 1 https://github.com/ovn-org/ovn ovn-upstream + git clone --branch $(BRANCH) --depth 1 https://github.com/ovn-org/ovn-vif ovn-vif-upstream + cd ovn-upstream && \ + export COMMIT=`git rev-parse --short HEAD` && \ + git archive --format tgz --prefix=ovn-$(VERSION)~git$(DATE).$$COMMIT/ \ + -o ../../ovn_$(VERSION)~git$(DATE).$$COMMIT.orig.tar.gz $(BRANCH) && \ + cd ../ovn-vif-upstream && \ + git archive --format tgz --prefix=ovn-vif-$(VERSION)~git$(DATE).$$COMMIT/ \ + -o ../../ovn_$(VERSION)~git$(DATE).$$COMMIT.orig-ovn-vif.tar.gz $(BRANCH) + rm -Rf ovn-upstream ovn-vif-upstream diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 000000000..2dfb2fe55 --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1 @@ +ovn-vif/Documentation/_static/logo.png diff --git a/debian/testlist.py b/debian/testlist.py new file mode 100755 index 000000000..24d2ae9c5 --- /dev/null +++ b/debian/testlist.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python3 +import enum +import itertools +import os +import sys + + +if len(sys.argv) < 3: + print( + "usage: {} skipdescriptionlist testsuite\n" + "\n" + "This program reads two files, a skiplist containing the \n" + "description of tests to skip separated by newline, and a \n" + "generated testsuite script.\n" + "\n" + "From this it produces string with range of tests to execute \n" + "which can be provided to the testsuite script.\n".format(sys.argv[0]), + file=sys.stderr, + ) + sys.exit(os.EX_USAGE) + + +SKIP_TEST_STRINGS = [] +with open(sys.argv[1]) as fin: + SKIP_TEST_STRINGS = [line.rstrip() for line in fin.readlines()] + + +@enum.unique +class State(enum.Enum): + INIT = enum.auto() + AT_HELP_ALL = enum.auto() + + +SKIP_TESTS = set() +TESTS = set() +with open(sys.argv[2]) as fin: + state = State.INIT + last_test = 0 + for line in fin.readlines(): + if state == State.INIT: + if not line.startswith('at_help_all="'): + continue + else: + state = State.AT_HELP_ALL + data = line.split('"')[1].rstrip().split(";") + elif state == State.AT_HELP_ALL: + if line.startswith('"'): + break + data = line.rstrip().split(";") + test_nr = int(data[0]) + if last_test < test_nr: + last_test = test_nr + for skip_string in SKIP_TEST_STRINGS: + if skip_string in data[2]: + SKIP_TESTS.add(test_nr) + else: + TESTS.add(test_nr) + + +def ranges(testlist): + for a, b in itertools.groupby( + enumerate(list(testlist)), lambda pair: pair[1] - pair[0] + ): + b = list(b) + yield b[0][1], b[-1][1] + + +testranges = [ + "{}-{}".format(testrange[0], testrange[1]) + for testrange in ranges(TESTS - SKIP_TESTS) +] +print(" ".join(testranges)) diff --git a/debian/watch b/debian/watch new file mode 100644 index 000000000..4831f3456 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/ovn-$1\.tar\.gz/ \ + https://github.com/ovn-org/ovn/tags .*/v?(\d\S+)\.tar\.gz +opts="filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/ovn-vif-$1\.tar\.gz/, component=ovn-vif" \ + https://github.com/ovn-org/ovn-vif/tags .*/v?(\d\S+)\.tar\.gz From patchwork Fri Aug 5 20:34:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1664194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=kFBKC61L; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lzy5c4nRgz9s1l for ; Sat, 6 Aug 2022 06:35:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C84F341E0C; Fri, 5 Aug 2022 20:35:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C84F341E0C Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=kFBKC61L 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 PVulfAlEIint; Fri, 5 Aug 2022 20:35:10 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0E3EC41D25; Fri, 5 Aug 2022 20:35:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0E3EC41D25 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id DBE6EC008D; Fri, 5 Aug 2022 20:35:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9FE49C002D for ; Fri, 5 Aug 2022 20:34:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 827274049B for ; Fri, 5 Aug 2022 20:34:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 827274049B Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=kFBKC61L 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 0a4Z05hkWtHC for ; Fri, 5 Aug 2022 20:34:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 88A7E40B38 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by smtp2.osuosl.org (Postfix) with ESMTPS id 88A7E40B38 for ; Fri, 5 Aug 2022 20:34:57 +0000 (UTC) Received: from frode-threadripper.. (ti0189a330-0179.bb.online.no [88.91.31.180]) (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 smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id F1AD141714 for ; Fri, 5 Aug 2022 20:34:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1659731695; bh=4iemD4q00WE2Eb1bQPiteCMjRgEOSWwezjv0ZtKZjRY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kFBKC61LOtbkVC+nWl613tl33rEG84G1M29DYO8FEPBvx4aK7pUjYHBvxK/22pPS8 NhRwxpd8gPAbe/1/QICpKNDg+DNeESVDdphpYRvfYVbk8Q94YFRAB2yMCkvhkR3oft YHpqMRooI1+vz4K3cIu7Z/27gDLyVQCMMuKA/tkFE6eeXvxYs8u7vKP/kOoqKQ4GYK /o/fpn+7BlAKAzCUX/NneGTKfePIi6x5yIuMpT3xkBH4T7eXzYIpZBgn1jRyT0SVDo xZWPpQg8TyLaS984UXanNSm08vsphWsdkW3c83M1wzyH4PW+Dxq1xrpNFu/bhqCa+F Xv7vBabRIByLg== From: Frode Nordahl To: dev@openvswitch.org Date: Fri, 5 Aug 2022 22:34:52 +0200 Message-Id: <20220805203452.3060165-6-frode.nordahl@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805203452.3060165-1-frode.nordahl@canonical.com> References: <20220805203452.3060165-1-frode.nordahl@canonical.com> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn 5/5] ci: Add jobb for building the deb package. 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: Frode Nordahl --- .ci/linux-build.sh | 33 +++++++++++++++++++++++++ .ci/linux-prepare.sh | 6 +++++ .github/workflows/test.yml | 49 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index dc32564fa..6a2226223 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -69,9 +69,42 @@ if [ "$TESTSUITE" ]; then exit 1 fi fi +elif [ "$DEB_PACKAGE" ]; then + configure_ovn + make debian + + # There is a pending SRU to the Ubuntu Open vSwitch package that allows + # building OVN 22.03.1 and onwards. Let's use the Debian package until + # it arrives. + deb_ovs_pool=http://ftp.debian.org/debian/pool/main/o/openvswitch + wget -O /tmp/openvswitch-source_2.17.2-3_all.deb \ + $deb_ovs_pool/openvswitch-source_2.17.2-3_all.deb + sudo dpkg -i /tmp/openvswitch-source_2.17.2-3_all.deb + + mk-build-deps --install --root-cmd sudo --remove debian/control + dpkg-checkbuilddeps + make debian-deb + packages=$(ls $(pwd)/../*.deb) + deps="" + for pkg in $packages; do + _ifs=$IFS + IFS="," + for dep in $(dpkg-deb -f $pkg Depends); do + dep_name=$(echo "$dep"|awk '{print$1}') + # Don't install internal package inter-dependencies from apt + echo $dep_name | grep -q ovn && continue + deps+=" $dep_name" + done + IFS=$_ifs + done + # install package dependencies from apt + echo $deps | xargs sudo apt -y install + # install the locally built openvswitch packages + sudo dpkg -i $packages else configure_ovn $OPTS make -j4 || { cat config.log; exit 1; } fi + exit 0 diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh index e0c528479..6d73f1535 100755 --- a/.ci/linux-prepare.sh +++ b/.ci/linux-prepare.sh @@ -2,6 +2,12 @@ set -ev +if [ "$DEB_PACKAGE" ]; then + # We're not using sparse for debian packages, tests are skipped and + # all extra dependencies tracked by mk-build-deps. + exit 0 +fi + # Build and install sparse. # # Explicitly disable sparse support for llvm because some travis diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3b7283229..973fb9666 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -169,3 +169,52 @@ jobs: with: name: logs-osx-clang---disable-ssl path: config.log + + build-linux-deb: + env: + deb_dependencies: | + build-essential fakeroot devscripts equivs + DEB_PACKAGE: yes + DEB_HOST_ARCH: amd64 + + name: linux deb + runs-on: ubuntu-22.04 + timeout-minutes: 30 + + strategy: + fail-fast: false + + steps: + - name: checkout self + uses: actions/checkout@v2 + with: + submodules: recursive + + - name: checkout ovn-vif + uses: actions/checkout@v2 + with: + repository: 'ovn-org/ovn-vif' + path: 'ovn-vif' + ref: 'main' + + - name: update PATH + run: | + echo "$HOME/bin" >> $GITHUB_PATH + echo "$HOME/.local/bin" >> $GITHUB_PATH + + - name: update APT cache + run: sudo apt update || true + - name: install dependencies for debian packages + run: sudo apt install -y ${{ env.deb_dependencies }} + + - name: prepare + run: ./.ci/linux-prepare.sh + + - name: build + run: ./.ci/linux-build.sh + + - name: upload deb packages + uses: actions/upload-artifact@v2 + with: + name: deb-packages + path: '/home/runner/work/ovn/*.deb'