X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=4fcee77ae26d7a8931c6d774cfcf444d87d4fa23;hb=HEAD;hp=56cb7450d08ee0fd71ecc764c057ec5dc72e0d2c;hpb=b31bcf60cf4fbabca0182196c97b3004e42f53e5;p=sliver-openvswitch.git diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 56cb7450d..4fcee77ae 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ #include -#include #include #include #include @@ -26,21 +25,29 @@ #include #include #include +#include #include "command-line.h" #include "compiler.h" #include "dirs.h" #include "dynamic-string.h" +#include "fatal-signal.h" +#include "hash.h" #include "json.h" #include "ovsdb-data.h" #include "ovsdb-idl.h" #include "poll-loop.h" #include "process.h" +#include "stream.h" #include "stream-ssl.h" +#include "smap.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); @@ -61,7 +68,7 @@ struct vsctl_command_syntax { void (*prerequisites)(struct vsctl_context *ctx); /* Does the actual work of the command and puts the command's output, if - * any, in ctx->output. + * any, in ctx->output or ctx->table. * * Alternatively, if some prerequisite of the command is not met and the * caller should wait for something to change and then retry, it may set @@ -90,6 +97,7 @@ struct vsctl_command { /* Data modified by commands. */ struct ds output; + struct table *table; }; /* --db: The database server to contact. */ @@ -107,8 +115,21 @@ static bool wait_for_reload = true; /* --timeout: Time to wait for a connection to 'db'. */ static int timeout; +/* --retry: If true, ovs-vsctl will retry connecting to the database forever. + * If false and --db says to use an active connection method (e.g. "unix:", + * "tcp:", "ssl:"), then ovs-vsctl will try to connect once and exit with an + * error if the database server cannot be contacted (e.g. ovsdb-server is not + * running). + * + * Regardless of this setting, --timeout always limits how long ovs-vsctl will + * wait. */ +static bool retry; + +/* Format for table output. */ +static struct table_style table_style = TABLE_STYLE_DEFAULT; + /* All supported commands. */ -static const struct vsctl_command_syntax all_commands[]; +static const struct vsctl_command_syntax *get_all_commands(void); /* The IDL we're using and the current transaction, if any. * This is for use by vsctl_exit() only, to allow it to clean up. @@ -120,17 +141,18 @@ static void vsctl_exit(int status) NO_RETURN; static void vsctl_fatal(const char *, ...) PRINTF_FORMAT(1, 2) NO_RETURN; static char *default_db(void); static void usage(void) NO_RETURN; -static void parse_options(int argc, char *argv[]); +static void parse_options(int argc, char *argv[], struct shash *local_options); static bool might_write_to_db(char **argv); static struct vsctl_command *parse_commands(int argc, char *argv[], + struct shash *local_options, size_t *n_commandsp); -static void parse_command(int argc, char *argv[], struct vsctl_command *); +static void parse_command(int argc, char *argv[], struct shash *local_options, + 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); @@ -138,17 +160,52 @@ static void set_column(const struct vsctl_table_class *, const struct ovsdb_idl_row *, const char *arg, struct ovsdb_symbol_table *); +static bool is_condition_satisfied(const struct vsctl_table_class *, + const struct ovsdb_idl_row *, + const char *arg, + struct ovsdb_symbol_table *); + +/* Post_db_reload_check frame work is to allow ovs-vsctl to do additional + * checks after OVSDB transactions are successfully recorded and reload by + * ovs-vswitchd. + * + * For example, When a new interface is added to OVSDB, ovs-vswitchd will + * either store a positive values on successful implementing the new + * interface, or -1 on failure. + * + * Unless -no-wait command line option is specified, + * post_db_reload_do_checks() is called right after any configuration + * changes is picked up (i.e. reload) by ovs-vswitchd. Any error detected + * post OVSDB reload is reported as ovs-vsctl errors. OVS-vswitchd logs + * more detailed messages about those errors. + * + * Current implementation only check for Post OVSDB reload failures on new + * interface additions with 'add-br' and 'add-port' commands. + * + * post_db_reload_expect_iface() + * + * keep track of interfaces to be checked post OVSDB reload. */ +static void post_db_reload_check_init(void); +static void post_db_reload_do_checks(const struct vsctl_context *); +static void post_db_reload_expect_iface(const struct ovsrec_interface *); + +static struct uuid *neoteric_ifaces; +static size_t n_neoteric_ifaces; +static size_t allocated_neoteric_ifaces; + int main(int argc, char *argv[]) { extern struct vlog_module VLM_reconnect; struct ovsdb_idl *idl; struct vsctl_command *commands; + struct shash local_options; + unsigned int seqno; size_t n_commands; char *args; set_program_name(argv[0]); - signal(SIGPIPE, SIG_IGN); + fatal_ignore_sigpipe(); vlog_set_levels(NULL, VLF_CONSOLE, VLL_WARN); vlog_set_levels(&VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); ovsrec_init(); @@ -158,30 +215,73 @@ main(int argc, char *argv[]) VLOG(might_write_to_db(argv) ? VLL_INFO : VLL_DBG, "Called as %s", args); /* Parse command line. */ - parse_options(argc, argv); - commands = parse_commands(argc - optind, argv + optind, &n_commands); + shash_init(&local_options); + parse_options(argc, argv, &local_options); + commands = parse_commands(argc - optind, argv + optind, &local_options, + &n_commands); if (timeout) { time_alarm(timeout); } /* Initialize IDL. */ - idl = the_idl = ovsdb_idl_create(db, &ovsrec_idl_class, false); + idl = the_idl = ovsdb_idl_create(db, &ovsrec_idl_class, false, retry); 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 (!ovsdb_idl_is_alive(idl)) { + int retval = ovsdb_idl_get_last_error(idl); + vsctl_fatal("%s: database connection failed (%s)", + db, ovs_retval_to_string(retval)); + } + + 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(); + } + } +} + +static struct option * +find_option(const char *name, struct option *options, size_t n_options) +{ + size_t i; + + for (i = 0; i < n_options; i++) { + if (!strcmp(options[i].name, name)) { + return &options[i]; + } + } + return NULL; +} + +static struct option * +add_option(struct option **optionsp, size_t *n_optionsp, + size_t *allocated_optionsp) +{ + if (*n_optionsp >= *allocated_optionsp) { + *optionsp = x2nrealloc(*optionsp, allocated_optionsp, + sizeof **optionsp); } + return &(*optionsp)[(*n_optionsp)++]; } static void -parse_options(int argc, char *argv[]) +parse_options(int argc, char *argv[], struct shash *local_options) { enum { OPT_DB = UCHAR_MAX + 1, @@ -190,34 +290,96 @@ parse_options(int argc, char *argv[]) OPT_NO_WAIT, OPT_DRY_RUN, OPT_PEER_CA_CERT, - VLOG_OPTION_ENUMS + OPT_LOCAL, + OPT_RETRY, + VLOG_OPTION_ENUMS, + 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'}, + static const struct option global_long_options[] = { + {"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'}, + {"retry", no_argument, NULL, OPT_RETRY}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, VLOG_LONG_OPTIONS, -#ifdef HAVE_OPENSSL - STREAM_SSL_LONG_OPTIONS - {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, -#endif - {0, 0, 0, 0}, + TABLE_LONG_OPTIONS, + STREAM_SSL_LONG_OPTIONS, + {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT}, + {NULL, 0, NULL, 0}, }; + const int n_global_long_options = ARRAY_SIZE(global_long_options) - 1; char *tmp, *short_options; - tmp = long_options_to_short_options(long_options); + const struct vsctl_command_syntax *p; + struct option *options, *o; + size_t allocated_options; + size_t n_options; + size_t i; + + tmp = long_options_to_short_options(global_long_options); short_options = xasprintf("+%s", tmp); free(tmp); + /* We want to parse both global and command-specific options here, but + * getopt_long() isn't too convenient for the job. We copy our global + * options into a dynamic array, then append all of the command-specific + * options. */ + options = xmemdup(global_long_options, sizeof global_long_options); + allocated_options = ARRAY_SIZE(global_long_options); + n_options = n_global_long_options; + for (p = get_all_commands(); p->name; p++) { + if (p->options[0]) { + char *save_ptr = NULL; + char *name; + char *s; + + s = xstrdup(p->options); + for (name = strtok_r(s, ",", &save_ptr); name != NULL; + name = strtok_r(NULL, ",", &save_ptr)) { + char *equals; + int has_arg; + + ovs_assert(name[0] == '-' && name[1] == '-' && name[2]); + name += 2; + + equals = strchr(name, '='); + if (equals) { + has_arg = required_argument; + *equals = '\0'; + } else { + has_arg = no_argument; + } + + o = find_option(name, options, n_options); + if (o) { + ovs_assert(o - options >= n_global_long_options); + ovs_assert(o->has_arg == has_arg); + } else { + o = add_option(&options, &n_options, &allocated_options); + o->name = xstrdup(name); + o->has_arg = has_arg; + o->flag = NULL; + o->val = OPT_LOCAL; + } + } + + free(s); + } + } + o = add_option(&options, &n_options, &allocated_options); + memset(o, 0, sizeof *o); + + table_style.format = TF_LIST; + for (;;) { + int idx; int c; - c = getopt_long(argc, argv, short_options, long_options, NULL); + c = getopt_long(argc, argv, short_options, options, &idx); if (c == -1) { break; } @@ -243,11 +405,22 @@ parse_options(int argc, char *argv[]) dry_run = true; break; + case OPT_LOCAL: + if (shash_find(local_options, options[idx].name)) { + vsctl_fatal("'%s' option specified multiple times", + options[idx].name); + } + shash_add_nocopy(local_options, + xasprintf("--%s", options[idx].name), + optarg ? xstrdup(optarg) : NULL); + break; + case 'h': usage(); case 'V': - OVS_PRINT_VERSION(0, 0); + ovs_print_version(0, 0); + printf("DB Schema %s\n", ovsrec_get_db_version()); exit(EXIT_SUCCESS); case 't': @@ -258,15 +431,18 @@ parse_options(int argc, char *argv[]) } break; + case OPT_RETRY: + retry = true; + break; + 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); @@ -280,10 +456,16 @@ parse_options(int argc, char *argv[]) if (!db) { db = default_db(); } + + for (i = n_global_long_options; options[i].name; i++) { + free(CONST_CAST(char *, options[i].name)); + } + free(options); } static struct vsctl_command * -parse_commands(int argc, char *argv[], size_t *n_commandsp) +parse_commands(int argc, char *argv[], struct shash *local_options, + size_t *n_commandsp) { struct vsctl_command *commands; size_t n_commands, allocated_commands; @@ -304,8 +486,10 @@ parse_commands(int argc, char *argv[], size_t *n_commandsp) shash_moved(&c->options); } } - parse_command(i - start, &argv[start], + parse_command(i - start, &argv[start], local_options, &commands[n_commands++]); + } else if (!shash_is_empty(local_options)) { + vsctl_fatal("missing command name (use --help for help)"); } start = i + 1; } @@ -318,7 +502,8 @@ parse_commands(int argc, char *argv[], size_t *n_commandsp) } static void -parse_command(int argc, char *argv[], struct vsctl_command *command) +parse_command(int argc, char *argv[], struct shash *local_options, + struct vsctl_command *command) { const struct vsctl_command_syntax *p; struct shash_node *node; @@ -326,6 +511,7 @@ parse_command(int argc, char *argv[], struct vsctl_command *command) int i; shash_init(&command->options); + shash_swap(local_options, &command->options); for (i = 0; i < argc; i++) { const char *option = argv[i]; const char *equals; @@ -350,7 +536,7 @@ parse_command(int argc, char *argv[], struct vsctl_command *command) shash_add_nocopy(&command->options, key, value); } if (i == argc) { - vsctl_fatal("missing command name"); + vsctl_fatal("missing command name (use --help for help)"); } p = find_command(argv[i]); @@ -412,7 +598,7 @@ find_command(const char *name) if (shash_is_empty(&commands)) { const struct vsctl_command_syntax *p; - for (p = all_commands; p->name; p++) { + for (p = get_all_commands(); p->name; p++) { shash_add_assert(&commands, p->name, p); } } @@ -430,7 +616,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); @@ -460,12 +646,17 @@ usage(void) %s: ovs-vswitchd management utility\n\ 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\ add-br BRIDGE create a new bridge named BRIDGE\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\ @@ -473,26 +664,30 @@ Bridge commands:\n\ br-get-external-id BRIDGE KEY print value of KEY on BRIDGE\n\ br-get-external-id BRIDGE list key-value pairs on BRIDGE\n\ \n\ -Port commands:\n\ +Port commands (a bond is considered to be a single port):\n\ list-ports BRIDGE print the names of all the ports on BRIDGE\n\ add-port BRIDGE PORT add network device PORT to BRIDGE\n\ add-bond BRIDGE PORT IFACE... add bonded port PORT in BRIDGE from IFACES\n\ del-port [BRIDGE] PORT delete PORT (which may be bonded) from BRIDGE\n\ port-to-br PORT print name of bridge that contains PORT\n\ -A bond is considered to be a single port.\n\ \n\ Interface commands (a bond consists of multiple interfaces):\n\ list-ifaces BRIDGE print the names of all interfaces on BRIDGE\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 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\ del-ssl delete the SSL configuration\n\ @@ -503,6 +698,7 @@ Switch commands:\n\ \n\ Database commands:\n\ list TBL [REC] list RECord (or all records) in TBL\n\ + find TBL CONDITION... list records satisfying CONDITION 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\ @@ -516,9 +712,16 @@ Potentially unsafe database commands require --force option.\n\ Options:\n\ --db=DATABASE connect to DATABASE\n\ (default: %s)\n\ + --no-wait do not wait for ovs-vswitchd to reconfigure\n\ + --retry keep trying to connect to server forever\n\ + -t, --timeout=SECS wait at most SECS seconds for ovs-vswitchd\n\ + --dry-run do not commit changes to database\n\ --oneline print exactly one line of output per command\n", program_name, program_name, default_db()); vlog_usage(); + printf("\ + --no-syslog equivalent to --verbose=vsctl:syslog:warn\n"); + stream_usage("database", true, true, false); printf("\n\ Other options:\n\ -h, --help display this help message\n\ @@ -531,7 +734,7 @@ default_db(void) { static char *def; if (!def) { - def = xasprintf("unix:%s/db.sock", ovs_rundir); + def = xasprintf("unix:%s/db.sock", ovs_rundir()); } return def; } @@ -559,12 +762,25 @@ struct vsctl_context { /* Modifiable state. */ struct ds output; + struct table *table; struct ovsdb_idl *idl; struct ovsdb_idl_txn *txn; struct ovsdb_symbol_table *symtab; const struct ovsrec_open_vswitch *ovs; bool verified_ports; + /* A cache of the contents of the database. + * + * A command that needs to use any of this information must first call + * vsctl_context_populate_cache(). A command that changes anything that + * could invalidate the cache must either call + * vsctl_context_invalidate_cache() or manually update the cache to + * maintain its correctness. */ + bool cache_valid; + struct shash bridges; /* Maps from bridge name to struct vsctl_bridge. */ + struct shash ports; /* Maps from port name to struct vsctl_port. */ + struct shash ifaces; /* Maps from port name to struct vsctl_iface. */ + /* A command may set this member to true if some prerequisite is not met * and the caller should wait for something to change and then retry. */ bool try_again; @@ -573,30 +789,31 @@ struct vsctl_context { struct vsctl_bridge { 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 list ports; /* Contains "struct vsctl_port"s. */ + + /* VLAN ("fake") bridge support. + * + * Use 'parent != NULL' to detect a fake bridge, because 'vlan' can be 0 + * in either case. */ + struct hmap children; /* VLAN bridges indexed by 'vlan'. */ + struct hmap_node children_node; /* Node in parent's 'children' hmap. */ + struct vsctl_bridge *parent; /* Real bridge, or NULL. */ + int vlan; /* VLAN VID (0...4095), or 0. */ }; struct vsctl_port { + struct list ports_node; /* In struct vsctl_bridge's 'ports' list. */ + struct list ifaces; /* Contains "struct vsctl_iface"s. */ struct ovsrec_port *port_cfg; struct vsctl_bridge *bridge; }; struct vsctl_iface { + struct list ifaces_node; /* In struct vsctl_port's 'ifaces' list. */ struct ovsrec_interface *iface_cfg; struct vsctl_port *port; }; -struct vsctl_info { - struct vsctl_context *ctx; - struct shash bridges; /* Maps from bridge name to struct vsctl_bridge. */ - struct shash ports; /* Maps from port name to struct vsctl_port. */ - struct shash ifaces; /* Maps from port name to struct vsctl_iface. */ -}; - static char * vsctl_context_to_string(const struct vsctl_context *ctx) { @@ -641,66 +858,162 @@ verify_ports(struct vsctl_context *ctx) } static struct vsctl_bridge * -add_bridge(struct vsctl_info *b, - struct ovsrec_bridge *br_cfg, const char *name, - struct vsctl_bridge *parent, int vlan) +add_bridge_to_cache(struct vsctl_context *ctx, + struct ovsrec_bridge *br_cfg, const char *name, + struct vsctl_bridge *parent, int vlan) { struct vsctl_bridge *br = xmalloc(sizeof *br); br->br_cfg = br_cfg; br->name = xstrdup(name); + list_init(&br->ports); br->parent = parent; br->vlan = vlan; + hmap_init(&br->children); 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; + hmap_insert(&parent->children, &br->children_node, hash_int(vlan, 0)); } - shash_add(&b->bridges, br->name, br); + shash_add(&ctx->bridges, br->name, br); return br; } +static void +ovs_delete_bridge(const struct ovsrec_open_vswitch *ovs, + struct ovsrec_bridge *bridge) +{ + struct ovsrec_bridge **bridges; + size_t i, n; + + bridges = xmalloc(sizeof *ovs->bridges * ovs->n_bridges); + for (i = n = 0; i < ovs->n_bridges; i++) { + if (ovs->bridges[i] != bridge) { + bridges[n++] = ovs->bridges[i]; + } + } + ovsrec_open_vswitch_set_bridges(ovs, bridges, n); + free(bridges); +} + +static void +del_cached_bridge(struct vsctl_context *ctx, struct vsctl_bridge *br) +{ + ovs_assert(list_is_empty(&br->ports)); + ovs_assert(hmap_is_empty(&br->children)); + if (br->parent) { + hmap_remove(&br->parent->children, &br->children_node); + } + if (br->br_cfg) { + ovsrec_bridge_delete(br->br_cfg); + ovs_delete_bridge(ctx->ovs, br->br_cfg); + } + shash_find_and_delete(&ctx->bridges, br->name); + hmap_destroy(&br->children); + free(br->name); + free(br); +} + static bool 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 * -find_vlan_bridge(struct vsctl_info *info, - struct vsctl_bridge *parent, int vlan) +find_vlan_bridge(struct vsctl_bridge *parent, int vlan) { - struct shash_node *node; + struct vsctl_bridge *child; - SHASH_FOR_EACH (node, &info->bridges) { - struct vsctl_bridge *br = node->data; - if (br->parent == parent && br->vlan == vlan) { - return br; + HMAP_FOR_EACH_IN_BUCKET (child, children_node, hash_int(vlan, 0), + &parent->children) { + if (child->vlan == vlan) { + return child; } } return NULL; } +static struct vsctl_port * +add_port_to_cache(struct vsctl_context *ctx, struct vsctl_bridge *parent, + struct ovsrec_port *port_cfg) +{ + struct vsctl_port *port; + + if (port_cfg->tag + && *port_cfg->tag >= 0 && *port_cfg->tag <= 4095) { + struct vsctl_bridge *vlan_bridge; + + vlan_bridge = find_vlan_bridge(parent, *port_cfg->tag); + if (vlan_bridge) { + parent = vlan_bridge; + } + } + + port = xmalloc(sizeof *port); + list_push_back(&parent->ports, &port->ports_node); + list_init(&port->ifaces); + port->port_cfg = port_cfg; + port->bridge = parent; + shash_add(&ctx->ports, port_cfg->name, port); + + return port; +} + +static void +del_cached_port(struct vsctl_context *ctx, struct vsctl_port *port) +{ + ovs_assert(list_is_empty(&port->ifaces)); + list_remove(&port->ports_node); + shash_find_and_delete(&ctx->ports, port->port_cfg->name); + ovsrec_port_delete(port->port_cfg); + free(port); +} + +static struct vsctl_iface * +add_iface_to_cache(struct vsctl_context *ctx, struct vsctl_port *parent, + struct ovsrec_interface *iface_cfg) +{ + struct vsctl_iface *iface; + + iface = xmalloc(sizeof *iface); + list_push_back(&parent->ifaces, &iface->ifaces_node); + iface->iface_cfg = iface_cfg; + iface->port = parent; + shash_add(&ctx->ifaces, iface_cfg->name, iface); + + return iface; +} + +static void +del_cached_iface(struct vsctl_context *ctx, struct vsctl_iface *iface) +{ + list_remove(&iface->ifaces_node); + shash_find_and_delete(&ctx->ifaces, iface->iface_cfg->name); + ovsrec_interface_delete(iface->iface_cfg); + free(iface); +} + static void -free_info(struct vsctl_info *info) +vsctl_context_invalidate_cache(struct vsctl_context *ctx) { struct shash_node *node; - SHASH_FOR_EACH (node, &info->bridges) { + if (!ctx->cache_valid) { + return; + } + ctx->cache_valid = false; + + SHASH_FOR_EACH (node, &ctx->bridges) { struct vsctl_bridge *bridge = node->data; + hmap_destroy(&bridge->children); free(bridge->name); free(bridge); } - shash_destroy(&info->bridges); + shash_destroy(&ctx->bridges); - shash_destroy_free_data(&info->ports); - shash_destroy_free_data(&info->ifaces); + shash_destroy_free_data(&ctx->ports); + shash_destroy_free_data(&ctx->ifaces); } static void @@ -719,33 +1032,38 @@ pre_get_info(struct vsctl_context *ctx) ovsdb_idl_add_column(ctx->idl, &ovsrec_port_col_interfaces); ovsdb_idl_add_column(ctx->idl, &ovsrec_interface_col_name); + ovsdb_idl_add_column(ctx->idl, &ovsrec_interface_col_ofport); } static void -get_info(struct vsctl_context *ctx, struct vsctl_info *info) +vsctl_context_populate_cache(struct vsctl_context *ctx) { const struct ovsrec_open_vswitch *ovs = ctx->ovs; - struct shash bridges, ports; + struct sset bridges, ports; size_t i; - info->ctx = ctx; - shash_init(&info->bridges); - shash_init(&info->ports); - shash_init(&info->ifaces); + if (ctx->cache_valid) { + /* Cache is already populated. */ + return; + } + ctx->cache_valid = true; + shash_init(&ctx->bridges); + shash_init(&ctx->ports); + shash_init(&ctx->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; } - br = add_bridge(info, br_cfg, br_cfg->name, NULL, 0); + br = add_bridge_to_cache(ctx, br_cfg, br_cfg->name, NULL, 0); if (!br) { continue; } @@ -753,101 +1071,107 @@ 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)) { - add_bridge(info, NULL, port_cfg->name, br, *port_cfg->tag); + && sset_add(&bridges, port_cfg->name)) { + add_bridge_to_cache(ctx, 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); + br = shash_find_data(&ctx->bridges, br_cfg->name); for (j = 0; j < br_cfg->n_ports; j++) { struct ovsrec_port *port_cfg = br_cfg->ports[j]; struct vsctl_port *port; size_t k; - if (!shash_add_once(&ports, port_cfg->name, NULL)) { + port = shash_find_data(&ctx->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->bridge = find_vlan_bridge(info, br, *port_cfg->tag); - if (!port->bridge) { - port->bridge = br; - } - } else { - port->bridge = br; - } - shash_add(&info->ports, port_cfg->name, port); - + port = add_port_to_cache(ctx, br, port_cfg); for (k = 0; k < port_cfg->n_interfaces; k++) { 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(&ctx->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; } - iface = xmalloc(sizeof *iface); - iface->iface_cfg = iface_cfg; - iface->port = port; - shash_add(&info->ifaces, iface_cfg->name, iface); + add_iface_to_cache(ctx, port, iface_cfg); } } } - shash_destroy(&bridges); - shash_destroy(&ports); + sset_destroy(&bridges); } static void -check_conflicts(struct vsctl_info *info, const char *name, +check_conflicts(struct vsctl_context *ctx, const char *name, char *msg) { struct vsctl_iface *iface; struct vsctl_port *port; - verify_ports(info->ctx); + verify_ports(ctx); - if (shash_find(&info->bridges, name)) { + if (shash_find(&ctx->bridges, name)) { vsctl_fatal("%s because a bridge named %s already exists", msg, name); } - port = shash_find_data(&info->ports, name); + port = shash_find_data(&ctx->ports, name); if (port) { vsctl_fatal("%s because a port named %s already exists on " "bridge %s", msg, name, port->bridge->name); } - iface = shash_find_data(&info->ifaces, name); + iface = shash_find_data(&ctx->ifaces, name); if (iface) { vsctl_fatal("%s because an interface named %s already exists " "on bridge %s", msg, name, iface->port->bridge->name); @@ -857,20 +1181,24 @@ check_conflicts(struct vsctl_info *info, const char *name, } static struct vsctl_bridge * -find_bridge(struct vsctl_info *info, const char *name, bool must_exist) +find_bridge(struct vsctl_context *ctx, const char *name, bool must_exist) { - struct vsctl_bridge *br = shash_find_data(&info->bridges, name); + struct vsctl_bridge *br; + + ovs_assert(ctx->cache_valid); + + br = shash_find_data(&ctx->bridges, name); if (must_exist && !br) { vsctl_fatal("no bridge named %s", name); } - ovsrec_open_vswitch_verify_bridges(info->ctx->ovs); + ovsrec_open_vswitch_verify_bridges(ctx->ovs); return br; } static struct vsctl_bridge * -find_real_bridge(struct vsctl_info *info, const char *name, bool must_exist) +find_real_bridge(struct vsctl_context *ctx, const char *name, bool must_exist) { - struct vsctl_bridge *br = find_bridge(info, name, must_exist); + struct vsctl_bridge *br = find_bridge(ctx, name, must_exist); if (br && br->parent) { vsctl_fatal("%s is a fake bridge", name); } @@ -878,30 +1206,38 @@ find_real_bridge(struct vsctl_info *info, const char *name, bool must_exist) } static struct vsctl_port * -find_port(struct vsctl_info *info, const char *name, bool must_exist) +find_port(struct vsctl_context *ctx, const char *name, bool must_exist) { - struct vsctl_port *port = shash_find_data(&info->ports, name); + struct vsctl_port *port; + + ovs_assert(ctx->cache_valid); + + port = shash_find_data(&ctx->ports, name); if (port && !strcmp(name, port->bridge->name)) { port = NULL; } if (must_exist && !port) { vsctl_fatal("no port named %s", name); } - verify_ports(info->ctx); + verify_ports(ctx); return port; } static struct vsctl_iface * -find_iface(struct vsctl_info *info, const char *name, bool must_exist) +find_iface(struct vsctl_context *ctx, const char *name, bool must_exist) { - struct vsctl_iface *iface = shash_find_data(&info->ifaces, name); + struct vsctl_iface *iface; + + ovs_assert(ctx->cache_valid); + + iface = shash_find_data(&ctx->ifaces, name); if (iface && !strcmp(name, iface->port->bridge->name)) { iface = NULL; } if (must_exist && !iface) { vsctl_fatal("no interface named %s", name); } - verify_ports(info->ctx); + verify_ports(ctx); return iface; } @@ -953,37 +1289,202 @@ ovs_insert_bridge(const struct ovsrec_open_vswitch *ovs, } static void -ovs_delete_bridge(const struct ovsrec_open_vswitch *ovs, - struct ovsrec_bridge *bridge) +cmd_init(struct vsctl_context *ctx OVS_UNUSED) { - struct ovsrec_bridge **bridges; - size_t i, n; +} - bridges = xmalloc(sizeof *ovs->bridges * ovs->n_bridges); - for (i = n = 0; i < ovs->n_bridges; i++) { - if (ovs->bridges[i] != bridge) { - bridges[n++] = ovs->bridges[i]; +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); + } } } - ovsrec_open_vswitch_set_bridges(ovs, bridges, n); - free(bridges); +} + +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_init(struct vsctl_context *ctx OVS_UNUSED) +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) { - ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_managers); + ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_manager_options); 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); + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_ipfix); ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_flood_vlans); ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_other_config); @@ -1004,43 +1505,42 @@ cmd_emer_reset(struct vsctl_context *ctx) const struct ovsrec_interface *iface; const struct ovsrec_mirror *mirror, *next_mirror; const struct ovsrec_controller *ctrl, *next_ctrl; + const struct ovsrec_manager *mgr, *next_mgr; const struct ovsrec_netflow *nf, *next_nf; const struct ovsrec_ssl *ssl, *next_ssl; const struct ovsrec_sflow *sflow, *next_sflow; + const struct ovsrec_ipfix *ipfix, *next_ipfix; + const struct ovsrec_flow_sample_collector_set *fscset, *next_fscset; /* Reset the Open_vSwitch table. */ - ovsrec_open_vswitch_set_managers(ctx->ovs, NULL, 0); + ovsrec_open_vswitch_set_manager_options(ctx->ovs, NULL, 0); ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL); OVSREC_BRIDGE_FOR_EACH (br, idl) { - int i; - char *hw_key = "hwaddr"; - char *hw_val = NULL; + const char *hwaddr; 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); + ovsrec_bridge_set_ipfix(br, NULL); ovsrec_bridge_set_flood_vlans(br, NULL, 0); /* We only want to save the "hwaddr" key from other_config. */ - for (i=0; i < br->n_other_config; i++) { - if (!strcmp(br->key_other_config[i], hw_key)) { - hw_val = br->value_other_config[i]; - break; - } - } - if (hw_val) { - char *val = xstrdup(hw_val); - ovsrec_bridge_set_other_config(br, &hw_key, &val, 1); - free(val); + hwaddr = smap_get(&br->other_config, "hwaddr"); + if (hwaddr) { + struct smap smap = SMAP_INITIALIZER(&smap); + smap_add(&smap, "hwaddr", hwaddr); + ovsrec_bridge_set_other_config(br, &smap); + smap_destroy(&smap); } else { - ovsrec_bridge_set_other_config(br, NULL, NULL, 0); + ovsrec_bridge_set_other_config(br, NULL); } } OVSREC_PORT_FOR_EACH (port, idl) { - ovsrec_port_set_other_config(port, NULL, NULL, 0); + ovsrec_port_set_other_config(port, NULL); } OVSREC_INTERFACE_FOR_EACH (iface, idl) { @@ -1058,6 +1558,10 @@ cmd_emer_reset(struct vsctl_context *ctx) ovsrec_controller_delete(ctrl); } + OVSREC_MANAGER_FOR_EACH_SAFE (mgr, next_mgr, idl) { + ovsrec_manager_delete(mgr); + } + OVSREC_NETFLOW_FOR_EACH_SAFE (nf, next_nf, idl) { ovsrec_netflow_delete(nf); } @@ -1069,14 +1573,24 @@ cmd_emer_reset(struct vsctl_context *ctx) OVSREC_SFLOW_FOR_EACH_SAFE (sflow, next_sflow, idl) { ovsrec_sflow_delete(sflow); } + + OVSREC_IPFIX_FOR_EACH_SAFE (ipfix, next_ipfix, idl) { + ovsrec_ipfix_delete(ipfix); + } + + OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH_SAFE (fscset, next_fscset, idl) { + ovsrec_flow_sample_collector_set_delete(fscset); + } + + vsctl_context_invalidate_cache(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; + struct ovsrec_interface *iface; int vlan; br_name = ctx->argv[1]; @@ -1086,19 +1600,19 @@ 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", ctx->argv[0]); } - get_info(ctx, &info); + vsctl_context_populate_cache(ctx); if (may_exist) { struct vsctl_bridge *br; - br = find_bridge(&info, br_name, false); + br = find_bridge(ctx, br_name, false); if (br) { if (!parent_name) { if (br->parent) { @@ -1125,12 +1639,11 @@ cmd_add_br(struct vsctl_context *ctx) return; } } - check_conflicts(&info, br_name, + check_conflicts(ctx, br_name, xasprintf("cannot create a bridge named %s", br_name)); if (!parent_name) { struct ovsrec_port *port; - struct ovsrec_interface *iface; struct ovsrec_bridge *br; iface = ovsrec_interface_insert(ctx->txn); @@ -1149,12 +1662,11 @@ cmd_add_br(struct vsctl_context *ctx) } else { struct vsctl_bridge *parent; struct ovsrec_port *port; - struct ovsrec_interface *iface; struct ovsrec_bridge *br; int64_t tag = vlan; - parent = find_bridge(&info, parent_name, false); - if (parent && parent->vlan) { + parent = find_bridge(ctx, parent_name, false); + if (parent && parent->parent) { vsctl_fatal("cannot create bridge with fake bridge as parent"); } if (!parent) { @@ -1175,52 +1687,61 @@ cmd_add_br(struct vsctl_context *ctx) bridge_insert_port(br, port); } - free_info(&info); + post_db_reload_expect_iface(iface); + vsctl_context_invalidate_cache(ctx); } static void -del_port(struct vsctl_info *info, struct vsctl_port *port) +del_port(struct vsctl_context *ctx, struct vsctl_port *port) { - struct shash_node *node; - - SHASH_FOR_EACH (node, &info->ifaces) { - struct vsctl_iface *iface = node->data; - if (iface->port == port) { - ovsrec_interface_delete(iface->iface_cfg); - } - } - ovsrec_port_delete(port->port_cfg); + struct vsctl_iface *iface, *next_iface; bridge_delete_port((port->bridge->parent ? port->bridge->parent->br_cfg : port->bridge->br_cfg), port->port_cfg); + + LIST_FOR_EACH_SAFE (iface, next_iface, ifaces_node, &port->ifaces) { + del_cached_iface(ctx, iface); + } + del_cached_port(ctx, port); } static void -cmd_del_br(struct vsctl_context *ctx) +del_bridge(struct vsctl_context *ctx, struct vsctl_bridge *br) { - bool must_exist = !shash_find(&ctx->options, "--if-exists"); - struct vsctl_bridge *bridge; - struct vsctl_info info; + struct vsctl_bridge *child, *next_child; + struct vsctl_port *port, *next_port; + const struct ovsrec_flow_sample_collector_set *fscset, *next_fscset; - get_info(ctx, &info); - bridge = find_bridge(&info, ctx->argv[1], must_exist); - if (bridge) { - struct shash_node *node; + HMAP_FOR_EACH_SAFE (child, next_child, children_node, &br->children) { + del_bridge(ctx, child); + } - SHASH_FOR_EACH (node, &info.ports) { - struct vsctl_port *port = node->data; - if (port->bridge == bridge || port->bridge->parent == bridge - || !strcmp(port->port_cfg->name, bridge->name)) { - del_port(&info, port); - } - } - if (bridge->br_cfg) { - ovsrec_bridge_delete(bridge->br_cfg); - ovs_delete_bridge(ctx->ovs, bridge->br_cfg); + LIST_FOR_EACH_SAFE (port, next_port, ports_node, &br->ports) { + del_port(ctx, port); + } + + OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH_SAFE (fscset, next_fscset, + ctx->idl) { + if (fscset->bridge == br->br_cfg) { + ovsrec_flow_sample_collector_set_delete(fscset); } } - free_info(&info); + + del_cached_bridge(ctx, br); +} + +static void +cmd_del_br(struct vsctl_context *ctx) +{ + bool must_exist = !shash_find(&ctx->options, "--if-exists"); + struct vsctl_bridge *bridge; + + vsctl_context_populate_cache(ctx); + bridge = find_bridge(ctx, ctx->argv[1], must_exist); + if (bridge) { + del_bridge(ctx, bridge); + } } static void @@ -1239,71 +1760,49 @@ static void cmd_list_br(struct vsctl_context *ctx) { struct shash_node *node; - struct vsctl_info info; struct svec bridges; + bool real = shash_find(&ctx->options, "--real"); + bool fake = shash_find(&ctx->options, "--fake"); + + /* If neither fake nor real were requested, return both. */ + if (!real && !fake) { + real = fake = true; + } - get_info(ctx, &info); + vsctl_context_populate_cache(ctx); svec_init(&bridges); - SHASH_FOR_EACH (node, &info.bridges) { + SHASH_FOR_EACH (node, &ctx->bridges) { struct vsctl_bridge *br = node->data; - svec_add(&bridges, br->name); + + if (br->parent ? fake : real) { + svec_add(&bridges, br->name); + } } output_sorted(&bridges, &ctx->output); svec_destroy(&bridges); - - free_info(&info); } static void cmd_br_exists(struct vsctl_context *ctx) { - struct vsctl_info info; - - get_info(ctx, &info); - if (!find_bridge(&info, ctx->argv[1], false)) { + vsctl_context_populate_cache(ctx); + if (!find_bridge(ctx, ctx->argv[1], false)) { vsctl_exit(2); } - free_info(&info); -} - -/* Returns true if 'b_prefix' (of length 'b_prefix_len') concatenated with 'b' - * equals 'a', false otherwise. */ -static bool -key_matches(const char *a, - const char *b_prefix, size_t b_prefix_len, const char *b) -{ - return !strncmp(a, b_prefix, b_prefix_len) && !strcmp(a + b_prefix_len, b); } static void -set_external_id(char **old_keys, char **old_values, size_t old_n, - char *key, char *value, - char ***new_keysp, char ***new_valuesp, size_t *new_np) +set_external_id(struct smap *old, struct smap *new, + char *key, char *value) { - char **new_keys; - char **new_values; - size_t new_n; - size_t i; + smap_clone(new, old); - new_keys = xmalloc(sizeof *new_keys * (old_n + 1)); - new_values = xmalloc(sizeof *new_values * (old_n + 1)); - new_n = 0; - for (i = 0; i < old_n; i++) { - if (strcmp(key, old_keys[i])) { - new_keys[new_n] = old_keys[i]; - new_values[new_n] = old_values[i]; - new_n++; - } - } if (value) { - new_keys[new_n] = key; - new_values[new_n] = value; - new_n++; + smap_replace(new, key, value); + } else { + smap_remove(new, key); } - *new_keysp = new_keys; - *new_valuesp = new_values; - *new_np = new_n; } static void @@ -1317,60 +1816,55 @@ pre_cmd_br_set_external_id(struct vsctl_context *ctx) static void cmd_br_set_external_id(struct vsctl_context *ctx) { - struct vsctl_info info; struct vsctl_bridge *bridge; - char **keys, **values; - size_t n; + struct smap new; - get_info(ctx, &info); - bridge = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + bridge = find_bridge(ctx, ctx->argv[1], true); if (bridge->br_cfg) { - set_external_id(bridge->br_cfg->key_external_ids, - bridge->br_cfg->value_external_ids, - bridge->br_cfg->n_external_ids, - ctx->argv[2], ctx->argc >= 4 ? ctx->argv[3] : NULL, - &keys, &values, &n); + + set_external_id(&bridge->br_cfg->external_ids, &new, ctx->argv[2], + ctx->argc >= 4 ? ctx->argv[3] : NULL); ovsrec_bridge_verify_external_ids(bridge->br_cfg); - ovsrec_bridge_set_external_ids(bridge->br_cfg, keys, values, n); + ovsrec_bridge_set_external_ids(bridge->br_cfg, &new); } else { char *key = xasprintf("fake-bridge-%s", ctx->argv[2]); - struct vsctl_port *port = shash_find_data(&info.ports, ctx->argv[1]); - set_external_id(port->port_cfg->key_external_ids, - port->port_cfg->value_external_ids, - port->port_cfg->n_external_ids, - key, ctx->argc >= 4 ? ctx->argv[3] : NULL, - &keys, &values, &n); + struct vsctl_port *port = shash_find_data(&ctx->ports, ctx->argv[1]); + set_external_id(&port->port_cfg->external_ids, &new, + key, ctx->argc >= 4 ? ctx->argv[3] : NULL); ovsrec_port_verify_external_ids(port->port_cfg); - ovsrec_port_set_external_ids(port->port_cfg, keys, values, n); + ovsrec_port_set_external_ids(port->port_cfg, &new); free(key); } - free(keys); - free(values); - - free_info(&info); + smap_destroy(&new); } static void -get_external_id(char **keys, char **values, size_t n, - const char *prefix, const char *key, +get_external_id(struct smap *smap, const char *prefix, const char *key, struct ds *output) { - size_t prefix_len = strlen(prefix); - struct svec svec; - size_t i; + if (key) { + char *prefix_key = xasprintf("%s%s", prefix, key); + const char *value = smap_get(smap, prefix_key); - svec_init(&svec); - for (i = 0; i < n; i++) { - if (!key && !strncmp(keys[i], prefix, prefix_len)) { - svec_add_nocopy(&svec, xasprintf("%s=%s", - keys[i] + prefix_len, values[i])); - } else if (key_matches(keys[i], prefix, prefix_len, key)) { - svec_add(&svec, values[i]); - break; + if (value) { + ds_put_format(output, "%s\n", value); } + free(prefix_key); + } else { + const struct smap_node **sorted = smap_sort(smap); + size_t prefix_len = strlen(prefix); + size_t i; + + for (i = 0; i < smap_count(smap); i++) { + const struct smap_node *node = sorted[i]; + if (!strncmp(node->key, prefix, prefix_len)) { + ds_put_format(output, "%s=%s\n", node->key + prefix_len, + node->value); + } + } + free(sorted); } - output_sorted(&svec, output); - svec_destroy(&svec); } static void @@ -1382,54 +1876,42 @@ pre_cmd_br_get_external_id(struct vsctl_context *ctx) static void cmd_br_get_external_id(struct vsctl_context *ctx) { - struct vsctl_info info; struct vsctl_bridge *bridge; - get_info(ctx, &info); - bridge = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + bridge = find_bridge(ctx, ctx->argv[1], true); if (bridge->br_cfg) { ovsrec_bridge_verify_external_ids(bridge->br_cfg); - get_external_id(bridge->br_cfg->key_external_ids, - bridge->br_cfg->value_external_ids, - bridge->br_cfg->n_external_ids, - "", ctx->argc >= 3 ? ctx->argv[2] : NULL, - &ctx->output); + get_external_id(&bridge->br_cfg->external_ids, "", + ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); } else { - struct vsctl_port *port = shash_find_data(&info.ports, ctx->argv[1]); + struct vsctl_port *port = shash_find_data(&ctx->ports, ctx->argv[1]); ovsrec_port_verify_external_ids(port->port_cfg); - get_external_id(port->port_cfg->key_external_ids, - port->port_cfg->value_external_ids, - port->port_cfg->n_external_ids, - "fake-bridge-", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); + get_external_id(&port->port_cfg->external_ids, "fake-bridge-", + ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); } - free_info(&info); } - static void cmd_list_ports(struct vsctl_context *ctx) { struct vsctl_bridge *br; - struct shash_node *node; - struct vsctl_info info; + struct vsctl_port *port; struct svec ports; - get_info(ctx, &info); - br = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + br = find_bridge(ctx, ctx->argv[1], true); ovsrec_bridge_verify_ports(br->br_cfg ? br->br_cfg : br->parent->br_cfg); svec_init(&ports); - SHASH_FOR_EACH (node, &info.ports) { - struct vsctl_port *port = node->data; - - if (strcmp(port->port_cfg->name, br->name) && br == port->bridge) { + LIST_FOR_EACH (port, ports_node, &br->ports) { + if (strcmp(port->port_cfg->name, br->name)) { svec_add(&ports, port->port_cfg->name); } } output_sorted(&ports, &ctx->output); svec_destroy(&ports); - - free_info(&info); } static void @@ -1439,17 +1921,17 @@ add_port(struct vsctl_context *ctx, char *iface_names[], int n_ifaces, char *settings[], int n_settings) { - struct vsctl_info info; + struct vsctl_port *vsctl_port; struct vsctl_bridge *bridge; struct ovsrec_interface **ifaces; struct ovsrec_port *port; size_t i; - get_info(ctx, &info); + vsctl_context_populate_cache(ctx); if (may_exist) { struct vsctl_port *vsctl_port; - vsctl_port = find_port(&info, port_name, false); + vsctl_port = find_port(ctx, port_name, false); if (vsctl_port) { struct svec want_names, have_names; @@ -1486,28 +1968,28 @@ add_port(struct vsctl_context *ctx, return; } } - check_conflicts(&info, port_name, + check_conflicts(ctx, port_name, xasprintf("cannot create a port named %s", port_name)); for (i = 0; i < n_ifaces; i++) { - check_conflicts(&info, iface_names[i], + check_conflicts(ctx, iface_names[i], xasprintf("cannot create an interface named %s", iface_names[i])); } - bridge = find_bridge(&info, br_name, true); + bridge = find_bridge(ctx, br_name, true); ifaces = xmalloc(n_ifaces * sizeof *ifaces); for (i = 0; i < n_ifaces; i++) { ifaces[i] = ovsrec_interface_insert(ctx->txn); ovsrec_interface_set_name(ifaces[i], iface_names[i]); + post_db_reload_expect_iface(ifaces[i]); } port = ovsrec_port_insert(ctx->txn); ovsrec_port_set_name(port, port_name); ovsrec_port_set_interfaces(port, ifaces, n_ifaces); 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); } @@ -1520,13 +2002,17 @@ add_port(struct vsctl_context *ctx, bridge_insert_port((bridge->parent ? bridge->parent->br_cfg : bridge->br_cfg), port); - free_info(&info); + vsctl_port = add_port_to_cache(ctx, bridge, port); + for (i = 0; i < n_ifaces; i++) { + add_iface_to_cache(ctx, vsctl_port, ifaces[i]); + } + free(ifaces); } 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); @@ -1535,7 +2021,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; @@ -1562,19 +2048,25 @@ cmd_del_port(struct vsctl_context *ctx) { bool must_exist = !shash_find(&ctx->options, "--if-exists"); bool with_iface = shash_find(&ctx->options, "--with-iface") != NULL; + const char *target = ctx->argv[ctx->argc - 1]; struct vsctl_port *port; - struct vsctl_info info; - get_info(ctx, &info); - if (!with_iface) { - port = find_port(&info, ctx->argv[ctx->argc - 1], must_exist); + vsctl_context_populate_cache(ctx); + if (find_bridge(ctx, target, false)) { + if (must_exist) { + vsctl_fatal("cannot delete port %s because it is the local port " + "for bridge %s (deleting this port requires deleting " + "the entire bridge)", target, target); + } + port = NULL; + } else if (!with_iface) { + port = find_port(ctx, target, must_exist); } else { - const char *target = ctx->argv[ctx->argc - 1]; struct vsctl_iface *iface; - port = find_port(&info, target, false); + port = find_port(ctx, target, false); if (!port) { - iface = find_iface(&info, target, false); + iface = find_iface(ctx, target, false); if (iface) { port = iface->port; } @@ -1588,7 +2080,7 @@ cmd_del_port(struct vsctl_context *ctx) if (ctx->argc == 3) { struct vsctl_bridge *bridge; - bridge = find_bridge(&info, ctx->argv[1], true); + bridge = find_bridge(ctx, ctx->argv[1], true); if (port->bridge != bridge) { if (port->bridge->parent == bridge) { vsctl_fatal("bridge %s does not have a port %s (although " @@ -1602,119 +2094,121 @@ cmd_del_port(struct vsctl_context *ctx) } } - del_port(&info, port); + del_port(ctx, port); } - - free_info(&info); } static void cmd_port_to_br(struct vsctl_context *ctx) { struct vsctl_port *port; - struct vsctl_info info; - get_info(ctx, &info); - port = find_port(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + port = find_port(ctx, ctx->argv[1], true); ds_put_format(&ctx->output, "%s\n", port->bridge->name); - free_info(&info); } static void cmd_br_to_vlan(struct vsctl_context *ctx) { struct vsctl_bridge *bridge; - struct vsctl_info info; - get_info(ctx, &info); - bridge = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + bridge = find_bridge(ctx, ctx->argv[1], true); ds_put_format(&ctx->output, "%d\n", bridge->vlan); - free_info(&info); } static void cmd_br_to_parent(struct vsctl_context *ctx) { struct vsctl_bridge *bridge; - struct vsctl_info info; - get_info(ctx, &info); - bridge = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + bridge = find_bridge(ctx, ctx->argv[1], true); if (bridge->parent) { bridge = bridge->parent; } ds_put_format(&ctx->output, "%s\n", bridge->name); - free_info(&info); } static void cmd_list_ifaces(struct vsctl_context *ctx) { struct vsctl_bridge *br; - struct shash_node *node; - struct vsctl_info info; + struct vsctl_port *port; struct svec ifaces; - get_info(ctx, &info); - br = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + br = find_bridge(ctx, ctx->argv[1], true); verify_ports(ctx); svec_init(&ifaces); - SHASH_FOR_EACH (node, &info.ifaces) { - struct vsctl_iface *iface = node->data; + LIST_FOR_EACH (port, ports_node, &br->ports) { + struct vsctl_iface *iface; - if (strcmp(iface->iface_cfg->name, br->name) - && br == iface->port->bridge) { - svec_add(&ifaces, iface->iface_cfg->name); + LIST_FOR_EACH (iface, ifaces_node, &port->ifaces) { + if (strcmp(iface->iface_cfg->name, br->name)) { + svec_add(&ifaces, iface->iface_cfg->name); + } } } output_sorted(&ifaces, &ctx->output); svec_destroy(&ifaces); - - free_info(&info); } static void cmd_iface_to_br(struct vsctl_context *ctx) { struct vsctl_iface *iface; - struct vsctl_info info; - get_info(ctx, &info); - iface = find_iface(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + iface = find_iface(ctx, ctx->argv[1], true); ds_put_format(&ctx->output, "%s\n", iface->port->bridge->name); - free_info(&info); } static void verify_controllers(struct ovsrec_bridge *bridge) { - if (bridge) { - size_t i; + size_t i; - ovsrec_bridge_verify_controller(bridge); - for (i = 0; i < bridge->n_controller; i++) { - ovsrec_controller_verify_target(bridge->controller[i]); - } + ovsrec_bridge_verify_controller(bridge); + for (i = 0; i < bridge->n_controller; i++) { + ovsrec_controller_verify_target(bridge->controller[i]); } } +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) { - 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); + vsctl_context_populate_cache(ctx); + + br = find_bridge(ctx, ctx->argv[1], true); + if (br->parent) { + br = br->parent; + } verify_controllers(br->br_cfg); /* Print the targets in sorted order for reproducibility. */ svec_init(&targets); - for (i = 0; i < br->n_ctrl; i++) { - svec_add(&targets, br->ctrl[i]->target); + for (i = 0; i < br->br_cfg->n_controller; i++) { + svec_add(&targets, br->br_cfg->controller[i]->target); } svec_sort(&targets); @@ -1722,8 +2216,6 @@ cmd_get_controller(struct vsctl_context *ctx) ds_put_format(&ctx->output, "%s\n", targets.names[i]); } svec_destroy(&targets); - - free_info(&info); } static void @@ -1740,19 +2232,17 @@ delete_controllers(struct ovsrec_controller **controllers, static void cmd_del_controller(struct vsctl_context *ctx) { - struct vsctl_info info; - struct vsctl_bridge *br; + struct ovsrec_bridge *br; - get_info(ctx, &info); - br = find_real_bridge(&info, ctx->argv[1], true); - verify_controllers(br->br_cfg); + vsctl_context_populate_cache(ctx); - if (br->ctrl) { - delete_controllers(br->ctrl, br->n_ctrl); - ovsrec_bridge_set_controller(br->br_cfg, NULL, 0); - } + br = find_real_bridge(ctx, ctx->argv[1], true)->br_cfg; + verify_controllers(br); - free_info(&info); + if (br->controller) { + delete_controllers(br->controller, br->n_controller); + ovsrec_bridge_set_controller(br, NULL, 0); + } } static struct ovsrec_controller ** @@ -1763,6 +2253,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]); } @@ -1773,75 +2266,169 @@ insert_controllers(struct ovsdb_idl_txn *txn, char *targets[], size_t n) static void cmd_set_controller(struct vsctl_context *ctx) { - struct vsctl_info info; - struct vsctl_bridge *br; struct ovsrec_controller **controllers; + struct ovsrec_bridge *br; size_t n; - get_info(ctx, &info); - br = find_real_bridge(&info, ctx->argv[1], true); - verify_controllers(br->br_cfg); + vsctl_context_populate_cache(ctx); + + br = find_real_bridge(ctx, ctx->argv[1], true)->br_cfg; + verify_controllers(br); - delete_controllers(br->ctrl, br->n_ctrl); + delete_controllers(br->controller, br->n_controller); n = ctx->argc - 2; controllers = insert_controllers(ctx->txn, &ctx->argv[2], n); - ovsrec_bridge_set_controller(br->br_cfg, controllers, n); + ovsrec_bridge_set_controller(br, controllers, n); free(controllers); - - free_info(&info); } static void cmd_get_fail_mode(struct vsctl_context *ctx) { - struct vsctl_info info; struct vsctl_bridge *br; + const char *fail_mode; - get_info(ctx, &info); - br = find_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + br = find_bridge(ctx, ctx->argv[1], true); - if (br->br_cfg) { - ovsrec_bridge_verify_fail_mode(br->br_cfg); - } - if (br->fail_mode && strlen(br->fail_mode)) { - ds_put_format(&ctx->output, "%s\n", br->fail_mode); + if (br->parent) { + br = br->parent; } + ovsrec_bridge_verify_fail_mode(br->br_cfg); - free_info(&info); + fail_mode = br->br_cfg->fail_mode; + if (fail_mode && strlen(fail_mode)) { + ds_put_format(&ctx->output, "%s\n", fail_mode); + } } static void cmd_del_fail_mode(struct vsctl_context *ctx) { - struct vsctl_info info; struct vsctl_bridge *br; - get_info(ctx, &info); - br = find_real_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); - ovsrec_bridge_set_fail_mode(br->br_cfg, NULL); + br = find_real_bridge(ctx, ctx->argv[1], true); - free_info(&info); + ovsrec_bridge_set_fail_mode(br->br_cfg, NULL); } static void cmd_set_fail_mode(struct vsctl_context *ctx) { - struct vsctl_info info; struct vsctl_bridge *br; const char *fail_mode = ctx->argv[2]; - get_info(ctx, &info); - br = find_real_bridge(&info, ctx->argv[1], true); + vsctl_context_populate_cache(ctx); + + br = find_real_bridge(ctx, ctx->argv[1], true); if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) { vsctl_fatal("fail-mode must be \"standalone\" or \"secure\""); } ovsrec_bridge_set_fail_mode(br->br_cfg, fail_mode); +} + +static void +verify_managers(const struct ovsrec_open_vswitch *ovs) +{ + size_t i; - free_info(&info); + ovsrec_open_vswitch_verify_manager_options(ovs); + + for (i = 0; i < ovs->n_manager_options; ++i) { + const struct ovsrec_manager *mgr = ovs->manager_options[i]; + + ovsrec_manager_verify_target(mgr); + } +} + +static void +pre_manager(struct vsctl_context *ctx) +{ + ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_manager_options); + ovsdb_idl_add_column(ctx->idl, &ovsrec_manager_col_target); +} + +static void +cmd_get_manager(struct vsctl_context *ctx) +{ + const struct ovsrec_open_vswitch *ovs = ctx->ovs; + struct svec targets; + size_t i; + + verify_managers(ovs); + + /* Print the targets in sorted order for reproducibility. */ + svec_init(&targets); + + for (i = 0; i < ovs->n_manager_options; i++) { + svec_add(&targets, ovs->manager_options[i]->target); + } + + svec_sort_unique(&targets); + for (i = 0; i < targets.n; i++) { + ds_put_format(&ctx->output, "%s\n", targets.names[i]); + } + svec_destroy(&targets); +} + +static void +delete_managers(const struct vsctl_context *ctx) +{ + const struct ovsrec_open_vswitch *ovs = ctx->ovs; + size_t i; + + /* Delete Manager rows pointed to by 'manager_options' column. */ + for (i = 0; i < ovs->n_manager_options; i++) { + ovsrec_manager_delete(ovs->manager_options[i]); + } + + /* Delete 'Manager' row refs in 'manager_options' column. */ + ovsrec_open_vswitch_set_manager_options(ovs, NULL, 0); +} + +static void +cmd_del_manager(struct vsctl_context *ctx) +{ + const struct ovsrec_open_vswitch *ovs = ctx->ovs; + + verify_managers(ovs); + delete_managers(ctx); +} + +static void +insert_managers(struct vsctl_context *ctx, char *targets[], size_t n) +{ + struct ovsrec_manager **managers; + size_t i; + + /* 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]); + } + + /* Store uuids of new Manager rows in 'manager_options' column. */ + ovsrec_open_vswitch_set_manager_options(ctx->ovs, managers, n); + free(managers); +} + +static void +cmd_set_manager(struct vsctl_context *ctx) +{ + const size_t n = ctx->argc - 1; + + verify_managers(ctx->ovs); + delete_managers(ctx); + insert_managers(ctx, &ctx->argv[1], n); } static void @@ -1936,7 +2523,8 @@ struct vsctl_table_class { static const struct vsctl_table_class tables[] = { {&ovsrec_table_bridge, {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}, - {NULL, NULL, NULL}}}, + {&ovsrec_table_flow_sample_collector_set, NULL, + &ovsrec_flow_sample_collector_set_col_bridge}}}, {&ovsrec_table_controller, {{&ovsrec_table_bridge, @@ -1973,16 +2561,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}}}, @@ -1996,6 +2574,21 @@ 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}}}, + + {&ovsrec_table_ipfix, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_ipfix}, + {&ovsrec_table_flow_sample_collector_set, NULL, + &ovsrec_flow_sample_collector_set_col_ipfix}}}, + + {&ovsrec_table_flow_sample_collector_set, + {{NULL, NULL, NULL}, + {NULL, NULL, NULL}}}, + {NULL, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}} }; @@ -2145,7 +2738,8 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, static const struct ovsdb_idl_row * get_row (struct vsctl_context *ctx, - const struct vsctl_table_class *table, const char *record_id) + const struct vsctl_table_class *table, const char *record_id, + bool must_exist) { const struct ovsdb_idl_row *row; struct uuid uuid; @@ -2162,15 +2756,7 @@ get_row (struct vsctl_context *ctx, } } } - return row; -} - -static const struct ovsdb_idl_row * -must_get_row(struct vsctl_context *ctx, - const struct vsctl_table_class *table, const char *record_id) -{ - const struct ovsdb_idl_row *row = get_row(ctx, table, record_id); - if (!row) { + if (must_exist && !row) { vsctl_fatal("no row \"%s\" in table %s", record_id, table->class->name); } @@ -2208,7 +2794,7 @@ get_column(const struct vsctl_table_class *table, const char *column_name, } } -static struct uuid * +static struct ovsdb_symbol * create_symbol(struct ovsdb_symbol_table *symtab, const char *id, bool *newp) { struct ovsdb_symbol *symbol; @@ -2222,12 +2808,12 @@ create_symbol(struct ovsdb_symbol_table *symtab, const char *id, bool *newp) } symbol = ovsdb_symbol_table_insert(symtab, id); - if (symbol->used) { + if (symbol->created) { vsctl_fatal("row id \"%s\" may only be specified on one --id option", id); } - symbol->used = true; - return &symbol->uuid; + symbol->created = true; + return symbol; } static void @@ -2265,23 +2851,19 @@ missing_operator_error(const char *arg, const char **allowed_operators, /* Breaks 'arg' apart into a number of fields in the following order: * - * - If 'columnp' is nonnull, the name of a column in 'table'. The column - * is stored into '*columnp'. The column name may be abbreviated. + * - The name of a column in 'table', stored into '*columnp'. The column + * name may be abbreviated. * - * - If 'keyp' is nonnull, optionally a key string. (If both 'columnp' - * and 'keyp' are nonnull, then the column and key names are expected to - * be separated by ':'). The key is stored as a malloc()'d string into - * '*keyp', or NULL if no key is present in 'arg'. + * - Optionally ':' followed by a key string. The key is stored as a + * malloc()'d string into '*keyp', or NULL if no key is present in + * 'arg'. * * - 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'. - * - * At least 'columnp' or 'keyp' must be nonnull. + * 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. */ @@ -2289,63 +2871,50 @@ 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) { const char *p = arg; + char *column_name; char *error; - assert(columnp || keyp); - assert(!(operatorp && !valuep)); - if (keyp) { - *keyp = NULL; - } + ovs_assert(!(operatorp && !valuep)); + *keyp = NULL; if (valuep) { *valuep = NULL; } /* Parse column name. */ - if (columnp) { - char *column_name; - - error = ovsdb_token_parse(&p, &column_name); - if (error) { - goto error; - } - if (column_name[0] == '\0') { - free(column_name); - error = xasprintf("%s: missing column name", arg); - goto error; - } - error = get_column(table, column_name, columnp); + error = ovsdb_token_parse(&p, &column_name); + if (error) { + goto error; + } + if (column_name[0] == '\0') { free(column_name); - if (error) { - goto error; - } + error = xasprintf("%s: missing column name", arg); + goto error; + } + error = get_column(table, column_name, columnp); + free(column_name); + if (error) { + goto error; } /* Parse key string. */ - if (*p == ':' || !columnp) { - if (columnp) { - p++; - } else if (!keyp) { - error = xasprintf("%s: key not accepted here", arg); - goto error; - } + if (*p == ':') { + p++; error = ovsdb_token_parse(&p, keyp); if (error) { goto error; } - } else if (keyp) { - *keyp = NULL; } /* Parse value string. */ if (valuep) { - const char *best; size_t best_len; size_t i; + int best; if (!allowed_operators) { static const char *equals = "="; @@ -2353,7 +2922,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]; @@ -2361,10 +2930,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; } @@ -2374,9 +2943,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); @@ -2386,24 +2952,20 @@ parse_column_key_value(const char *arg, return NULL; error: - if (columnp) { - *columnp = NULL; - } - if (keyp) { - free(*keyp); - *keyp = NULL; - } + *columnp = NULL; + free(*keyp); + *keyp = NULL; if (valuep) { free(*valuep); *valuep = NULL; if (operatorp) { - *operatorp = NULL; + *operatorp = -1; } } return error; } -static void +static const struct ovsdb_idl_column * pre_parse_column_key_value(struct vsctl_context *ctx, const char *arg, const struct vsctl_table_class *table) @@ -2420,15 +2982,37 @@ pre_parse_column_key_value(struct vsctl_context *ctx, pre_get_column(ctx, table, column_name, &column); free(column_name); + + return column; +} + +static void +check_mutable(const struct vsctl_table_class *table, + const struct ovsdb_idl_column *column) +{ + if (!column->mutable) { + vsctl_fatal("cannot modify read-only column %s in table %s", + column->name, table->class->name); + } } 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") @@ -2444,7 +3028,7 @@ static void cmd_get(struct vsctl_context *ctx) { const char *id = shash_find_data(&ctx->options, "--id"); - bool if_exists = shash_find(&ctx->options, "--if-exists"); + bool must_exist = !shash_find(&ctx->options, "--if-exists"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const struct vsctl_table_class *table; @@ -2452,16 +3036,30 @@ cmd_get(struct vsctl_context *ctx) struct ds *out = &ctx->output; int i; + if (id && !must_exist) { + vsctl_fatal("--if-exists and --id may not be specified together"); + } + table = get_table(table_name); - row = must_get_row(ctx, table, record_id); + row = get_row(ctx, table, record_id, must_exist); + if (!row) { + return; + } + if (id) { + struct ovsdb_symbol *symbol; bool new; - *create_symbol(ctx->symtab, id, &new) = row->uuid; + symbol = create_symbol(ctx->symtab, id, &new); if (!new) { vsctl_fatal("row id \"%s\" specified on \"get\" command was used " "before it was defined", id); } + symbol->uuid = row->uuid; + + /* This symbol refers to a row that already exists, so disable warnings + * about it being unreferenced. */ + symbol->strong_ref = true; } for (i = 3; i < ctx->argc; i++) { const struct ovsdb_idl_column *column; @@ -2499,7 +3097,7 @@ cmd_get(struct vsctl_context *ctx) idx = ovsdb_datum_find_key(datum, &key, column->type.key.type); if (idx == UINT_MAX) { - if (!if_exists) { + if (must_exist) { vsctl_fatal("no key \"%s\" in %s record \"%s\" column %s", key_string, table->class->name, record_id, column->name); @@ -2518,68 +3116,218 @@ cmd_get(struct vsctl_context *ctx) } } +static void +parse_column_names(const char *column_names, + const struct vsctl_table_class *table, + const struct ovsdb_idl_column ***columnsp, + size_t *n_columnsp) +{ + const struct ovsdb_idl_column **columns; + size_t n_columns; + + if (!column_names) { + size_t i; + + n_columns = table->class->n_columns + 1; + columns = xmalloc(n_columns * sizeof *columns); + columns[0] = NULL; + for (i = 0; i < table->class->n_columns; i++) { + columns[i + 1] = &table->class->columns[i]; + } + } else { + char *s = xstrdup(column_names); + size_t allocated_columns; + char *save_ptr = NULL; + char *column_name; + + columns = NULL; + allocated_columns = n_columns = 0; + for (column_name = strtok_r(s, ", ", &save_ptr); column_name; + column_name = strtok_r(NULL, ", ", &save_ptr)) { + const struct ovsdb_idl_column *column; + + if (!strcasecmp(column_name, "_uuid")) { + column = NULL; + } else { + die_if_error(get_column(table, column_name, &column)); + } + if (n_columns >= allocated_columns) { + columns = x2nrealloc(columns, &allocated_columns, + sizeof *columns); + } + columns[n_columns++] = column; + } + free(s); + + if (!n_columns) { + vsctl_fatal("must specify at least one column name"); + } + } + *columnsp = columns; + *n_columnsp = n_columns; +} + + +static void +pre_list_columns(struct vsctl_context *ctx, + const struct vsctl_table_class *table, + const char *column_names) +{ + const struct ovsdb_idl_column **columns; + size_t n_columns; + size_t i; + + parse_column_names(column_names, table, &columns, &n_columns); + for (i = 0; i < n_columns; i++) { + if (columns[i]) { + ovsdb_idl_add_column(ctx->idl, columns[i]); + } + } + free(columns); +} + static void pre_cmd_list(struct vsctl_context *ctx) { + const char *column_names = shash_find_data(&ctx->options, "--columns"); const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; - size_t i; table = pre_get_table(ctx, table_name); - for (i = 0; i < table->class->n_columns; i++) { - ovsdb_idl_add_column(ctx->idl, &table->class->columns[i]); + pre_list_columns(ctx, table, column_names); +} + +static struct table * +list_make_table(const struct ovsdb_idl_column **columns, size_t n_columns) +{ + struct table *out; + size_t i; + + out = xmalloc(sizeof *out); + table_init(out); + + for (i = 0; i < n_columns; i++) { + const struct ovsdb_idl_column *column = columns[i]; + const char *column_name = column ? column->name : "_uuid"; + + table_add_column(out, "%s", column_name); } + + return out; } static void -list_record(const struct vsctl_table_class *table, - const struct ovsdb_idl_row *row, struct ds *out) +list_record(const struct ovsdb_idl_row *row, + const struct ovsdb_idl_column **columns, size_t n_columns, + struct table *out) { size_t i; - ds_put_format(out, "%-20s: "UUID_FMT"\n", "_uuid", - UUID_ARGS(&row->uuid)); - for (i = 0; i < table->class->n_columns; i++) { - const struct ovsdb_idl_column *column = &table->class->columns[i]; - const struct ovsdb_datum *datum; + if (!row) { + return; + } - datum = ovsdb_idl_read(row, column); + table_add_row(out); + for (i = 0; i < n_columns; i++) { + const struct ovsdb_idl_column *column = columns[i]; + struct cell *cell = table_add_cell(out); - ds_put_format(out, "%-20s: ", column->name); - ovsdb_datum_to_string(datum, &column->type, out); - ds_put_char(out, '\n'); + if (!column) { + struct ovsdb_datum datum; + union ovsdb_atom atom; + + atom.uuid = row->uuid; + + datum.keys = &atom; + datum.values = NULL; + datum.n = 1; + + cell->json = ovsdb_datum_to_json(&datum, &ovsdb_type_uuid); + cell->type = &ovsdb_type_uuid; + } else { + const struct ovsdb_datum *datum = ovsdb_idl_read(row, column); + + cell->json = ovsdb_datum_to_json(datum, &column->type); + cell->type = &column->type; + } } } static void cmd_list(struct vsctl_context *ctx) { + const char *column_names = shash_find_data(&ctx->options, "--columns"); + bool must_exist = !shash_find(&ctx->options, "--if-exists"); + const struct ovsdb_idl_column **columns; const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; - struct ds *out = &ctx->output; + struct table *out; + size_t n_columns; int i; table = get_table(table_name); + parse_column_names(column_names, table, &columns, &n_columns); + out = ctx->table = list_make_table(columns, n_columns); if (ctx->argc > 2) { for (i = 2; i < ctx->argc; i++) { - if (i > 2) { - ds_put_char(out, '\n'); - } - list_record(table, must_get_row(ctx, table, ctx->argv[i]), out); + list_record(get_row(ctx, table, ctx->argv[i], must_exist), + columns, n_columns, out); } } 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) { - if (!first) { - ds_put_char(out, '\n'); + 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); + } + } + free(columns); +} + +static void +pre_cmd_find(struct vsctl_context *ctx) +{ + const char *column_names = shash_find_data(&ctx->options, "--columns"); + const char *table_name = ctx->argv[1]; + const struct vsctl_table_class *table; + int i; + + table = pre_get_table(ctx, table_name); + pre_list_columns(ctx, table, column_names); + for (i = 2; i < ctx->argc; i++) { + pre_parse_column_key_value(ctx, ctx->argv[i], table); + } +} + +static void +cmd_find(struct vsctl_context *ctx) +{ + const char *column_names = shash_find_data(&ctx->options, "--columns"); + const struct ovsdb_idl_column **columns; + const char *table_name = ctx->argv[1]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + struct table *out; + size_t n_columns; + + table = get_table(table_name); + parse_column_names(column_names, table, &columns, &n_columns); + out = ctx->table = list_make_table(columns, n_columns); + for (row = ovsdb_idl_first_row(ctx->idl, table->class); row; + row = ovsdb_idl_next_row(row)) { + int i; + + for (i = 2; i < ctx->argc; i++) { + if (!is_condition_satisfied(table, row, ctx->argv[i], + ctx->symtab)) { + goto next_row; } - list_record(table, row, out); } + list_record(row, columns, n_columns, out); + + next_row: ; } + free(columns); } static void @@ -2591,7 +3339,10 @@ pre_cmd_set(struct vsctl_context *ctx) table = pre_get_table(ctx, table_name); for (i = 3; i < ctx->argc; i++) { - pre_parse_column_key_value(ctx, ctx->argv[i], table); + const struct ovsdb_idl_column *column; + + column = pre_parse_column_key_value(ctx, ctx->argv[i], table); + check_mutable(table, column); } } @@ -2633,6 +3384,7 @@ set_column(const struct vsctl_table_class *table, ovsdb_datum_union(&datum, ovsdb_idl_read(row, column), &column->type, false); + ovsdb_idl_txn_verify(row, column); ovsdb_idl_txn_write(row, column, &datum); } else { struct ovsdb_datum datum; @@ -2649,6 +3401,7 @@ set_column(const struct vsctl_table_class *table, static void cmd_set(struct vsctl_context *ctx) { + bool must_exist = !shash_find(&ctx->options, "--if-exists"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const struct vsctl_table_class *table; @@ -2656,10 +3409,16 @@ cmd_set(struct vsctl_context *ctx) int i; table = get_table(table_name); - row = must_get_row(ctx, table, record_id); + row = get_row(ctx, table, record_id, must_exist); + if (!row) { + return; + } + for (i = 3; i < ctx->argc; i++) { set_column(table, row, ctx->argv[i], ctx->symtab); } + + vsctl_context_invalidate_cache(ctx); } static void @@ -2672,11 +3431,13 @@ pre_cmd_add(struct vsctl_context *ctx) table = pre_get_table(ctx, table_name); pre_get_column(ctx, table, column_name, &column); + check_mutable(table, column); } static void cmd_add(struct vsctl_context *ctx) { + bool must_exist = !shash_find(&ctx->options, "--if-exists"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const char *column_name = ctx->argv[3]; @@ -2688,8 +3449,11 @@ cmd_add(struct vsctl_context *ctx) int i; table = get_table(table_name); - row = must_get_row(ctx, table, record_id); die_if_error(get_column(table, column_name, &column)); + row = get_row(ctx, table, record_id, must_exist); + if (!row) { + return; + } type = &column->type; ovsdb_datum_clone(&old, ovsdb_idl_read(row, column), &column->type); @@ -2714,6 +3478,8 @@ cmd_add(struct vsctl_context *ctx) } ovsdb_idl_txn_verify(row, column); ovsdb_idl_txn_write(row, column, &old); + + vsctl_context_invalidate_cache(ctx); } static void @@ -2726,11 +3492,13 @@ pre_cmd_remove(struct vsctl_context *ctx) table = pre_get_table(ctx, table_name); pre_get_column(ctx, table, column_name, &column); + check_mutable(table, column); } static void cmd_remove(struct vsctl_context *ctx) { + bool must_exist = !shash_find(&ctx->options, "--if-exists"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const char *column_name = ctx->argv[3]; @@ -2742,8 +3510,11 @@ cmd_remove(struct vsctl_context *ctx) int i; table = get_table(table_name); - row = must_get_row(ctx, table, record_id); die_if_error(get_column(table, column_name, &column)); + row = get_row(ctx, table, record_id, must_exist); + if (!row) { + return; + } type = &column->type; ovsdb_datum_clone(&old, ovsdb_idl_read(row, column), &column->type); @@ -2775,6 +3546,8 @@ cmd_remove(struct vsctl_context *ctx) } ovsdb_idl_txn_verify(row, column); ovsdb_idl_txn_write(row, column, &old); + + vsctl_context_invalidate_cache(ctx); } static void @@ -2789,12 +3562,14 @@ pre_cmd_clear(struct vsctl_context *ctx) const struct ovsdb_idl_column *column; pre_get_column(ctx, table, ctx->argv[i], &column); + check_mutable(table, column); } } static void cmd_clear(struct vsctl_context *ctx) { + bool must_exist = !shash_find(&ctx->options, "--if-exists"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; const struct vsctl_table_class *table; @@ -2802,7 +3577,11 @@ cmd_clear(struct vsctl_context *ctx) int i; table = get_table(table_name); - row = must_get_row(ctx, table, record_id); + row = get_row(ctx, table, record_id, must_exist); + if (!row) { + return; + } + for (i = 3; i < ctx->argc; i++) { const struct ovsdb_idl_column *column; const struct ovsdb_type *type; @@ -2820,21 +3599,47 @@ cmd_clear(struct vsctl_context *ctx) ovsdb_datum_init_empty(&datum); ovsdb_idl_txn_write(row, column, &datum); } + + vsctl_context_invalidate_cache(ctx); } static void -cmd_create(struct vsctl_context *ctx) +pre_create(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; + + table = get_table(table_name); + if (!id && !table->class->is_root) { + VLOG_WARN("applying \"create\" command to table %s without --id " + "option will have no effect", table->class->name); + } +} + +static void +cmd_create(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 = get_table(table_name); const struct ovsdb_idl_row *row; const struct uuid *uuid; int i; - uuid = id ? create_symbol(ctx->symtab, id, NULL) : NULL; + if (id) { + struct ovsdb_symbol *symbol = create_symbol(ctx->symtab, id, NULL); + if (table->class->is_root) { + /* This table is in the root set, meaning that rows created in it + * won't disappear even if they are unreferenced, so disable + * warnings about that by pretending that there is a reference. */ + symbol->strong_ref = true; + } + uuid = &symbol->uuid; + } else { + uuid = NULL; + } - table = get_table(table_name); row = ovsdb_idl_txn_insert(ctx->txn, table->class, uuid); for (i = 2; i < ctx->argc; i++) { set_column(table, row, ctx->argv[i], ctx->symtab); @@ -2857,7 +3662,9 @@ post_create(struct vsctl_context *ctx) const struct uuid *real; struct uuid dummy; - uuid_from_string(&dummy, ds_cstr(&ctx->output)); + if (!uuid_from_string(&dummy, ds_cstr(&ctx->output))) { + OVS_NOT_REACHED(); + } real = ovsdb_idl_txn_get_insert_uuid(ctx->txn, &dummy); if (real) { ds_clear(&ctx->output); @@ -2866,6 +3673,52 @@ post_create(struct vsctl_context *ctx) ds_put_char(&ctx->output, '\n'); } +static void +post_db_reload_check_init(void) +{ + n_neoteric_ifaces = 0; +} + +static void +post_db_reload_expect_iface(const struct ovsrec_interface *iface) +{ + if (n_neoteric_ifaces >= allocated_neoteric_ifaces) { + neoteric_ifaces = x2nrealloc(neoteric_ifaces, + &allocated_neoteric_ifaces, + sizeof *neoteric_ifaces); + } + neoteric_ifaces[n_neoteric_ifaces++] = iface->header_.uuid; +} + +static void +post_db_reload_do_checks(const struct vsctl_context *ctx) +{ + struct ds dead_ifaces = DS_EMPTY_INITIALIZER; + size_t i; + + for (i = 0; i < n_neoteric_ifaces; i++) { + const struct uuid *uuid; + + uuid = ovsdb_idl_txn_get_insert_uuid(ctx->txn, &neoteric_ifaces[i]); + if (uuid) { + const struct ovsrec_interface *iface; + + iface = ovsrec_interface_get_for_uuid(ctx->idl, uuid); + if (iface && (!iface->ofport || *iface->ofport == -1)) { + ds_put_format(&dead_ifaces, "'%s', ", iface->name); + } + } + } + + if (dead_ifaces.length) { + dead_ifaces.length -= 2; /* Strip off trailing comma and space. */ + ovs_error(0, "Error detected while setting up %s. See ovs-vswitchd " + "log for details.", ds_cstr(&dead_ifaces)); + } + + ds_destroy(&dead_ifaces); +} + static void pre_cmd_destroy(struct vsctl_context *ctx) { @@ -2878,37 +3731,124 @@ static void cmd_destroy(struct vsctl_context *ctx) { bool must_exist = !shash_find(&ctx->options, "--if-exists"); + bool delete_all = shash_find(&ctx->options, "--all"); const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; int i; table = get_table(table_name); - for (i = 2; i < ctx->argc; i++) { + + if (delete_all && ctx->argc > 2) { + vsctl_fatal("--all and records argument should not be specified together"); + } + + if (delete_all && !must_exist) { + vsctl_fatal("--all and --if-exists should not be specified together"); + } + + if (delete_all) { const struct ovsdb_idl_row *row; + const struct ovsdb_idl_row *next_row; - row = (must_exist ? must_get_row : get_row)(ctx, table, ctx->argv[i]); - if (row) { - ovsdb_idl_txn_delete(row); + for (row = ovsdb_idl_first_row(ctx->idl, table->class); + row;) { + next_row = ovsdb_idl_next_row(row); + ovsdb_idl_txn_delete(row); + row = next_row; } + } else { + for (i = 2; i < ctx->argc; i++) { + const struct ovsdb_idl_row *row; + + row = get_row(ctx, table, ctx->argv[i], must_exist); + if (row) { + ovsdb_idl_txn_delete(row); + } + } + } + vsctl_context_invalidate_cache(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: + OVS_NOT_REACHED(); } } 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) +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), @@ -2918,9 +3858,14 @@ is_condition_satified(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", @@ -2929,41 +3874,46 @@ is_condition_satified(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 @@ -2991,58 +3941,79 @@ cmd_wait_until(struct vsctl_context *ctx) table = get_table(table_name); - row = get_row(ctx, table, record_id); + row = get_row(ctx, table, record_id, false); 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)) { + if (!is_condition_satisfied(table, row, ctx->argv[i], ctx->symtab)) { ctx->try_again = true; return; } } } -static struct json * -where_uuid_equals(const struct uuid *uuid) +/* Prepares 'ctx', which has already been initialized with + * vsctl_context_init(), for processing 'command'. */ +static void +vsctl_context_init_command(struct vsctl_context *ctx, + struct vsctl_command *command) { - return - json_array_create_1( - json_array_create_3( - json_string_create("_uuid"), - json_string_create("=="), - json_array_create_2( - json_string_create("uuid"), - json_string_create_nocopy( - xasprintf(UUID_FMT, UUID_ARGS(uuid)))))); + ctx->argc = command->argc; + ctx->argv = command->argv; + ctx->options = command->options; + + ds_swap(&ctx->output, &command->output); + ctx->table = command->table; + + ctx->verified_ports = false; + + ctx->try_again = false; } +/* Prepares 'ctx' for processing commands, initializing its members with the + * values passed in as arguments. + * + * If 'command' is nonnull, calls vsctl_context_init_command() to prepare for + * that particular command. */ static void vsctl_context_init(struct vsctl_context *ctx, struct vsctl_command *command, struct ovsdb_idl *idl, struct ovsdb_idl_txn *txn, const struct ovsrec_open_vswitch *ovs, struct ovsdb_symbol_table *symtab) { - ctx->argc = command->argc; - ctx->argv = command->argv; - ctx->options = command->options; - - ds_swap(&ctx->output, &command->output); + if (command) { + vsctl_context_init_command(ctx, command); + } ctx->idl = idl; ctx->txn = txn; ctx->ovs = ovs; ctx->symtab = symtab; - ctx->verified_ports = false; + ctx->cache_valid = false; +} - ctx->try_again = false; +/* Completes processing of 'command' within 'ctx'. */ +static void +vsctl_context_done_command(struct vsctl_context *ctx, + struct vsctl_command *command) +{ + ds_swap(&ctx->output, &command->output); + command->table = ctx->table; } +/* Finishes up with 'ctx'. + * + * If command is nonnull, first calls vsctl_context_done_command() to complete + * processing that command within 'ctx'. */ static void vsctl_context_done(struct vsctl_context *ctx, struct vsctl_command *command) { - ds_swap(&ctx->output, &command->output); + if (command) { + vsctl_context_done_command(ctx, command); + } + vsctl_context_invalidate_cache(ctx); } static void @@ -3060,12 +4031,14 @@ run_prerequisites(struct vsctl_command *commands, size_t n_commands, struct vsctl_context ctx; ds_init(&c->output); + c->table = NULL; vsctl_context_init(&ctx, c, idl, NULL, NULL, NULL); (c->syntax->prerequisites)(&ctx); vsctl_context_done(&ctx, c); - assert(!c->output.string); + ovs_assert(!c->output.string); + ovs_assert(!c->table); } } } @@ -3078,8 +4051,9 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, const struct ovsrec_open_vswitch *ovs; enum ovsdb_idl_txn_status status; struct ovsdb_symbol_table *symtab; - const char *unused; + struct vsctl_context ctx; struct vsctl_command *c; + struct shash_node *node; int64_t next_cfg = 0; char *error = NULL; @@ -3097,26 +4071,50 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, } if (wait_for_reload) { - struct json *where = where_uuid_equals(&ovs->header_.uuid); - ovsdb_idl_txn_increment(txn, "Open_vSwitch", "next_cfg", where); - json_destroy(where); + ovsdb_idl_txn_increment(txn, &ovs->header_, + &ovsrec_open_vswitch_col_next_cfg); } + post_db_reload_check_init(); symtab = ovsdb_symbol_table_create(); for (c = commands; c < &commands[n_commands]; c++) { ds_init(&c->output); + c->table = NULL; } + vsctl_context_init(&ctx, NULL, idl, txn, ovs, symtab); for (c = commands; c < &commands[n_commands]; c++) { - struct vsctl_context ctx; - - vsctl_context_init(&ctx, c, idl, txn, ovs, symtab); - (c->syntax->run)(&ctx); - vsctl_context_done(&ctx, c); + vsctl_context_init_command(&ctx, c); + if (c->syntax->run) { + (c->syntax->run)(&ctx); + } + vsctl_context_done_command(&ctx, c); if (ctx.try_again) { + vsctl_context_done(&ctx, NULL); goto try_again; } } + vsctl_context_done(&ctx, NULL); + + SHASH_FOR_EACH (node, &symtab->sh) { + struct ovsdb_symbol *symbol = node->data; + if (!symbol->created) { + vsctl_fatal("row id \"%s\" is referenced but never created (e.g. " + "with \"-- --id=%s create ...\")", + node->name, node->name); + } + if (!symbol->strong_ref) { + if (!symbol->weak_ref) { + VLOG_WARN("row id \"%s\" was created but no reference to it " + "was inserted, so it will not actually appear in " + "the database", node->name); + } else { + VLOG_WARN("row id \"%s\" was created but only a weak " + "reference to it was inserted, so it will not " + "actually appear in the database", node->name); + } + } + } status = ovsdb_idl_txn_commit_block(txn); if (wait_for_reload && status == TXN_SUCCESS) { @@ -3134,18 +4132,11 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, } } error = xstrdup(ovsdb_idl_txn_get_error(txn)); - ovsdb_idl_txn_destroy(txn); - txn = the_idl_txn = NULL; - - unused = ovsdb_symbol_table_find_unused(symtab); - if (unused) { - vsctl_fatal("row id \"%s\" is referenced but never created (e.g. " - "with \"-- --id=%s create ...\")", unused, unused); - } switch (status) { + case TXN_UNCOMMITTED: case TXN_INCOMPLETE: - NOT_REACHED(); + OVS_NOT_REACHED(); case TXN_ABORTED: /* Should not happen--we never call ovsdb_idl_txn_abort(). */ @@ -3161,8 +4152,12 @@ 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(); + OVS_NOT_REACHED(); } free(error); @@ -3170,9 +4165,10 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, for (c = commands; c < &commands[n_commands]; c++) { struct ds *ds = &c->output; - struct shash_node *node; - if (oneline) { + if (c->table) { + table_print(c->table, &table_style); + } else if (oneline) { size_t j; ds_chomp(ds, '\n'); @@ -3196,19 +4192,24 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, fputs(ds_cstr(ds), stdout); } ds_destroy(&c->output); + table_destroy(c->table); + free(c->table); - SHASH_FOR_EACH (node, &c->options) { - free(node->data); - } - shash_destroy(&c->options); + shash_destroy_free_data(&c->options); } free(commands); if (wait_for_reload && status != TXN_UNCHANGED) { + /* Even, if --retry flag was not specified, ovs-vsctl still + * has to retry to establish OVSDB connection, if wait_for_reload + * was set. Otherwise, ovs-vsctl would end up waiting forever + * until cur_cfg would be updated. */ + ovsdb_idl_enable_reconnect(idl); for (;;) { ovsdb_idl_run(idl); OVSREC_OPEN_VSWITCH_FOR_EACH (ovs, idl) { if (ovs->cur_cfg >= next_cfg) { + post_db_reload_do_checks(&ctx); goto done; } } @@ -3217,6 +4218,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, } done: ; } + ovsdb_idl_txn_destroy(txn); ovsdb_idl_destroy(idl); exit(EXIT_SUCCESS); @@ -3227,10 +4229,13 @@ try_again: if (txn) { ovsdb_idl_txn_abort(txn); ovsdb_idl_txn_destroy(txn); + the_idl_txn = NULL; } ovsdb_symbol_table_destroy(symtab); for (c = commands; c < &commands[n_commands]; c++) { ds_destroy(&c->output); + table_destroy(c->table); + free(c->table); } free(error); } @@ -3238,11 +4243,12 @@ 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}, {"del-br", 1, 1, pre_get_info, cmd_del_br, NULL, "--if-exists", RW}, - {"list-br", 0, 0, pre_get_info, cmd_list_br, NULL, "", RO}, + {"list-br", 0, 0, pre_get_info, cmd_list_br, NULL, "--real,--fake", RO}, {"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}, @@ -3266,14 +4272,19 @@ static const struct vsctl_command_syntax all_commands[] = { {"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}, + /* Manager commands. */ + {"get-manager", 0, 0, pre_manager, cmd_get_manager, NULL, "", RO}, + {"del-manager", 0, 0, pre_manager, cmd_del_manager, NULL, "", RW}, + {"set-manager", 1, INT_MAX, pre_manager, cmd_set_manager, NULL, "", RW}, + /* SSL commands. */ {"get-ssl", 0, 0, pre_cmd_get_ssl, cmd_get_ssl, NULL, "", RO}, {"del-ssl", 0, 0, pre_cmd_del_ssl, cmd_del_ssl, NULL, "", RW}, @@ -3282,19 +4293,27 @@ 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, "", RO}, - {"set", 3, INT_MAX, pre_cmd_set, cmd_set, NULL, "", RW}, - {"add", 4, INT_MAX, pre_cmd_add, cmd_add, NULL, "", RW}, - {"remove", 4, INT_MAX, pre_cmd_remove, cmd_remove, NULL, "", RW}, - {"clear", 3, INT_MAX, pre_cmd_clear, cmd_clear, NULL, "", RW}, - {"create", 2, INT_MAX, NULL, cmd_create, post_create, "--id=", RW}, - {"destroy", 1, INT_MAX, pre_cmd_destroy, cmd_destroy, NULL, "--if-exists", + {"list", 1, INT_MAX, pre_cmd_list, cmd_list, NULL, + "--if-exists,--columns=", RO}, + {"find", 1, INT_MAX, pre_cmd_find, cmd_find, NULL, "--columns=", RO}, + {"set", 3, INT_MAX, pre_cmd_set, cmd_set, NULL, "--if-exists", RW}, + {"add", 4, INT_MAX, pre_cmd_add, cmd_add, NULL, "--if-exists", RW}, + {"remove", 4, INT_MAX, pre_cmd_remove, cmd_remove, NULL, "--if-exists", RW}, + {"clear", 3, INT_MAX, pre_cmd_clear, cmd_clear, NULL, "--if-exists", RW}, + {"create", 2, INT_MAX, pre_create, cmd_create, post_create, "--id=", RW}, + {"destroy", 1, INT_MAX, pre_cmd_destroy, cmd_destroy, NULL, + "--if-exists,--all", RW}, {"wait-until", 2, INT_MAX, pre_cmd_wait_until, cmd_wait_until, NULL, "", RO}, {NULL, 0, 0, NULL, NULL, NULL, NULL, RO}, }; +static const struct vsctl_command_syntax *get_all_commands(void) +{ + return all_commands; +}