networkxml2xmltest: Update couple of test cases

Soon, individual test cases of networkxml2xmltest will be subject
to networkValidate() call. This means, that input XMLs must be
valid (or marked as expected fail). Anyway, there are couple of
offenders:

1) 8021Qbh-net.xml setting vlan for <forward mode='private'/> is
   unsupported,
2) hostdev.xml networkValidate() will check if hostdevs specified
   for <forward mode='hostdev'/> are VFs. Use PCI addresses from
   virpcimock.
3) openvswitch-net.xml for <forward mode='bridge'/> only
   openvswitch type of virtualports is allowed.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/networkxml2xmlin/8021Qbh-net.xml b/tests/networkxml2xmlin/8021Qbh-net.xml
index 3aaab61db69e2da7c6615110b528abb6f16c1bb5..2d779dcac0af7259d0ec5d6d021d1b0a3f715fc9 100644 (file)
--- a/tests/networkxml2xmlin/8021Qbh-net.xml
+++ b/tests/networkxml2xmlin/8021Qbh-net.xml
@@ -8,9 +8,6 @@
     <interface dev="eth4"/>
     <interface dev="eth5"/>
   </forward>
-  <vlan>
-    <tag id='549'/>
-  </vlan>
   <virtualport type="802.1Qbh">
     <parameters profileid="spongebob24"/>
   </virtualport>

diff --git a/tests/networkxml2xmlin/hostdev.xml b/tests/networkxml2xmlin/hostdev.xml
index 03f141106f9bb799220a437c63bb8dca59345280..94974804a7ca8412bfa7fd5e507eb3aa27789733 100644 (file)
--- a/tests/networkxml2xmlin/hostdev.xml
+++ b/tests/networkxml2xmlin/hostdev.xml
@@ -2,9 +2,7 @@
   <name>hostdev</name>
   <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
   <forward mode='hostdev' managed='yes'>
-    <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x1'/>
-    <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x2'/>
-    <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x3'/>
-    <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x4'/>
+    <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
+    <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x2'/>
   </forward>
 </network>

diff --git a/tests/networkxml2xmlin/openvswitch-net.xml b/tests/networkxml2xmlin/openvswitch-net.xml
index 2f6084d690408b84784837e555f0e9a327846b80..30c1e2af10a7955ec5c3f4ad21f85c08a730ca5c 100644 (file)
--- a/tests/networkxml2xmlin/openvswitch-net.xml
+++ b/tests/networkxml2xmlin/openvswitch-net.xml
@@ -7,7 +7,7 @@
     <vlan trunk='yes'>
       <tag id='666'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='bob-profile'/>
     </virtualport>
   </portgroup>
@@ -17,7 +17,7 @@
       <tag id='888'/>
       <tag id='999'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='alice-profile'/>
     </virtualport>
   </portgroup>
@@ -26,7 +26,7 @@
       <tag id='123' nativeMode='tagged'/>
       <tag id='444'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='native-profile'/>
     </virtualport>
   </portgroup>

diff --git a/tests/networkxml2xmlout/8021Qbh-net.xml b/tests/networkxml2xmlout/8021Qbh-net.xml
index 281466a9f7df9bf6407682f3e3ee3dfa598cf3d3..d4d5b4b44312f6e138d5aba498d7359dc86d4b45 100644 (file)
--- a/tests/networkxml2xmlout/8021Qbh-net.xml
+++ b/tests/networkxml2xmlout/8021Qbh-net.xml
@@ -8,9 +8,6 @@
     <interface dev='eth4'/>
     <interface dev='eth5'/>
   </forward>
-  <vlan>
-    <tag id='549'/>
-  </vlan>
   <virtualport type='802.1Qbh'>
     <parameters profileid='spongebob24'/>
   </virtualport>

diff --git a/tests/networkxml2xmlout/hostdev.xml b/tests/networkxml2xmlout/hostdev.xml
index 03f141106f9bb799220a437c63bb8dca59345280..94974804a7ca8412bfa7fd5e507eb3aa27789733 100644 (file)
--- a/tests/networkxml2xmlout/hostdev.xml
+++ b/tests/networkxml2xmlout/hostdev.xml
@@ -2,9 +2,7 @@
   <name>hostdev</name>
   <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
   <forward mode='hostdev' managed='yes'>
-    <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x1'/>
-    <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x2'/>
-    <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x3'/>
-    <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x4'/>
+    <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
+    <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x2'/>
   </forward>
 </network>

diff --git a/tests/networkxml2xmlout/openvswitch-net.xml b/tests/networkxml2xmlout/openvswitch-net.xml
index 2f6084d690408b84784837e555f0e9a327846b80..30c1e2af10a7955ec5c3f4ad21f85c08a730ca5c 100644 (file)
--- a/tests/networkxml2xmlout/openvswitch-net.xml
+++ b/tests/networkxml2xmlout/openvswitch-net.xml
@@ -7,7 +7,7 @@
     <vlan trunk='yes'>
       <tag id='666'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='bob-profile'/>
     </virtualport>
   </portgroup>
@@ -17,7 +17,7 @@
       <tag id='888'/>
       <tag id='999'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='alice-profile'/>
     </virtualport>
   </portgroup>
@@ -26,7 +26,7 @@
       <tag id='123' nativeMode='tagged'/>
       <tag id='444'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='native-profile'/>
     </virtualport>
   </portgroup>

diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml
index cc0c344c1b3f33adf9baffb8cbc27b50ef457ad3..d52e91e564563d1914f015265b1f1ec6226b69f7 100644 (file)
--- a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml
+++ b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml
@@ -7,7 +7,7 @@
     <vlan trunk='yes'>
       <tag id='666'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='bob-profile'/>
     </virtualport>
   </portgroup>
@@ -26,7 +26,7 @@
       <tag id='123' nativeMode='tagged'/>
       <tag id='444'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='native-profile'/>
     </virtualport>
   </portgroup>

diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml
index 7c19ad9f484cc5a299875d534a829ae0c7f043cd..069b2a01d86509f6274cb01fd28a9d0fa979167f 100644 (file)
--- a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml
+++ b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml
@@ -18,7 +18,7 @@
     <vlan trunk='yes'>
       <tag id='666'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='bob-profile'/>
     </virtualport>
   </portgroup>
@@ -28,7 +28,7 @@
       <tag id='888'/>
       <tag id='999'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='alice-profile'/>
     </virtualport>
   </portgroup>
@@ -37,7 +37,7 @@
       <tag id='123' nativeMode='tagged'/>
       <tag id='444'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='native-profile'/>
     </virtualport>
   </portgroup>

diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml
index 41044240dff4f7e351f863c1b79359bb036c3e76..2fb0cf9f6d63d5e6fa936c5eadfb28cba1ccc4c4 100644 (file)
--- a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml
+++ b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml
@@ -7,7 +7,7 @@
     <vlan trunk='yes'>
       <tag id='666'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='bob-profile'/>
     </virtualport>
   </portgroup>
@@ -16,7 +16,7 @@
       <tag id='123' nativeMode='tagged'/>
       <tag id='444'/>
     </vlan>
-    <virtualport>
+    <virtualport type='openvswitch'>
       <parameters profileid='native-profile'/>
     </virtualport>
   </portgroup>