Use "dp-show" instead of "showdp" in dpctl.

To dump information on all datapaths, dpctl has a "showdp" command.  To
be more consistent with other datapath-specific commands, this has been
changed to "dp-show".

diff --git a/secchan/secchan.8.in b/secchan/secchan.8.in
index 031e028319964f9a5de2da3150cf20349cf0dac8..0bf1293a69c3c37a339f3ebdfcf44c4e87e5983e 100644 (file)
--- a/secchan/secchan.8.in
+++ b/secchan/secchan.8.in
@@ -149,8 +149,8 @@ argument.  You must also configure the network device for the OpenFlow
 ``local port'' to allow \fBsecchan\fR to connect to that controller.
 The OpenFlow local port is a virtual network port that \fBsecchan\fR
 bridges to the physical switch ports.  The name of the local port for
-a given \fIdatapath\fR may be seen by running \fBdpctl showdp
-\fIdatapath\fR; the local port is listed as port 0 in \fBshowdp\fR's
+a given \fIdatapath\fR may be seen by running \fBdpctl dp-show
+\fIdatapath\fR; the local port is listed as port 0 in \fBdp-show\fR's
 output.
 
 .IP

diff --git a/utilities/dpctl.8.in b/utilities/dpctl.8.in
index 20545f8e21943b377e40d1cf3b5f45ec31ecfa76..ffd9be754e961eaad1672bf5f693671d21367c34 100644 (file)
--- a/utilities/dpctl.8.in
+++ b/utilities/dpctl.8.in
@@ -91,7 +91,7 @@ Prints the name of datapath \fIdp\fR, that is, the name of the network
 device acting as its local port.
 
 .TP
-\fBshowdp \fR[\fIdp\fR...]
+\fBdp-show \fR[\fIdp\fR...]
 Prints a summary of configured datapaths, including their datapath
 numbers and a list of ports connected to each datapath.  (The local
 port is identified as port 0.)

diff --git a/utilities/dpctl.c b/utilities/dpctl.c
index c231110448071934688b5b26070acec29ff04f38..6d334e2a088915144d02594c9c40e222e54ca72a 100644 (file)
--- a/utilities/dpctl.c
+++ b/utilities/dpctl.c
@@ -214,8 +214,8 @@ usage(void)
            "  deldp DP                    delete local datapath DP\n"
            "  addif DP IFACE...           add each IFACE as a port on DP\n"
            "  delif DP IFACE...           delete each IFACE from DP\n"
-           "  showdp                      show basic info on all datapaths\n"
-           "  showdp DP...                show basic info on each DP\n"
+           "  dp-show                     show basic info on all datapaths\n"
+           "  dp-show DP...               show basic info on each DP\n"
            "  dp-dump-flows DP            display flows in DP\n"
            "  dp-dump-groups DP           display port groups in DP\n"
            "\nFor OpenFlow switches:\n"
@@ -495,7 +495,7 @@ show_dpif(struct dpif *dpif)
 }
 
 static void
-do_show_dp(const struct settings *s UNUSED, int argc UNUSED, char *argv[])
+do_dp_show(const struct settings *s UNUSED, int argc UNUSED, char *argv[])
 {
     bool failure = false;
     if (argc > 1) {
@@ -1664,7 +1664,7 @@ static struct command all_commands[] = {
     { "delif", 2, INT_MAX, do_del_port },
     { "get-idx", 1, 1, do_get_idx },
     { "get-name", 1, 1, do_get_name },
-    { "showdp", 0, INT_MAX, do_show_dp },
+    { "dp-show", 0, INT_MAX, do_dp_show },
     { "dp-dump-flows", 1, 1, do_dp_dump_flows },
     { "dp-dump-groups", 1, 1, do_dp_dump_groups },
 #endif

diff --git a/vswitchd/etc/init.d/vswitch b/vswitchd/etc/init.d/vswitch
index 6bcb72c36159993c2385e7e0a512d5582e8133d6..8406ebf25fdb12e88b0c9834b18541ddc17fb56d 100755 (executable)
--- a/vswitchd/etc/init.d/vswitch
+++ b/vswitchd/etc/init.d/vswitch
@@ -25,13 +25,13 @@ BRCOMPATD_SYSLOG_LOGLEVEL="${BRCOMPATD_SYSLOG_LOGLEVEL:-WARN}"
 BRCOMPATD_MEMLEAK_LOGFILE="${BRCOMPATD_MEMLEAK_LOGFILE:-}"
 
 function dp_list {
-    $VSWITCH_BASE/utilities/dpctl showdp | grep '^dp[0-9]\+:' | cut -d':' -f 1
+    $VSWITCH_BASE/utilities/dpctl dp-show | grep '^dp[0-9]\+:' | cut -d':' -f 1
 }
 
 function dp_intf {
     local dp=$1
     # Currently port0 is hardcoded to be the local port.
-    $VSWITCH_BASE/utilities/dpctl showdp $dp | grep 'port 0:' | cut -d' ' -f 3
+    $VSWITCH_BASE/utilities/dpctl dp-show $dp | grep 'port 0:' | cut -d' ' -f 3
 }
 
 function clear_old_bridge_ports {