ovn-nbctl: Swap lport-add arguments

Signed-off-by: Justin Pettit <jpettit@nicira.com>

diff --git a/ovn/ovn-nbctl.8.xml b/ovn/ovn-nbctl.8.xml
index 7cdef00..1bc022e 100644 (file)
--- a/ovn/ovn-nbctl.8.xml
+++ b/ovn/ovn-nbctl.8.xml
@@ -17,7 +17,7 @@
     <p><code>lswitch-get-external-id</code> <var>lswitch</var> [<var>key</var>]</p>
 
     <h1>Logical Port Commands</h1>
-    <p><code>lport-add</code> <var>name</var> <var>lswitch</var></p>
+    <p><code>lport-add</code> <var>lswitch</var> <var>name</var></p>
     <p><code>lport-del</code> <var>lport</var></p>
     <p><code>lport-list</code> <var>lswitch</var></p>
     <p><code>lport-set-external-id</code> <var>lport</var> <var>key</var> [<var>value</var>]</p>

diff --git a/ovn/ovn-nbctl.c b/ovn/ovn-nbctl.c
index 3ffe699..2078e2a 100644 (file)
--- a/ovn/ovn-nbctl.c
+++ b/ovn/ovn-nbctl.c
@@ -57,7 +57,7 @@ Logical Switch Commands:\n\
                             List one or all external:ids set on a switch\n\
 \n\
 Logical Port Commands:\n\
-  lport-add <name> <lswitch> Create a logical port on a logical switch\n\
+  lport-add <lswitch> <lport> Create a logical port on a logical switch\n\
   lport-del <lport>         Delete a logical port (by name or UUID)\n\
   lport-list <lswitch>      List ports on a logical switch\n\
   lport-set-external-id <lport> <key> [value]\n\
@@ -254,13 +254,13 @@ do_lport_add(struct ovs_cmdl_context *ctx)
     struct nbrec_logical_port *lport;
     const struct nbrec_logical_switch *lswitch;
 
-    lswitch = lswitch_by_name_or_uuid(nb_ctx, ctx->argv[2]);
+    lswitch = lswitch_by_name_or_uuid(nb_ctx, ctx->argv[1]);
     if (!lswitch) {
         return;
     }
 
     lport = nbrec_logical_port_insert(nb_ctx->txn);
-    nbrec_logical_port_set_name(lport, ctx->argv[1]);
+    nbrec_logical_port_set_name(lport, ctx->argv[2]);
     nbrec_logical_port_set_lswitch(lport, lswitch);
 }
 
@@ -521,7 +521,7 @@ static const struct ovs_cmdl_command all_commands[] = {
     },
     {
         .name = "lport-add",
-        .usage = "<name> <lswitch>",
+        .usage = "<lswitch> <name>",
         .min_args = 2,
         .max_args = 2,
         .handler = do_lport_add,