On Fri, Sep 13, 2013 at 03:03:33PM -0700, Jarno Rajahalme wrote: > Adds commands add-meter, mod-meter, del-meter, del-meters, dump-meter, > dump-meters, meter-stats, and meter-features. > > Syntax is as follows: > > add-meter <br> meter=<n> (kbps|pktps) [burst] [stats] bands= > type=(drop|dscp_remark) rate=<n> [burst_size=<n>] [prec_level=<n>] <more > bands> > > mod-meter <br> meter=<n> (kbps|pktps) [burst] [stats] bands= > type=(drop|dscp_remark) rate=<n> [burst_size=<n>] [prec_level=<n>] <more > bands> > > del-meter <br> meter=(<n>|all) > > del-meters <br> > > dump-meter <br> meter=(<n>|all) > > dump-meters <br> > > meter-stats <br> [meter=(<n>|all)] > > meter-features <br> > > Signed-off-by: Jarno Rajahalme <jrajaha...@nicira.com>
I think that the documentation here would more naturally follow just after the groups documentation, and a note that OF1.3 or later is required also seems warranted. I folded this in: diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index 2e8cf73..526e12c 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -190,7 +190,7 @@ statistics are printed for all queues on \fIport\fR; if only \fIport\fR is omitted, then statistics are printed for \fIqueue\fR on every port where it exists. . -.SS "OpenFlow 1.1+ Switch Management Commands" +.SS "OpenFlow 1.1+ Group Table Commands" . The following commands work only with switches that support OpenFlow 1.1 or later. Because support for OpenFlow 1.1 and later is still @@ -238,6 +238,42 @@ Send to controller. (This is how an OpenFlow 1.0 switch always handles packets that do not match any flow in the last table.) .RE . +.SS "OpenFlow 1.3+ Switch Meter Table Commands" +. +These commands manage the meter table in an OpenFlow switch. In each +case, \fImeter\fR specifies a meter entry in the format described in +\fBMeter Syntax\fR, below. +. +.PP +OpenFlow 1.3 introduced support for meters, so these commands only +work with switches that support OpenFlow 1.3 or later. The caveats +described for groups in the previous section also apply to meters. +. +.IP "\fBadd\-meter \fIswitch meter\fR" +Add a meter entry to \fIswitch\fR's tables. The \fImeter\fR syntax is +described in section \fBMeter Syntax\fR, below. +. +.IP "\fBmod\-meter \fIswitch meter\fR" +Modify an existing meter. +. +.IP "\fBdel\-meters \fIswitch\fR" +.IQ "\fBdel\-meter \fIswitch\fR [\fImeter\fR]" +Delete entries from \fIswitch\fR's meter table. \fImeter\fR can specify +a single meter with syntax \fBmeter=\fIid\fR, or all meters with syntax +\fBmeter=all\fR. +. +.IP "\fBdump\-meters \fIswitch\fR" +.IQ "\fBdump\-meter \fIswitch\fR [\fImeter\fR]" +Print meter configuration. \fImeter\fR can specify a single meter with +syntax \fBmeter=\fIid\fR, or all meters with syntax \fBmeter=all\fR. +. +.IP "\fBmeter\-stats \fIswitch\fR [\fImeter\fR]" +Print meter statistics. \fImeter\fR can specify a single meter with +syntax \fBmeter=\fIid\fR, or all meters with syntax \fBmeter=all\fR. +. +.IP "\fBmeter\-features \fIswitch\fR" +Print meter features. +. .SS "OpenFlow Switch Flow Table Commands" . These commands manage the flow table in an OpenFlow switch. In each @@ -330,37 +366,6 @@ Deletes entries from \fIswitch\fR's group table. With only a \fIswitch\fR argument, deletes all groups. Otherwise, deletes the group for each group entry. . -.SS "OpenFlow Switch Meter Table Commands" -. -These commands manage the meter table in an OpenFlow switch. In each -case, \fImeter\fR specifies a meter entry in the format described in -\fBMeter Syntax\fR, below. - -.IP "\fBadd\-meter \fIswitch meter\fR" -Add a meter entry to \fIswitch\fR's tables. The \fImeter\fR syntax is -described in section \fBMeter Syntax\fR, below. -. -.IP "\fBmod\-meter \fIswitch meter\fR" -Modify an existing meter. -. -.IP "\fBdel\-meters \fIswitch\fR" -.IQ "\fBdel\-meter \fIswitch\fR [\fImeter\fR]" -Delete entries from \fIswitch\fR's meter table. \fImeter\fR can specify -a single meter with syntax \fBmeter=\fIid\fR, or all meters with syntax -\fBmeter=all\fR. -. -.IP "\fBdump\-meters \fIswitch\fR" -.IQ "\fBdump\-meter \fIswitch\fR [\fImeter\fR]" -Print meter configuration. \fImeter\fR can specify a single meter with -syntax \fBmeter=\fIid\fR, or all meters with syntax \fBmeter=all\fR. -. -.IP "\fBmeter\-stats \fIswitch\fR [\fImeter\fR]" -Print meter statistics. \fImeter\fR can specify a single meter with -syntax \fBmeter=\fIid\fR, or all meters with syntax \fBmeter=all\fR. -. -.IP "\fBmeter\-features \fIswitch\fR" -Print meter features. -. .SS "OpenFlow Switch Monitoring Commands" . .IP "\fBsnoop \fIswitch\fR" _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
