db-ctl-base: do not require client to expose the "tables" variable

[cascardo/ovs.git] / utilities / ovs-vsctl.c

diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index 6bc6818..8d62d54 100644 (file)
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -970,14 +970,7 @@ cmd_init(struct ctl_context *ctx OVS_UNUSED)
 {
 }
 
-struct cmd_show_table {
-    const struct ovsdb_idl_table_class *table;
-    const struct ovsdb_idl_column *name_column;
-    const struct ovsdb_idl_column *columns[3];
-    bool recurse;
-};
-
-static struct cmd_show_table cmd_show_tables[] = {
+struct cmd_show_table cmd_show_tables[] = {
     {&ovsrec_table_open_vswitch,
      NULL,
      {&ovsrec_open_vswitch_col_manager_options,
@@ -1019,136 +1012,9 @@ static struct cmd_show_table cmd_show_tables[] = {
       NULL,
       NULL},
      false},
-};
-
-static void
-pre_cmd_show(struct ctl_context *ctx)
-{
-    struct cmd_show_table *show;
-
-    for (show = cmd_show_tables;
-         show < &cmd_show_tables[ARRAY_SIZE(cmd_show_tables)];
-         show++) {
-        size_t i;
-
-        ovsdb_idl_add_table(ctx->idl, show->table);
-        if (show->name_column) {
-            ovsdb_idl_add_column(ctx->idl, show->name_column);
-        }
-        for (i = 0; i < ARRAY_SIZE(show->columns); i++) {
-            const struct ovsdb_idl_column *column = show->columns[i];
-            if (column) {
-                ovsdb_idl_add_column(ctx->idl, column);
-            }
-        }
-    }
-}
-
-static struct cmd_show_table *
-cmd_show_find_table_by_row(const struct ovsdb_idl_row *row)
-{
-    struct cmd_show_table *show;
 
-    for (show = cmd_show_tables;
-         show < &cmd_show_tables[ARRAY_SIZE(cmd_show_tables)];
-         show++) {
-        if (show->table == row->table->class) {
-            return show;
-        }
-    }
-    return NULL;
-}
-
-static struct cmd_show_table *
-cmd_show_find_table_by_name(const char *name)
-{
-    struct cmd_show_table *show;
-
-    for (show = cmd_show_tables;
-         show < &cmd_show_tables[ARRAY_SIZE(cmd_show_tables)];
-         show++) {
-        if (!strcmp(show->table->name, name)) {
-            return show;
-        }
-    }
-    return NULL;
-}
-
-static void
-cmd_show_row(struct ctl_context *ctx, const struct ovsdb_idl_row *row,
-             int level)
-{
-    struct cmd_show_table *show = cmd_show_find_table_by_row(row);
-    size_t i;
-
-    ds_put_char_multiple(&ctx->output, ' ', level * 4);
-    if (show && show->name_column) {
-        const struct ovsdb_datum *datum;
-
-        ds_put_format(&ctx->output, "%s ", show->table->name);
-        datum = ovsdb_idl_read(row, show->name_column);
-        ovsdb_datum_to_string(datum, &show->name_column->type, &ctx->output);
-    } else {
-        ds_put_format(&ctx->output, UUID_FMT, UUID_ARGS(&row->uuid));
-    }
-    ds_put_char(&ctx->output, '\n');
-
-    if (!show || show->recurse) {
-        return;
-    }
-
-    show->recurse = true;
-    for (i = 0; i < ARRAY_SIZE(show->columns); i++) {
-        const struct ovsdb_idl_column *column = show->columns[i];
-        const struct ovsdb_datum *datum;
-
-        if (!column) {
-            break;
-        }
-
-        datum = ovsdb_idl_read(row, column);
-        if (column->type.key.type == OVSDB_TYPE_UUID &&
-            column->type.key.u.uuid.refTableName) {
-            struct cmd_show_table *ref_show;
-            size_t j;
-
-            ref_show = cmd_show_find_table_by_name(
-                column->type.key.u.uuid.refTableName);
-            if (ref_show) {
-                for (j = 0; j < datum->n; j++) {
-                    const struct ovsdb_idl_row *ref_row;
-
-                    ref_row = ovsdb_idl_get_row_for_uuid(ctx->idl,
-                                                         ref_show->table,
-                                                         &datum->keys[j].uuid);
-                    if (ref_row) {
-                        cmd_show_row(ctx, ref_row, level + 1);
-                    }
-                }
-                continue;
-            }
-        }
-
-        if (!ovsdb_datum_is_default(datum, &column->type)) {
-            ds_put_char_multiple(&ctx->output, ' ', (level + 1) * 4);
-            ds_put_format(&ctx->output, "%s: ", column->name);
-            ovsdb_datum_to_string(datum, &column->type, &ctx->output);
-            ds_put_char(&ctx->output, '\n');
-        }
-    }
-    show->recurse = false;
-}
-
-static void
-cmd_show(struct ctl_context *ctx)
-{
-    const struct ovsdb_idl_row *row;
-
-    for (row = ovsdb_idl_first_row(ctx->idl, cmd_show_tables[0].table);
-         row; row = ovsdb_idl_next_row(row)) {
-        cmd_show_row(ctx, row, 0);
-    }
-}
+    {NULL, NULL, {NULL, NULL, NULL}, false}
+};
 
 static void
 pre_cmd_emer_reset(struct ctl_context *ctx)
@@ -1690,8 +1556,8 @@ add_port(struct ctl_context *ctx,
     }
 
     for (i = 0; i < n_settings; i++) {
-        set_column(get_table("Port"), &port->header_, settings[i],
-                   ctx->symtab);
+        ctl_set_column("Port", &port->header_, settings[i],
+                       ctx->symtab);
     }
 
     bridge_insert_port((bridge->parent ? bridge->parent->br_cfg
@@ -2396,7 +2262,7 @@ cmd_get_aa_mapping(struct ctl_context *ctx)
 }
 
 \f
-const struct ctl_table_class tables[] = {
+static const struct ctl_table_class tables[] = {
     {&ovsrec_table_bridge,
      {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL},
       {&ovsrec_table_flow_sample_collector_set, NULL,
@@ -2803,7 +2669,6 @@ try_again:
 static const struct ctl_command_syntax vsctl_commands[] = {
     /* Open vSwitch commands. */
     {"init", 0, 0, "", NULL, cmd_init, NULL, "", RW},
-    {"show", 0, 0, "", pre_cmd_show, cmd_show, NULL, "", RO},
 
     /* Bridge commands. */
     {"add-br", 1, 3, "NEW-BRIDGE [PARENT] [NEW-VLAN]", pre_get_info,
@@ -2884,6 +2749,6 @@ static const struct ctl_command_syntax vsctl_commands[] = {
 static void
 vsctl_cmd_init(void)
 {
-    ctl_init();
+    ctl_init(tables);
     ctl_register_commands(vsctl_commands);
 }