From patchwork Sat Oct 10 04:20:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 528531 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 63AA3140E42 for ; Sat, 10 Oct 2015 15:20:24 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 9A1EA10ACD; Fri, 9 Oct 2015 21:20:23 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 1858E10AB4 for ; Fri, 9 Oct 2015 21:20:23 -0700 (PDT) Received: from bar4.cudamail.com (bar2 [192.168.15.2]) by mx3v1.cudamail.com (Postfix) with ESMTP id 995FAD48B5 for ; Fri, 9 Oct 2015 22:20:22 -0600 (MDT) X-ASG-Debug-ID: 1444450822-03dc213abc8e8b0001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar4.cudamail.com with ESMTP id ZUYv9QkNSFt62qcY (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 09 Oct 2015 22:20:22 -0600 (MDT) X-Barracuda-Envelope-From: blp@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mail-pa0-f43.google.com) (209.85.220.43) by mx3-pf3.cudamail.com with ESMTPS (RC4-SHA encrypted); 10 Oct 2015 04:20:21 -0000 Received-SPF: unknown (mx3-pf3.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.43 Received: by pacex6 with SMTP id ex6so104239033pac.0 for ; Fri, 09 Oct 2015 21:20:21 -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=0aeBkbP/FBBzMG2kmsY4ZF2GZ1aXn3GTQKU1CZJyyPs=; b=JrYQxDtqr07tBXhI8M8INsMwpT9auPSAPliDj9sVtwNLHzdnVYYIS4ym1mlxWlb9Wc mWKLOsYnqqdMjKNz0D22p95NtogEhIISMAQI2TJgbdUiNzhC/gGayfXy+6zOGRlXBDmh 1eHgfhIRXsX6XXq1+J3avdAbG0hipDETiZTNA7b/KKfQm94LmXsoSckqSPnzsM+q23pt gf19p968FFrKQnEQfPOBlrBb5QOTQEAADhLaBPxq7srWl5ZmNhPiWYvGPoId1n+WFYMI Mc0pneMscUGAhJsmfHDX7hh5oegfE1XhLcw/jlui8UqR3SK/+iHDQrcvmAm3QanReiUD G+2g== X-Gm-Message-State: ALoCoQkPOmLOLHv3FURwG4vjwA4KT1grPdpGU28dQPrEHcjaHEzxFQ5E/7ZI2EgnQoUGK8Nk7KQ7 X-Received: by 10.66.55.41 with SMTP id o9mr19888952pap.44.1444450821616; Fri, 09 Oct 2015 21:20:21 -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 rp5sm5453154pab.0.2015.10.09.21.20.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Oct 2015 21:20:20 -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-V3-1008077327 X-CudaMail-DTE: 100915 X-CudaMail-Originating-IP: 209.85.220.43 Date: Fri, 9 Oct 2015 21:20:12 -0700 X-ASG-Orig-Subj: [##CM-V3-1008077327##][PATCH 11/23] patch: Allow client to determine port names. Message-Id: <1444450812-12104-1-git-send-email-blp@nicira.com> X-Mailer: git-send-email 2.1.3 X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1444450822 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 11/23] patch: Allow client to determine port names. 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" Calculating the patch port names from the bridge names makes sense when there's only one pair of patch ports between a pair of bridges, but that won't be the case for an upcoming use of patch ports. This changes makes it easy to check for existing patch ports in create_patch_port(), instead of in its caller, and since that seems like a more sensible place this change also moves it there. Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- ovn/controller/patch.c | 101 +++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 58 deletions(-) diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c index 6a55f90..83a3739 100644 --- a/ovn/controller/patch.c +++ b/ovn/controller/patch.c @@ -25,102 +25,81 @@ VLOG_DEFINE_THIS_MODULE(patch); static char * -patch_port_name(const struct ovsrec_bridge *b1, const struct ovsrec_bridge *b2) +patch_port_name(const struct ovsrec_bridge *src, + const struct ovsrec_bridge *dst) { - return xasprintf("patch-%s-to-%s", b1->name, b2->name); + return xasprintf("patch-%s-to-%s", src->name, dst->name); } -/* - * Return true if the port is a patch port from b1 to b2 - */ +/* Return true if 'port' is a patch port with the specified 'peer'. */ static bool -match_patch_port(const struct ovsrec_port *port, - const struct ovsrec_bridge *b1, - const struct ovsrec_bridge *b2) +match_patch_port(const struct ovsrec_port *port, const char *peer) { - struct ovsrec_interface *iface; - size_t i; - char *peer_port_name; - bool res = false; - - peer_port_name = patch_port_name(b2, b1); - - for (i = 0; i < port->n_interfaces; i++) { - iface = port->interfaces[i]; + for (size_t i = 0; i < port->n_interfaces; i++) { + struct ovsrec_interface *iface = port->interfaces[i]; if (strcmp(iface->type, "patch")) { continue; } - const char *peer; - peer = smap_get(&iface->options, "peer"); - if (peer && !strcmp(peer, peer_port_name)) { - res = true; - break; + const char *iface_peer = smap_get(&iface->options, "peer"); + if (peer && !strcmp(iface_peer, peer)) { + return true; } } - - free(peer_port_name); - - return res; + return false; } static void create_patch_port(struct controller_ctx *ctx, const char *network, - const struct ovsrec_bridge *b1, - const struct ovsrec_bridge *b2) + const struct ovsrec_bridge *src, const char *src_name, + const struct ovsrec_bridge *dst, const char *dst_name, + struct shash *existing_ports) { - char *port_name = patch_port_name(b1, b2); - char *peer_port_name = patch_port_name(b2, b1); + for (size_t i = 0; i < src->n_ports; i++) { + if (match_patch_port(src->ports[i], dst_name)) { + /* Patch port already exists on 'src'. */ + shash_find_and_delete(existing_ports, src->ports[i]->name); + return; + } + } ovsdb_idl_txn_add_comment(ctx->ovs_idl_txn, "ovn-controller: creating patch port '%s' from '%s' to '%s'", - port_name, b1->name, b2->name); + src_name, src->name, dst->name); struct ovsrec_interface *iface; iface = ovsrec_interface_insert(ctx->ovs_idl_txn); - ovsrec_interface_set_name(iface, port_name); + ovsrec_interface_set_name(iface, src_name); ovsrec_interface_set_type(iface, "patch"); - const struct smap options = SMAP_CONST1(&options, "peer", peer_port_name); + const struct smap options = SMAP_CONST1(&options, "peer", dst_name); ovsrec_interface_set_options(iface, &options); struct ovsrec_port *port; port = ovsrec_port_insert(ctx->ovs_idl_txn); - ovsrec_port_set_name(port, port_name); + 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); ovsrec_port_set_external_ids(port, &ids); struct ovsrec_port **ports; - ports = xmalloc(sizeof *ports * (b1->n_ports + 1)); - memcpy(ports, b1->ports, sizeof *ports * b1->n_ports); - ports[b1->n_ports] = port; - ovsrec_bridge_verify_ports(b1); - ovsrec_bridge_set_ports(b1, ports, b1->n_ports + 1); + ports = xmalloc(sizeof *ports * (src->n_ports + 1)); + memcpy(ports, src->ports, sizeof *ports * src->n_ports); + ports[src->n_ports] = port; + ovsrec_bridge_verify_ports(src); + ovsrec_bridge_set_ports(src, ports, src->n_ports + 1); free(ports); - free(port_name); - free(peer_port_name); } static void create_patch_ports(struct controller_ctx *ctx, const char *network, - struct shash *existing_ports, - const struct ovsrec_bridge *b1, - const struct ovsrec_bridge *b2) + const struct ovsrec_bridge *b1, const char *name1, + const struct ovsrec_bridge *b2, const char *name2, + struct shash *existing_ports) { - size_t i; - - for (i = 0; i < b1->n_ports; i++) { - if (match_patch_port(b1->ports[i], b1, b2)) { - /* Patch port already exists on b1 */ - shash_find_and_delete(existing_ports, b1->ports[i]->name); - break; - } - } - if (i == b1->n_ports) { - create_patch_port(ctx, network, b1, b2); - } + create_patch_port(ctx, network, b1, name1, b2, name2, existing_ports); + create_patch_port(ctx, network, b2, name2, b1, name1, existing_ports); } static void @@ -191,8 +170,14 @@ parse_bridge_mappings(struct controller_ctx *ctx, continue; } - create_patch_ports(ctx, network, existing_ports, br_int, ovs_bridge); - create_patch_ports(ctx, network, existing_ports, ovs_bridge, br_int); + char *br_int_name = patch_port_name(br_int, ovs_bridge); + char *ovs_bridge_name = patch_port_name(ovs_bridge, br_int); + create_patch_ports(ctx, network, + br_int, br_int_name, + ovs_bridge, ovs_bridge_name, + existing_ports); + free(ovs_bridge_name); + free(br_int_name); } free(start); }