Thanks again for fixing this. Acked-by: Justin Pettit <jpet...@nicira.com>
I'm only going to review these two patches tonight, since they'll fix the upgrade issue, and it's late. I can take a look at the other two in the morning, but let's push these when you're ready. --Justin > On Mar 19, 2015, at 11:52 PM, Ben Pfaff <b...@nicira.com> wrote: > > Otherwise this creates a gratuitous incompatibility with older databases, > which can be a problem in upgrade situations. > > VMware-BZ: #1413562 > Reported-by: Alex Wang <al...@nicira.com> > Signed-off-by: Ben Pfaff <b...@nicira.com> > --- > utilities/ovs-vsctl.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c > index fa73b00..009a8ca 100644 > --- a/utilities/ovs-vsctl.c > +++ b/utilities/ovs-vsctl.c > @@ -1185,7 +1185,6 @@ pre_get_info(struct vsctl_context *ctx) > 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_ports); > - ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_auto_attach); > > ovsdb_idl_add_column(ctx->idl, &ovsrec_port_col_name); > ovsdb_idl_add_column(ctx->idl, &ovsrec_port_col_fake_bridge); > @@ -1194,7 +1193,6 @@ pre_get_info(struct vsctl_context *ctx) > > ovsdb_idl_add_column(ctx->idl, &ovsrec_interface_col_name); > > - ovsdb_idl_add_column(ctx->idl, &ovsrec_autoattach_col_mappings); > ovsdb_idl_add_column(ctx->idl, &ovsrec_interface_col_ofport); > } > > @@ -2806,6 +2804,7 @@ pre_aa_mapping(struct vsctl_context *ctx) > { > pre_get_info(ctx); > > + ovsdb_idl_add_column(ctx->idl, &ovsrec_bridge_col_auto_attach); > ovsdb_idl_add_column(ctx->idl, &ovsrec_autoattach_col_mappings); > } > > @@ -4678,7 +4677,7 @@ static const struct vsctl_command_syntax all_commands[] > = { > cmd_set_ssl, NULL, "--bootstrap", RW}, > > /* Auto Attach commands. */ > - {"add-aa-mapping", 3, 3, "BRIDGE ARG ARG", pre_get_info, > cmd_add_aa_mapping, > + {"add-aa-mapping", 3, 3, "BRIDGE ARG ARG", pre_aa_mapping, > cmd_add_aa_mapping, > NULL, "", RW}, > {"del-aa-mapping", 3, 3, "BRIDGE ARG ARG", pre_aa_mapping, > cmd_del_aa_mapping, > NULL, "", RW}, > -- > 2.1.3 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev