diff options
| author | Gabe Beged-Dov <gabe@begeddov.com> | 2016-09-29 15:40:02 -0700 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2016-09-30 14:43:14 -0400 |
| commit | 4a478134f114cf47aeeeaed1617163965ba30892 (patch) | |
| tree | 5996721880e1e3da6c29dcc99728398980625d00 | |
| parent | b614c894ee55b07009f3e5b10ddec7556773fcc4 (diff) | |
| download | openvswitch-4a478134f114cf47aeeeaed1617163965ba30892.tar.gz | |
ovn: update docs for l2gateway port vlan tag
update description of l2gateway logical switch ports to include optional
vlan tag. Also restore comment in ovn/controller/physical.c from original commit
by Russell Bryant (184bc3c ovn: Add software l2 gateway) on 7/1/2016.
Signed-off-by: Gabe Beged-Dov <gabe@begeddov.com>
Co-authored-by: Russell Bryant <russell@ovn.org>
Signed-off-by: Russell Bryant <russell@ovn.org>
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ovn/controller/physical.c | 4 | ||||
| -rw-r--r-- | ovn/ovn-nb.xml | 7 |
3 files changed, 7 insertions, 5 deletions
@@ -89,6 +89,7 @@ Flavio Fernandes flavio@flaviof.com Flavio Leitner fbl@redhat.com Francesco Fusco ffusco@redhat.com FUJITA Tomonori fujita.tomonori@lab.ntt.co.jp +Gabe Beged-Dov gabe@begeddov.com Gaetano Catalli gaetano.catalli@gmail.com Gal Sagie gal.sagie@gmail.com Geoffrey Wossum gwossum@acm.org diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index df6990a55..1a9153179 100644 --- a/ovn/controller/physical.c +++ b/ovn/controller/physical.c @@ -202,8 +202,8 @@ consider_port_binding(enum mf_field_id mff_ovn_geneve, * For a container nested inside a VM and accessible via a VLAN, * 'tag' is the VLAN ID; otherwise 'tag' is 0. * - * For a localnet patch port, if a VLAN ID was configured, 'tag' - * is set to that VLAN ID; otherwise 'tag' is 0. + * For a localnet or l2gateway patch port, if a VLAN ID was + * configured, 'tag' is set to that VLAN ID; otherwise 'tag' is 0. * * - If the port is on a remote chassis, the OpenFlow port for a * tunnel to the VIF's remote chassis. 'tun' identifies that diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml index c45a444a7..cd7943cdc 100644 --- a/ovn/ovn-nb.xml +++ b/ovn/ovn-nb.xml @@ -343,10 +343,11 @@ </p> <p> - When <ref column="type"/> is set to <code>localnet</code>, this can + When <ref column="type"/> is set to <code>localnet</code> or + <code>l2gateway</code>, this can be set to indicate that the port represents a connection to a - specific VLAN on a locally accessible network. The VLAN ID is used to - match incoming traffic and is also added to outgoing traffic. + specific VLAN on a locally accessible network. The VLAN ID is used + to match incoming traffic and is also added to outgoing traffic. </p> </column> |