X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=e33d2d1e069f61d1de1a7adcdf59451542a54b8d;hb=c611c9d011111eeb2767faa1e8f02958fd36aeac;hp=e86cb7cd949ce48dc0fd9095e4afba8f4e52fdc0;hpb=524555d18bda66f4f2c4bcb7bfb83b22bf50a942;p=openvswitch diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index e86cb7cd..e33d2d1e 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,12 @@ #include #include +#include #include +#include #include #include +#include #include #include #include @@ -29,6 +32,8 @@ #include "compiler.h" #include "dirs.h" #include "dynamic-string.h" +#include "json.h" +#include "ovsdb-data.h" #include "ovsdb-idl.h" #include "poll-loop.h" #include "svec.h" @@ -45,6 +50,15 @@ static const char *db; /* --oneline: Write each command's output as a single line? */ static bool oneline; +/* --dry-run: Do not commit any changes. */ +static bool dry_run; + +/* --no-wait: Wait for ovs-vswitchd to reload its configuration? */ +static bool wait_for_reload = true; + +/* --timeout: Time to wait for a connection to 'db'. */ +static int timeout = 5; + static void vsctl_fatal(const char *, ...) PRINTF_FORMAT(1, 2) NO_RETURN; static char *default_db(void); static void usage(void) NO_RETURN; @@ -71,6 +85,10 @@ main(int argc, char *argv[]) vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); parse_options(argc, argv); + if (timeout) { + time_alarm(timeout); + } + /* Log our arguments. This is often valuable for debugging systems. */ ds_init(&args); for (i = 1; i < argc; i++) { @@ -138,23 +156,28 @@ parse_options(int argc, char *argv[]) OPT_DB = UCHAR_MAX + 1, OPT_ONELINE, OPT_NO_SYSLOG, - OPT_NO_WAIT + OPT_NO_WAIT, + OPT_DRY_RUN, + VLOG_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}, - {"verbose", optional_argument, 0, 'v'}, + {"timeout", required_argument, 0, 't'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, + VLOG_LONG_OPTIONS, {0, 0, 0, 0}, }; + for (;;) { int c; - c = getopt_long(argc, argv, "+v::hV", long_options, NULL); + c = getopt_long(argc, argv, "+v::hVt:", long_options, NULL); if (c == -1) { break; } @@ -173,7 +196,11 @@ parse_options(int argc, char *argv[]) break; case OPT_NO_WAIT: - /* XXX not yet implemented */ + wait_for_reload = false; + break; + + case OPT_DRY_RUN: + dry_run = true; break; case 'h': @@ -183,10 +210,16 @@ parse_options(int argc, char *argv[]) OVS_PRINT_VERSION(0, 0); exit(EXIT_SUCCESS); - case 'v': - vlog_set_verbosity(optarg); + case 't': + timeout = strtoul(optarg, NULL, 10); + if (timeout < 0) { + ovs_fatal(0, "value %s on -t or --timeout is invalid", + optarg); + } break; + VLOG_OPTION_HANDLERS + case '?': exit(EXIT_FAILURE); @@ -265,6 +298,28 @@ usage(void) " iface-get-external-id IFACE" " list key-value pairs on IFACE\n" ); + printf("\nController commands:\n" + " get-controller [BRIDGE] " + "print the controller for BRIDGE\n" + " del-controller [BRIDGE] " + "delete the controller for BRIDGE\n" + " set-controller [BRIDGE] TARGET " + "set the controller for BRIDGE to TARGET\n" + " get-fail-mode [BRIDGE] " + "print the fail-mode for BRIDGE\n" + " del-fail-mode [BRIDGE] " + "delete the fail-mode for BRIDGE\n" + " set-fail-mode [BRIDGE] MODE " + "set the fail-mode for BRIDGE to MODE\n" + ); + printf("\nSSL commands:\n" + " get-ssl " + "print the SSL configuration\n" + " del-ssl " + "delete the SSL configuration\n" + " set-ssl PRIV-KEY CERT CA-CERT " + "set the SSL configuration\n" + ); printf("\nOptions:\n" " --db=DATABASE " "connect to DATABASE\n" @@ -295,6 +350,7 @@ default_db(void) struct vsctl_context { int argc; char **argv; + struct ovsdb_idl *idl; const struct ovsrec_open_vswitch *ovs; struct ds output; struct shash options; @@ -303,6 +359,7 @@ struct vsctl_context { struct vsctl_bridge { struct ovsrec_bridge *br_cfg; char *name; + struct ovsrec_controller *ctrl; struct vsctl_bridge *parent; int vlan; }; @@ -321,6 +378,7 @@ struct vsctl_info { struct shash bridges; struct shash ports; struct shash ifaces; + struct ovsrec_controller *ctrl; }; static struct ovsdb_idl_txn * @@ -339,6 +397,7 @@ add_bridge(struct vsctl_info *b, br->name = xstrdup(name); br->parent = parent; br->vlan = vlan; + br->ctrl = parent ? parent->br_cfg->controller : br_cfg->controller; shash_add(&b->bridges, br->name, br); return br; } @@ -402,6 +461,8 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) shash_init(&info->ports); shash_init(&info->ifaces); + info->ctrl = ovs->controller; + shash_init(&bridges); shash_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { @@ -533,6 +594,16 @@ find_bridge(struct vsctl_info *info, const char *name, bool must_exist) return br; } +static struct vsctl_bridge * +find_real_bridge(struct vsctl_info *info, const char *name, bool must_exist) +{ + struct vsctl_bridge *br = find_bridge(info, name, must_exist); + if (br && br->parent) { + vsctl_fatal("%s is a fake bridge", name); + } + return br; +} + static struct vsctl_port * find_port(struct vsctl_info *info, const char *name, bool must_exist) { @@ -673,7 +744,7 @@ cmd_add_br(struct vsctl_context *ctx) parent = find_bridge(&info, parent_name, false); if (parent && parent->vlan) { - vsctl_fatal("cannot create brdige with fake bridge as parent"); + vsctl_fatal("cannot create bridge with fake bridge as parent"); } if (!parent) { vsctl_fatal("parent bridge %s does not exist", parent_name); @@ -935,7 +1006,7 @@ cmd_list_ports(struct vsctl_context *ctx) static void add_port(const struct ovsrec_open_vswitch *ovs, - const char *br_name, const char *port_name, + const char *br_name, const char *port_name, bool fake_iface, char *iface_names[], int n_ifaces) { struct vsctl_info info; @@ -959,6 +1030,7 @@ add_port(const struct ovsrec_open_vswitch *ovs, port = ovsrec_port_insert(txn_from_openvswitch(ovs)); 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) { @@ -975,13 +1047,16 @@ add_port(const struct ovsrec_open_vswitch *ovs, static void cmd_add_port(struct vsctl_context *ctx) { - add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], &ctx->argv[2], 1); + add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], false, &ctx->argv[2], 1); } static void cmd_add_bond(struct vsctl_context *ctx) { - add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], &ctx->argv[3], ctx->argc - 3); + bool fake_iface = shash_find(&ctx->options, "--fake-iface"); + + add_port(ctx->ovs, ctx->argv[1], ctx->argv[2], fake_iface, + &ctx->argv[3], ctx->argc - 3); } static void @@ -1166,6 +1241,946 @@ cmd_iface_get_external_id(struct vsctl_context *ctx) "", ctx->argc >= 3 ? ctx->argv[2] : NULL, &ctx->output); free_info(&info); } + +static void +cmd_get_controller(struct vsctl_context *ctx) +{ + struct vsctl_info info; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + /* Return the controller from the "Open_vSwitch" table */ + if (info.ctrl) { + ds_put_format(&ctx->output, "%s\n", info.ctrl->target); + } + } else { + /* Return the controller for a particular bridge. */ + struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); + + /* If no controller is explicitly defined for the requested + * bridge, fallback to the "Open_vSwitch" table's controller. */ + if (br->ctrl) { + ds_put_format(&ctx->output, "%s\n", br->ctrl->target); + } else if (info.ctrl) { + ds_put_format(&ctx->output, "%s\n", info.ctrl->target); + } + } + + free_info(&info); +} + +static void +cmd_del_controller(struct vsctl_context *ctx) +{ + struct vsctl_info info; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + if (info.ctrl) { + ovsrec_controller_delete(info.ctrl); + ovsrec_open_vswitch_set_controller(ctx->ovs, NULL); + } + } else { + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (br->ctrl) { + ovsrec_controller_delete(br->ctrl); + ovsrec_bridge_set_controller(br->br_cfg, NULL); + } + } + + free_info(&info); +} + +static void +cmd_set_controller(struct vsctl_context *ctx) +{ + struct vsctl_info info; + struct ovsrec_controller *ctrl; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 2) { + /* Set the controller in the "Open_vSwitch" table. */ + if (info.ctrl) { + ovsrec_controller_delete(info.ctrl); + } + ctrl = ovsrec_controller_insert(txn_from_openvswitch(ctx->ovs)); + ovsrec_controller_set_target(ctrl, ctx->argv[1]); + ovsrec_open_vswitch_set_controller(ctx->ovs, ctrl); + } else { + /* Set the controller for a particular bridge. */ + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (br->ctrl) { + ovsrec_controller_delete(br->ctrl); + } + ctrl = ovsrec_controller_insert(txn_from_openvswitch(ctx->ovs)); + ovsrec_controller_set_target(ctrl, ctx->argv[2]); + ovsrec_bridge_set_controller(br->br_cfg, ctrl); + } + + free_info(&info); +} + +static void +cmd_get_fail_mode(struct vsctl_context *ctx) +{ + struct vsctl_info info; + const char *fail_mode = NULL; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + /* Return the fail-mode from the "Open_vSwitch" table */ + if (info.ctrl && info.ctrl->fail_mode) { + fail_mode = info.ctrl->fail_mode; + } + } else { + /* Return the fail-mode for a particular bridge. */ + struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); + + /* If no controller or fail-mode is explicitly defined for the + * requested bridge, fallback to the "Open_vSwitch" table's + * setting. */ + if (br->ctrl && br->ctrl->fail_mode) { + fail_mode = br->ctrl->fail_mode; + } else if (info.ctrl && info.ctrl->fail_mode) { + fail_mode = info.ctrl->fail_mode; + } + } + + if (fail_mode && strlen(fail_mode)) { + ds_put_format(&ctx->output, "%s\n", fail_mode); + } + + free_info(&info); +} + +static void +cmd_del_fail_mode(struct vsctl_context *ctx) +{ + struct vsctl_info info; + + get_info(ctx->ovs, &info); + + if (ctx->argc == 1) { + if (info.ctrl && info.ctrl->fail_mode) { + ovsrec_controller_set_fail_mode(info.ctrl, NULL); + } + } else { + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (br->ctrl && br->ctrl->fail_mode) { + ovsrec_controller_set_fail_mode(br->ctrl, NULL); + } + } + + free_info(&info); +} + +static void +cmd_set_fail_mode(struct vsctl_context *ctx) +{ + struct vsctl_info info; + const char *fail_mode; + + get_info(ctx->ovs, &info); + + fail_mode = (ctx->argc == 2) ? ctx->argv[1] : ctx->argv[2]; + + if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) { + vsctl_fatal("fail-mode must be \"standalone\" or \"secure\""); + } + + if (ctx->argc == 2) { + /* Set the fail-mode in the "Open_vSwitch" table. */ + if (!info.ctrl) { + vsctl_fatal("no controller declared"); + } + ovsrec_controller_set_fail_mode(info.ctrl, fail_mode); + } else { + struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); + + if (!br->ctrl) { + vsctl_fatal("no controller declared for %s", br->name); + } + ovsrec_controller_set_fail_mode(br->ctrl, fail_mode); + } + + free_info(&info); +} + +static void +cmd_get_ssl(struct vsctl_context *ctx) +{ + struct ovsrec_ssl *ssl = ctx->ovs->ssl; + + if (ssl) { + ds_put_format(&ctx->output, "Private key: %s\n", ssl->private_key); + ds_put_format(&ctx->output, "Certificate: %s\n", ssl->certificate); + ds_put_format(&ctx->output, "CA Certificate: %s\n", ssl->ca_cert); + ds_put_format(&ctx->output, "Bootstrap: %s\n", + ssl->bootstrap_ca_cert ? "true" : "false"); + } +} + +static void +cmd_del_ssl(struct vsctl_context *ctx) +{ + struct ovsrec_ssl *ssl = ctx->ovs->ssl; + + if (ssl) { + ovsrec_ssl_delete(ssl); + ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL); + } +} + +static void +cmd_set_ssl(struct vsctl_context *ctx) +{ + bool bootstrap = shash_find(&ctx->options, "--bootstrap"); + struct ovsrec_ssl *ssl = ctx->ovs->ssl; + + if (ssl) { + ovsrec_ssl_delete(ssl); + } + ssl = ovsrec_ssl_insert(txn_from_openvswitch(ctx->ovs)); + + ovsrec_ssl_set_private_key(ssl, ctx->argv[1]); + ovsrec_ssl_set_certificate(ssl, ctx->argv[2]); + ovsrec_ssl_set_ca_cert(ssl, ctx->argv[3]); + + ovsrec_ssl_set_bootstrap_ca_cert(ssl, bootstrap); + + ovsrec_open_vswitch_set_ssl(ctx->ovs, ssl); +} + +/* Parameter commands. */ + +/* POSIX extended regular expression for an 8-bit unsigned decimal integer. */ +#define OCTET_RE "([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])" + +/* POSIX extended regular expression for an IP address. */ +#define IP_RE "("OCTET_RE"\\."OCTET_RE"\\."OCTET_RE"\\."OCTET_RE")" + +/* POSIX extended regular expression for a netmask. */ +#define NETMASK_RE \ + "255.255.255."NETMASK_END_RE"|" \ + "255.255."NETMASK_END_RE".0|" \ + "255."NETMASK_END_RE".0.0|" \ + NETMASK_END_RE".0.0.0" +#define NETMASK_END_RE "(255|254|252|248|240|224|192|128|0)" + +/* POSIX extended regular expression for an Ethernet address. */ +#define XX_RE "[0-9a-fA-F][0-9a-fA-F]" +#define MAC_RE XX_RE":"XX_RE":"XX_RE":"XX_RE":"XX_RE":"XX_RE + +/* POSIX extended regular expression for a TCP or UDP port number. */ +#define PORT_RE \ + "([0-9]|" \ + "[1-9][0-9]|" \ + "[1-9][0-9][0-9]|" \ + "[1-9][0-9][0-9][0-9]|" \ + "[1-5][0-9][0-9][0-9][0-9]|" \ + "6[1-4][0-9][0-9][0-9]|" \ + "65[1-4][0-9][0-9]|" \ + "655[1-2][0-9]|" \ + "6553[1-5])" + +enum { + VSCF_READONLY = 1 << 0, + VSCF_HIDDEN = 1 << 1 +}; + +struct vsctl_column { + struct ovsdb_idl_column *idl; + int flags; + const char *constraint; +}; + +static const struct vsctl_column bridge_columns[] = { + {&ovsrec_bridge_col_datapath_id, VSCF_READONLY, NULL}, + {&ovsrec_bridge_col_name, VSCF_READONLY, NULL}, + {&ovsrec_bridge_col_mirrors, VSCF_READONLY, NULL}, + {&ovsrec_bridge_col_other_config, 0, NULL}, + {&ovsrec_bridge_col_flood_vlans, 0, "[1,4095]"}, + {&ovsrec_bridge_col_controller, VSCF_READONLY, NULL}, + {&ovsrec_bridge_col_netflow, VSCF_READONLY, NULL}, + {&ovsrec_bridge_col_external_ids, 0, NULL}, + {&ovsrec_bridge_col_ports, VSCF_READONLY, NULL}, + {NULL, 0, NULL}, +}; + +static const struct vsctl_column controller_columns[] = { + {&ovsrec_controller_col_connection_mode, 0, "in-band|out-of-band"}, + {&ovsrec_controller_col_controller_burst_limit, 0, "[25,]"}, + {&ovsrec_controller_col_controller_rate_limit, 0, "[100,]"}, + {&ovsrec_controller_col_discover_accept_regex, 0, NULL}, + {&ovsrec_controller_col_discover_update_resolv_conf, 0, NULL}, + {&ovsrec_controller_col_fail_mode, 0, "standalone|secure"}, + {&ovsrec_controller_col_inactivity_probe, 0, "[5000,]"}, + {&ovsrec_controller_col_local_gateway, 0, IP_RE}, + {&ovsrec_controller_col_local_ip, 0, IP_RE}, + {&ovsrec_controller_col_local_netmask, 0, NETMASK_RE}, + {&ovsrec_controller_col_max_backoff, 0, "[1000,]"}, + {&ovsrec_controller_col_target, 0, NULL}, + {NULL, 0, NULL}, +}; + +static const struct vsctl_column interface_columns[] = { + {&ovsrec_interface_col_external_ids, 0, NULL}, + {&ovsrec_interface_col_ingress_policing_burst, 0, "[10,]"}, + {&ovsrec_interface_col_ingress_policing_rate, 0, "[100,]"}, + {&ovsrec_interface_col_mac, 0, MAC_RE}, + {&ovsrec_interface_col_name, VSCF_READONLY, NULL}, + {&ovsrec_interface_col_ofport, VSCF_READONLY, NULL}, + {&ovsrec_interface_col_options, 0, NULL}, + {&ovsrec_interface_col_type, VSCF_READONLY, NULL}, + {NULL, 0, NULL}, +}; + +static const struct vsctl_column mirror_columns[] = { + {&ovsrec_mirror_col_name, VSCF_READONLY, NULL}, + {&ovsrec_mirror_col_output_port, 0, "Port"}, + {&ovsrec_mirror_col_output_vlan, 0, "[1,4095]"}, + {&ovsrec_mirror_col_select_dst_port, 0, "Port"}, + {&ovsrec_mirror_col_select_src_port, 0, "Port"}, + {&ovsrec_mirror_col_select_vlan, 0, "[1,4095]"}, + {NULL, 0, NULL}, +}; + +static const struct vsctl_column netflow_columns[] = { + {&ovsrec_netflow_col_active_timeout, 0, "[-1,]"}, + {&ovsrec_netflow_col_add_id_to_interface, 0, NULL}, + {&ovsrec_netflow_col_targets, 0, IP_RE":"PORT_RE}, + {&ovsrec_netflow_col_engine_type, 0, "[0,255]"}, + {&ovsrec_netflow_col_engine_id, 0, "[0,255]"}, + {NULL, 0, NULL}, +}; + +static const struct vsctl_column open_vswitch_columns[] = { + {&ovsrec_open_vswitch_col_bridges, VSCF_READONLY, NULL}, + {&ovsrec_open_vswitch_col_controller, VSCF_READONLY, NULL}, + {&ovsrec_open_vswitch_col_cur_cfg, VSCF_HIDDEN, NULL}, + {&ovsrec_open_vswitch_col_management_id, 0, "[0-9a-fA-F]{12}"}, + {&ovsrec_open_vswitch_col_managers, 0, "p?(ssl|tcp|unix):.*"}, + {&ovsrec_open_vswitch_col_next_cfg, VSCF_HIDDEN, NULL}, + {&ovsrec_open_vswitch_col_ssl, VSCF_READONLY, NULL}, + {NULL, 0, NULL}, +}; + +static const struct vsctl_column port_columns[] = { + {&ovsrec_port_col_bond_updelay, 0, "[0,]"}, + {&ovsrec_port_col_bond_downdelay, 0, "[0,]"}, + {&ovsrec_port_col_bond_fake_iface, VSCF_READONLY, NULL}, + {&ovsrec_port_col_external_ids, 0, NULL}, + {&ovsrec_port_col_fake_bridge, VSCF_READONLY, NULL}, + {&ovsrec_port_col_interfaces, VSCF_READONLY, NULL}, + {&ovsrec_port_col_mac, 0, MAC_RE}, + {&ovsrec_port_col_name, VSCF_READONLY, NULL}, + {&ovsrec_port_col_other_config, 0, NULL}, + {&ovsrec_port_col_tag, 0, "[0,4095]"}, + {&ovsrec_port_col_trunks, 0, "[0,4095]"}, + {NULL, 0, NULL}, +}; + +static const struct vsctl_column ssl_columns[] = { + {&ovsrec_ssl_col_bootstrap_ca_cert, 0, NULL}, + {&ovsrec_ssl_col_ca_cert, 0, NULL}, + {&ovsrec_ssl_col_certificate, 0, NULL}, + {&ovsrec_ssl_col_private_key, 0, NULL}, + {NULL, 0, NULL}, +}; + +struct vsctl_row_id { + const struct ovsdb_idl_table_class *table; + const struct ovsdb_idl_column *name_column; + const struct ovsdb_idl_column *uuid_column; +}; + +struct vsctl_table_class { + struct ovsdb_idl_table_class *class; + const struct vsctl_column *columns; + struct vsctl_row_id row_ids[2]; +}; + +static const struct vsctl_table_class tables[] = { + {&ovsrec_table_bridge, bridge_columns, + {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, NULL}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_controller, controller_columns, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_controller}, + {&ovsrec_table_open_vswitch, + NULL, + &ovsrec_open_vswitch_col_controller}}}, + + {&ovsrec_table_interface, interface_columns, + {{&ovsrec_table_interface, &ovsrec_interface_col_name, NULL}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_mirror, mirror_columns, + {{&ovsrec_table_mirror, &ovsrec_mirror_col_name, NULL}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_netflow, netflow_columns, + {{&ovsrec_table_bridge, + &ovsrec_bridge_col_name, + &ovsrec_bridge_col_netflow}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_open_vswitch, open_vswitch_columns, + {{&ovsrec_table_open_vswitch, NULL, NULL}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_port, port_columns, + {{&ovsrec_table_port, &ovsrec_port_col_name, NULL}, + {NULL, NULL, NULL}}}, + + {&ovsrec_table_ssl, ssl_columns, + {{&ovsrec_table_open_vswitch, NULL, &ovsrec_open_vswitch_col_ssl}}}, + + {NULL, NULL, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}} +}; + +static int +to_lower_and_underscores(unsigned c) +{ + return c == '-' ? '_' : tolower(c); +} + +static unsigned int +score_partial_match(const char *name, const char *s) +{ + int score; + + if (!strcmp(name, s)) { + return UINT_MAX; + } + for (score = 0; ; score++, name++, s++) { + if (to_lower_and_underscores(*name) != to_lower_and_underscores(*s)) { + break; + } else if (*name == '\0') { + return UINT_MAX - 1; + } + } + return *s == '\0' ? score : 0; +} + +static const struct vsctl_table_class * +get_table(const char *table_name) +{ + const struct vsctl_table_class *table; + const struct vsctl_table_class *best_match = NULL; + unsigned int best_score = 0; + + for (table = tables; table->class; table++) { + unsigned int score = score_partial_match(table->class->name, + table_name); + if (score > best_score) { + best_match = table; + best_score = score; + } else if (score == best_score) { + best_match = NULL; + } + } + if (best_match) { + return best_match; + } else if (best_score) { + ovs_fatal(0, "multiple table names match \"%s\"", table_name); + } else { + ovs_fatal(0, "unknown table \"%s\"", table_name); + } +} + +static const struct ovsdb_idl_row * +get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, + const struct vsctl_row_id *id, const char *record_id) +{ + const struct ovsdb_idl_row *referrer, *final; + + if (!id->table) { + return NULL; + } + + if (!id->name_column) { + if (strcmp(record_id, ".")) { + return NULL; + } + referrer = ovsdb_idl_first_row(ctx->idl, id->table); + if (!referrer || ovsdb_idl_next_row(referrer)) { + return NULL; + } + } else { + const struct ovsdb_idl_row *row; + unsigned int best_score = 0; + + /* It might make sense to relax this assertion. */ + assert(id->name_column->type.key_type == OVSDB_TYPE_STRING); + + referrer = NULL; + for (row = ovsdb_idl_first_row(ctx->idl, id->table); + row != NULL && best_score != UINT_MAX; + row = ovsdb_idl_next_row(row)) + { + struct ovsdb_datum name; + + ovsdb_idl_txn_read(row, id->name_column, &name); + if (name.n == 1) { + unsigned int score = score_partial_match(name.keys[0].string, + record_id); + if (score > best_score) { + referrer = row; + best_score = score; + } else if (score == best_score) { + referrer = NULL; + } + } + ovsdb_datum_destroy(&name, &id->name_column->type); + } + } + if (!referrer) { + return NULL; + } + + final = NULL; + if (id->uuid_column) { + struct ovsdb_datum uuid; + + assert(id->uuid_column->type.key_type == OVSDB_TYPE_UUID); + assert(id->uuid_column->type.value_type == OVSDB_TYPE_VOID); + + ovsdb_idl_txn_read(referrer, id->uuid_column, &uuid); + if (uuid.n == 1) { + final = ovsdb_idl_get_row_for_uuid(ctx->idl, table->class, + &uuid.keys[0].uuid); + } + ovsdb_datum_destroy(&uuid, &id->uuid_column->type); + } else { + final = referrer; + } + + return final; +} + +static const struct ovsdb_idl_row * +get_row(struct vsctl_context *ctx, + const struct vsctl_table_class *table, const char *record_id) +{ + const struct ovsdb_idl_row *row; + struct uuid uuid; + + if (uuid_from_string(&uuid, record_id)) { + row = ovsdb_idl_get_row_for_uuid(ctx->idl, table->class, &uuid); + } else { + int i; + + for (i = 0; i < ARRAY_SIZE(table->row_ids); i++) { + row = get_row_by_id(ctx, table, &table->row_ids[i], record_id); + if (row) { + break; + } + } + } + if (!row) { + ovs_fatal(0, "no row \"%s\" in table %s", + record_id, table->class->name); + } + return row; +} + +static const struct vsctl_column * +get_column(const struct vsctl_table_class *table, const char *column_name) +{ + const struct vsctl_column *column; + const struct vsctl_column *best_match = NULL; + unsigned int best_score = 0; + + for (column = table->columns; column->idl; column++) { + if (!(column->flags & VSCF_HIDDEN)) { + unsigned int score = score_partial_match(column->idl->name, + column_name); + if (score > best_score) { + best_match = column; + best_score = score; + } else if (score == best_score) { + best_match = NULL; + } + } + } + if (best_match) { + return best_match; + } else if (best_score) { + ovs_fatal(0, "%s has more than one column whose name matches \"%s\"", + table->class->name, column_name); + } else { + ovs_fatal(0, "%s does not have a column \"%s\"", + table->class->name, column_name); + } +} + +static void +check_trailer(const char *s, const char *p) +{ + if (*p != '\0') { + ovs_fatal(0, "%s: trailing garbage in argument at offset %td", + s, p - s); + } +} + +static void +parse_column_key_value(const char *arg, const struct vsctl_table_class *table, + const struct vsctl_column **columnp, + char **keyp, char **valuep) +{ + const char *p = arg; + + assert(columnp || keyp); + + /* Parse column name. */ + if (columnp) { + char *column_name; + + p = ovsdb_token_parse(arg, &column_name); + if (column_name[0] == '\0') { + ovs_fatal(0, "%s: missing column name", arg); + } + *columnp = get_column(table, column_name); + free(column_name); + } + + /* Parse key string. */ + if (*p == ':' || !columnp) { + if (columnp) { + p++; + } else if (!keyp) { + ovs_fatal(0, "%s: key not accepted here", arg); + } + p = ovsdb_token_parse(p, keyp); + } else if (keyp) { + *keyp = NULL; + } + + /* Parse value string. */ + if (*p == '=') { + if (!valuep) { + ovs_fatal(0, "%s: value not accepted here", arg); + } + *valuep = xstrdup(p + 1); + return; + } else { + if (valuep) { + *valuep = NULL; + } + check_trailer(arg, p); + } +} + +static void +cmd_get(struct vsctl_context *ctx) +{ + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + struct ds *out = &ctx->output; + int i; + + table = get_table(table_name); + row = get_row(ctx, table, record_id); + for (i = 3; i < ctx->argc; i++) { + const struct vsctl_column *column; + struct ovsdb_datum datum; + char *key_string; + + parse_column_key_value(ctx->argv[i], table, + &column, &key_string, NULL); + + ovsdb_idl_txn_read(row, column->idl, &datum); + if (key_string) { + union ovsdb_atom key; + unsigned int idx; + + if (column->idl->type.value_type == OVSDB_TYPE_VOID) { + ovs_fatal(0, "cannot specify key to get for non-map column %s", + column->idl->name); + } + + ovsdb_atom_from_string(&key, column->idl->type.key_type, + key_string); + + idx = ovsdb_datum_find_key(&datum, &key, + column->idl->type.key_type); + if (idx == UINT_MAX) { + ovs_fatal(0, "no key %s in %s record \"%s\" column %s", + key_string, table_name, record_id, + column->idl->name); + + } + ovsdb_atom_to_string(&datum.values[idx], + column->idl->type.value_type, out); + + ovsdb_atom_destroy(&key, column->idl->type.key_type); + } else { + ovsdb_datum_to_string(&datum, &column->idl->type, out); + } + ds_put_char(out, '\n'); + ovsdb_datum_destroy(&datum, &column->idl->type); + + free(key_string); + } +} + +static void +list_record(const struct vsctl_table_class *table, const struct ovsdb_idl_row *row, + struct ds *out) +{ + const struct vsctl_column *column; + + ds_put_format(out, "%-20s (RO): "UUID_FMT"\n", "_uuid", + UUID_ARGS(&row->uuid)); + for (column = table->columns; column->idl; column++) { + struct ovsdb_datum datum; + + if (column->flags & VSCF_HIDDEN) { + continue; + } + + ovsdb_idl_txn_read(row, column->idl, &datum); + + ds_put_format(out, "%-20s (%s): ", column->idl->name, + column->flags & VSCF_READONLY ? "RO" : "RW"); + ovsdb_datum_to_string(&datum, &column->idl->type, out); + ds_put_char(out, '\n'); + + ovsdb_datum_destroy(&datum, &column->idl->type); + } +} + +static void +cmd_list(struct vsctl_context *ctx) +{ + const char *table_name = ctx->argv[1]; + const struct vsctl_table_class *table; + struct ds *out = &ctx->output; + int i; + + table = get_table(table_name); + if (ctx->argc > 2) { + for (i = 2; i < ctx->argc; i++) { + if (i > 2) { + ds_put_char(out, '\n'); + } + list_record(table, get_row(ctx, table, ctx->argv[i]), 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'); + } + list_record(table, row, out); + } + } +} + +static void +check_string_constraint(const struct ovsdb_datum *datum, + const char *constraint) +{ + unsigned int i; + char *regex; + regex_t re; + int retval; + + regex = xasprintf("^%s$", constraint); + retval = regcomp(&re, regex, REG_NOSUB | REG_EXTENDED); + if (retval) { + size_t length = regerror(retval, &re, NULL, 0); + char *buffer = xmalloc(length); + regerror(retval, &re, buffer, length); + ovs_fatal(0, "internal error compiling regular expression %s: %s", + regex, buffer); + } + + for (i = 0; i < datum->n; i++) { + const char *key = datum->keys[i].string; + if (regexec(&re, key, 0, NULL, 0)) { + ovs_fatal(0, "%s is not valid (it does not match %s)", key, regex); + } + } + free(regex); + regfree(&re); +} + +static void +check_integer_constraint(const struct ovsdb_datum *datum, + const char *constraint) +{ + int64_t min, max; + unsigned int i; + int n = -1; + + sscanf(constraint, "[%"SCNd64",%"SCNd64"]%n", &min, &max, &n); + if (n == -1) { + sscanf(constraint, "[%"SCNd64",]%n", &min, &n); + if (n == -1) { + sscanf(constraint, "[,%"SCNd64"]%n", &max, &n); + if (n == -1) { + VLOG_DBG("internal error: bad integer contraint \"%s\"", + constraint); + return; + } else { + min = INT64_MIN; + } + } else { + max = INT64_MAX; + } + } + + for (i = 0; i < datum->n; i++) { + int64_t value = datum->keys[i].integer; + if (value < min || value > max) { + if (max == INT64_MAX) { + ovs_fatal(0, "%"PRId64" is less than the minimum " + "allowed value %"PRId64, value, min); + } else if (min == INT64_MIN) { + ovs_fatal(0, "%"PRId64" is greater than the maximum " + "allowed value %"PRId64, value, max); + } else { + ovs_fatal(0, "%"PRId64" is outside the valid range %"PRId64" " + "to %"PRId64" (inclusive)", value, min, max); + } + } + } +} + +static void +check_constraint(const struct ovsdb_datum *datum, + const struct ovsdb_type *type, const char *constraint) +{ + if (constraint && datum->n) { + if (type->key_type == OVSDB_TYPE_STRING) { + check_string_constraint(datum, constraint); + } else if (type->key_type == OVSDB_TYPE_INTEGER) { + check_integer_constraint(datum, constraint); + } + } +} + +static void +cmd_set(struct vsctl_context *ctx) +{ + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + struct ds *out = &ctx->output; + int i; + + table = get_table(table_name); + row = get_row(ctx, table, record_id); + for (i = 3; i < ctx->argc; i++) { + const struct vsctl_column *column; + char *key_string, *value_string; + + parse_column_key_value(ctx->argv[i], table, + &column, &key_string, &value_string); + if (column->flags & VSCF_READONLY) { + ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", + ctx->argv[i], column->idl->name, table_name); + } + if (!value_string) { + ovs_fatal(0, "%s: missing value", ctx->argv[i]); + } + + if (key_string) { + union ovsdb_atom key, value; + struct ovsdb_datum old, new; + + if (column->idl->type.value_type == OVSDB_TYPE_VOID) { + ovs_fatal(0, "cannot specify key to set for non-map column %s", + column->idl->name); + } + + ovsdb_atom_from_string(&key, column->idl->type.key_type, + key_string); + ovsdb_atom_from_string(&value, column->idl->type.value_type, + value_string); + + ovsdb_datum_init_empty(&new); + ovsdb_datum_add_unsafe(&new, &key, &value, &column->idl->type); + + ovsdb_idl_txn_read(row, column->idl, &old); + ovsdb_datum_union(&old, &new, &column->idl->type, true); + ovsdb_idl_txn_write(row, column->idl, &old); + + ovsdb_datum_destroy(&new, &column->idl->type); + } else { + struct ovsdb_datum datum; + + ovsdb_datum_from_string(&datum, &column->idl->type, value_string); + check_constraint(&datum, &column->idl->type, column->constraint); + ovsdb_idl_txn_write(row, column->idl, &datum); + } + ds_put_char(out, '\n'); + + free(key_string); + } +} + +static void +cmd_add(struct vsctl_context *ctx) +{ + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const char *column_name = ctx->argv[3]; + const struct vsctl_table_class *table; + const struct vsctl_column *column; + const struct ovsdb_idl_row *row; + const struct ovsdb_type *type; + struct ovsdb_datum old; + int i; + + table = get_table(table_name); + row = get_row(ctx, table, record_id); + column = get_column(table, column_name); + type = &column->idl->type; + ovsdb_idl_txn_read(row, column->idl, &old); + for (i = 4; i < ctx->argc; i++) { + struct ovsdb_type add_type; + struct ovsdb_datum add; + + if (column->flags & VSCF_READONLY) { + ovs_fatal(0, "%s: cannot modify read-only column %s in table %s", + ctx->argv[i], column->idl->name, table_name); + } + + add_type = *type; + add_type.n_min = 1; + add_type.n_max = UINT_MAX; + ovsdb_datum_from_string(&add, &add_type, ctx->argv[i]); + ovsdb_datum_union(&old, &add, type, false); + ovsdb_datum_destroy(&add, type); + } + if (old.n > type->n_max) { + ovs_fatal(0, "\"add\" operation would put %u %s in column %s of " + "table %s but at most %u are allowed", + old.n, + type->value_type == OVSDB_TYPE_VOID ? "values" : "pairs", + column->idl->name, table_name, type->n_max); + } + ovsdb_idl_txn_write(row, column->idl, &old); +} typedef void vsctl_handler_func(struct vsctl_context *); @@ -1178,8 +2193,22 @@ struct vsctl_command { }; static void run_vsctl_command(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, - struct ds *output); + const struct ovsrec_open_vswitch *, + struct ovsdb_idl *, struct ds *output); + +static struct json * +where_uuid_equals(const struct uuid *uuid) +{ + 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)))))); +} static void do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) @@ -1187,11 +2216,23 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) struct ovsdb_idl_txn *txn; const struct ovsrec_open_vswitch *ovs; enum ovsdb_idl_txn_status status; - struct ds *output; + struct ds comment, *output; + int64_t next_cfg = 0; int n_output; int i, start; txn = ovsdb_idl_txn_create(idl); + if (dry_run) { + ovsdb_idl_txn_set_dry_run(txn); + } + + ds_init(&comment); + ds_put_cstr(&comment, "ovs-vsctl:"); + for (i = 0; i < argc; i++) { + ds_put_format(&comment, " %s", argv[i]); + } + ovsdb_idl_txn_add_comment(txn, ds_cstr(&comment)); + ds_destroy(&comment); ovs = ovsrec_open_vswitch_first(idl); if (!ovs) { @@ -1199,13 +2240,19 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) ovs = ovsrec_open_vswitch_insert(txn); } + 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); + } + output = xmalloc(argc * sizeof *output); n_output = 0; for (start = i = 0; i <= argc; i++) { if (i == argc || !strcmp(argv[i], "--")) { if (i > start) { ds_init(&output[n_output]); - run_vsctl_command(i - start, &argv[start], ovs, + run_vsctl_command(i - start, &argv[start], ovs, idl, &output[n_output++]); } start = i + 1; @@ -1218,6 +2265,9 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) ovsdb_idl_txn_wait(txn); poll_block(); } + if (wait_for_reload && status == TXN_SUCCESS) { + next_cfg = ovsdb_idl_txn_get_increment_new_value(txn); + } ovsdb_idl_txn_destroy(txn); switch (status) { @@ -1228,6 +2278,7 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) /* Should not happen--we never call ovsdb_idl_txn_abort(). */ vsctl_fatal("transaction aborted"); + case TXN_UNCHANGED: case TXN_SUCCESS: break; @@ -1270,6 +2321,23 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl) fputs(ds_cstr(ds), stdout); } } + + if (wait_for_reload && status != TXN_UNCHANGED) { + for (;;) { + const struct ovsrec_open_vswitch *ovs; + + ovsdb_idl_run(idl); + OVSREC_OPEN_VSWITCH_FOR_EACH (ovs, idl) { + if (ovs->cur_cfg >= next_cfg) { + goto done; + } + } + ovsdb_idl_wait(idl); + poll_block(); + } + done: ; + } + exit(EXIT_SUCCESS); } @@ -1293,7 +2361,7 @@ get_vsctl_handler(int argc, char *argv[], struct vsctl_context *ctx) /* Port commands. */ {"list-ports", 1, 1, cmd_list_ports, ""}, {"add-port", 2, 2, cmd_add_port, ""}, - {"add-bond", 4, INT_MAX, cmd_add_bond, ""}, + {"add-bond", 4, INT_MAX, cmd_add_bond, "--fake-iface"}, {"del-port", 1, 2, cmd_del_port, "--if-exists"}, {"port-to-br", 1, 1, cmd_port_to_br, ""}, {"port-set-external-id", 2, 3, cmd_port_set_external_id, ""}, @@ -1304,6 +2372,30 @@ get_vsctl_handler(int argc, char *argv[], struct vsctl_context *ctx) {"iface-to-br", 1, 1, cmd_iface_to_br, ""}, {"iface-set-external-id", 2, 3, cmd_iface_set_external_id, ""}, {"iface-get-external-id", 1, 2, cmd_iface_get_external_id, ""}, + + /* Controller commands. */ + {"get-controller", 0, 1, cmd_get_controller, ""}, + {"del-controller", 0, 1, cmd_del_controller, ""}, + {"set-controller", 1, 2, cmd_set_controller, ""}, + {"get-fail-mode", 0, 1, cmd_get_fail_mode, ""}, + {"del-fail-mode", 0, 1, cmd_del_fail_mode, ""}, + {"set-fail-mode", 1, 2, cmd_set_fail_mode, ""}, + + /* SSL commands. */ + {"get-ssl", 0, 0, cmd_get_ssl, ""}, + {"del-ssl", 0, 0, cmd_del_ssl, ""}, + {"set-ssl", 3, 3, cmd_set_ssl, "--bootstrap"}, + + /* Parameter commands. */ + {"get", 3, INT_MAX, cmd_get, ""}, + {"list", 1, INT_MAX, cmd_list, ""}, + {"set", 3, INT_MAX, cmd_set, ""}, + {"add", 4, INT_MAX, cmd_add, ""}, +#if 0 + /* XXX Not yet implemented. */ + {"remove", 4, INT_MAX, cmd_remove, ""}, + {"clear", 3, INT_MAX, cmd_clear, ""}, +#endif }; const struct vsctl_command *p; @@ -1365,13 +2457,15 @@ check_vsctl_command(int argc, char *argv[]) static void run_vsctl_command(int argc, char *argv[], - const struct ovsrec_open_vswitch *ovs, struct ds *output) + const struct ovsrec_open_vswitch *ovs, + struct ovsdb_idl *idl, struct ds *output) { vsctl_handler_func *function; struct vsctl_context ctx; function = get_vsctl_handler(argc, argv, &ctx); ctx.ovs = ovs; + ctx.idl = idl; ds_init(&ctx.output); function(&ctx); *output = ctx.output;