diff mbox

[ovs-dev,1/5] ovn-sb.xml: Document ct.trk and improve wording for other ct flags.

Message ID 20170418194743.27431-2-blp@ovn.org
State Accepted
Headers show

Commit Message

Ben Pfaff April 18, 2017, 7:47 p.m. UTC
Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 ovn/ovn-sb.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Comments

Miguel Angel Ajo April 19, 2017, 2:23 p.m. UTC | #1
Makes sense, looking at the other patches of the series now.

Acked-By: Miguel Angel Ajo <majopela@redhat.com>

On Tue, Apr 18, 2017 at 9:47 PM, Ben Pfaff <blp@ovn.org> wrote:

> Signed-off-by: Ben Pfaff <blp@ovn.org>
> ---
>  ovn/ovn-sb.xml | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml
> index 8605c98895f0..72bf27913717 100644
> --- a/ovn/ovn-sb.xml
> +++ b/ovn/ovn-sb.xml
> @@ -852,9 +852,16 @@
>          <li><code>ct_mark</code> <code>ct_label</code></li>
>          <li>
>            <p>
> -            <code>ct_state</code>, which has the following Boolean
> subfields:
> +            <code>ct_state</code>, which has several Boolean subfields.
> The
> +            <code>ct_next</code> action initializes the following
> subfields:
>            </p>
>            <ul>
> +            <li>
> +              <code>ct.trk</code>: Always set to true by
> <code>ct_next</code>
> +              to indicate that connection tracking has taken place.  All
> other
> +              <code>ct</code> subfields have <code>ct.trk</code> as a
> +              prerequisite.
> +            </li>
>              <li><code>ct.new</code>: True for a new flow</li>
>              <li><code>ct.est</code>: True for an established flow</li>
>              <li><code>ct.rel</code>: True for a related flow</li>
> @@ -862,8 +869,8 @@
>              <li><code>ct.inv</code>: True for a connection entry in a bad
> state</li>
>            </ul>
>            <p>
> -            The above subfields of <code>ct_state</code> are initialized
> by
> -            the <code>ct_next</code> action, described later.
> +            The <code>ct_dnat</code>, <code>ct_snat</code>, and
> +            <code>ct_lb</code> actions initialize the following subfields:
>            </p>
>            <ul>
>              <li>
> @@ -875,11 +882,6 @@
>                address has been changed.
>              </li>
>            </ul>
> -          <p>
> -            The above subfields of <code>ct_state</code> are initialized
> by
> -            the actions like <code>ct_dnat</code>, <code>ct_snat</code>
> and
> -            <code>ct_lb</code> described later.
> -          </p>
>          </li>
>        </ul>
>
> --
> 2.10.2
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
diff mbox

Patch

diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml
index 8605c98895f0..72bf27913717 100644
--- a/ovn/ovn-sb.xml
+++ b/ovn/ovn-sb.xml
@@ -852,9 +852,16 @@ 
         <li><code>ct_mark</code> <code>ct_label</code></li>
         <li>
           <p>
-            <code>ct_state</code>, which has the following Boolean subfields:
+            <code>ct_state</code>, which has several Boolean subfields.  The
+            <code>ct_next</code> action initializes the following subfields:
           </p>
           <ul>
+            <li>
+              <code>ct.trk</code>: Always set to true by <code>ct_next</code>
+              to indicate that connection tracking has taken place.  All other
+              <code>ct</code> subfields have <code>ct.trk</code> as a
+              prerequisite.
+            </li>
             <li><code>ct.new</code>: True for a new flow</li>
             <li><code>ct.est</code>: True for an established flow</li>
             <li><code>ct.rel</code>: True for a related flow</li>
@@ -862,8 +869,8 @@ 
             <li><code>ct.inv</code>: True for a connection entry in a bad state</li>
           </ul>
           <p>
-            The above subfields of <code>ct_state</code> are initialized by
-            the <code>ct_next</code> action, described later.
+            The <code>ct_dnat</code>, <code>ct_snat</code>, and
+            <code>ct_lb</code> actions initialize the following subfields:
           </p>
           <ul>
             <li>
@@ -875,11 +882,6 @@ 
               address has been changed.
             </li>
           </ul>
-          <p>
-            The above subfields of <code>ct_state</code> are initialized by
-            the actions like <code>ct_dnat</code>, <code>ct_snat</code> and
-            <code>ct_lb</code> described later.
-          </p>
         </li>
       </ul>