Acked-by: Justin Pettit <jpet...@nicira.com>
--Justin
> On Jul 28, 2015, at 8:44 AM, Ben Pfaff <b...@nicira.com> wrote:
>
> The generic *_init() names for these functions made it sounds like they
> do something more than just register IDL columns, even though that's all
> they do. Also, the controller_ctx that was passed into each of them was
> only used to get the IDL handle. This commit renames them and changes
> their parameter type to simplify and make all of this clearer.
>
> Signed-off-by: Ben Pfaff <b...@nicira.com>
> ---
> ovn/controller/binding.c | 24 ++++++++++++------------
> ovn/controller/binding.h | 3 ++-
> ovn/controller/chassis.c | 6 +++---
> ovn/controller/chassis.h | 3 ++-
> ovn/controller/encaps.c | 22 +++++++++++-----------
> ovn/controller/encaps.h | 3 ++-
> ovn/controller/ovn-controller.c | 11 ++++-------
> ovn/controller/physical.c | 26 +++++++++++++-------------
> ovn/controller/physical.h | 3 ++-
> 9 files changed, 51 insertions(+), 50 deletions(-)
>
> diff --git a/ovn/controller/binding.c b/ovn/controller/binding.c
> index 4cf8636..c83b044 100644
> --- a/ovn/controller/binding.c
> +++ b/ovn/controller/binding.c
> @@ -26,22 +26,22 @@
> VLOG_DEFINE_THIS_MODULE(binding);
>
> void
> -binding_init(struct controller_ctx *ctx)
> +binding_register_ovs_idl(struct ovsdb_idl *ovs_idl)
> {
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_open_vswitch);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_open_vswitch_col_bridges);
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_open_vswitch);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_open_vswitch_col_bridges);
>
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_bridge);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_bridge_col_name);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_bridge_col_ports);
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_bridge);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_bridge_col_name);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_bridge_col_ports);
>
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_port);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_port_col_name);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_port_col_interfaces);
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_port);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_port_col_name);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_port_col_interfaces);
>
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_interface);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_interface_col_name);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_interface_col_external_ids);
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_interface);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_name);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_external_ids);
> }
>
> static void
> diff --git a/ovn/controller/binding.h b/ovn/controller/binding.h
> index c60235f..708a6e6 100644
> --- a/ovn/controller/binding.h
> +++ b/ovn/controller/binding.h
> @@ -20,9 +20,10 @@
> #include <stdbool.h>
>
> struct controller_ctx;
> +struct ovsdb_idl;
> struct ovsrec_bridge;
>
> -void binding_init(struct controller_ctx *);
> +void binding_register_ovs_idl(struct ovsdb_idl *);
> void binding_run(struct controller_ctx *, const struct ovsrec_bridge *br_int,
> const char *chassis_id);
> bool binding_cleanup(struct controller_ctx *, const char *chassis_id);
> diff --git a/ovn/controller/chassis.c b/ovn/controller/chassis.c
> index 2dfce19..9d6a77a 100644
> --- a/ovn/controller/chassis.c
> +++ b/ovn/controller/chassis.c
> @@ -24,10 +24,10 @@
> VLOG_DEFINE_THIS_MODULE(chassis);
>
> void
> -chassis_init(struct controller_ctx *ctx)
> +chassis_register_ovs_idl(struct ovsdb_idl *ovs_idl)
> {
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_open_vswitch);
> - ovsdb_idl_add_column(ctx->ovs_idl,
> &ovsrec_open_vswitch_col_external_ids);
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_open_vswitch);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_open_vswitch_col_external_ids);
> }
>
> void
> diff --git a/ovn/controller/chassis.h b/ovn/controller/chassis.h
> index 24648b2..26017d0 100644
> --- a/ovn/controller/chassis.h
> +++ b/ovn/controller/chassis.h
> @@ -19,9 +19,10 @@
> #include <stdbool.h>
>
> struct controller_ctx;
> +struct ovsdb_idl;
> struct ovsrec_bridge;
>
> -void chassis_init(struct controller_ctx *);
> +void chassis_register_ovs_idl(struct ovsdb_idl *);
> void chassis_run(struct controller_ctx *, const char *chassis_id);
> bool chassis_cleanup(struct controller_ctx *, const char *chassis_id);
>
> diff --git a/ovn/controller/encaps.c b/ovn/controller/encaps.c
> index f150246..0872bf4 100644
> --- a/ovn/controller/encaps.c
> +++ b/ovn/controller/encaps.c
> @@ -27,18 +27,18 @@
> VLOG_DEFINE_THIS_MODULE(encaps);
>
> void
> -encaps_init(struct controller_ctx *ctx)
> +encaps_register_ovs_idl(struct ovsdb_idl *ovs_idl)
> {
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_bridge);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_bridge_col_ports);
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_port);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_port_col_name);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_port_col_interfaces);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_port_col_external_ids);
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_interface);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_interface_col_name);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_interface_col_type);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_interface_col_options);
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_bridge);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_bridge_col_ports);
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_port);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_port_col_name);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_port_col_interfaces);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_port_col_external_ids);
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_interface);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_name);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_type);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_options);
> }
>
> /* Enough context to create a new tunnel, using tunnel_add(). */
> diff --git a/ovn/controller/encaps.h b/ovn/controller/encaps.h
> index d1b00f2..20f0eb0 100644
> --- a/ovn/controller/encaps.h
> +++ b/ovn/controller/encaps.h
> @@ -19,9 +19,10 @@
> #include <stdbool.h>
>
> struct controller_ctx;
> +struct ovsdb_idl;
> struct ovsrec_bridge;
>
> -void encaps_init(struct controller_ctx *);
> +void encaps_register_ovs_idl(struct ovsdb_idl *);
> void encaps_run(struct controller_ctx *,
> const struct ovsrec_bridge *br_int, const char *chassis_id);
> bool encaps_cleanup(struct controller_ctx *,
> diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
> index 2746407..49d23d7 100644
> --- a/ovn/controller/ovn-controller.c
> +++ b/ovn/controller/ovn-controller.c
> @@ -241,16 +241,13 @@ main(int argc, char *argv[])
> /* Connect to OVS OVSDB instance. We do not monitor all tables by
> * default, so modules must register their interest explicitly. */
> ctx.ovs_idl = ovsdb_idl_create(ovs_remote, &ovsrec_idl_class, false,
> true);
> -
> - /* Register interest in "external_ids" column in "Open_vSwitch" table,
> - * since we'll need to get the OVN OVSDB remote. */
> ovsdb_idl_add_table(ctx.ovs_idl, &ovsrec_table_open_vswitch);
> ovsdb_idl_add_column(ctx.ovs_idl, &ovsrec_open_vswitch_col_external_ids);
> + chassis_register_ovs_idl(ctx.ovs_idl);
> + encaps_register_ovs_idl(ctx.ovs_idl);
> + binding_register_ovs_idl(ctx.ovs_idl);
> + physical_register_ovs_idl(ctx.ovs_idl);
>
> - chassis_init(&ctx);
> - encaps_init(&ctx);
> - binding_init(&ctx);
> - physical_init(&ctx);
> pipeline_init();
>
> get_initial_snapshot(ctx.ovs_idl);
> diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c
> index 5dafdf6..11f88cb 100644
> --- a/ovn/controller/physical.c
> +++ b/ovn/controller/physical.c
> @@ -26,20 +26,20 @@
> #include "vswitch-idl.h"
>
> void
> -physical_init(struct controller_ctx *ctx)
> +physical_register_ovs_idl(struct ovsdb_idl *ovs_idl)
> {
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_bridge);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_bridge_col_ports);
> -
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_port);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_port_col_name);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_port_col_interfaces);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_port_col_external_ids);
> -
> - ovsdb_idl_add_table(ctx->ovs_idl, &ovsrec_table_interface);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_interface_col_name);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_interface_col_ofport);
> - ovsdb_idl_add_column(ctx->ovs_idl, &ovsrec_interface_col_external_ids);
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_bridge);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_bridge_col_ports);
> +
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_port);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_port_col_name);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_port_col_interfaces);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_port_col_external_ids);
> +
> + ovsdb_idl_add_table(ovs_idl, &ovsrec_table_interface);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_name);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_ofport);
> + ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_external_ids);
> }
>
> void
> diff --git a/ovn/controller/physical.h b/ovn/controller/physical.h
> index 3c86a7f..9de76de 100644
> --- a/ovn/controller/physical.h
> +++ b/ovn/controller/physical.h
> @@ -26,9 +26,10 @@
>
> struct controller_ctx;
> struct hmap;
> +struct ovsdb_idl;
> struct ovsrec_bridge;
>
> -void physical_init(struct controller_ctx *);
> +void physical_register_ovs_idl(struct ovsdb_idl *);
> void physical_run(struct controller_ctx *, const struct ovsrec_bridge *br_int,
> const char *chassis_id,
> struct hmap *flow_table);
> --
> 2.1.3
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
