From patchwork Sat Oct 10 04:20:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 528532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id E2F83140E42 for ; Sat, 10 Oct 2015 15:20:46 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id ECC7310B28; Fri, 9 Oct 2015 21:20:45 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 325EA10AB4 for ; Fri, 9 Oct 2015 21:20:45 -0700 (PDT) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id AB8F01E0493 for ; Fri, 9 Oct 2015 22:20:44 -0600 (MDT) X-ASG-Debug-ID: 1444450844-03dc537fe1ef2650001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id pXhJAWdsNP6vMwZT (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 09 Oct 2015 22:20:44 -0600 (MDT) X-Barracuda-Envelope-From: blp@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f41.google.com) (209.85.220.41) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 10 Oct 2015 04:20:44 -0000 Received-SPF: unknown (mx1-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.41 Received: by pablk4 with SMTP id lk4so104024359pab.3 for ; Fri, 09 Oct 2015 21:20:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qVdATJVy0gxZIhxWywnVdAcvA0IdD1LVeMqJrLhvuPM=; b=Q8llzEeqQ9mlKAB/Bn+JHfNwzUJBLo9M6BtvA5kQPbJkwe3RlSzEDJrmgDKHXtjNdC Z/63XQhQh5X3I1nfeanovinwTjHZX2KFqxfm6Nx/c4Kuu+ivqIeMBHDjapnE3mxWSz8X UXj6fujjhxijCWZsosv5JGRwpg5dkhNF7QIFKEVH3Su5LAIh00cclTKaa8J9Caomjj1t hYiLgEnFady7535tIMxbw9mB153juVfQdSKb7V+eaYmvvKEWv/Ffo0krD738K275n37Z IpQ3bh5qqaWOEDlcPi71X/54pLonkpGzI5u6G4CjkpKpD2XDVE1piRhWHnp1TjFPU/SW B3BQ== X-Gm-Message-State: ALoCoQkCX2jR+TOgttPHjKr6wmhp12GiDg6b0CCXjXK3H8NkgeWLcDRgAYmkw4ir+i5Q1/p1wInd X-Received: by 10.68.253.66 with SMTP id zy2mr10068384pbc.50.1444450843441; Fri, 09 Oct 2015 21:20:43 -0700 (PDT) Received: from sigabrt.gateway.sonic.net (173-228-112-112.dsl.dynamic.fusionbroadband.com. [173.228.112.112]) by smtp.gmail.com with ESMTPSA id o3sm5365390pap.37.2015.10.09.21.20.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Oct 2015 21:20:42 -0700 (PDT) X-CudaMail-Envelope-Sender: blp@nicira.com X-Barracuda-Apparent-Source-IP: 173.228.112.112 From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-1008110835 X-CudaMail-DTE: 100915 X-CudaMail-Originating-IP: 209.85.220.41 Date: Fri, 9 Oct 2015 21:20:31 -0700 X-ASG-Orig-Subj: [##CM-E2-1008110835##][PATCH 12/23] ovn-controller: Rename "ovn-patch-port" to "ovn-localnet-port". Message-Id: <1444450838-12150-1-git-send-email-blp@nicira.com> X-Mailer: git-send-email 2.1.3 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1444450844 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 12/23] ovn-controller: Rename "ovn-patch-port" to "ovn-localnet-port". X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" An upcoming patch will introduce a different use for patch ports, so ovn-patch-port would become an ambiguous name. Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- ovn/controller/ovn-controller.8.xml | 6 ++++-- ovn/controller/patch.c | 4 ++-- ovn/controller/physical.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ovn/controller/ovn-controller.8.xml b/ovn/controller/ovn-controller.8.xml index 508ad26..189ee70 100644 --- a/ovn/controller/ovn-controller.8.xml +++ b/ovn/controller/ovn-controller.8.xml @@ -143,7 +143,8 @@
- external-ids:ovn-patch-port in the Port table + external-ids:ovn-localnet-port in the Port + table

@@ -158,7 +159,8 @@

Each localnet logical port is implemented as a pair of patch ports, one in the integration bridge, one in a different - bridge, with the same external-ids:ovn-patch-port value. + bridge, with the same external-ids:ovn-localnet-port + value.

diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c index 83a3739..90c72ff 100644 --- a/ovn/controller/patch.c +++ b/ovn/controller/patch.c @@ -78,7 +78,7 @@ create_patch_port(struct controller_ctx *ctx, port = ovsrec_port_insert(ctx->ovs_idl_txn); ovsrec_port_set_name(port, src_name); ovsrec_port_set_interfaces(port, &iface, 1); - const struct smap ids = SMAP_CONST1(&ids, "ovn-patch-port", network); + const struct smap ids = SMAP_CONST1(&ids, "ovn-localnet-port", network); ovsrec_port_set_external_ids(port, &ids); struct ovsrec_port **ports; @@ -193,7 +193,7 @@ patch_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int) struct shash existing_ports = SHASH_INITIALIZER(&existing_ports); const struct ovsrec_port *port; OVSREC_PORT_FOR_EACH (port, ctx->ovs_idl) { - if (smap_get(&port->external_ids, "ovn-patch-port")) { + if (smap_get(&port->external_ids, "ovn-localnet-port")) { shash_add(&existing_ports, port->name, port); } } diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index 0c239df..a1f7fe5 100644 --- a/ovn/controller/physical.c +++ b/ovn/controller/physical.c @@ -155,7 +155,7 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id mff_ovn_geneve, } const char *localnet = smap_get(&port_rec->external_ids, - "ovn-patch-port"); + "ovn-localnet-port"); for (int j = 0; j < port_rec->n_interfaces; j++) { const struct ovsrec_interface *iface_rec = port_rec->interfaces[j];