mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

db-ctl-base: Allow print rows that weak reference to table in

Browse Source 
'cmd_show_table'.

Sometimes, it is desirable to print the table with weak reference to
the table specified in 'struct cmd_show_table'.  For example the
Port_Binding table rows in OVN_Southbound database that refer to the
same Chassis table row can be printed under the same chassis entry
in 'ovn-sbctl show' output.

To achieve it, this commit adds a new struct in 'struct cmd_show_table'
that allows users to print a table with weak reference to 'table'
specified in 'struct cmd_show_table'.  The 'ovn-sbctl' which now prints
the Port_Binding entries with Chassis table, is the first user of this
new feature.

Requested-by: Justin Pettit <jpettit@nicira.com>
Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Justin Pettit <jpettit@nicira.com>
This commit is contained in:
Alex Wang
2015-08-12 21:29:06 -07:00
parent ebbcddeba8
commit 016e46846d
6 changed files with 115 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/db-ctl-base.c
View File

@@ -1620,6 +1620,15 @@ pre_cmd_show(struct ctl_context *ctx)
ovsdb_idl_add_column(ctx->idl, column);
}
}
if (show->wref_table.table) {
ovsdb_idl_add_table(ctx->idl, show->wref_table.table);
}
if (show->wref_table.name_column) {
ovsdb_idl_add_column(ctx->idl, show->wref_table.name_column);
}
if (show->wref_table.wref_column) {
ovsdb_idl_add_column(ctx->idl, show->wref_table.wref_column);
}
}
}
@@ -1649,6 +1658,39 @@ cmd_show_find_table_by_name(const char *name)
return NULL;
}
/* Prints table entries that weak reference the 'cur_row'. */
static void
cmd_show_weak_ref(struct ctl_context *ctx, const struct cmd_show_table *show,
const struct ovsdb_idl_row *cur_row, int level)
{
const struct ovsdb_idl_row *row_wref;
const struct ovsdb_idl_table_class *table = show->wref_table.table;
const struct ovsdb_idl_column *name_column
= show->wref_table.name_column;
const struct ovsdb_idl_column *wref_column
= show->wref_table.wref_column;
if (!table || !name_column || !wref_column) {
return;
}
for (row_wref = ovsdb_idl_first_row(ctx->idl, table); row_wref;
row_wref = ovsdb_idl_next_row(row_wref)) {
const struct ovsdb_datum *wref_datum
= ovsdb_idl_read(row_wref, wref_column);
/* If weak reference refers to the 'cur_row', prints it. */
if (wref_datum->n
&& uuid_equals(&cur_row->uuid, &wref_datum->keys[0].uuid)) {
const struct ovsdb_datum *name_datum
= ovsdb_idl_read(row_wref, name_column);
ds_put_char_multiple(&ctx->output, ' ', (level + 1) * 4);
ds_put_format(&ctx->output, "%s ", table->name);
ovsdb_datum_to_string(name_datum, &name_column->type, &ctx->output);
ds_put_char(&ctx->output, '\n');
}
}
}
/* 'shown' records the tables that has been displayed by the current
* command to avoid duplicated prints.
*/
@@ -1753,6 +1795,7 @@ cmd_show_row(struct ctl_context *ctx, const struct ovsdb_idl_row *row,
ds_put_char(&ctx->output, '\n');
}
}
cmd_show_weak_ref(ctx, show, row, level);
sset_find_and_delete_assert(shown, show->table->name);
}