From 614cee5270daf3194eff9f254df2298aac030d14 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Tue, 25 May 2021 09:07:35 +0200
Subject: [qemu] Add test dependency to reuse test resources from
master-sync-shared
---
core/modules/qemu/runvirt-plugin-qemu/pom.xml | 8 +
.../plugin/qemu/configuration/FilterTestUtils.java | 4 +-
.../libvirt/xml/qemu-kvm_capabilities_default.xml | 986 ---------------------
.../qemu-kvm_default-ubuntu-20-04-vm_filtered.xml | 162 ----
4 files changed, 11 insertions(+), 1149 deletions(-)
delete mode 100644 core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_capabilities_default.xml
delete mode 100644 core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_filtered.xml
diff --git a/core/modules/qemu/runvirt-plugin-qemu/pom.xml b/core/modules/qemu/runvirt-plugin-qemu/pom.xml
index f02be96d..d8bb9743 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/pom.xml
+++ b/core/modules/qemu/runvirt-plugin-qemu/pom.xml
@@ -102,6 +102,14 @@
1.1-SNAPSHOT
compile
+
+ org.openslx.bwlp
+ master-sync-shared
+ 1.1-SNAPSHOT
+ tests
+ test-jar
+ test
+
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/FilterTestUtils.java b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/FilterTestUtils.java
index 45aa1109..a308693f 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/FilterTestUtils.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/test/java/org/openslx/runvirt/plugin/qemu/configuration/FilterTestUtils.java
@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.openslx.libvirt.domain.Domain;
import org.openslx.libvirt.xml.LibvirtXmlDocumentException;
import org.openslx.libvirt.xml.LibvirtXmlSerializationException;
+import org.openslx.libvirt.xml.LibvirtXmlTestResources;
import org.openslx.libvirt.xml.LibvirtXmlValidationException;
import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs;
import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs.CmdLnOption;
@@ -101,7 +102,8 @@ public class FilterTestUtils
Domain domain = null;
try {
- domain = new Domain( FilterTestResources.getLibvirtXmlFile( "qemu-kvm_default-ubuntu-20-04-vm_filtered.xml" ) );
+ domain = new Domain( LibvirtXmlTestResources
+ .getLibvirtXmlStream( "qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent.xml" ) );
} catch ( LibvirtXmlDocumentException | LibvirtXmlSerializationException | LibvirtXmlValidationException e ) {
fail( "Cannot prepare requested Libvirt domain XML file from the resources folder: "
+ e.getLocalizedMessage() );
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_capabilities_default.xml b/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_capabilities_default.xml
deleted file mode 100644
index 4f2a94f2..00000000
--- a/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_capabilities_default.xml
+++ /dev/null
@@ -1,986 +0,0 @@
-
-
-
- 9b2f12af-1fba-444c-b72b-9cbc43fb3ca5
-
- x86_64
- Skylake-Client-IBRS
- Intel
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- tcp
- rdma
-
-
-
-
-
- 16161320
- 4040330
- 0
- 0
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
- none
- 0
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-alpha
- clipper
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-arm
- integratorcp
- ast2600-evb
- borzoi
- spitz
- virt-2.7
- nuri
- mcimx7d-sabre
- romulus-bmc
- virt-3.0
- virt-5.0
- npcm750-evb
- virt-2.10
- musca-b1
- virt-2.8
- realview-pbx-a9
- versatileab
- kzm
- musca-a
- virt-3.1
- mcimx6ul-evk
- virt-5.1
- smdkc210
- sx1
- virt-2.11
- imx25-pdk
- virt-2.9
- orangepi-pc
- z2
- virt-5.2
- virt
- xilinx-zynq-a9
- tosa
- mps2-an500
- virt-2.12
- mps2-an521
- sabrelite
- mps2-an511
- canon-a1100
- realview-eb
- emcraft-sf2
- realview-pb-a8
- virt-4.0
- raspi1ap
- palmetto-bmc
- sx1-v1
- n810
- tacoma-bmc
- n800
- virt-4.1
- quanta-gsj
- versatilepb
- terrier
- mainstone
- realview-eb-mpcore
- supermicrox11-bmc
- virt-4.2
- witherspoon-bmc
- swift-bmc
- vexpress-a9
- midway
- musicpal
- lm3s811evb
- lm3s6965evb
- microbit
- mps2-an505
- mps2-an385
- cubieboard
- verdex
- netduino2
- mps2-an386
- raspi2b
- raspi2
- vexpress-a15
- sonorapass-bmc
- cheetah
- virt-2.6
- ast2500-evb
- highbank
- akita
- connex
- netduinoplus2
- collie
- raspi0
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-arm
- integratorcp
- ast2600-evb
- borzoi
- spitz
- virt-2.7
- nuri
- mcimx7d-sabre
- romulus-bmc
- virt-3.0
- virt-5.0
- npcm750-evb
- virt-2.10
- musca-b1
- virt-2.8
- realview-pbx-a9
- versatileab
- kzm
- musca-a
- virt-3.1
- mcimx6ul-evk
- virt-5.1
- smdkc210
- sx1
- virt-2.11
- imx25-pdk
- virt-2.9
- orangepi-pc
- z2
- virt-5.2
- virt
- xilinx-zynq-a9
- tosa
- mps2-an500
- virt-2.12
- mps2-an521
- sabrelite
- mps2-an511
- canon-a1100
- realview-eb
- emcraft-sf2
- realview-pb-a8
- virt-4.0
- raspi1ap
- palmetto-bmc
- sx1-v1
- n810
- tacoma-bmc
- n800
- virt-4.1
- quanta-gsj
- versatilepb
- terrier
- mainstone
- realview-eb-mpcore
- supermicrox11-bmc
- virt-4.2
- witherspoon-bmc
- swift-bmc
- vexpress-a9
- midway
- musicpal
- lm3s811evb
- lm3s6965evb
- microbit
- mps2-an505
- mps2-an385
- cubieboard
- verdex
- netduino2
- mps2-an386
- raspi2b
- raspi2
- vexpress-a15
- sonorapass-bmc
- cheetah
- virt-2.6
- ast2500-evb
- highbank
- akita
- connex
- netduinoplus2
- collie
- raspi0
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-aarch64
- integratorcp
- ast2600-evb
- borzoi
- spitz
- virt-2.7
- nuri
- mcimx7d-sabre
- romulus-bmc
- virt-3.0
- virt-5.0
- npcm750-evb
- virt-2.10
- musca-b1
- virt-2.8
- realview-pbx-a9
- versatileab
- kzm
- musca-a
- virt-3.1
- mcimx6ul-evk
- virt-5.1
- smdkc210
- sx1
- virt-2.11
- imx25-pdk
- virt-2.9
- orangepi-pc
- z2
- virt-5.2
- virt
- xilinx-zynq-a9
- xlnx-zcu102
- tosa
- mps2-an500
- virt-2.12
- mps2-an521
- sabrelite
- mps2-an511
- canon-a1100
- realview-eb
- emcraft-sf2
- realview-pb-a8
- sbsa-ref
- virt-4.0
- raspi1ap
- palmetto-bmc
- sx1-v1
- n810
- tacoma-bmc
- n800
- virt-4.1
- quanta-gsj
- versatilepb
- terrier
- mainstone
- realview-eb-mpcore
- supermicrox11-bmc
- virt-4.2
- witherspoon-bmc
- swift-bmc
- vexpress-a9
- midway
- musicpal
- lm3s811evb
- lm3s6965evb
- microbit
- mps2-an505
- mps2-an385
- raspi3ap
- cubieboard
- verdex
- netduino2
- xlnx-versal-virt
- mps2-an386
- raspi3b
- raspi3
- raspi2b
- raspi2
- vexpress-a15
- sonorapass-bmc
- cheetah
- virt-2.6
- ast2500-evb
- highbank
- akita
- connex
- netduinoplus2
- collie
- raspi0
-
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-cris
- axis-dev88
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-i386
- pc-i440fx-5.2
- pc
- pc-q35-5.2
- q35
- pc-i440fx-2.12
- pc-i440fx-2.0
- pc-q35-4.2
- pc-i440fx-2.5
- pc-i440fx-4.2
- pc-i440fx-1.5
- pc-q35-2.7
- pc-i440fx-2.2
- pc-1.1
- pc-i440fx-2.7
- pc-q35-2.4
- pc-q35-2.10
- pc-i440fx-1.7
- pc-q35-5.1
- pc-q35-2.9
- pc-i440fx-2.11
- pc-q35-3.1
- pc-q35-4.1
- pc-i440fx-2.4
- pc-1.3
- pc-i440fx-4.1
- pc-i440fx-5.1
- pc-i440fx-2.9
- isapc
- pc-i440fx-1.4
- pc-q35-2.6
- pc-i440fx-3.1
- pc-q35-2.12
- pc-i440fx-2.1
- pc-1.0
- pc-i440fx-2.6
- pc-q35-4.0.1
- pc-i440fx-1.6
- pc-q35-5.0
- pc-q35-2.8
- pc-i440fx-2.10
- pc-q35-3.0
- pc-q35-4.0
- microvm
- pc-i440fx-2.3
- pc-1.2
- pc-i440fx-4.0
- pc-i440fx-5.0
- pc-i440fx-2.8
- pc-q35-2.5
- pc-i440fx-3.0
- pc-q35-2.11
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-m68k
- mcf5208evb
- an5206
- q800
- next-cube
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-microblaze
- petalogix-s3adsp1800
- petalogix-ml605
- xlnx-zynqmp-pmu
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-microblazeel
- petalogix-s3adsp1800
- petalogix-ml605
- xlnx-zynqmp-pmu
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-mips
- malta
- mipssim
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-mipsel
- malta
- mipssim
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-mips64
- malta
- pica61
- mipssim
- magnum
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-mips64el
- malta
- mipssim
- pica61
- magnum
- boston
- fuloong2e
- fulong2e
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-ppc
- g3beige
- virtex-ml507
- mac99
- ppce500
- sam460ex
- bamboo
- 40p
- ref405ep
- mpc8544ds
- taihu
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-ppc64
- pseries-5.2
- pseries
- powernv9
- powernv
- taihu
- pseries-4.1
- mpc8544ds
- pseries-2.5
- powernv10
- pseries-4.2
- pseries-2.6
- ppce500
- pseries-2.7
- pseries-3.0
- pseries-5.0
- 40p
- pseries-2.8
- pseries-3.1
- pseries-5.1
- pseries-2.9
- bamboo
- g3beige
- pseries-2.12-sxxm
- pseries-2.10
- virtex-ml507
- pseries-2.11
- pseries-2.1
- pseries-2.12
- pseries-2.2
- mac99
- sam460ex
- ref405ep
- pseries-2.3
- powernv8
- pseries-4.0
- pseries-2.4
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-ppc64
- pseries-5.2
- pseries
- powernv9
- powernv
- taihu
- pseries-4.1
- mpc8544ds
- pseries-2.5
- powernv10
- pseries-4.2
- pseries-2.6
- ppce500
- pseries-2.7
- pseries-3.0
- pseries-5.0
- 40p
- pseries-2.8
- pseries-3.1
- pseries-5.1
- pseries-2.9
- bamboo
- g3beige
- pseries-2.12-sxxm
- pseries-2.10
- virtex-ml507
- pseries-2.11
- pseries-2.1
- pseries-2.12
- pseries-2.2
- mac99
- sam460ex
- ref405ep
- pseries-2.3
- powernv8
- pseries-4.0
- pseries-2.4
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-riscv32
- spike
- virt
- opentitan
- sifive_e
- sifive_u
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-riscv64
- spike
- virt
- sifive_e
- sifive_u
- microchip-icicle-kit
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-s390x
- s390-ccw-virtio-5.2
- s390-ccw-virtio
- s390-ccw-virtio-4.0
- s390-ccw-virtio-3.1
- s390-ccw-virtio-2.6
- s390-ccw-virtio-2.12
- s390-ccw-virtio-2.9
- s390-ccw-virtio-5.1
- s390-ccw-virtio-3.0
- s390-ccw-virtio-4.2
- s390-ccw-virtio-2.5
- s390-ccw-virtio-2.11
- s390-ccw-virtio-2.8
- s390-ccw-virtio-5.0
- s390-ccw-virtio-4.1
- s390-ccw-virtio-2.4
- s390-ccw-virtio-2.10
- s390-ccw-virtio-2.7
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-sh4
- shix
- r2d
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-sh4eb
- shix
- r2d
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-sparc
- SS-5
- SS-20
- LX
- SPARCClassic
- leon3_generic
- SPARCbook
- SS-4
- SS-600MP
- SS-10
- Voyager
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-sparc64
- sun4u
- niagara
- sun4v
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 64
- /usr/bin/qemu-system-x86_64
- pc-i440fx-5.2
- pc
- pc-q35-5.2
- q35
- pc-i440fx-2.12
- pc-i440fx-2.0
- pc-q35-4.2
- pc-i440fx-2.5
- pc-i440fx-4.2
- pc-i440fx-1.5
- pc-q35-2.7
- pc-i440fx-2.2
- pc-1.1
- pc-i440fx-2.7
- pc-q35-2.4
- pc-q35-2.10
- pc-i440fx-1.7
- pc-q35-5.1
- pc-q35-2.9
- pc-i440fx-2.11
- pc-q35-3.1
- pc-q35-4.1
- pc-i440fx-2.4
- pc-1.3
- pc-i440fx-4.1
- pc-i440fx-5.1
- pc-i440fx-2.9
- isapc
- pc-i440fx-1.4
- pc-q35-2.6
- pc-i440fx-3.1
- pc-q35-2.12
- pc-i440fx-2.1
- pc-1.0
- pc-i440fx-2.6
- pc-q35-4.0.1
- pc-i440fx-1.6
- pc-q35-5.0
- pc-q35-2.8
- pc-i440fx-2.10
- pc-q35-3.0
- pc-q35-4.0
- microvm
- pc-i440fx-2.3
- pc-1.2
- pc-i440fx-4.0
- pc-i440fx-5.0
- pc-i440fx-2.8
- pc-q35-2.5
- pc-i440fx-3.0
- pc-q35-2.11
-
-
-
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-xtensa
- sim
- kc705
- ml605
- ml605-nommu
- virt
- lx60-nommu
- lx200
- lx200-nommu
- lx60
- kc705-nommu
-
-
-
-
-
-
-
-
-
-
- hvm
-
- 32
- /usr/bin/qemu-system-xtensaeb
- sim
- kc705
- ml605
- ml605-nommu
- virt
- lx60-nommu
- lx200
- lx200-nommu
- lx60
- kc705-nommu
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_filtered.xml b/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_filtered.xml
deleted file mode 100644
index 08b9ac71..00000000
--- a/core/modules/qemu/runvirt-plugin-qemu/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_filtered.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-
- ubuntu-20-04
- 8dc5433c-0228-49e4-b019-fa2b606aa544
- Ubuntu 20.04
- Ubuntu 20.04 desktop installation
-
-
-
-
-
- 4194304
- 4194304
- 2
-
- hvm
-
-
-
-
-
-
-
-
-
-
-
-
- destroy
- restart
- destroy
-
-
-
-
-
- /usr/bin/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /dev/urandom
-
-
-
-
-
--
cgit v1.2.3-55-g7522