From patchwork Mon Feb 24 23:39:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1243717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48RJST5Wvgz9sPg for ; Tue, 25 Feb 2020 10:39:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 22F44877E2; Mon, 24 Feb 2020 23:39:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y7PxyhJIjBAA; Mon, 24 Feb 2020 23:39:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 362D187820; Mon, 24 Feb 2020 23:39:35 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 17E9FC07FF; Mon, 24 Feb 2020 23:39:35 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3CB43C0177 for ; Mon, 24 Feb 2020 23:39:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2C4CC8487B for ; Mon, 24 Feb 2020 23:39:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eu84pqyR7pqO for ; Mon, 24 Feb 2020 23:39:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8B588847C3 for ; Mon, 24 Feb 2020 23:39:31 +0000 (UTC) Received: from localhost.localdomain (unknown [66.170.99.95]) (Authenticated sender: blp@ovn.org) by relay12.mail.gandi.net (Postfix) with ESMTPSA id B61B1200005; Mon, 24 Feb 2020 23:39:27 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 24 Feb 2020 15:39:22 -0800 Message-Id: <20200224233922.697819-1-blp@ovn.org> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH ovn] ovn-northd: Fix documentation and comments for bridged redirection. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The series that introduced redirect-type first used "vlan" as the name for the feature, then changed to "bridged" without updating all the comments and the documentation. This updates those. CC: Ankur Sharma Fixes: 37cd27b8a85e ("OVN: Vlan backed DVR N-S, redirect-type option") Fixes: 8ba15c3d1084 ("OVN: Vlan backed DVR N-S, avoid get_arp on non redirect chassis.") Fixes: 03493b33c073 ("OVN: Vlan backed DVR N-S, redirect packet via localnet port") Signed-off-by: Ben Pfaff Acked-by: Numan Siddique --- northd/ovn-northd.c | 2 +- ovn-architecture.7.xml | 20 ++++++++++---------- utilities/ovn-nbctl.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 3aba0487d451..4ae4a04a8d3a 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -9442,7 +9442,7 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, /* Packet is on a non gateway chassis and * has an unresolved ARP on a network behind gateway * chassis attached router port. Since, redirect type - * is set to vlan, hence instead of calling "get_arp" + * is "bridged", instead of calling "get_arp" * on this node, we will redirect the packet to gateway * chassis, by setting destination mac router port mac.*/ ds_clear(&match); diff --git a/ovn-architecture.7.xml b/ovn-architecture.7.xml index 6ff924a43ff1..9c8c6ff2dbb3 100644 --- a/ovn-architecture.7.xml +++ b/ovn-architecture.7.xml @@ -1662,18 +1662,18 @@

- VLAN based redirection + VLAN-based redirection: As an enhancement to reside-on-redirect-chassis we support - VLAN based redirection as well. By setting - options:redirect-type to vlan to a gateway + VLAN-based redirection as well. By setting + options:redirect-type to bridged on a gateway chassis attached router port, user can enforce that redirected packet should not use tunnel port but rather use localnet port of peer logical - switch to go out as vlan packet. + switch to go out on a physical VLAN.

- Following happens for a VLAN based redirection: + Following happens for bridged redirection:

  1. @@ -1688,9 +1688,9 @@
  2. - This VLAN backed redirected packet has destination mac - as router port mac (the one to which gateway chassis is attached) and - vlan id is that of localnet port (peer logical switch of + This redirected packet has destination mac + as router port mac (the one to which gateway chassis is attached). + Its VLAN id is that of localnet port (peer logical switch of the logical router port).
    3. @@ -1705,7 +1705,7 @@

- Some guidelines and expections with VLAN based redirection: + Some guidelines and expections with bridged redirection:

    @@ -1725,7 +1725,7 @@
  1. Default redirection type continues to be overlay. - User can switch the redirect-type between vlan + User can switch the redirect-type between bridged and overlay by changing the value of options:redirect-type
    2. diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c index 33cb75046ee6..e80058e614a3 100644 --- a/utilities/ovn-nbctl.c +++ b/utilities/ovn-nbctl.c @@ -680,11 +680,11 @@ Logical router port commands:\n\ lrp-set-redirect-type PORT TYPE\n\ set whether redirected packet to gateway chassis\n\ of PORT will be encapsulated or not\n\ - ('overlay' or 'vlan')\n\ + ('overlay' or 'bridged')\n\ lrp-get-redirect-type PORT\n\ get whether redirected packet to gateway chassis\n\ of PORT will be encapsulated or not\n\ - ('overlay' or 'vlan')\n\ + ('overlay' or 'bridged')\n\ \n\ Route commands:\n\ [--policy=POLICY] [--ecmp] lr-route-add ROUTER PREFIX NEXTHOP [PORT]\n\