#include "vswitchd/vswitch-idl.h"
#include "timeval.h"
#include "util.h"
-
#include "vlog.h"
-#define THIS_MODULE VLM_vsctl
+
+VLOG_DEFINE_THIS_MODULE(vsctl)
/* vsctl_fatal() also logs the error, so it is preferred in this file. */
#define ovs_fatal please_use_vsctl_fatal_instead_of_ovs_fatal
static bool wait_for_reload = true;
/* --timeout: Time to wait for a connection to 'db'. */
-static int timeout = 5;
+static int timeout;
/* All supported commands. */
static const struct vsctl_command_syntax all_commands[];
int
main(int argc, char *argv[])
{
+ extern struct vlog_module VLM_reconnect;
struct ovsdb_idl *idl;
struct vsctl_command *commands;
size_t n_commands;
set_program_name(argv[0]);
signal(SIGPIPE, SIG_IGN);
- time_init();
- vlog_init();
- vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN);
- vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN);
+ vlog_set_levels(NULL, VLF_CONSOLE, VLL_WARN);
+ vlog_set_levels(&VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN);
ovsrec_init();
/* Log our arguments. This is often valuable for debugging systems. */
#endif
{0, 0, 0, 0},
};
+ char *tmp, *short_options;
+ tmp = long_options_to_short_options(long_options);
+ short_options = xasprintf("+%s", tmp);
+ free(tmp);
for (;;) {
int c;
- c = getopt_long(argc, argv, "+v::hVt:", long_options, NULL);
+ c = getopt_long(argc, argv, short_options, long_options, NULL);
if (c == -1) {
break;
}
break;
case OPT_NO_SYSLOG:
- vlog_set_levels(VLM_vsctl, VLF_SYSLOG, VLL_WARN);
+ vlog_set_levels(&VLM_vsctl, VLF_SYSLOG, VLL_WARN);
break;
case OPT_NO_WAIT:
abort();
}
}
+ free(short_options);
if (!db) {
db = default_db();
message = xvasprintf(format, args);
va_end(args);
- vlog_set_levels(VLM_vsctl, VLF_CONSOLE, VLL_EMER);
+ vlog_set_levels(&VLM_vsctl, VLF_CONSOLE, VLL_EMER);
VLOG_ERR("%s", message);
ovs_error(0, "%s", message);
vsctl_exit(EXIT_FAILURE);
iface-to-br IFACE print name of bridge that contains IFACE\n\
\n\
Controller commands:\n\
- get-controller [BRIDGE] print the controller for BRIDGE\n\
- del-controller [BRIDGE] delete the controller for BRIDGE\n\
- set-controller [BRIDGE] TARGET set the controller for BRIDGE to TARGET\n\
- get-fail-mode [BRIDGE] print the fail-mode for BRIDGE\n\
- del-fail-mode [BRIDGE] delete the fail-mode for BRIDGE\n\
- set-fail-mode [BRIDGE] MODE set the fail-mode for BRIDGE to MODE\n\
+ get-controller BRIDGE print the controller for BRIDGE\n\
+ del-controller BRIDGE delete the controller for BRIDGE\n\
+ set-controller BRIDGE TARGET set the controller for BRIDGE to TARGET\n\
+ get-fail-mode BRIDGE print the fail-mode for BRIDGE\n\
+ del-fail-mode BRIDGE delete the fail-mode for BRIDGE\n\
+ set-fail-mode BRIDGE MODE set the fail-mode for BRIDGE to MODE\n\
\n\
SSL commands:\n\
get-ssl print the SSL configuration\n\
\n\
Database commands:\n\
list TBL [REC] list RECord (or all records) in TBL\n\
- get TBL REC COL[:KEY] print values of COLumns in RECORD in TBL\n\
+ get TBL REC COL[:KEY] print values of COLumns in RECord in TBL\n\
set TBL REC COL[:KEY]=VALUE set COLumn values in RECord in TBL\n\
add TBL REC COL [KEY=]VALUE add (KEY=)VALUE to COLumn in RECord in TBL\n\
remove TBL REC COL [KEY=]VALUE remove (KEY=)VALUE from COLumn\n\
clear TBL REC COL clear values from COLumn in RECord in TBL\n\
create TBL COL[:KEY]=VALUE create and initialize new record\n\
- destroy TBL REC delete REC from TBL\n\
+ destroy TBL REC delete RECord from TBL\n\
+ wait-until TBL REC [COL[:KEY]=VALUE] wait until condition is true\n\
Potentially unsafe database commands require --force option.\n\
\n\
Options:\n\
struct ovsrec_bridge *br_cfg;
char *name;
struct ovsrec_controller **ctrl;
+ char *fail_mode;
size_t n_ctrl;
struct vsctl_bridge *parent;
int vlan;
};
struct vsctl_info {
+ struct vsctl_context *ctx;
struct shash bridges;
struct shash ports;
struct shash ifaces;
- struct ovsrec_controller **ctrl;
- size_t n_ctrl;
};
static char *
if (parent) {
br->ctrl = parent->br_cfg->controller;
br->n_ctrl = parent->br_cfg->n_controller;
+ br->fail_mode = parent->br_cfg->fail_mode;
} else {
br->ctrl = br_cfg->controller;
br->n_ctrl = br_cfg->n_controller;
+ br->fail_mode = br_cfg->fail_mode;
}
shash_add(&b->bridges, br->name, br);
return br;
}
static void
-get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info)
+get_info(struct vsctl_context *ctx, struct vsctl_info *info)
{
+ const struct ovsrec_open_vswitch *ovs = ctx->ovs;
struct shash bridges, ports;
size_t i;
+ info->ctx = ctx;
shash_init(&info->bridges);
shash_init(&info->ports);
shash_init(&info->ifaces);
- info->ctrl = ovs->controller;
- info->n_ctrl = ovs->n_controller;
-
shash_init(&bridges);
shash_init(&ports);
for (i = 0; i < ovs->n_bridges; i++) {
/* Reset the Open_vSwitch table. */
ovsrec_open_vswitch_set_managers(ctx->ovs, NULL, 0);
- ovsrec_open_vswitch_set_controller(ctx->ovs, NULL, 0);
ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL);
OVSREC_BRIDGE_FOR_EACH (br, idl) {
ctx->argv[0]);
}
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
if (may_exist) {
struct vsctl_bridge *br;
struct vsctl_bridge *bridge;
struct vsctl_info info;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
bridge = find_bridge(&info, ctx->argv[1], must_exist);
if (bridge) {
struct shash_node *node;
struct vsctl_info info;
struct svec bridges;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
svec_init(&bridges);
SHASH_FOR_EACH (node, &info.bridges) {
{
struct vsctl_info info;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
if (!find_bridge(&info, ctx->argv[1], false)) {
vsctl_exit(2);
}
char **keys, **values;
size_t n;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
bridge = find_bridge(&info, ctx->argv[1], true);
if (bridge->br_cfg) {
set_external_id(bridge->br_cfg->key_external_ids,
struct vsctl_info info;
struct vsctl_bridge *bridge;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
bridge = find_bridge(&info, ctx->argv[1], true);
if (bridge->br_cfg) {
get_external_id(bridge->br_cfg->key_external_ids,
struct vsctl_info info;
struct svec ports;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
br = find_bridge(&info, ctx->argv[1], true);
svec_init(&ports);
struct ovsrec_port *port;
size_t i;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
if (may_exist) {
struct vsctl_port *port;
struct vsctl_port *port;
struct vsctl_info info;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
if (!with_iface) {
port = find_port(&info, ctx->argv[ctx->argc - 1], must_exist);
} else {
struct vsctl_port *port;
struct vsctl_info info;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
port = find_port(&info, ctx->argv[1], true);
ds_put_format(&ctx->output, "%s\n", port->bridge->name);
free_info(&info);
struct vsctl_bridge *bridge;
struct vsctl_info info;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
bridge = find_bridge(&info, ctx->argv[1], true);
ds_put_format(&ctx->output, "%d\n", bridge->vlan);
free_info(&info);
struct vsctl_bridge *bridge;
struct vsctl_info info;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
bridge = find_bridge(&info, ctx->argv[1], true);
if (bridge->parent) {
bridge = bridge->parent;
struct vsctl_info info;
struct svec ifaces;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
br = find_bridge(&info, ctx->argv[1], true);
svec_init(&ifaces);
struct vsctl_iface *iface;
struct vsctl_info info;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
iface = find_iface(&info, ctx->argv[1], true);
ds_put_format(&ctx->output, "%s\n", iface->port->bridge->name);
free_info(&info);
}
-/* Print targets of the 'n_controllers' in 'controllers' on the output for
- * 'ctx'. */
static void
-print_controllers(struct vsctl_context *ctx,
- struct ovsrec_controller **controllers,
- size_t n_controllers)
+cmd_get_controller(struct vsctl_context *ctx)
{
- /* Print the targets in sorted order for reproducibility. */
+ struct vsctl_info info;
+ struct vsctl_bridge *br;
struct svec targets;
size_t i;
+ get_info(ctx, &info);
+ br = find_bridge(&info, ctx->argv[1], true);
+
+ /* Print the targets in sorted order for reproducibility. */
svec_init(&targets);
- for (i = 0; i < n_controllers; i++) {
- svec_add(&targets, controllers[i]->target);
+ for (i = 0; i < br->n_ctrl; i++) {
+ svec_add(&targets, br->ctrl[i]->target);
}
svec_sort(&targets);
ds_put_format(&ctx->output, "%s\n", targets.names[i]);
}
svec_destroy(&targets);
-}
-
-static void
-cmd_get_controller(struct vsctl_context *ctx)
-{
- struct vsctl_info info;
-
- get_info(ctx->ovs, &info);
-
- if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) {
- print_controllers(ctx, info.ctrl, info.n_ctrl);
- } else {
- struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true);
- if (br->n_ctrl) {
- print_controllers(ctx, br->ctrl, br->n_ctrl);
- } else {
- print_controllers(ctx, info.ctrl, info.n_ctrl);
- }
- }
free_info(&info);
}
cmd_del_controller(struct vsctl_context *ctx)
{
struct vsctl_info info;
+ struct vsctl_bridge *br;
- get_info(ctx->ovs, &info);
+ get_info(ctx, &info);
+ br = find_real_bridge(&info, ctx->argv[1], true);
- if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) {
- if (info.n_ctrl) {
- delete_controllers(info.ctrl, info.n_ctrl);
- ovsrec_open_vswitch_set_controller(ctx->ovs, NULL, 0);
- }
- } else {
- struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true);
- if (br->ctrl) {
- delete_controllers(br->ctrl, br->n_ctrl);
- ovsrec_bridge_set_controller(br->br_cfg, NULL, 0);
- }
+ if (br->ctrl) {
+ delete_controllers(br->ctrl, br->n_ctrl);
+ ovsrec_bridge_set_controller(br->br_cfg, NULL, 0);
}
free_info(&info);
return controllers;
}
-static void
-set_default_controllers(struct vsctl_context *ctx, char *targets[], size_t n)
-{
- struct ovsrec_controller **controllers;
-
- delete_controllers(ctx->ovs->controller, ctx->ovs->n_controller);
-
- controllers = insert_controllers(ctx->txn, targets, n);
- ovsrec_open_vswitch_set_controller(ctx->ovs, controllers, n);
- free(controllers);
-}
-
static void
cmd_set_controller(struct vsctl_context *ctx)
{
struct vsctl_info info;
+ struct vsctl_bridge *br;
+ struct ovsrec_controller **controllers;
+ size_t n;
- get_info(ctx->ovs, &info);
-
- if (ctx->argc == 2) {
- /* Set one controller in the "Open_vSwitch" table. */
- set_default_controllers(ctx, &ctx->argv[1], 1);
- } else if (!strcmp(ctx->argv[1], "default")) {
- /* Set one or more controllers in the "Open_vSwitch" table. */
- set_default_controllers(ctx, &ctx->argv[2], ctx->argc - 2);
- } else {
- /* Set one or more controllers for a particular bridge. */
- struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true);
- struct ovsrec_controller **controllers;
- size_t n;
+ get_info(ctx, &info);
+ br = find_real_bridge(&info, ctx->argv[1], true);
- delete_controllers(br->ctrl, br->n_ctrl);
+ delete_controllers(br->ctrl, br->n_ctrl);
- n = ctx->argc - 2;
- controllers = insert_controllers(ctx->txn, &ctx->argv[2], n);
- ovsrec_bridge_set_controller(br->br_cfg, controllers, n);
- free(controllers);
- }
+ n = ctx->argc - 2;
+ controllers = insert_controllers(ctx->txn, &ctx->argv[2], n);
+ ovsrec_bridge_set_controller(br->br_cfg, controllers, n);
+ free(controllers);
free_info(&info);
}
-static const char *
-get_fail_mode(struct ovsrec_controller **controllers, size_t n_controllers)
-{
- const char *fail_mode;
- size_t i;
-
- fail_mode = NULL;
- for (i = 0; i < n_controllers; i++) {
- const char *s = controllers[i]->fail_mode;
- if (s) {
- if (!strcmp(s, "secure")) {
- return s;
- } else {
- fail_mode = s;
- }
- }
- }
-
- return fail_mode;
-}
-
static void
cmd_get_fail_mode(struct vsctl_context *ctx)
{
struct vsctl_info info;
- const char *fail_mode = NULL;
-
- get_info(ctx->ovs, &info);
-
- if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) {
- /* Return the fail-mode from the "Open_vSwitch" table */
- fail_mode = get_fail_mode(info.ctrl, info.n_ctrl);
- } else {
- /* Return the fail-mode for a particular bridge. */
- struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true);
+ struct vsctl_bridge *br;
- /* If no controller is defined for the requested bridge, fallback to
- * the "Open_vSwitch" table's controller. */
- fail_mode = (br->n_ctrl
- ? get_fail_mode(br->ctrl, br->n_ctrl)
- : get_fail_mode(info.ctrl, info.n_ctrl));
- }
+ get_info(ctx, &info);
+ br = find_bridge(&info, ctx->argv[1], true);
- if (fail_mode && strlen(fail_mode)) {
- ds_put_format(&ctx->output, "%s\n", fail_mode);
+ if (br->fail_mode && strlen(br->fail_mode)) {
+ ds_put_format(&ctx->output, "%s\n", br->fail_mode);
}
free_info(&info);
}
-static void
-set_fail_mode(struct ovsrec_controller **controllers, size_t n_controllers,
- const char *fail_mode)
-{
- size_t i;
-
- for (i = 0; i < n_controllers; i++) {
- ovsrec_controller_set_fail_mode(controllers[i], fail_mode);
- }
-}
-
static void
cmd_del_fail_mode(struct vsctl_context *ctx)
{
struct vsctl_info info;
+ struct vsctl_bridge *br;
- get_info(ctx->ovs, &info);
-
- if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) {
- set_fail_mode(info.ctrl, info.n_ctrl, NULL);
- } else {
- struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true);
+ get_info(ctx, &info);
+ br = find_real_bridge(&info, ctx->argv[1], true);
- set_fail_mode(br->ctrl, br->n_ctrl, NULL);
- }
+ ovsrec_bridge_set_fail_mode(br->br_cfg, NULL);
free_info(&info);
}
cmd_set_fail_mode(struct vsctl_context *ctx)
{
struct vsctl_info info;
- const char *bridge;
- const char *fail_mode;
-
- get_info(ctx->ovs, &info);
+ struct vsctl_bridge *br;
+ const char *fail_mode = ctx->argv[2];
- if (ctx->argc == 2) {
- bridge = "default";
- fail_mode = ctx->argv[1];
- } else {
- bridge = ctx->argv[1];
- fail_mode = ctx->argv[2];
- }
+ get_info(ctx, &info);
+ br = find_real_bridge(&info, ctx->argv[1], true);
if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) {
vsctl_fatal("fail-mode must be \"standalone\" or \"secure\"");
}
- if (!strcmp(bridge, "default")) {
- /* Set the fail-mode in the "Open_vSwitch" table. */
- if (!info.ctrl) {
- vsctl_fatal("no controller declared");
- }
- set_fail_mode(info.ctrl, info.n_ctrl, fail_mode);
- } else {
- struct vsctl_bridge *br = find_real_bridge(&info, bridge, true);
-
- if (!br->ctrl) {
- vsctl_fatal("no controller declared for %s", br->name);
- }
- set_fail_mode(br->ctrl, br->n_ctrl, fail_mode);
- }
+ ovsrec_bridge_set_fail_mode(br->br_cfg, fail_mode);
free_info(&info);
}
{&ovsrec_table_controller,
{{&ovsrec_table_bridge,
&ovsrec_bridge_col_name,
- &ovsrec_bridge_col_controller},
- {&ovsrec_table_open_vswitch,
- NULL,
- &ovsrec_open_vswitch_col_controller}}},
+ &ovsrec_bridge_col_controller}}},
{&ovsrec_table_interface,
{{&ovsrec_table_interface, &ovsrec_interface_col_name, NULL},
static const struct ovsdb_idl_row *
get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table,
- const struct vsctl_row_id *id, const char *record_id,
- bool partial_match_ok)
+ const struct vsctl_row_id *id, const char *record_id)
{
const struct ovsdb_idl_row *referrer, *final;
}
} else {
const struct ovsdb_idl_row *row;
- unsigned int best_score = 0;
-
- /* It might make sense to relax this assertion. */
- assert(id->name_column->type.key.type == OVSDB_TYPE_STRING);
referrer = NULL;
for (row = ovsdb_idl_first_row(ctx->idl, id->table);
- row != NULL && best_score != UINT_MAX;
+ row != NULL;
row = ovsdb_idl_next_row(row))
{
- struct ovsdb_datum name;
-
- ovsdb_idl_txn_read(row, id->name_column, &name);
- if (name.n == 1) {
- unsigned int score;
-
- score = (partial_match_ok
- ? score_partial_match(name.keys[0].string, record_id)
- : !strcmp(name.keys[0].string, record_id));
- if (score > best_score) {
- referrer = row;
- best_score = score;
- } else if (score == best_score) {
- referrer = NULL;
+ const struct ovsdb_datum *name;
+
+ name = ovsdb_idl_get(row, id->name_column,
+ OVSDB_TYPE_STRING, OVSDB_TYPE_VOID);
+ if (name->n == 1 && !strcmp(name->keys[0].string, record_id)) {
+ if (referrer) {
+ vsctl_fatal("multiple rows in %s match \"%s\"",
+ table->class->name, record_id);
}
+ referrer = row;
}
- ovsdb_datum_destroy(&name, &id->name_column->type);
- }
- if (best_score && !referrer) {
- vsctl_fatal("multiple rows in %s match \"%s\"",
- table->class->name, record_id);
}
}
if (!referrer) {
final = NULL;
if (id->uuid_column) {
- struct ovsdb_datum uuid;
-
- assert(id->uuid_column->type.key.type == OVSDB_TYPE_UUID);
- assert(id->uuid_column->type.value.type == OVSDB_TYPE_VOID);
+ const struct ovsdb_datum *uuid;
- ovsdb_idl_txn_read(referrer, id->uuid_column, &uuid);
- if (uuid.n == 1) {
+ uuid = ovsdb_idl_get(referrer, id->uuid_column,
+ OVSDB_TYPE_UUID, OVSDB_TYPE_VOID);
+ if (uuid->n == 1) {
final = ovsdb_idl_get_row_for_uuid(ctx->idl, table->class,
- &uuid.keys[0].uuid);
+ &uuid->keys[0].uuid);
}
- ovsdb_datum_destroy(&uuid, &id->uuid_column->type);
} else {
final = referrer;
}
}
static const struct ovsdb_idl_row *
-get_row__(struct vsctl_context *ctx,
- const struct vsctl_table_class *table, const char *record_id,
- bool partial_match_ok)
+get_row (struct vsctl_context *ctx,
+ const struct vsctl_table_class *table, const char *record_id)
{
const struct ovsdb_idl_row *row;
struct uuid uuid;
int i;
for (i = 0; i < ARRAY_SIZE(table->row_ids); i++) {
- row = get_row_by_id(ctx, table, &table->row_ids[i], record_id,
- partial_match_ok);
+ row = get_row_by_id(ctx, table, &table->row_ids[i], record_id);
if (row) {
break;
}
return row;
}
-static const struct ovsdb_idl_row *
-get_row(struct vsctl_context *ctx,
- const struct vsctl_table_class *table, const char *record_id)
-{
- return get_row__(ctx, table, record_id, true);
-}
-
static const struct ovsdb_idl_row *
must_get_row(struct vsctl_context *ctx,
const struct vsctl_table_class *table, const char *record_id)
const char *op = allowed_operators[i];
size_t op_len = strlen(op);
- if (op_len > best_len && !strncmp(op, p, op_len)) {
+ if (op_len > best_len && !strncmp(op, p, op_len) && p[op_len]) {
best_len = op_len;
best = op;
}
if (operatorp) {
*operatorp = best;
}
-
- p += best_len;
- if (p[0] == '\0') {
- error = missing_operator_error(arg, allowed_operators, n_allowed);
- goto error;
- }
- *valuep = xstrdup(p);
+ *valuep = xstrdup(p + best_len);
} else {
if (valuep) {
*valuep = NULL;
row = must_get_row(ctx, table, record_id);
for (i = 3; i < ctx->argc; i++) {
const struct ovsdb_idl_column *column;
- struct ovsdb_datum datum;
+ const struct ovsdb_datum *datum;
char *key_string;
/* Special case for obtaining the UUID of a row. We can't just do this
&column, &key_string,
NULL, NULL, 0, NULL));
- ovsdb_idl_txn_read(row, column, &datum);
+ datum = ovsdb_idl_read(row, column);
if (key_string) {
union ovsdb_atom key;
unsigned int idx;
&column->type.key,
key_string, ctx->symtab));
- idx = ovsdb_datum_find_key(&datum, &key,
+ idx = ovsdb_datum_find_key(datum, &key,
column->type.key.type);
if (idx == UINT_MAX) {
if (!if_exists) {
column->name);
}
} else {
- ovsdb_atom_to_string(&datum.values[idx],
+ ovsdb_atom_to_string(&datum->values[idx],
column->type.value.type, out);
}
ovsdb_atom_destroy(&key, column->type.key.type);
} else {
- ovsdb_datum_to_string(&datum, &column->type, out);
+ ovsdb_datum_to_string(datum, &column->type, out);
}
ds_put_char(out, '\n');
- ovsdb_datum_destroy(&datum, &column->type);
free(key_string);
}
UUID_ARGS(&row->uuid));
for (i = 0; i < table->class->n_columns; i++) {
const struct ovsdb_idl_column *column = &table->class->columns[i];
- struct ovsdb_datum datum;
+ const struct ovsdb_datum *datum;
- ovsdb_idl_txn_read(row, column, &datum);
+ datum = ovsdb_idl_read(row, column);
ds_put_format(out, "%-20s: ", column->name);
- ovsdb_datum_to_string(&datum, &column->type, out);
+ ovsdb_datum_to_string(datum, &column->type, out);
ds_put_char(out, '\n');
-
- ovsdb_datum_destroy(&datum, &column->type);
}
}
if (key_string) {
union ovsdb_atom key, value;
- struct ovsdb_datum old, new;
+ struct ovsdb_datum datum;
if (column->type.value.type == OVSDB_TYPE_VOID) {
vsctl_fatal("cannot specify key to set for non-map column %s",
die_if_error(ovsdb_atom_from_string(&value, &column->type.value,
value_string, symtab));
- ovsdb_datum_init_empty(&new);
- ovsdb_datum_add_unsafe(&new, &key, &value, &column->type);
+ ovsdb_datum_init_empty(&datum);
+ ovsdb_datum_add_unsafe(&datum, &key, &value, &column->type);
ovsdb_atom_destroy(&key, column->type.key.type);
ovsdb_atom_destroy(&value, column->type.value.type);
- ovsdb_idl_txn_read(row, column, &old);
- ovsdb_datum_union(&old, &new, &column->type, true);
- ovsdb_idl_txn_write(row, column, &old);
-
- ovsdb_datum_destroy(&new, &column->type);
+ ovsdb_datum_union(&datum, ovsdb_idl_read(row, column),
+ &column->type, false);
+ ovsdb_idl_txn_write(row, column, &datum);
} else {
struct ovsdb_datum datum;
die_if_error(get_column(table, column_name, &column));
type = &column->type;
- ovsdb_idl_txn_read(row, column, &old);
+ ovsdb_datum_clone(&old, ovsdb_idl_read(row, column), &column->type);
for (i = 4; i < ctx->argc; i++) {
struct ovsdb_type add_type;
struct ovsdb_datum add;
die_if_error(get_column(table, column_name, &column));
type = &column->type;
- ovsdb_idl_txn_read(row, column, &old);
+ ovsdb_datum_clone(&old, ovsdb_idl_read(row, column), &column->type);
for (i = 4; i < ctx->argc; i++) {
struct ovsdb_type rm_type;
struct ovsdb_datum rm;
}
}
}
+
+static bool
+is_condition_satified(const struct vsctl_table_class *table,
+ const struct ovsdb_idl_row *row, const char *arg,
+ struct ovsdb_symbol_table *symtab)
+{
+ static const char *operators[] = {
+ "=", "!=", "<", ">", "<=", ">="
+ };
+
+ const struct ovsdb_idl_column *column;
+ const struct ovsdb_datum *have_datum;
+ char *key_string, *value_string;
+ const char *operator;
+ unsigned int idx;
+ char *error;
+ int cmp = 0;
+
+ error = parse_column_key_value(arg, table, &column, &key_string,
+ &operator, operators, ARRAY_SIZE(operators),
+ &value_string);
+ die_if_error(error);
+ if (!value_string) {
+ vsctl_fatal("%s: missing value", arg);
+ }
+
+ have_datum = ovsdb_idl_read(row, column);
+ if (key_string) {
+ union ovsdb_atom want_key, want_value;
+
+ if (column->type.value.type == OVSDB_TYPE_VOID) {
+ vsctl_fatal("cannot specify key to check for non-map column %s",
+ column->name);
+ }
+
+ die_if_error(ovsdb_atom_from_string(&want_key, &column->type.key,
+ key_string, symtab));
+ die_if_error(ovsdb_atom_from_string(&want_value, &column->type.value,
+ value_string, symtab));
+
+ idx = ovsdb_datum_find_key(have_datum,
+ &want_key, column->type.key.type);
+ if (idx != UINT_MAX) {
+ cmp = ovsdb_atom_compare_3way(&have_datum->values[idx],
+ &want_value,
+ column->type.value.type);
+ }
+
+ ovsdb_atom_destroy(&want_key, column->type.key.type);
+ ovsdb_atom_destroy(&want_value, column->type.value.type);
+ } else {
+ struct ovsdb_datum want_datum;
+
+ die_if_error(ovsdb_datum_from_string(&want_datum, &column->type,
+ value_string, symtab));
+ idx = 0;
+ cmp = ovsdb_datum_compare_3way(have_datum, &want_datum,
+ &column->type);
+ ovsdb_datum_destroy(&want_datum, &column->type);
+ }
+
+ free(key_string);
+ free(value_string);
+
+ return (idx == UINT_MAX ? false
+ : !strcmp(operator, "=") ? cmp == 0
+ : !strcmp(operator, "!=") ? cmp != 0
+ : !strcmp(operator, "<") ? cmp < 0
+ : !strcmp(operator, ">") ? cmp > 0
+ : !strcmp(operator, "<=") ? cmp <= 0
+ : !strcmp(operator, ">=") ? cmp >= 0
+ : (abort(), 0));
+}
+
+static void
+cmd_wait_until(struct vsctl_context *ctx)
+{
+ const char *table_name = ctx->argv[1];
+ const char *record_id = ctx->argv[2];
+ const struct vsctl_table_class *table;
+ const struct ovsdb_idl_row *row;
+ int i;
+
+ table = get_table(table_name);
+
+ row = get_row(ctx, table, record_id);
+ if (!row) {
+ ctx->try_again = true;
+ return;
+ }
+
+ for (i = 3; i < ctx->argc; i++) {
+ if (!is_condition_satified(table, row, ctx->argv[i], ctx->symtab)) {
+ ctx->try_again = true;
+ return;
+ }
+ }
+}
\f
static struct json *
where_uuid_equals(const struct uuid *uuid)
const char *unused;
struct vsctl_command *c;
int64_t next_cfg = 0;
- char *error;
+ char *error = NULL;
txn = the_idl_txn = ovsdb_idl_txn_create(idl);
if (dry_run) {
{"iface-to-br", 1, 1, cmd_iface_to_br, NULL, ""},
/* Controller commands. */
- {"get-controller", 0, 1, cmd_get_controller, NULL, ""},
- {"del-controller", 0, 1, cmd_del_controller, NULL, ""},
+ {"get-controller", 1, 1, cmd_get_controller, NULL, ""},
+ {"del-controller", 1, 1, cmd_del_controller, NULL, ""},
{"set-controller", 1, INT_MAX, cmd_set_controller, NULL, ""},
- {"get-fail-mode", 0, 1, cmd_get_fail_mode, NULL, ""},
- {"del-fail-mode", 0, 1, cmd_del_fail_mode, NULL, ""},
- {"set-fail-mode", 1, 2, cmd_set_fail_mode, NULL, ""},
+ {"get-fail-mode", 1, 1, cmd_get_fail_mode, NULL, ""},
+ {"del-fail-mode", 1, 1, cmd_del_fail_mode, NULL, ""},
+ {"set-fail-mode", 2, 2, cmd_set_fail_mode, NULL, ""},
/* SSL commands. */
{"get-ssl", 0, 0, cmd_get_ssl, NULL, ""},
{"clear", 3, INT_MAX, cmd_clear, NULL, ""},
{"create", 2, INT_MAX, cmd_create, post_create, "--id="},
{"destroy", 1, INT_MAX, cmd_destroy, NULL, "--if-exists"},
+ {"wait-until", 2, INT_MAX, cmd_wait_until, NULL, ""},
{NULL, 0, 0, NULL, NULL, NULL},
};
git://git.onelab.eu / sliver-openvswitch.git / blobdiff