[ovs-dev] [PATCH 2/6] OpenFlow: Update documentation to indicate support for virtual meters.

Justin Pettit jpettit at ovn.org
Fri Jun 29 19:13:50 UTC 2018


Support was added in commit 9e638f223feb ("ofproto: Support action
upcall meters").

Signed-off-by: Justin Pettit <jpettit at ovn.org>
---
 Documentation/topics/openflow.rst |  8 --------
 utilities/ovs-ofctl.8.in          | 15 +++++++++------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Documentation/topics/openflow.rst b/Documentation/topics/openflow.rst
index b00cbdefaaac..bb7559047742 100644
--- a/Documentation/topics/openflow.rst
+++ b/Documentation/topics/openflow.rst
@@ -104,14 +104,6 @@ specs carefully yet.)
 
   (optional for OF1.3+)
 
-* Per-flow meters.
-
-  OpenFlow protocol support is now implemented.  Support for the special
-  ``OFPM_SLOWPATH`` and ``OFPM_CONTROLLER`` meters is missing.  Support for
-  the software switch is under review.
-
-  (optional for OF1.3+)
-
 * Auxiliary connections.
 
   An implementation in generic code might be a week's worth of work.  The value
diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in
index c5735cafc23f..5a34383d01e2 100644
--- a/utilities/ovs-ofctl.8.in
+++ b/utilities/ovs-ofctl.8.in
@@ -2244,13 +2244,16 @@ multiple arguments.). Unless noted otherwise only the last instance
 of each field is honoured.
 .PP
 .IP \fBmeter=\fIid\fR
-The integer meter id of the meter.
+The identifier for the meter.  An integer is used to specify a
+user-defined meter.  In addition, the keywords "all", "controller", and
+"slowpath", are also supported as virtual meters.  The "controller" and
+"slowpath" virtual meters apply to packets sent to the controller and to
+the OVS userspace, respectively.
+.IP
 When this field is specified in \fBdel-meter\fR, \fBdump-meter\fR, or
-\fBmeter-stats\fR, the keyword "all" may be used to designate all meters.
-.
-This field is required, except for \fBmeter-stats\fR, which dumps all stats
-when this field is not specified.
-
+\fBmeter-stats\fR, the keyword "all" may be used to designate all
+meters.  This field is required, except for \fBmeter-stats\fR, which
+dumps all stats when this field is not specified.
 .IP \fBkbps\fR
 .IQ \fBpktps\fR
 The unit for the meter band rate parameters, either kilobits per second, or
-- 
2.17.1



More information about the dev mailing list