X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=d22a518dd39f34522311c924a8a006c87154e03b;hb=854a94d9d20ee57b00ed8d8503e0fd945eb52301;hp=2baab003acc9a40b7fa2e1bbb6f7001bb60bc923;hpb=28a14bf3d86efb8f0f29936e84cc9e4e384dffe8;p=sliver-openvswitch.git diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 2baab003a..d22a518dd 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ #include #include #include +#include #include "command-line.h" #include "compiler.h" @@ -38,11 +39,13 @@ #include "process.h" #include "stream.h" #include "stream-ssl.h" +#include "sset.h" #include "svec.h" -#include "vswitchd/vswitch-idl.h" +#include "lib/vswitch-idl.h" #include "table.h" #include "timeval.h" #include "util.h" +#include "vconn.h" #include "vlog.h" VLOG_DEFINE_THIS_MODULE(vsctl); @@ -135,8 +138,7 @@ static void parse_command(int argc, char *argv[], struct vsctl_command *); static const struct vsctl_command_syntax *find_command(const char *name); static void run_prerequisites(struct vsctl_command[], size_t n_commands, struct ovsdb_idl *); -static void do_vsctl(const char *args, - struct vsctl_command *, size_t n_commands, +static void do_vsctl(const char *args, struct vsctl_command *, size_t n, struct ovsdb_idl *); static const struct vsctl_table_class *get_table(const char *table_name); @@ -155,6 +157,7 @@ main(int argc, char *argv[]) extern struct vlog_module VLM_reconnect; struct ovsdb_idl *idl; struct vsctl_command *commands; + unsigned int seqno; size_t n_commands; char *args; @@ -180,14 +183,26 @@ main(int argc, char *argv[]) idl = the_idl = ovsdb_idl_create(db, &ovsrec_idl_class, false); run_prerequisites(commands, n_commands, idl); - /* Now execute the commands. */ + /* Execute the commands. + * + * 'seqno' is the database sequence number for which we last tried to + * execute our transaction. There's no point in trying to commit more than + * once for any given sequence number, because if the transaction fails + * it's because the database changed and we need to obtain an up-to-date + * view of the database before we try the transaction again. */ + seqno = ovsdb_idl_get_seqno(idl); for (;;) { - if (ovsdb_idl_run(idl)) { + ovsdb_idl_run(idl); + + if (seqno != ovsdb_idl_get_seqno(idl)) { + seqno = ovsdb_idl_get_seqno(idl); do_vsctl(args, commands, n_commands, idl); } - ovsdb_idl_wait(idl); - poll_block(); + if (seqno == ovsdb_idl_get_seqno(idl)) { + ovsdb_idl_wait(idl); + poll_block(); + } } } @@ -205,21 +220,19 @@ parse_options(int argc, char *argv[]) TABLE_OPTION_ENUMS }; static struct option long_options[] = { - {"db", required_argument, 0, OPT_DB}, - {"no-syslog", no_argument, 0, OPT_NO_SYSLOG}, - {"no-wait", no_argument, 0, OPT_NO_WAIT}, - {"dry-run", no_argument, 0, OPT_DRY_RUN}, - {"oneline", no_argument, 0, OPT_ONELINE}, - {"timeout", required_argument, 0, 't'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + {"db", required_argument, NULL, OPT_DB}, + {"no-syslog", no_argument, NULL, OPT_NO_SYSLOG}, + {"no-wait", no_argument, NULL, OPT_NO_WAIT}, + {"dry-run", no_argument, NULL, OPT_DRY_RUN}, + {"oneline", no_argument, NULL, OPT_ONELINE}, + {"timeout", required_argument, NULL, 't'}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, VLOG_LONG_OPTIONS, TABLE_LONG_OPTIONS, -#ifdef HAVE_OPENSSL - STREAM_SSL_LONG_OPTIONS - {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, -#endif - {0, 0, 0, 0}, + STREAM_SSL_LONG_OPTIONS, + {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT}, + {NULL, 0, NULL, 0}, }; char *tmp, *short_options; @@ -262,7 +275,7 @@ parse_options(int argc, char *argv[]) usage(); case 'V': - OVS_PRINT_VERSION(0, 0); + ovs_print_version(0, 0); exit(EXIT_SUCCESS); case 't': @@ -276,13 +289,11 @@ parse_options(int argc, char *argv[]) VLOG_OPTION_HANDLERS TABLE_OPTION_HANDLERS(&table_style) -#ifdef HAVE_OPENSSL STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: stream_ssl_set_peer_ca_cert_file(optarg); break; -#endif case '?': exit(EXIT_FAILURE); @@ -446,7 +457,7 @@ vsctl_fatal(const char *format, ...) message = xvasprintf(format, args); va_end(args); - vlog_set_levels(&VLM_vsctl, VLF_CONSOLE, VLL_EMER); + vlog_set_levels(&VLM_vsctl, VLF_CONSOLE, VLL_OFF); VLOG_ERR("%s", message); ovs_error(0, "%s", message); vsctl_exit(EXIT_FAILURE); @@ -478,6 +489,7 @@ usage: %s [OPTIONS] COMMAND [ARG...]\n\ \n\ Open vSwitch commands:\n\ init initialize database, if not yet initialized\n\ + show print overview of database contents\n\ emer-reset reset configuration to clean state\n\ \n\ Bridge commands:\n\ @@ -485,7 +497,7 @@ Bridge commands:\n\ add-br BRIDGE PARENT VLAN create new fake BRIDGE in PARENT on VLAN\n\ del-br BRIDGE delete BRIDGE and all of its ports\n\ list-br print the names of all the bridges\n\ - br-exists BRIDGE test whether BRIDGE exists\n\ + br-exists BRIDGE exit 2 if BRIDGE does not exist\n\ br-to-vlan BRIDGE print the VLAN which BRIDGE is on\n\ br-to-parent BRIDGE print the parent of BRIDGE\n\ br-set-external-id BRIDGE KEY VALUE set KEY on BRIDGE to VALUE\n\ @@ -505,17 +517,17 @@ Interface commands (a bond consists of multiple interfaces):\n\ 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-controller BRIDGE print the controllers for BRIDGE\n\ + del-controller BRIDGE delete the controllers for BRIDGE\n\ + set-controller BRIDGE TARGET... set the controllers for BRIDGE\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\ Manager commands:\n\ - get-manager print all manager(s)\n\ - del-manager delete all manager(s)\n\ - set-manager TARGET... set the list of manager(s) to TARGET(s)\n\ + get-manager print the managers\n\ + del-manager delete the managers\n\ + set-manager TARGET... set the list of managers to TARGET...\n\ \n\ SSL commands:\n\ get-ssl print the SSL configuration\n\ @@ -608,8 +620,13 @@ struct vsctl_bridge { struct ovsrec_controller **ctrl; char *fail_mode; size_t n_ctrl; - struct vsctl_bridge *parent; - int vlan; + + /* VLAN ("fake") bridge support. + * + * Use 'parent != NULL' to detect a fake bridge, because 'vlan' can be 0 + * in either case. */ + struct vsctl_bridge *parent; /* Real bridge, or NULL. */ + int vlan; /* VLAN VID (0...4095), or 0. */ }; struct vsctl_port { @@ -700,7 +717,7 @@ port_is_fake_bridge(const struct ovsrec_port *port_cfg) { return (port_cfg->fake_bridge && port_cfg->tag - && *port_cfg->tag >= 1 && *port_cfg->tag <= 4095); + && *port_cfg->tag >= 0 && *port_cfg->tag <= 4095); } static struct vsctl_bridge * @@ -757,7 +774,7 @@ static void get_info(struct vsctl_context *ctx, struct vsctl_info *info) { const struct ovsrec_open_vswitch *ovs = ctx->ovs; - struct shash bridges, ports; + struct sset bridges, ports; size_t i; info->ctx = ctx; @@ -765,14 +782,14 @@ get_info(struct vsctl_context *ctx, struct vsctl_info *info) shash_init(&info->ports); shash_init(&info->ifaces); - shash_init(&bridges); - shash_init(&ports); + sset_init(&bridges); + sset_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { struct ovsrec_bridge *br_cfg = ovs->bridges[i]; struct vsctl_bridge *br; size_t j; - if (!shash_add_once(&bridges, br_cfg->name, NULL)) { + if (!sset_add(&bridges, br_cfg->name)) { VLOG_WARN("%s: database contains duplicate bridge name", br_cfg->name); continue; @@ -785,29 +802,27 @@ get_info(struct vsctl_context *ctx, struct vsctl_info *info) for (j = 0; j < br_cfg->n_ports; j++) { struct ovsrec_port *port_cfg = br_cfg->ports[j]; - if (!shash_add_once(&ports, port_cfg->name, NULL)) { - VLOG_WARN("%s: database contains duplicate port name", - port_cfg->name); + if (!sset_add(&ports, port_cfg->name)) { + /* Duplicate port name. (We will warn about that later.) */ continue; } if (port_is_fake_bridge(port_cfg) - && shash_add_once(&bridges, port_cfg->name, NULL)) { + && sset_add(&bridges, port_cfg->name)) { add_bridge(info, NULL, port_cfg->name, br, *port_cfg->tag); } } } - shash_destroy(&bridges); - shash_destroy(&ports); + sset_destroy(&bridges); + sset_destroy(&ports); - shash_init(&bridges); - shash_init(&ports); + sset_init(&bridges); for (i = 0; i < ovs->n_bridges; i++) { struct ovsrec_bridge *br_cfg = ovs->bridges[i]; struct vsctl_bridge *br; size_t j; - if (!shash_add_once(&bridges, br_cfg->name, NULL)) { + if (!sset_add(&bridges, br_cfg->name)) { continue; } br = shash_find_data(&info->bridges, br_cfg->name); @@ -816,19 +831,30 @@ get_info(struct vsctl_context *ctx, struct vsctl_info *info) struct vsctl_port *port; size_t k; - if (!shash_add_once(&ports, port_cfg->name, NULL)) { + port = shash_find_data(&info->ports, port_cfg->name); + if (port) { + if (port_cfg == port->port_cfg) { + VLOG_WARN("%s: port is in multiple bridges (%s and %s)", + port_cfg->name, br->name, port->bridge->name); + } else { + /* Log as an error because this violates the database's + * uniqueness constraints, so the database server shouldn't + * have allowed it. */ + VLOG_ERR("%s: database contains duplicate port name", + port_cfg->name); + } continue; } if (port_is_fake_bridge(port_cfg) - && !shash_add_once(&bridges, port_cfg->name, NULL)) { + && !sset_add(&bridges, port_cfg->name)) { continue; } port = xmalloc(sizeof *port); port->port_cfg = port_cfg; if (port_cfg->tag - && *port_cfg->tag >= 1 && *port_cfg->tag <= 4095) { + && *port_cfg->tag >= 0 && *port_cfg->tag <= 4095) { port->bridge = find_vlan_bridge(info, br, *port_cfg->tag); if (!port->bridge) { port->bridge = br; @@ -842,9 +868,21 @@ get_info(struct vsctl_context *ctx, struct vsctl_info *info) struct ovsrec_interface *iface_cfg = port_cfg->interfaces[k]; struct vsctl_iface *iface; - if (shash_find(&info->ifaces, iface_cfg->name)) { - VLOG_WARN("%s: database contains duplicate interface name", - iface_cfg->name); + iface = shash_find_data(&info->ifaces, iface_cfg->name); + if (iface) { + if (iface_cfg == iface->iface_cfg) { + VLOG_WARN("%s: interface is in multiple ports " + "(%s and %s)", + iface_cfg->name, + iface->port->port_cfg->name, + port->port_cfg->name); + } else { + /* Log as an error because this violates the database's + * uniqueness constraints, so the database server + * shouldn't have allowed it. */ + VLOG_ERR("%s: database contains duplicate interface " + "name", iface_cfg->name); + } continue; } @@ -855,8 +893,7 @@ get_info(struct vsctl_context *ctx, struct vsctl_info *info) } } } - shash_destroy(&bridges); - shash_destroy(&ports); + sset_destroy(&bridges); } static void @@ -1006,6 +1043,186 @@ cmd_init(struct vsctl_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[] = { + {&ovsrec_table_open_vswitch, + NULL, + {&ovsrec_open_vswitch_col_manager_options, + &ovsrec_open_vswitch_col_bridges, + &ovsrec_open_vswitch_col_ovs_version}, + false}, + + {&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + {&ovsrec_bridge_col_controller, + &ovsrec_bridge_col_fail_mode, + &ovsrec_bridge_col_ports}, + false}, + + {&ovsrec_table_port, + &ovsrec_port_col_name, + {&ovsrec_port_col_tag, + &ovsrec_port_col_trunks, + &ovsrec_port_col_interfaces}, + false}, + + {&ovsrec_table_interface, + &ovsrec_interface_col_name, + {&ovsrec_interface_col_type, + &ovsrec_interface_col_options, + NULL}, + false}, + + {&ovsrec_table_controller, + &ovsrec_controller_col_target, + {&ovsrec_controller_col_is_connected, + NULL, + NULL}, + false}, + + {&ovsrec_table_manager, + &ovsrec_manager_col_target, + {&ovsrec_manager_col_is_connected, + NULL, + NULL}, + false}, +}; + +static void +pre_cmd_show(struct vsctl_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 vsctl_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 vsctl_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); + } +} + static void pre_cmd_emer_reset(struct vsctl_context *ctx) { @@ -1113,7 +1330,7 @@ cmd_emer_reset(struct vsctl_context *ctx) static void cmd_add_br(struct vsctl_context *ctx) { - bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; + bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL; const char *br_name, *parent_name; struct vsctl_info info; int vlan; @@ -1125,8 +1342,8 @@ cmd_add_br(struct vsctl_context *ctx) } else if (ctx->argc == 4) { parent_name = ctx->argv[2]; vlan = atoi(ctx->argv[3]); - if (vlan < 1 || vlan > 4095) { - vsctl_fatal("%s: vlan must be between 1 and 4095", ctx->argv[0]); + if (vlan < 0 || vlan > 4095) { + vsctl_fatal("%s: vlan must be between 0 and 4095", ctx->argv[0]); } } else { vsctl_fatal("'%s' command takes exactly 1 or 3 arguments", @@ -1161,6 +1378,7 @@ cmd_add_br(struct vsctl_context *ctx) br_name, parent_name, vlan, br_name, br->vlan); } } + free_info(&info); return; } } @@ -1193,7 +1411,7 @@ cmd_add_br(struct vsctl_context *ctx) int64_t tag = vlan; parent = find_bridge(&info, parent_name, false); - if (parent && parent->vlan) { + if (parent && parent->parent) { vsctl_fatal("cannot create bridge with fake bridge as parent"); } if (!parent) { @@ -1521,6 +1739,7 @@ add_port(struct vsctl_context *ctx, svec_destroy(&want_names); svec_destroy(&have_names); + free_info(&info); return; } @@ -1546,7 +1765,7 @@ add_port(struct vsctl_context *ctx, ovsrec_port_set_bond_fake_iface(port, fake_iface); free(ifaces); - if (bridge->vlan) { + if (bridge->parent) { int64_t tag = bridge->vlan; ovsrec_port_set_tag(port, &tag, 1); } @@ -1565,7 +1784,7 @@ add_port(struct vsctl_context *ctx, static void cmd_add_port(struct vsctl_context *ctx) { - bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; + bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL; add_port(ctx, ctx->argv[1], ctx->argv[2], may_exist, false, &ctx->argv[2], 1, &ctx->argv[3], ctx->argc - 3); @@ -1574,7 +1793,7 @@ cmd_add_port(struct vsctl_context *ctx) static void cmd_add_bond(struct vsctl_context *ctx) { - bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; + bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL; bool fake_iface = shash_find(&ctx->options, "--fake-iface"); int n_ifaces; int i; @@ -1811,6 +2030,9 @@ insert_controllers(struct ovsdb_idl_txn *txn, char *targets[], size_t n) controllers = xmalloc(n * sizeof *controllers); for (i = 0; i < n; i++) { + if (vconn_verify_name(targets[i]) && pvconn_verify_name(targets[i])) { + VLOG_WARN("target type \"%s\" is possibly erroneous", targets[i]); + } controllers[i] = ovsrec_controller_insert(txn); ovsrec_controller_set_target(controllers[i], targets[i]); } @@ -1969,6 +2191,9 @@ insert_managers(struct vsctl_context *ctx, char *targets[], size_t n) /* Insert each manager in a new row in Manager table. */ managers = xmalloc(n * sizeof *managers); for (i = 0; i < n; i++) { + if (stream_verify_name(targets[i]) && pstream_verify_name(targets[i])) { + VLOG_WARN("target type \"%s\" is possibly erroneous", targets[i]); + } managers[i] = ovsrec_manager_insert(ctx->txn); ovsrec_manager_set_target(managers[i], targets[i]); } @@ -2117,16 +2342,6 @@ static const struct vsctl_table_class tables[] = { {{&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}}}, @@ -2140,6 +2355,10 @@ static const struct vsctl_table_class tables[] = { &ovsrec_bridge_col_sflow}, {NULL, NULL, NULL}}}, + {&ovsrec_table_flow_table, + {{&ovsrec_table_flow_table, &ovsrec_flow_table_col_name, NULL}, + {NULL, NULL, NULL}}}, + {NULL, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}} }; @@ -2419,10 +2638,9 @@ missing_operator_error(const char *arg, const char **allowed_operators, * - If 'valuep' is nonnull, an operator followed by a value string. The * allowed operators are the 'n_allowed' string in 'allowed_operators', * or just "=" if 'n_allowed' is 0. If 'operatorp' is nonnull, then the - * operator is stored into '*operatorp' (one of the pointers from - * 'allowed_operators' is stored; nothing is malloc()'d). The value is - * stored as a malloc()'d string into '*valuep', or NULL if no value is - * present in 'arg'. + * index of the operator within 'allowed_operators' is stored into + * '*operatorp'. The value is stored as a malloc()'d string into + * '*valuep', or NULL if no value is present in 'arg'. * * On success, returns NULL. On failure, returned a malloc()'d string error * message and stores NULL into all of the nonnull output arguments. */ @@ -2430,7 +2648,7 @@ static char * WARN_UNUSED_RESULT parse_column_key_value(const char *arg, const struct vsctl_table_class *table, const struct ovsdb_idl_column **columnp, char **keyp, - const char **operatorp, + int *operatorp, const char **allowed_operators, size_t n_allowed, char **valuep) { @@ -2471,9 +2689,9 @@ parse_column_key_value(const char *arg, /* Parse value string. */ if (valuep) { - const char *best; size_t best_len; size_t i; + int best; if (!allowed_operators) { static const char *equals = "="; @@ -2481,7 +2699,7 @@ parse_column_key_value(const char *arg, n_allowed = 1; } - best = NULL; + best = -1; best_len = 0; for (i = 0; i < n_allowed; i++) { const char *op = allowed_operators[i]; @@ -2489,10 +2707,10 @@ parse_column_key_value(const char *arg, if (op_len > best_len && !strncmp(op, p, op_len) && p[op_len]) { best_len = op_len; - best = op; + best = i; } } - if (!best) { + if (best < 0) { error = missing_operator_error(arg, allowed_operators, n_allowed); goto error; } @@ -2502,9 +2720,6 @@ parse_column_key_value(const char *arg, } *valuep = xstrdup(p + best_len); } else { - if (valuep) { - *valuep = NULL; - } if (*p != '\0') { error = xasprintf("%s: trailing garbage \"%s\" in argument", arg, p); @@ -2521,7 +2736,7 @@ error: free(*valuep); *valuep = NULL; if (operatorp) { - *operatorp = NULL; + *operatorp = -1; } } return error; @@ -2549,10 +2764,20 @@ pre_parse_column_key_value(struct vsctl_context *ctx, static void pre_cmd_get(struct vsctl_context *ctx) { + const char *id = shash_find_data(&ctx->options, "--id"); const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; int i; + /* Using "get" without --id or a column name could possibly make sense. + * Maybe, for example, a ovs-vsctl run wants to assert that a row exists. + * But it is unlikely that an interactive user would want to do that, so + * issue a warning if we're running on a terminal. */ + if (!id && ctx->argc <= 3 && isatty(STDOUT_FILENO)) { + VLOG_WARN("\"get\" command without row arguments or \"--id\" is " + "possibly erroneous"); + } + table = pre_get_table(ctx, table_name); for (i = 3; i < ctx->argc; i++) { if (!strcasecmp(ctx->argv[i], "_uuid") @@ -2802,11 +3027,9 @@ cmd_list(struct vsctl_context *ctx) } } else { const struct ovsdb_idl_row *row; - bool first; - for (row = ovsdb_idl_first_row(ctx->idl, table->class), first = true; - row != NULL; - row = ovsdb_idl_next_row(row), first = false) { + for (row = ovsdb_idl_first_row(ctx->idl, table->class); row != NULL; + row = ovsdb_idl_next_row(row)) { list_record(row, columns, n_columns, out); } } @@ -3196,22 +3419,86 @@ cmd_destroy(struct vsctl_context *ctx) } } +#define RELOPS \ + RELOP(RELOP_EQ, "=") \ + RELOP(RELOP_NE, "!=") \ + RELOP(RELOP_LT, "<") \ + RELOP(RELOP_GT, ">") \ + RELOP(RELOP_LE, "<=") \ + RELOP(RELOP_GE, ">=") \ + RELOP(RELOP_SET_EQ, "{=}") \ + RELOP(RELOP_SET_NE, "{!=}") \ + RELOP(RELOP_SET_LT, "{<}") \ + RELOP(RELOP_SET_GT, "{>}") \ + RELOP(RELOP_SET_LE, "{<=}") \ + RELOP(RELOP_SET_GE, "{>=}") + +enum relop { +#define RELOP(ENUM, STRING) ENUM, + RELOPS +#undef RELOP +}; + +static bool +is_set_operator(enum relop op) +{ + return (op == RELOP_SET_EQ || op == RELOP_SET_NE || + op == RELOP_SET_LT || op == RELOP_SET_GT || + op == RELOP_SET_LE || op == RELOP_SET_GE); +} + +static bool +evaluate_relop(const struct ovsdb_datum *a, const struct ovsdb_datum *b, + const struct ovsdb_type *type, enum relop op) +{ + switch (op) { + case RELOP_EQ: + case RELOP_SET_EQ: + return ovsdb_datum_compare_3way(a, b, type) == 0; + case RELOP_NE: + case RELOP_SET_NE: + return ovsdb_datum_compare_3way(a, b, type) != 0; + case RELOP_LT: + return ovsdb_datum_compare_3way(a, b, type) < 0; + case RELOP_GT: + return ovsdb_datum_compare_3way(a, b, type) > 0; + case RELOP_LE: + return ovsdb_datum_compare_3way(a, b, type) <= 0; + case RELOP_GE: + return ovsdb_datum_compare_3way(a, b, type) >= 0; + + case RELOP_SET_LT: + return b->n > a->n && ovsdb_datum_includes_all(a, b, type); + case RELOP_SET_GT: + return a->n > b->n && ovsdb_datum_includes_all(b, a, type); + case RELOP_SET_LE: + return ovsdb_datum_includes_all(a, b, type); + case RELOP_SET_GE: + return ovsdb_datum_includes_all(b, a, type); + + default: + NOT_REACHED(); + } +} + static bool is_condition_satisfied(const struct vsctl_table_class *table, const struct ovsdb_idl_row *row, const char *arg, struct ovsdb_symbol_table *symtab) { static const char *operators[] = { - "=", "!=", "<", ">", "<=", ">=" +#define RELOP(ENUM, STRING) STRING, + RELOPS +#undef RELOP }; const struct ovsdb_idl_column *column; const struct ovsdb_datum *have_datum; char *key_string, *value_string; - const char *operator; - unsigned int idx; + struct ovsdb_type type; + int operator; + bool retval; char *error; - int cmp = 0; error = parse_column_key_value(arg, table, &column, &key_string, &operator, operators, ARRAY_SIZE(operators), @@ -3221,9 +3508,14 @@ is_condition_satisfied(const struct vsctl_table_class *table, vsctl_fatal("%s: missing value", arg); } + type = column->type; + type.n_max = UINT_MAX; + have_datum = ovsdb_idl_read(row, column); if (key_string) { - union ovsdb_atom want_key, want_value; + union ovsdb_atom want_key; + struct ovsdb_datum b; + unsigned int idx; if (column->type.value.type == OVSDB_TYPE_VOID) { vsctl_fatal("cannot specify key to check for non-map column %s", @@ -3232,41 +3524,46 @@ is_condition_satisfied(const struct vsctl_table_class *table, 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)); + + type.key = type.value; + type.value.type = OVSDB_TYPE_VOID; + die_if_error(ovsdb_datum_from_string(&b, &type, 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); + if (idx == UINT_MAX && !is_set_operator(operator)) { + retval = false; + } else { + struct ovsdb_datum a; + + if (idx != UINT_MAX) { + a.n = 1; + a.keys = &have_datum->values[idx]; + a.values = NULL; + } else { + a.n = 0; + a.keys = NULL; + a.values = NULL; + } + + retval = evaluate_relop(&a, &b, &type, operator); } ovsdb_atom_destroy(&want_key, column->type.key.type); - ovsdb_atom_destroy(&want_value, column->type.value.type); + ovsdb_datum_destroy(&b, &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); + retval = evaluate_relop(have_datum, &want_datum, &type, operator); 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)); + return retval; } static void @@ -3418,10 +3715,13 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, struct vsctl_context ctx; vsctl_context_init(&ctx, c, idl, txn, ovs, symtab); - (c->syntax->run)(&ctx); + if (c->syntax->run) { + (c->syntax->run)(&ctx); + } vsctl_context_done(&ctx, c); if (ctx.try_again) { + status = TXN_TRY_AGAIN; goto try_again; } } @@ -3466,6 +3766,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, txn = the_idl_txn = NULL; switch (status) { + case TXN_UNCOMMITTED: case TXN_INCOMPLETE: NOT_REACHED(); @@ -3483,6 +3784,10 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, case TXN_ERROR: vsctl_fatal("transaction error: %s", error); + case TXN_NOT_LOCKED: + /* Should not happen--we never call ovsdb_idl_set_lock(). */ + vsctl_fatal("database not locked"); + default: NOT_REACHED(); } @@ -3562,6 +3867,7 @@ try_again: static const struct vsctl_command_syntax all_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, pre_get_info, cmd_add_br, NULL, "--may-exist", RW}, @@ -3611,7 +3917,8 @@ static const struct vsctl_command_syntax all_commands[] = { /* Switch commands. */ {"emer-reset", 0, 0, pre_cmd_emer_reset, cmd_emer_reset, NULL, "", RW}, - /* Parameter commands. */ + /* Database commands. */ + {"comment", 0, INT_MAX, NULL, NULL, NULL, "", RO}, {"get", 2, INT_MAX, pre_cmd_get, cmd_get, NULL, "--if-exists,--id=", RO}, {"list", 1, INT_MAX, pre_cmd_list, cmd_list, NULL, "--columns=", RO}, {"find", 1, INT_MAX, pre_cmd_find, cmd_find, NULL, "--columns=", RO},