tests: fix test cases failed by 'vmport'

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2024-10-27 18:55:29 +03:00 · 2015-05-11 04:55:14 -04:00 · 2015-05-11 04:55:14 -04:00 · 24302dfdfd
commit 24302dfdfd
parent fbdf574c53
25 changed files with 35 additions and 0 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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">
--- 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>
--- 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>
--- 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"/>
--- 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>
--- 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"/>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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">
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>