[virt-tools-list] [virt-manager PATCH] tests: fix test cases failed by 'vmport'

[Chen Hanxiao]

Signed-off-by: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
---
 tests/cli-test-xml/compare/virt-convert-ovf-compare.xml                | 1 +
 tests/cli-test-xml/compare/virt-convert-vmx-compare.xml                | 1 +
 tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml             | 1 +
 tests/cli-test-xml/compare/virt-install-kvm-centos7.xml                | 2 ++
 tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml                | 2 ++
 tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml                  | 2 ++
 tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml                  | 2 ++
 tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml           | 3 +++
 tests/cli-test-xml/compare/virt-install-location-iso.xml               | 2 ++
 tests/cli-test-xml/compare/virt-install-many-devices.xml               | 1 +
 tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml      | 1 +
 tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml          | 1 +
 tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml         | 1 +
 tests/cli-test-xml/compare/virt-install-q35-defaults.xml               | 2 ++
 tests/cli-test-xml/compare/virt-install-qemu-plain.xml                 | 1 +
 tests/cli-test-xml/compare/virt-install-singleton-config-1.xml         | 1 +
 tests/cli-test-xml/compare/virt-install-win7-uefi.xml                  | 3 +++
 tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt  | 1 +
 tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt          | 1 +
 .../virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2 | 1 +
 tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt          | 1 +
 tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt   | 1 +
 tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt          | 1 +
 tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw | 1 +
 tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt        | 1 +
 25 files changed, 35 insertions(+)

diff --git a/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml b/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
index bcdf991..0d8556d 100644
--- a/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
+++ b/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
index 8ada025..d5a0714 100644
--- a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
+++ b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
@@ -12,6 +12,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
index 15ba910..735181c 100644
--- a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
+++ b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
@@ -12,6 +12,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml b/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
index 5189aec..92105c1 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
@@ -85,6 +86,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml b/tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml
index fad4a38..d70b4fa 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml
@@ -14,6 +14,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="host-model"/>
   <clock offset="utc">
@@ -73,6 +74,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="host-model"/>
   <clock offset="utc">
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml b/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
index 5189aec..92105c1 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
@@ -85,6 +86,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml b/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
index 5189aec..92105c1 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
@@ -85,6 +86,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml b/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
index 7e53e71..0a0ef95 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
     <hyperv>
       <relaxed state="on"/>
       <vapic state="on"/>
@@ -83,6 +84,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
     <hyperv>
       <relaxed state="on"/>
       <vapic state="on"/>
@@ -153,6 +155,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
     <hyperv>
       <relaxed state="on"/>
       <vapic state="on"/>
diff --git a/tests/cli-test-xml/compare/virt-install-location-iso.xml b/tests/cli-test-xml/compare/virt-install-location-iso.xml
index 2d82cc0..ec40d9c 100644
--- a/tests/cli-test-xml/compare/virt-install-location-iso.xml
+++ b/tests/cli-test-xml/compare/virt-install-location-iso.xml
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
@@ -77,6 +78,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/cli-test-xml/compare/virt-install-many-devices.xml b/tests/cli-test-xml/compare/virt-install-many-devices.xml
index f49962c..7c8b39a 100644
--- a/tests/cli-test-xml/compare/virt-install-many-devices.xml
+++ b/tests/cli-test-xml/compare/virt-install-many-devices.xml
@@ -11,6 +11,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu>
     <topology sockets="4" cores="1" threads="1"/>
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
index df864f1..6c7e573 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
@@ -12,6 +12,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
index df864f1..6c7e573 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
@@ -12,6 +12,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
index aff7ebd..0a27562 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
@@ -11,6 +11,7 @@
   <features>
     <acpi/>
     <apic/>
+    <vmport state="off"/>
   </features>
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml b/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
index fa3f699..0f28abf 100644
--- a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
+++ b/tests/cli-test-xml/compare/virt-install-q35-defaults.xml
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
@@ -86,6 +87,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
index c37015d..5f82d26 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
+++ b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
@@ -12,6 +12,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Penryn</model>
diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
index 115a044..8f98aa3 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
+++ b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
@@ -19,6 +19,7 @@
   <features>
     <acpi/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="host-model"/>
   <clock offset="localtime">
diff --git a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml b/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
index 53430a1..19bab1a 100644
--- a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
+++ b/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
@@ -15,6 +15,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
@@ -90,6 +91,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
@@ -165,6 +167,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
index 5411831..4bdcac3 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
@@ -12,6 +12,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
index 8cbcf41..a6d8651 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2 b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
index b3ce92d..9dbcb05 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
index 1afa525..d2570bc 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
index cf5f868..85712dd 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
@@ -12,6 +12,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
index 9915c24..57282f0 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
@@ -12,6 +12,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
index c63422e..7d9b13c 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
@@ -12,6 +12,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
index 148b002..23d6c4c 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
@@ -13,6 +13,7 @@
     <acpi/>
     <apic/>
     <pae/>
+    <vmport state="off"/>
   </features>
   <cpu mode="custom" match="exact">
     <model>Opteron_G4</model>
-- 
2.1.0