[libvirt] [PATCH 2/2] docs: correct and update network vlan example
Somehow I put an example of a domain interface with a <vlan> element
into the network documentation.
This patch replaces that with an example of a network definition that
has a vlan element with trunk='yes', multiple tags, and even the new
nativeMode attribute. It also includes a <portgroup> that has a vlan
defined.
---
Pushed under trivial rule.
docs/formatnetwork.html.in | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index 641f15e..eb7c4c7 100644
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -434,27 +434,24 @@
<h5><a name="elementVlanTag">Setting VLAN tag (on supported
network types only)</a></h5>
<pre>
- ...
- <devices>
- <interface type='bridge'>
- <b><vlan trunk='yes'></b>
- <b><tag id='42'/></b>
- <b><tag id='47'/></b>
- <b></vlan></b>
- <source bridge='ovsbr0'/>
- <virtualport type='openvswitch'>
- <parameters
interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
- </virtualport>
- </interface>
- <interface type='bridge'>
- <b><vlan trunk='yes'></b>
- <b><tag id='42'/></b>
- <b><tag id='123'
nativeMode='untagged'/></b>
- <b></vlan></b>
- ...
- </interface>
- <devices>
- ...</pre>
+<network>
+ <name>ovs-net</name>
+ <forward mode='bridge'/>
+ <bridge name='ovsbr0'/>
+ <virtualport type='openvswitch'>
+ <parameters
interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
+ </virtualport>
+ <b><vlan trunk='yes'></b>
+ <b><tag id='42'
nativeMode='untagged'/></b>
+ <b><tag id='47'/></b>
+ <b></vlan></b>
+ <portgroup name='dontpanic'>
+ <b><vlan></b>
+ <b><tag id='42'/></b>
+ <b></vlan></b>
+ </portgroup>
+</network>
+</pre>
<p>
If (and only if) the network type supports vlan tagging
--
1.7.11.7