From patchwork Mon Dec 5 07:17:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 702601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3tXGM74SwYz9t1B for ; Mon, 5 Dec 2016 18:18:27 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 15FA0B3F; Mon, 5 Dec 2016 07:17:53 +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 EA3BAB30 for ; Mon, 5 Dec 2016 07:17:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 7733C13B for ; Mon, 5 Dec 2016 07:17:51 +0000 (UTC) Received: from mfilter15-d.gandi.net (mfilter15-d.gandi.net [217.70.178.143]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 4B3C9A80C2; Mon, 5 Dec 2016 08:17:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter15-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter15-d.gandi.net (mfilter15-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id u4QXXUcuNOPr; Mon, 5 Dec 2016 08:17:48 +0100 (CET) X-Originating-IP: 173.228.112.229 Received: from sigabrt.gateway.sonic.net (173-228-112-229.dsl.dynamic.fusionbroadband.com [173.228.112.229]) (Authenticated sender: blp@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 17121A80D9; Mon, 5 Dec 2016 08:17:47 +0100 (CET) From: Ben Pfaff To: dev@openvswitch.org Date: Sun, 4 Dec 2016 23:17:39 -0800 Message-Id: <20161205071746.16989-3-blp@ovn.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161205071746.16989-1-blp@ovn.org> References: <20161205071746.16989-1-blp@ovn.org> X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, 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 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 2/9] ovn-controller: Make indexes more broadly available. 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 This will allow binding_run() to use them in an upcoming commit. Signed-off-by: Ben Pfaff Acked-by: Mickey Spiegel --- ovn/controller/ovn-controller.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c index fea7841..894af6f 100644 --- a/ovn/controller/ovn-controller.c +++ b/ovn/controller/ovn-controller.c @@ -512,6 +512,11 @@ main(int argc, char *argv[]) const struct ovsrec_bridge *br_int = get_br_int(&ctx); const char *chassis_id = get_chassis_id(ctx.ovs_idl); + struct lport_index lports; + struct mcgroup_index mcgroups; + lport_index_init(&lports, ctx.ovnsb_idl); + mcgroup_index_init(&mcgroups, ctx.ovnsb_idl); + const struct sbrec_chassis *chassis = NULL; if (chassis_id) { chassis = chassis_run(&ctx, chassis_id, br_int); @@ -524,11 +529,6 @@ main(int argc, char *argv[]) patch_run(&ctx, br_int, chassis_id, &local_datapaths, &patched_datapaths); - struct lport_index lports; - struct mcgroup_index mcgroups; - lport_index_init(&lports, ctx.ovnsb_idl); - mcgroup_index_init(&mcgroups, ctx.ovnsb_idl); - enum mf_field_id mff_ovn_geneve = ofctrl_run(br_int, &pending_ct_zones); @@ -557,10 +557,10 @@ main(int argc, char *argv[]) } } } - mcgroup_index_destroy(&mcgroups); - lport_index_destroy(&lports); } + mcgroup_index_destroy(&mcgroups); + lport_index_destroy(&lports); sset_destroy(&all_lports); struct local_datapath *cur_node, *next_node;