[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[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>
-  ...
-  &lt;devices&gt;
-    &lt;interface type='bridge'&gt;
-      <b>&lt;vlan trunk='yes'&gt;</b>
-        <b>&lt;tag id='42'/&gt;</b>
-        <b>&lt;tag id='47'/&gt;</b>
-      <b>&lt;/vlan&gt;</b>
-      &lt;source bridge='ovsbr0'/&gt;
-      &lt;virtualport type='openvswitch'&gt;
-        &lt;parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/&gt;
-      &lt;/virtualport&gt;
-    &lt;/interface&gt;
-    &lt;interface type='bridge'&gt;
-      <b>&lt;vlan trunk='yes'&gt;</b>
-        <b>&lt;tag id='42'/&gt;</b>
-        <b>&lt;tag id='123' nativeMode='untagged'/&gt;</b>
-      <b>&lt;/vlan&gt;</b>
-      ...
-    &lt;/interface&gt;
-  &lt;devices&gt;
-  ...</pre>
+&lt;network&gt;
+  &lt;name&gt;ovs-net&lt;/name&gt;
+  &lt;forward mode='bridge'/&gt;
+  &lt;bridge name='ovsbr0'/&gt;
+  &lt;virtualport type='openvswitch'&gt;
+    &lt;parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/&gt;
+  &lt;/virtualport&gt;
+  <b>&lt;vlan trunk='yes'&gt;</b>
+    <b>&lt;tag id='42' nativeMode='untagged'/&gt;</b>
+    <b>&lt;tag id='47'/&gt;</b>
+  <b>&lt;/vlan&gt;</b>
+  &lt;portgroup name='dontpanic'&gt;
+    <b>&lt;vlan&gt;</b>
+      <b>&lt;tag id='42'/&gt;</b>
+    <b>&lt;/vlan&gt;</b>
+  &lt;/portgroup&gt;
+&lt;/network&gt;
+</pre>
 
     <p>
       If (and only if) the network type supports vlan tagging
-- 
1.7.11.7


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]