From patchwork Thu Aug 24 03:55:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 805225 X-Patchwork-Delegate: rbryant@redhat.com 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=) 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 3xd9SJ1B72z9t24 for ; Thu, 24 Aug 2017 13:55:44 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 895F4899; Thu, 24 Aug 2017 03:55:42 +0000 (UTC) X-Original-To: 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 62FBF898 for ; Thu, 24 Aug 2017 03:55:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 49118237 for ; Thu, 24 Aug 2017 03:55:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A2F8C37EEF for ; Thu, 24 Aug 2017 03:55:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A2F8C37EEF Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=mmichels@redhat.com Received: from monae.redhat.com (ovpn-124-226.rdu2.redhat.com [10.10.124.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62C807EFC0 for ; Thu, 24 Aug 2017 03:55:40 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 23 Aug 2017 22:55:39 -0500 Message-Id: <20170824035539.13695-1-mmichels@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 24 Aug 2017 03:55:40 +0000 (UTC) Subject: [ovs-dev] [PATCH] ovn: Check for known logical switch port types. 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org OVN is lenient with the types of logical switch ports. Maybe too lenient. This patch attempts to solve this problem on two fronts: 1) In ovn-nbctl, if you attempt to set the port type to an unknown type, the command will not end up setting the type. 2) In northd, when copying the port type from the northbound database to the corresponding port-binding in the southbound database, a warning will be issued if the port is of an unknown type. Signed-off-by: Mark Michelson --- ovn/lib/ovn-util.c | 30 +++++++++++++++++++ ovn/lib/ovn-util.h | 2 ++ ovn/northd/ovn-northd.c | 4 +++ ovn/utilities/ovn-nbctl.c | 7 ++++- tests/ovn-nbctl.at | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 115 insertions(+), 1 deletion(-) diff --git a/ovn/lib/ovn-util.c b/ovn/lib/ovn-util.c index 037d0798a..883ce4ccb 100644 --- a/ovn/lib/ovn-util.c +++ b/ovn/lib/ovn-util.c @@ -299,3 +299,33 @@ default_sb_db(void) } return def; } + +/* l3gateway, chassisredirect, and patch + * are not in this list since they are + * only set in the SB DB by northd + */ +const char *OVN_NB_LSP_TYPES[] = { + "router", + "localnet", + "localport", + "l2gateway", + "vtep", +}; + +bool +ovn_is_known_nb_lsp_type(const char *type) +{ + int i; + + if (!type || !type[0]) { + return true; + } + + for (i = 0; i < ARRAY_SIZE(OVN_NB_LSP_TYPES); ++i) { + if (!strcmp(OVN_NB_LSP_TYPES[i], type)) { + return true; + } + } + + return false; +} diff --git a/ovn/lib/ovn-util.h b/ovn/lib/ovn-util.h index b3d2125a3..9b456426d 100644 --- a/ovn/lib/ovn-util.h +++ b/ovn/lib/ovn-util.h @@ -67,4 +67,6 @@ char *alloc_nat_zone_key(const struct uuid *key, const char *type); const char *default_nb_db(void); const char *default_sb_db(void); +bool ovn_is_known_nb_lsp_type(const char *type); + #endif diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index 49e4ac338..177df5a1e 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -1962,6 +1962,10 @@ ovn_port_update_sbrec(struct northd_context *ctx, } sbrec_port_binding_set_options(op->sb, &options); smap_destroy(&options); + if (!ovn_is_known_nb_lsp_type(op->nbsp->type)) { + VLOG_WARN("Unknown port type '%s' set on logical switch '%s'. " + "Using anyway.", op->nbsp->type, op->nbsp->name); + } sbrec_port_binding_set_type(op->sb, op->nbsp->type); } else { const char *chassis = NULL; diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index 46ede4e50..d00bd6ec9 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -1173,7 +1173,12 @@ nbctl_lsp_set_type(struct ctl_context *ctx) const struct nbrec_logical_switch_port *lsp; lsp = lsp_by_name_or_uuid(ctx, id, true); - nbrec_logical_switch_port_set_type(lsp, type); + if (ovn_is_known_nb_lsp_type(type)) { + nbrec_logical_switch_port_set_type(lsp, type); + } else { + ctl_fatal("Logical switch port type '%s' is unrecognized. " + "Not setting type.", type); + } } static void diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at index 354b8df96..e1c4b4473 100644 --- a/tests/ovn-nbctl.at +++ b/tests/ovn-nbctl.at @@ -951,3 +951,76 @@ IPv6 Routes OVN_NBCTL_TEST_STOP AT_CLEANUP + +dnl --------------------------------------------------------------------- + +AT_SETUP([ovn-nbctl - lsp types]) +OVN_NBCTL_TEST_START + +AT_CHECK([ovn-nbctl ls-add ls0]) +AT_CHECK([ovn-nbctl lsp-add ls0 lp0]) + +dnl switchport type defaults to empty +AT_CHECK([ovn-nbctl lsp-get-type lp0], [0], [dnl + +]) + +dnl The following are the valid entries for +dnl switchport type +AT_CHECK([ovn-nbctl lsp-set-type lp0 l2gateway]) +AT_CHECK([ovn-nbctl lsp-get-type lp0], [0], [dnl +l2gateway +]) + +AT_CHECK([ovn-nbctl lsp-set-type lp0 router]) +AT_CHECK([ovn-nbctl lsp-get-type lp0], [0], [dnl +router +]) + +AT_CHECK([ovn-nbctl lsp-set-type lp0 localnet]) +AT_CHECK([ovn-nbctl lsp-get-type lp0], [0], [dnl +localnet +]) + +AT_CHECK([ovn-nbctl lsp-set-type lp0 localport]) +AT_CHECK([ovn-nbctl lsp-get-type lp0], [0], [dnl +localport +]) + +AT_CHECK([ovn-nbctl lsp-set-type lp0 vtep]) +AT_CHECK([ovn-nbctl lsp-get-type lp0], [0], [dnl +vtep +]) + +dnl All of these are valid southbound port types but +dnl should be rejected for northbound logical switch +dnl ports. +AT_CHECK([ovn-nbctl lsp-set-type lp0 l3gateway], [1], [], [dnl +ovn-nbctl: Logical switch port type 'l3gateway' is unrecognized. Not setting type. +]) +AT_CHECK([ovn-nbctl lsp-set-type lp0 patch], [1], [], [dnl +ovn-nbctl: Logical switch port type 'patch' is unrecognized. Not setting type. +]) +AT_CHECK([ovn-nbctl lsp-set-type lp0 chassisredirect], [1], [], [dnl +ovn-nbctl: Logical switch port type 'chassisredirect' is unrecognized. Not setting type. +]) + +dnl switch port type should still be "vtep" since previous +dnl commands failed. +AT_CHECK([ovn-nbctl lsp-get-type lp0], [0], [dnl +vtep +]) + +dnl Attempt a nonsense type +AT_CHECK([ovn-nbctl lsp-set-type lp0 eggs], [1], [], [dnl +ovn-nbctl: Logical switch port type 'eggs' is unrecognized. Not setting type. +]) + +dnl Empty string should work too +AT_CHECK([ovn-nbctl lsp-set-type lp0 ""]) +AT_CHECK([ovn-nbctl lsp-get-type lp0], [0], [dnl + +]) + +OVN_NBCTL_TEST_STOP +AT_CLEANUP