diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-02-04 13:17:46 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-03-16 14:57:56 -0700 |
| commit | 9b45d7f5db91cdb41eb0a2124d92885d3b3edcc9 (patch) | |
| tree | 84d901de2d013366d383b8f504d32ed1055e919e /utilities | |
| parent | ee8b231cfc819f518f02b52ceda3cd199546fda2 (diff) | |
| download | openvswitch-9b45d7f5db91cdb41eb0a2124d92885d3b3edcc9.tar.gz | |
ofproto: Get rid of archaic "switch status" OpenFlow extension.
Back in 2008 or so, I introduced this extension as a way to provide
information about switch status to the new "switch UI" program. Since
then, the switch UI program has been removed and the important information
that was provided by the switch status extension is now available in the
database, so we might as well get rid of this extension, and that is what
this commit does.
Diffstat (limited to 'utilities')
| -rw-r--r-- | utilities/ovs-ofctl.8.in | 7 | ||||
| -rw-r--r-- | utilities/ovs-ofctl.c | 32 |
2 files changed, 0 insertions, 39 deletions
diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index 3472cc1a4..ec9129d24 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -54,13 +54,6 @@ Prints to the console information on \fIswitch\fR, including information on its flow tables and ports. . .TP -\fBstatus \fIswitch\fR [\fIkey\fR] -Prints to the console a series of key-value pairs that report the -status of \fIswitch\fR. If \fIkey\fR is specified, only the key-value -pairs whose key names begin with \fIkey\fR are printed. If \fIkey\fR is -omitted, all key-value pairs are printed. -. -.TP \fBdump\-tables \fIswitch\fR Prints to the console statistics for each of the flow tables used by \fIswitch\fR. diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 5c89c7673..cd44cd8be 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -158,7 +158,6 @@ usage(void) "usage: %s [OPTIONS] COMMAND [ARG...]\n" "\nFor OpenFlow switches:\n" " show SWITCH show OpenFlow information\n" - " status SWITCH [KEY] report statistics (about KEY)\n" " dump-desc SWITCH print switch description\n" " dump-tables SWITCH print table stats\n" " mod-port SWITCH IFACE ACT modify port behavior\n" @@ -401,36 +400,6 @@ do_show(int argc OVS_UNUSED, char *argv[]) } static void -do_status(int argc, char *argv[]) -{ - struct nicira_header *request, *reply; - struct vconn *vconn; - struct ofpbuf *b; - - request = make_nxmsg(sizeof *request, NXT_STATUS_REQUEST, &b); - if (argc > 2) { - ofpbuf_put(b, argv[2], strlen(argv[2])); - update_openflow_length(b); - } - open_vconn(argv[1], &vconn); - run(vconn_transact(vconn, b, &b), "talking to %s", argv[1]); - vconn_close(vconn); - - if (b->size < sizeof *reply) { - ovs_fatal(0, "short reply (%zu bytes)", b->size); - } - reply = b->data; - if (reply->header.type != OFPT_VENDOR - || reply->vendor != ntohl(NX_VENDOR_ID) - || reply->subtype != ntohl(NXT_STATUS_REPLY)) { - ofp_print(stderr, b->data, b->size, verbosity + 2); - ovs_fatal(0, "bad reply"); - } - - fwrite(reply + 1, b->size - sizeof *reply, 1, stdout); -} - -static void do_dump_desc(int argc OVS_UNUSED, char *argv[]) { dump_trivial_stats_transaction(argv[1], OFPST_DESC); @@ -1063,7 +1032,6 @@ do_ofp_print(int argc, char *argv[]) static const struct command all_commands[] = { { "show", 1, 1, do_show }, - { "status", 1, 2, do_status }, { "monitor", 1, 2, do_monitor }, { "snoop", 1, 1, do_snoop }, { "dump-desc", 1, 1, do_dump_desc }, |
