From 629a2a2d4fdc3dbc20b0ce46144cd29ce1c50b6c Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Sat, 4 Apr 2009 14:17:43 -0700 Subject: [PATCH] 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". --- secchan/secchan.8.in | 4 ++-- utilities/dpctl.8.in | 2 +- utilities/dpctl.c | 8 ++++---- vswitchd/etc/init.d/vswitch | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/secchan/secchan.8.in b/secchan/secchan.8.in index 031e0283..0bf1293a 100644 --- 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 20545f8e..ffd9be75 100644 --- 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 c2311104..6d334e2a 100644 --- 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 6bcb72c3..8406ebf2 100755 --- 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 { -- 2.30.2