summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--tests/ovs-vsctl.at2
-rw-r--r--utilities/ovs-vsctl.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 036e41e11..3e80eef1d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -52,6 +52,7 @@ Joan Cirer joan@ev0.net
John Galgay john@galgay.net
Luiz Henrique Ozaki luiz.ozaki@gmail.com
Michael Mao mmao@nicira.com
+Mikael Doverhag mdoverhag@nicira.com
Pankaj Thakkar thakkar@nicira.com
Paulo Cravero pcravero@as2594.net
Peter Balland peter@nicira.com
diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index 152a6585c..a05e80555 100644
--- a/tests/ovs-vsctl.at
+++ b/tests/ovs-vsctl.at
@@ -301,7 +301,7 @@ AT_CLEANUP
AT_SETUP([external IDs])
AT_KEYWORDS([ovs-vsctl])
OVS_VSCTL_SETUP
-AT_CHECK([RUN_OVS_VSCTL_TOGETHER(
+AT_CHECK([RUN_OVS_VSCTL_ONELINE(
[add-br a],
[add-port a a1],
[add-bond a bond0 a2 a3],
diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index 43aeb01fb..acdcaf317 100644
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -3236,8 +3236,8 @@ static const struct vsctl_command_syntax all_commands[] = {
{"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},
- {"br-set-external-id", 2, 3, pre_get_info, cmd_br_set_external_id, NULL,
- "", RW},
+ {"br-set-external-id", 2, 3, pre_cmd_br_set_external_id,
+ cmd_br_set_external_id, NULL, "", RW},
{"br-get-external-id", 1, 2, pre_cmd_br_get_external_id,
cmd_br_get_external_id, NULL, "", RO},