summaryrefslogtreecommitdiff
path: root/ovn
diff options
context:
space:
mode:
authorRussell Bryant <russell@ovn.org>2016-02-29 09:32:26 -0500
committerRussell Bryant <russell@ovn.org>2016-02-29 09:35:07 -0500
commite3d81adedd2cc596b931ae5ba8590ff8d0e82c5f (patch)
tree1648338d93b79d4dc3787ea30623c47d338167c2 /ovn
parent600766e877efa2713b9c87d127f7190d8ab48da9 (diff)
downloadopenvswitch-e3d81adedd2cc596b931ae5ba8590ff8d0e82c5f.tar.gz
ovn: Suppport ct_mark/ct_label in lflow matches.
Add support for matching on ct_mark and ct_label in OVN logical flows. Signed-off-by: Russell Bryant <russell@ovn.org> Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovn')
-rw-r--r--ovn/controller/lflow.c2
-rw-r--r--ovn/ovn-sb.xml1
2 files changed, 3 insertions, 0 deletions
diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c
index d53213c0e..33dca9b05 100644
--- a/ovn/controller/lflow.c
+++ b/ovn/controller/lflow.c
@@ -60,6 +60,8 @@ symtab_init(void)
#undef MFF_LOG_REG
/* Connection tracking state. */
+ expr_symtab_add_field(&symtab, "ct_mark", MFF_CT_MARK, NULL, false);
+ expr_symtab_add_field(&symtab, "ct_label", MFF_CT_LABEL, NULL, false);
expr_symtab_add_field(&symtab, "ct_state", MFF_CT_STATE, NULL, false);
char ct_state_str[16];
snprintf(ct_state_str, sizeof ct_state_str, "ct_state[%d]", CS_TRACKED_BIT);
diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml
index a49a63ea6..f9ec691d3 100644
--- a/ovn/ovn-sb.xml
+++ b/ovn/ovn-sb.xml
@@ -699,6 +699,7 @@
<li><code>icmp4.type</code> <code>icmp4.code</code></li>
<li><code>icmp6.type</code> <code>icmp6.code</code></li>
<li><code>nd.target</code> <code>nd.sll</code> <code>nd.tll</code></li>
+ <li><code>ct_mark</code> <code>ct_label</code></li>
<li>
<p>
<code>ct_state</code>, which has the following Boolean subfields: