ofp-util: Allow encoding of Open Flow 1.2 Flow Statistics Response Messages

[openvswitch] / vswitchd / vswitch.xml

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 32d4c595b20c1a412358df72685005d5392aea8d..13d24b69f47442f50e08640ffbc9435003fa47d9 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -569,21 +569,13 @@
           <dt><code>01:80:c2:00:00:0<var>x</var></code></dt>
           <dd>Other reserved protocols.</dd>
 
           <dt><code>01:80:c2:00:00:0<var>x</var></code></dt>
           <dd>Other reserved protocols.</dd>
 

-          <dt><code>00:00:5e:00:01:<var>x</var><var>x</var></code></dt>
-          <dd> VRRP IPv4 virtual router MAC address. </dd>
+          <dt><code>00:e0:2b:00:00:00</code></dt>
+          <dd>Extreme Discovery Protocol (EDP).</dd>

 
 

-          <dt><code>00:00:5e:00:02:<var>x</var><var>x</var></code></dt>
-          <dd> VRRP IPv6 virtual router MAC address. </dd>
-
-          <dt><code>00:00:0c:07:ac:<var>x</var><var>x</var></code></dt>
-          <dd> HSRP Version 1. </dd>
-
-          <dt><code>00:00:0c:9f:f<var>x</var>:<var>x</var><var>x</var></code>
-          </dt>
-          <dd> HSRP Version 2. </dd>
-
-          <dt><code>00:07:b4:<var>x</var><var>x</var>:<var>x</var><var>x</var>:<var>x</var><var>x</var></code></dt>
-          <dd> GLBP. </dd>
+          <dt>
+           <code>00:e0:2b:00:00:04</code> and <code>00:e0:2b:00:00:06</code>
+         </dt>
+          <dd>Ethernet Automatic Protection Switching (EAPS).</dd>

 
           <dt><code>01:00:0c:cc:cc:cc</code></dt>
           <dd>
 
           <dt><code>01:00:0c:cc:cc:cc</code></dt>
           <dd>


@@ -600,6 +592,9 @@
 
           <dt><code>01:00:0c:00:00:00</code></dt>
           <dd>Cisco Inter Switch Link.</dd>
 
           <dt><code>01:00:0c:00:00:00</code></dt>
           <dd>Cisco Inter Switch Link.</dd>

+
+          <dt><code>01:00:0c:cc:cc:c<var>x</var></code></dt>
+          <dd>Cisco CFM.</dd>

         </dl>
       </column>
 
         </dl>
       </column>
 


@@ -1769,11 +1764,6 @@
         frame having an invalid interval.
       </column>
 
         frame having an invalid interval.
       </column>
 

-      <column name="cfm_fault_status" key="sequence">
-        Indicates a CFM fault was triggered because the CFM module received
-        a CCM frame with a sequence number that it was not expecting.
-      </column>
-

       <column name="cfm_health">
         <p>
           Indicates the health of the interface as a percentage of CCM frames
       <column name="cfm_health">
         <p>
           Indicates the health of the interface as a percentage of CCM frames


@@ -2129,7 +2119,7 @@
       <p>
         The eviction process only considers flows that have an idle timeout or
         a hard timeout.  That is, eviction never deletes permanent flows.
       <p>
         The eviction process only considers flows that have an idle timeout or
         a hard timeout.  That is, eviction never deletes permanent flows.

-        (Permanent flows do count against <ref column="flow_limit"/>.
+        (Permanent flows do count against <ref column="flow_limit"/>.)

       </p>
 
       <p>
       </p>
 
       <p>


@@ -2756,10 +2746,9 @@
         Service (QoS) on IP networks.
 
         The DSCP value specified here is used when establishing the connection
         Service (QoS) on IP networks.
 
         The DSCP value specified here is used when establishing the connection

-        between the controller and the Open vSwitch.  The connection must be
-        reset for the new DSCP values to take effect.  If no value is
-        specified, a default value of 48 is chosen.  Valid DSCP values must be
-        in the range 0 to 63.
+        between the controller and the Open vSwitch.  If no value is specified,
+        a default value of 48 is chosen.  Valid DSCP values must be in the
+        range 0 to 63.

       </column>
     </group>
 
       </column>
     </group>
 


@@ -3003,10 +2992,9 @@
         Service (QoS) on IP networks.
 
         The DSCP value specified here is used when establishing the connection
         Service (QoS) on IP networks.
 
         The DSCP value specified here is used when establishing the connection

-        between the manager and the Open vSwitch.  The connection must be
-        reset for the new DSCP values to take effect.  If no value is
-        specified, a default value of 48 is chosen.  Valid DSCP values must be
-        in the range 0 to 63.
+        between the manager and the Open vSwitch.  If no value is specified, a
+        default value of 48 is chosen.  Valid DSCP values must be in the range
+        0 to 63.

       </column>
     </group>
 
       </column>
     </group>