From e815ad917e3adeb2be387c7ef6ed2dd74602d69b Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Mon, 26 Apr 2021 13:51:35 +0200
Subject: Add supported virtualizer versions for Libvirt/QEMU
---
.../VirtualizationConfigurationQemuTest.java | 58 +++++++++
.../xml/qemu-kvm_default-archlinux-vm-no-os.xml | 136 ++++++++++++++++++++
.../xml/qemu-kvm_default-archlinux-vm-old-os.xml | 140 +++++++++++++++++++++
3 files changed, 334 insertions(+)
create mode 100644 src/test/resources/libvirt/xml/qemu-kvm_default-archlinux-vm-no-os.xml
create mode 100644 src/test/resources/libvirt/xml/qemu-kvm_default-archlinux-vm-old-os.xml
(limited to 'src/test')
diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java
index 0412002..93f3750 100644
--- a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java
@@ -3,6 +3,7 @@ package org.openslx.virtualization.configuration;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.params.provider.Arguments.arguments;
@@ -32,6 +33,7 @@ import org.openslx.libvirt.domain.device.DiskStorage;
import org.openslx.libvirt.domain.device.Interface;
import org.openslx.libvirt.domain.device.Sound;
import org.openslx.libvirt.xml.LibvirtXmlTestResources;
+import org.openslx.virtualization.Version;
import org.openslx.virtualization.configuration.VirtualizationConfiguration.EtherType;
import org.openslx.virtualization.configuration.VirtualizationConfiguration.EthernetDevType;
import org.openslx.virtualization.configuration.VirtualizationConfiguration.SoundCardType;
@@ -518,4 +520,60 @@ public class VirtualizationConfigurationQemuTest
assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
}
+
+ @ParameterizedTest
+ @DisplayName( "Test get virtualizer HW version from VM configuration" )
+ @ValueSource( strings = { "qemu-kvm_default-archlinux-vm-old-os.xml", "qemu-kvm_default-archlinux-vm-no-os.xml" } )
+ public void testQemuMetaDataGetVirtualizerVersion( String xmlFileName )
+ throws VirtualizationConfigurationException, NoSuchFieldException, SecurityException,
+ IllegalArgumentException, IllegalAccessException
+ {
+ File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName );
+ VirtualizationConfigurationQemu vmConfig = new VirtualizationConfigurationQemu( null, file );
+
+ final Domain vmLibvirtDomainConfig = VirtualizationConfigurationQemuTest
+ .getPrivateDomainFromQemuMetaData( vmConfig );
+
+ final Version machineVersion = vmConfig.getVirtualizerVersion();
+
+ if ( vmLibvirtDomainConfig.getOsMachine() == null ) {
+ assertNull( machineVersion );
+ } else {
+ assertEquals( new Version( Short.valueOf( "3" ), Short.valueOf( "1" ) ), machineVersion );
+ }
+
+ assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ }
+
+ @ParameterizedTest
+ @DisplayName( "Test set virtualizer HW version in VM configuration" )
+ @ValueSource( strings = { "qemu-kvm_default-archlinux-vm-old-os.xml", "qemu-kvm_default-archlinux-vm-no-os.xml" } )
+ public void testQemuMetaDataSetVirtualizerVersion( String xmlFileName )
+ throws VirtualizationConfigurationException, NoSuchFieldException, SecurityException,
+ IllegalArgumentException, IllegalAccessException
+ {
+ File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName );
+ VirtualizationConfigurationQemu vmConfig = new VirtualizationConfigurationQemu( null, file );
+
+ final Domain vmLibvirtDomainConfig = VirtualizationConfigurationQemuTest
+ .getPrivateDomainFromQemuMetaData( vmConfig );
+
+ final String originalOsMachine = vmLibvirtDomainConfig.getOsMachine();
+ if ( originalOsMachine != null ) {
+ assertEquals( "pc-q35-3.1", originalOsMachine );
+ }
+
+ final Version modifiedVersion = new Version( Short.valueOf( "4" ), Short.valueOf( "1" ) );
+ vmConfig.setVirtualizerVersion( modifiedVersion );
+
+ final String modifiedOsMachine = vmLibvirtDomainConfig.getOsMachine();
+ if ( modifiedOsMachine == null ) {
+ assertNull( vmConfig.getVirtualizerVersion() );
+ } else {
+ assertEquals( modifiedVersion, vmConfig.getVirtualizerVersion() );
+ assertEquals( "pc-q35-4.1", modifiedOsMachine );
+ }
+
+ assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ }
}
diff --git a/src/test/resources/libvirt/xml/qemu-kvm_default-archlinux-vm-no-os.xml b/src/test/resources/libvirt/xml/qemu-kvm_default-archlinux-vm-no-os.xml
new file mode 100644
index 0000000..b34924d
--- /dev/null
+++ b/src/test/resources/libvirt/xml/qemu-kvm_default-archlinux-vm-no-os.xml
@@ -0,0 +1,136 @@
+
+ archlinux
+ 22bbd81f-b31b-4242-9907-8840844944bf
+
+
+
+
+
+ 4194304
+ 4194304
+ 2
+
+
+
+
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+
+
+
+
+ /usr/bin/qemu-system-x86_64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
+
diff --git a/src/test/resources/libvirt/xml/qemu-kvm_default-archlinux-vm-old-os.xml b/src/test/resources/libvirt/xml/qemu-kvm_default-archlinux-vm-old-os.xml
new file mode 100644
index 0000000..5efe9b2
--- /dev/null
+++ b/src/test/resources/libvirt/xml/qemu-kvm_default-archlinux-vm-old-os.xml
@@ -0,0 +1,140 @@
+
+ archlinux
+ 22bbd81f-b31b-4242-9907-8840844944bf
+
+
+
+
+
+ 4194304
+ 4194304
+ 2
+
+ hvm
+
+
+
+
+
+
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+
+
+
+
+ /usr/bin/qemu-system-x86_64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
+
--
cgit v1.2.3-55-g7522