From patchwork Thu Aug 1 23:52:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Sharma X-Patchwork-Id: 1140844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nutanix.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nutanix.com header.i=@nutanix.com header.b="pDr0riiC"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4606ZN6pHtz9s7T for ; Fri, 2 Aug 2019 09:53:48 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8571514A3; Thu, 1 Aug 2019 23:52:24 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 6746C149F for ; Thu, 1 Aug 2019 23:52:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx0b-002c1b01.pphosted.com (mx0b-002c1b01.pphosted.com [148.163.155.12]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3BE6282B for ; Thu, 1 Aug 2019 23:52:21 +0000 (UTC) Received: from pps.filterd (m0127841.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x71No1dm009082 for ; Thu, 1 Aug 2019 16:52:20 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=proofpoint20171006; bh=FCbtyCruEQiqy6y6lADybDNn/r9zjuWBVJYJ8Vf8lgM=; b=pDr0riiCJc5mcI5KOTcPKDm3JpEZdESKs90tSEqfXBJFpijAY7yDrpByugGVXXU1tfh/ /Y4Wf/zp8x+xb/a98JnflmCRZ8uFMLVg3UVxgmqEjfwJ0YsIoi6ZBvduRJIKM10OCOc7 WLDqDcSyysxTnF24Jk7X/L8/j7esOO5nEXoh05bziquR891hDIq8DVeSQ4kOk4SeUZVb xoLyK1Erx4NgW4VGYHe/d/YMEB9aY8SvRhgBGbcvbYF073g5pmnWCNvPQ4S1vKyG5Ske JrnacHdADArJ8BnQGhIgyN3yXJERfqDnM2z/YPM/lXf2oWMLrp2IdWg9p0j52qbBaOLM Vg== Received: from nam02-cy1-obe.outbound.protection.outlook.com (mail-cys01nam02lp2054.outbound.protection.outlook.com [104.47.37.54]) by mx0b-002c1b01.pphosted.com with ESMTP id 2u0m58jger-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 01 Aug 2019 16:52:20 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BqAd9cDb6nvpDwf1Y1HkcFtS2hvObpOdXcP+9AQSi4mb0q+i5BtTNu5WQLWdB6P+fDg/SCVyLVwEWTQo+65HChjlZWeyV7if9yjyiP2l65fT1mk84VZrH7o+kvK0scJeZKzNntHY2mfPXQdZ1aQbH7NJtPM8j14FWav5FxUwFxSbu49MBLYRZVx/dL4Ju9HQ/BCLO84708Led1KWsPgPl9bbbKrRyg483NGNxrqtOqY6rvVoxrw9Zfw5MJdGYAPTVBrokgxHIUpTa+jjWmpQWDu/k0F16yxFSQsWgSzr5i0ltjfS66cczB/uQj8wcCwrggjkFahNmefNZcPZOq5jCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FCbtyCruEQiqy6y6lADybDNn/r9zjuWBVJYJ8Vf8lgM=; b=B8GB/yWOfQ0LiU6kxWajEUJxfAgw3SM4uay/95Ytb2uaZr4Dg60idHgWBHDy0K/HqxXAYSL1hXh7V5APrvJDRoalscFAaTvIUtPVm74X7hV7sZ0GcmU9okaJyk6Pua826wcHOeOgwQZpzrsKVfQxQLCes18dg/Qq5pve3NRfFTWczIbTSqXGw3jSp+z1S1YiFZwIMrLsE3Hghu3M75bZHLAbyRmD6PRGDiWpa+eIPo/EgiGEO/y6K9SYzylHWaGDcjp6BhyW/hPI3YkHGp2GnJ7qA4du28ZKCCsq6RUOy4RLGWQLMvO++NkUBwKXYnra+2qtWmcO+ibov1LdrsTPRg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=nutanix.com;dmarc=pass action=none header.from=nutanix.com;dkim=pass header.d=nutanix.com;arc=none Received: from MW2PR02MB3899.namprd02.prod.outlook.com (52.132.178.28) by MW2PR02MB3657.namprd02.prod.outlook.com (52.132.177.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.13; Thu, 1 Aug 2019 23:52:19 +0000 Received: from MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::a4e3:ca62:dfc6:1149]) by MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::a4e3:ca62:dfc6:1149%3]) with mapi id 15.20.2136.010; Thu, 1 Aug 2019 23:52:19 +0000 From: Ankur Sharma To: "ovs-dev@openvswitch.org" Thread-Topic: [PATCH v3 2/4 ovn] OVN: Vlan backed DVR N-S, redirect-type option Thread-Index: AQHVSMQnqu9EINNGLEiAaybIybs+4g== Date: Thu, 1 Aug 2019 23:52:19 +0000 Message-ID: <1564703707-21545-3-git-send-email-ankur.sharma@nutanix.com> References: <1564703707-21545-1-git-send-email-ankur.sharma@nutanix.com> In-Reply-To: <1564703707-21545-1-git-send-email-ankur.sharma@nutanix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR06CA0041.namprd06.prod.outlook.com (2603:10b6:a03:14b::18) To MW2PR02MB3899.namprd02.prod.outlook.com (2603:10b6:907:4::28) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 1.8.3.1 x-originating-ip: [192.146.154.1] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8ba7a864-7cbc-49ce-aa92-08d716db49f7 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:MW2PR02MB3657; x-ms-traffictypediagnostic: MW2PR02MB3657: x-microsoft-antispam-prvs: x-proofpoint-crosstenant: true x-ms-oob-tlc-oobclassifiers: OLM:1002; x-forefront-prvs: 01165471DB x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(396003)(346002)(366004)(376002)(136003)(199004)(189003)(76176011)(2501003)(6512007)(2351001)(25786009)(5640700003)(36756003)(8676002)(7736002)(316002)(6506007)(14444005)(6436002)(8936002)(53936002)(71200400001)(305945005)(102836004)(66946007)(2906002)(256004)(5024004)(81156014)(81166006)(6486002)(3846002)(386003)(26005)(86362001)(50226002)(68736007)(2616005)(6916009)(14454004)(478600001)(66574012)(5660300002)(486006)(66476007)(66556008)(64756008)(66446008)(66066001)(52116002)(107886003)(4720700003)(186003)(446003)(4326008)(44832011)(6116002)(99286004)(11346002)(71190400001)(476003)(64030200001); DIR:OUT; SFP:1102; SCL:1; SRVR:MW2PR02MB3657; H:MW2PR02MB3899.namprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nutanix.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: PzkMjYwf0C/VkJGxtzIcA+LiaGHzDq4YelXf/mwcC1h+tV5h9vbYy6yTplQ6iGI683ajZ4sna3IJjmsbLRn57pYAP3yEQA3+gAtdygN6yPpwSX7Gwxpxv3S+9KKQPxxaNvOx29mS7QL6LGSS2Ev1z54lQWj+dhumKKm5yA6mt7sDMFliSsFyksIpqvssucU/gwb7H2640dijWByx9JKWcFj/Uc7lv0TfD2y+PW21fjcvjLmPoOoFxSoxnQN9KwJL4zMaHxEUEic3lBEEFubkte2ofhCXQ/rHumsYlZdoTJANw9ZFV0etHOyZhZFqlvkRzzH7GF+L6uoNzsD1P8fUvUI9eZH5lm9J5eElgISONdsSE+mays/andg7F3hL3OTi75NUwTOGUC5AQV8POFgrqfbCAzB7bJSa7W2d+vNysRM= MIME-Version: 1.0 X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ba7a864-7cbc-49ce-aa92-08d716db49f7 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Aug 2019 23:52:19.2890 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ankur.sharma@nutanix.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR02MB3657 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:5.22.84,1.0.8 definitions=2019-08-01_10:2019-07-31,2019-08-01 signatures=0 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v3 2/4 ovn] OVN: Vlan backed DVR N-S, redirect-type option X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Background: With c0974331b7a19a87ab8f1f2cec8fbe366af92fa2, we have added support for E-W workflow for vlan backed DVRs. This series enables N-S workflow for vlan backed DVRs. Key difference between E-W and N-S traffic flow is that N-S flow requires a gateway chassis. A gateway chassis will be respondible for following: a. Doing Network Address Translation (NAT). b. Becoming entry and exit point for North->South and South->North traffic respectively. OVN by default always uses overlay encapsulation to redirect the packet to gateway chassis. This series will enable the redirection to gateway chassis in the absence of encapsulation. This patch: a. Add a new key-value in options of a router port. b. This new config key will be used by ovn-controller to determine if a redirected packet will go out of tunnel port or localnet port. c. key is "redirect-type" and it takes "overlay" and "vlan" as values. d. Added ovn-nbctl command to set and get redirect-type option on a router port. e. This new configuration is added because vlan or overlay based forwarding is considered to be a logical switch property, hence for a router configuration has to be done at the router port level. Signed-off-by: Ankur Sharma --- northd/ovn-northd.c | 6 ++++++ ovn-nb.xml | 43 ++++++++++++++++++++++++++++++++++++++ tests/ovn-nbctl.at | 25 ++++++++++++++++++++++ tests/ovn-northd.at | 31 +++++++++++++++++++++++++++ utilities/ovn-nbctl.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 163 insertions(+) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index cd776fa..7c0fd6c 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -2445,6 +2445,9 @@ ovn_port_update_sbrec(struct northd_context *ctx, if (op->derived) { const char *redirect_chassis = smap_get(&op->nbrp->options, "redirect-chassis"); + const char *redirect_type = smap_get(&op->nbrp->options, + "redirect-type"); + int n_gw_options_set = 0; if (op->nbrp->ha_chassis_group) { n_gw_options_set++; @@ -2537,6 +2540,9 @@ ovn_port_update_sbrec(struct northd_context *ctx, sbrec_port_binding_set_gateway_chassis(op->sb, NULL, 0); } smap_add(&new, "distributed-port", op->nbrp->name); + if (redirect_type) { + smap_add(&new, "redirect-type", redirect_type); + } } else { if (op->peer) { smap_add(&new, "peer", op->peer->key); diff --git a/ovn-nb.xml b/ovn-nb.xml index f5f10a5..971017b 100644 --- a/ovn-nb.xml +++ b/ovn-nb.xml @@ -1947,6 +1947,49 @@ issues.

+ + +

+ This options dictates if a packet redirected to + gateway chassis will be overlay encapsulated + or go as a regular vlan packet. +

+ +

+ Option takes following values +

+ +
    +
  • + OVERLAY +
    • + +
  • + VLAN +
    • +
+ +

+ OVERLAY option will ensure that redirected packet goes out as + encapsulation via the tunnel port. +

+ +

+ VLAN option will ensure that redirected packet goes out as vlan + tagged via the localnet port. +

+ +

+ OVERLAY is the default redirection type. +

+ +

+ Option is applicable only to gateway chassis attached logical + router ports. +

+ + + diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at index a19e33f..11a3273 100644 --- a/tests/ovn-nbctl.at +++ b/tests/ovn-nbctl.at @@ -1220,6 +1220,31 @@ lrp0-chassis1 1 dnl --------------------------------------------------------------------- +OVN_NBCTL_TEST([ovn_nbctl_redirect_type], [logical router port redirect type], [ +AT_CHECK([ovn-nbctl lr-add lr0]) +AT_CHECK([ovn-nbctl lrp-add lr0 lrp0 00:00:00:01:02:03 192.168.1.1/24]) +AT_CHECK([ovn-nbctl lrp-get-redirect-type lrp0], [0], [dnl +overlay +]) +AT_CHECK([ovn-nbctl lrp-set-redirect-type lp0 vlan], [1], [], +[ovn-nbctl: lp0: port name not found +]) +AT_CHECK([ovn-nbctl lrp-set-redirect-type lrp0 vlan], [0], []) +AT_CHECK([ovn-nbctl lrp-get-redirect-type lrp0], [0], [dnl +vlan +]) +AT_CHECK([ovn-nbctl lrp-set-redirect-type lrp0 overlay], [0], []) +AT_CHECK([ovn-nbctl lrp-get-redirect-type lrp0], [0], [dnl +overlay +]) +AT_CHECK([ovn-nbctl lrp-set-redirect-type lrp0 abcd], [1], [], +[ovn-nbctl: Invalid redirect type: abcd +]) + +]) + +dnl --------------------------------------------------------------------- + OVN_NBCTL_TEST([ovn_nbctl_lrp_enable], [logical router port enable and disable], [ AT_CHECK([ovn-nbctl lr-add lr0]) AT_CHECK([ovn-nbctl lrp-add lr0 lrp0 00:00:00:01:02:03 192.168.1.1/24]) diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 0dea04e..8718130 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -936,3 +936,34 @@ OVS_WAIT_UNTIL([ test 0 = $?]) AT_CLEANUP + +AT_SETUP([ovn -- check Redirect Chassis propagation from NB to SB]) +AT_SKIP_IF([test $HAVE_PYTHON = no]) +ovn_start + +ovn-sbctl chassis-add gw1 geneve 127.0.0.1 + +ovn-nbctl lr-add R1 +ovn-nbctl lrp-add R1 R1-S1 02:ac:10:01:00:01 172.16.1.1/24 + +ovn-nbctl ls-add S1 +ovn-nbctl lsp-add S1 S1-R1 +ovn-nbctl lsp-set-type S1-R1 router +ovn-nbctl lsp-set-addresses S1-R1 router +ovn-nbctl --wait=sb lsp-set-options S1-R1 router-port=R1-S1 + +ovn-nbctl lrp-set-gateway-chassis R1-S1 gw1 + +uuid=`ovn-sbctl --columns=_uuid --bare find Port_Binding logical_port=cr-R1-S1` +echo "CR-LRP UUID is: " $uuid + +ovn-nbctl lrp-set-redirect-type R1-S1 vlan +AT_CHECK([ovn-sbctl get Port_Binding ${uuid} options:redirect-type], [0], [vlan +]) + +ovn-nbctl lrp-set-redirect-type R1-S1 overlay +AT_CHECK([ovn-sbctl get Port_Binding ${uuid} options:redirect-type], [0], [overlay +]) + + +AT_CLEANUP diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c index ad999dd..991bee5 100644 --- a/utilities/ovn-nbctl.c +++ b/utilities/ovn-nbctl.c @@ -661,6 +661,14 @@ Logical router port commands:\n\ ('enabled' or 'disabled')\n\ lrp-get-enabled PORT get administrative state PORT\n\ ('enabled' or 'disabled')\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\ + 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\ \n\ Route commands:\n\ [--policy=POLICY] lr-route-add ROUTER PREFIX NEXTHOP [PORT]\n\ @@ -4591,6 +4599,52 @@ nbctl_lrp_get_enabled(struct ctl_context *ctx) !lrp->enabled || *lrp->enabled ? "enabled" : "disabled"); } + +/* Set the logical router port redirect type. */ +static void +nbctl_lrp_set_redirect_type(struct ctl_context *ctx) +{ + const char *id = ctx->argv[1]; + const char *type = ctx->argv[2]; + const struct nbrec_logical_router_port *lrp = NULL; + struct smap lrp_options; + + char *error = lrp_by_name_or_uuid(ctx, id, true, &lrp); + if (error) { + ctx->error = error; + return; + } + + if (strcasecmp(type, "vlan") && strcasecmp(type, "overlay")) { + error = xasprintf("Invalid redirect type: %s", type); + ctx->error = error; + return; + } + + smap_init(&lrp_options); + smap_add(&lrp_options, "redirect-type", type); + + nbrec_logical_router_port_set_options(lrp, &lrp_options); + smap_destroy(&lrp_options); +} + +static void +nbctl_lrp_get_redirect_type(struct ctl_context *ctx) +{ + const char *id = ctx->argv[1]; + const struct nbrec_logical_router_port *lrp = NULL; + + char *error = lrp_by_name_or_uuid(ctx, id, true, &lrp); + if (error) { + ctx->error = error; + return; + } + + const char *redirect_type = smap_get(&lrp->options, "redirect-type"); + ds_put_format(&ctx->output, "%s\n", + !redirect_type ? "overlay": redirect_type); +} + struct ipv4_route { int priority; @@ -5598,6 +5652,10 @@ static const struct ctl_command_syntax nbctl_commands[] = { NULL, "", RW }, { "lrp-get-enabled", 1, 1, "PORT", NULL, nbctl_lrp_get_enabled, NULL, "", RO }, + { "lrp-set-redirect-type", 2, 2, "PORT TYPE", NULL, + nbctl_lrp_set_redirect_type, NULL, "", RW }, + { "lrp-get-redirect-type", 1, 1, "PORT", NULL, nbctl_lrp_get_redirect_type, + NULL, "", RO }, /* logical router route commands. */ { "lr-route-add", 3, 4, "ROUTER PREFIX NEXTHOP [PORT]", NULL,