{
static char *def;
if (!def) {
- def = xasprintf("unix:%s/db.sock", ovs_rundir);
+ def = xasprintf("unix:%s/db.sock", ovs_rundir());
}
return def;
}
ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_ssl);
ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_controller);
+ ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_fail_mode);
ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_mirrors);
ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_netflow);
ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_sflow);
char *hw_val = NULL;
ovsrec_bridge_set_controller(br, NULL, 0);
+ ovsrec_bridge_set_fail_mode(br, NULL);
ovsrec_bridge_set_mirrors(br, NULL, 0);
ovsrec_bridge_set_netflow(br, NULL);
ovsrec_bridge_set_sflow(br, NULL);
}
}
+static void
+pre_controller(struct vsctl_context *ctx)
+{
+ pre_get_info(ctx);
+
+ ovsdb_idl_add_column(ctx->idl, &ovsrec_controller_col_target);
+}
+
static void
cmd_get_controller(struct vsctl_context *ctx)
{
{{&ovsrec_table_port, &ovsrec_port_col_name, &ovsrec_port_col_qos},
{NULL, NULL, NULL}}},
+ {&ovsrec_table_monitor,
+ {{&ovsrec_table_interface,
+ &ovsrec_interface_col_name,
+ &ovsrec_interface_col_monitor},
+ {NULL, NULL, NULL}}},
+
+ {&ovsrec_table_maintenance_point,
+ {{NULL, NULL, NULL},
+ {NULL, NULL, NULL}}},
+
{&ovsrec_table_queue,
{{NULL, NULL, NULL},
{NULL, NULL, NULL}}},
for (c = commands; c < &commands[n_commands]; c++) {
struct ds *ds = &c->output;
- struct shash_node *node;
if (oneline) {
size_t j;
}
ds_destroy(&c->output);
- SHASH_FOR_EACH (node, &c->options) {
- free(node->data);
- }
- shash_destroy(&c->options);
+ smap_destroy(&c->options);
}
free(commands);
{"br-exists", 1, 1, pre_get_info, cmd_br_exists, NULL, "", RO},
{"br-to-vlan", 1, 1, pre_get_info, cmd_br_to_vlan, NULL, "", RO},
{"br-to-parent", 1, 1, pre_get_info, cmd_br_to_parent, NULL, "", RO},
- {"br-set-external-id", 2, 3, pre_get_info, cmd_br_set_external_id, NULL,
- "", RW},
+ {"br-set-external-id", 2, 3, pre_cmd_br_set_external_id,
+ cmd_br_set_external_id, NULL, "", RW},
{"br-get-external-id", 1, 2, pre_cmd_br_get_external_id,
cmd_br_get_external_id, NULL, "", RO},
{"iface-to-br", 1, 1, pre_get_info, cmd_iface_to_br, NULL, "", RO},
/* Controller commands. */
- {"get-controller", 1, 1, pre_get_info, cmd_get_controller, NULL, "", RO},
- {"del-controller", 1, 1, pre_get_info, cmd_del_controller, NULL, "", RW},
- {"set-controller", 1, INT_MAX, pre_get_info, cmd_set_controller, NULL, "",
- RW},
+ {"get-controller", 1, 1, pre_controller, cmd_get_controller, NULL, "", RO},
+ {"del-controller", 1, 1, pre_controller, cmd_del_controller, NULL, "", RW},
+ {"set-controller", 1, INT_MAX, pre_controller, cmd_set_controller, NULL,
+ "", RW},
{"get-fail-mode", 1, 1, pre_get_info, cmd_get_fail_mode, NULL, "", RO},
{"del-fail-mode", 1, 1, pre_get_info, cmd_del_fail_mode, NULL, "", RW},
{"set-fail-mode", 2, 2, pre_get_info, cmd_set_fail_mode, NULL, "", RW},