On Mar 14, 2011, at 11:25 AM, Ben Pfaff wrote:
> Could you get rid of the spurious </dl><dl> in the middle though? I
> see that we have weirdness like this all over in vswitch.xml but I
> don't know why.
Oh, yes. Sort of defeats the purpose of having a definition list, doesn't it?
I also corrected the description of the IDLE state to match that in the manager
status patch.
---cut here---
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 497da5d..6216843 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1897,15 +1897,11 @@
<dl>
<dt><code>other</code></dt>
<dd>Allows the controller access to all OpenFlow features.</dd>
- </dl>
- <dl>
<dt><code>master</code></dt>
<dd>Equivalent to <code>other</code>, except that there may be at
most one master controller at a time. When a controller configures
itself as <code>master</code>, any existing master is demoted to
the <code>slave</code>role.</dd>
- </dl>
- <dl>
<dt><code>slave</code></dt>
<dd>Allows the controller read-only access to OpenFlow features.
Attempts to modify the flow table will be rejected with an
@@ -1922,25 +1918,19 @@
<dd>A human-readable description of the last error on the connection
to the controller; i.e. <code>strerror(errno)</code>. This key
will exist only if an error has occurred.</dd>
- </dl>
- <dl>
<dt><code>state</code></dt>
<dd>The state of the connection to the controller. Possible values
are: <code>VOID</code> (connection is disabled),
<code>BACKOFF</code> (attempting to reconnect at an increasing
period), <code>CONNECTING</code> (attempting to connect),
<code>ACTIVE</code> (connected, remote host responsive), and
- <code>IDLE</code> (remote host unresponsive, disconnecting). These
+ <code>IDLE</code> (remote host idle, sending keep-alive). These
values may change in the future. They are provided only for human
consumption.</dd>
- </dl>
- <dl>
<dt><code>sec_since_connect</code></dt>
<dd>The amount of time since this controller last successfully
connected to the switch (in seconds). Value is empty if controller
has never successfully connected.</dd>
- </dl>
- <dl>
<dt><code>sec_since_disconnect</code></dt>
<dd>The amount of time since this controller last disconnected from
the switch (in seconds). Value is empty if controller has never
---cut here---
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
