From 858142d21286f2d9fee18e98d623e409ff8f6ed6 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Thu, 29 Apr 2021 09:15:13 +0200
Subject: Add unit tests for transformation logic (dozmod-client -->
dozmod-server)
---
.../virtualbox/xml/virtualbox_default-ubuntu.vbox | 58 ++++++++++++++++++++++
...irtualbox_default-ubuntu_transform-privacy.vbox | 42 ++++++++++++++++
2 files changed, 100 insertions(+)
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-ubuntu.vbox
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-privacy.vbox
(limited to 'src/test/resources/virtualbox/xml')
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu.vbox
new file mode 100644
index 0000000..8f49dca
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu.vbox
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-privacy.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-privacy.vbox
new file mode 100644
index 0000000..00a5a7c
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-privacy.vbox
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.2.3-55-g7522
From 4073fa2a38d5e73ec2a89eaea84e5183b0e599e5 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 30 Apr 2021 09:05:24 +0200
Subject: Add unit tests for transformation logic (dozmod-server -->
dozmod-client)
---
.../configuration/VirtualizationConfiguration.java | 41 +++--
.../VirtualizationConfigurationDocker.java | 5 +
.../VirtualizationConfigurationQemu.java | 77 ++++++----
.../VirtualizationConfigurationQemuUtils.java | 2 +-
.../VirtualizationConfigurationVirtualBox.java | 5 +
.../VirtualizationConfigurationVmware.java | 6 +-
.../VirtualizationConfigurationQemuTest.java | 53 +++----
...urationLogicDozModClientToDozModServerTest.java | 4 +
...urationLogicDozModServerToDozModClientTest.java | 104 +++++++++++++
.../logic/ConfigurationLogicTestUtils.java | 22 +++
..._default-ubuntu-20-04-vm_transform-editable.xml | 170 +++++++++++++++++++++
...rtualbox_default-ubuntu_transform-editable.vbox | 48 ++++++
...re-player_default-ubuntu_transform-editable.vmx | 54 +++++++
13 files changed, 512 insertions(+), 79 deletions(-)
create mode 100644 src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
create mode 100644 src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox
create mode 100644 src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-editable.vmx
(limited to 'src/test/resources/virtualbox/xml')
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java
index 3cbe71b..c5381c5 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java
@@ -30,7 +30,7 @@ public abstract class VirtualizationConfiguration
protected Map ddacc = new HashMap<>();
protected Map networkCards = new HashMap<>();
protected Map usbSpeeds = new HashMap<>();
-
+
private final Virtualizer virtualizer;
/**
@@ -38,7 +38,8 @@ public abstract class VirtualizationConfiguration
*/
public static enum SoundCardType
{
- NONE( "None" ), DEFAULT( "(default)" ), SOUND_BLASTER( "Sound Blaster 16" ), ES( "ES 1371" ), HD_AUDIO( "Intel Integrated HD Audio" ), AC( "Intel ICH Audio Codec 97" );
+ NONE( "None" ), DEFAULT( "(default)" ), SOUND_BLASTER( "Sound Blaster 16" ), ES( "ES 1371" ), HD_AUDIO(
+ "Intel Integrated HD Audio" ), AC( "Intel ICH Audio Codec 97" );
public final String displayName;
@@ -68,9 +69,12 @@ public abstract class VirtualizationConfiguration
*/
public static enum EthernetDevType
{
- AUTO( "(default)" ), PCNET32( "AMD PCnet32" ), E1000( "Intel E1000 (PCI)" ), E1000E( "Intel E1000e (PCI-Express)" ), VMXNET( "VMXnet" ), VMXNET3( "VMXnet 3" ), PCNETPCI2(
- "PCnet-PCI II" ), PCNETFAST3( "PCnet-FAST III" ), PRO1000MTD( "Intel PRO/1000 MT Desktop" ), PRO1000TS(
- "Intel PRO/1000 T Server" ), PRO1000MTS( "Intel PRO/1000 MT Server" ), PARAVIRT( "Paravirtualized Network" ), NONE( "No Network Card" );
+ AUTO( "(default)" ), PCNET32( "AMD PCnet32" ), E1000( "Intel E1000 (PCI)" ), E1000E(
+ "Intel E1000e (PCI-Express)" ), VMXNET( "VMXnet" ), VMXNET3( "VMXnet 3" ), PCNETPCI2(
+ "PCnet-PCI II" ), PCNETFAST3( "PCnet-FAST III" ), PRO1000MTD(
+ "Intel PRO/1000 MT Desktop" ), PRO1000TS(
+ "Intel PRO/1000 T Server" ), PRO1000MTS( "Intel PRO/1000 MT Server" ), PARAVIRT(
+ "Paravirtualized Network" ), NONE( "No Network Card" );
public final String displayName;
@@ -82,10 +86,7 @@ public abstract class VirtualizationConfiguration
public static enum UsbSpeed
{
- NONE( "None" ),
- USB1_1( "USB 1.1" ),
- USB2_0( "USB 2.0" ),
- USB3_0( "USB 3.0" );
+ NONE( "None" ), USB1_1( "USB 1.1" ), USB2_0( "USB 2.0" ), USB3_0( "USB 3.0" );
public final String displayName;
@@ -271,7 +272,7 @@ public abstract class VirtualizationConfiguration
LOGGER.debug( "Not a Libvirt file", e );
}
try {
- return new VirtualizationConfigurationDocker(osList, file);
+ return new VirtualizationConfigurationDocker( osList, file );
} catch ( VirtualizationConfigurationException e ) {
LOGGER.debug( "Not a tar.gz file, for docker container", e );
}
@@ -289,7 +290,8 @@ public abstract class VirtualizationConfiguration
* @return VmMetaData object representing the relevant parts of the given machine description
* @throws IOException
*/
- public static VirtualizationConfiguration getInstance( List osList, byte[] vmContent, int length )
+ public static VirtualizationConfiguration getInstance( List osList, byte[] vmContent,
+ int length )
throws IOException
{
try {
@@ -316,7 +318,7 @@ public abstract class VirtualizationConfiguration
LOGGER.error( "Could not detect any known virtualizer format" );
return null;
}
-
+
/**
* Returns the file name extension for the virtualization configuration file.
*
@@ -382,6 +384,15 @@ public abstract class VirtualizationConfiguration
return this.virtualizer;
}
+ /**
+ * Validates the virtualization configuration and reports errors if its content is not a valid
+ * virtualization configuration.
+ *
+ * @throws VirtualizationConfigurationException validation of the virtualization configuration
+ * failed.
+ */
+ public abstract void validate() throws VirtualizationConfigurationException;
+
/**
* Transforms the virtualization configuration in terms of a privacy filter to filter out
* sensitive information like name of users in absolute paths.
@@ -390,7 +401,7 @@ public abstract class VirtualizationConfiguration
* configuration failed.
*/
public abstract void transformPrivacy() throws VirtualizationConfigurationException;
-
+
/**
* Transforms the virtualization configuration applying options that are desired when locally
* editing a virtualized system (e.g. disables automatic DPI scaling).
@@ -399,7 +410,7 @@ public abstract class VirtualizationConfiguration
* configuration failed.
*/
public abstract void transformEditable() throws VirtualizationConfigurationException;
-
+
/**
* Transforms the virtualization configuration applying options that are desired when running a
* virtualized system in a stateless manner.
@@ -408,7 +419,7 @@ public abstract class VirtualizationConfiguration
* configuration failed.
*/
public abstract void transformNonPersistent() throws VirtualizationConfigurationException;
-
+
/**
* Function used to register virtual devices.
*/
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java
index 4c727a6..5b1615f 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java
@@ -200,4 +200,9 @@ public class VirtualizationConfigurationDocker extends VirtualizationConfigurati
public String getFileNameExtension() {
return VirtualizationConfigurationDocker.FILE_NAME_EXTENSION;
}
+
+ @Override
+ public void validate() throws VirtualizationConfigurationException
+ {
+ }
}
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
index bd25f79..716a2f3 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
@@ -9,6 +9,7 @@ import java.util.Map.Entry;
import org.openslx.bwlp.thrift.iface.OperatingSystem;
import org.openslx.libvirt.domain.Domain;
+import org.openslx.libvirt.domain.DomainUtils;
import org.openslx.libvirt.domain.device.ControllerUsb;
import org.openslx.libvirt.domain.device.Disk.BusType;
import org.openslx.libvirt.domain.device.Disk.StorageType;
@@ -218,21 +219,6 @@ public class VirtualizationConfigurationQemu extends
*/
private Domain vmConfig = null;
- /**
- * Stores current index of added HDD device to the Libvirt XML configuration file.
- */
- private int vmDeviceIndexHddAdd = 0;
-
- /**
- * Stores current index of added CDROM device to the Libvirt XML configuration file.
- */
- private int vmDeviceIndexCdromAdd = 0;
-
- /**
- * Stores current index of added ethernet device to the Libvirt XML configuration file.
- */
- private int vmDeviceIndexEthernetAdd = 0;
-
/**
* Creates new virtual machine configuration (managed by Libvirt) for the QEMU hypervisor.
*
@@ -335,7 +321,9 @@ public class VirtualizationConfigurationQemu extends
@Override
public boolean addHddTemplate( String diskImagePath, String hddMode, String redoDir )
{
- return this.addHddTemplate( this.vmDeviceIndexHddAdd++, diskImagePath, hddMode, redoDir );
+ int index = this.vmConfig.getDiskStorageDevices().size() - 1;
+ index = ( index > 0 ) ? index : 0;
+ return this.addHddTemplate( index, diskImagePath, hddMode, redoDir );
}
/**
@@ -369,7 +357,7 @@ public class VirtualizationConfigurationQemu extends
storageDiskDevice.setStorage( StorageType.FILE, diskImagePath );
}
- return false;
+ return true;
}
@Override
@@ -397,13 +385,14 @@ public class VirtualizationConfigurationQemu extends
@Override
public boolean addRam( int mem )
{
- BigInteger memory = BigInteger.valueOf( mem );
+ // convert given memory in MiB to memory in bytes for Libvirt XML Domain API functions
+ final BigInteger memory = DomainUtils.decodeMemory( Integer.toString( mem ), "MiB" );
this.vmConfig.setMemory( memory );
this.vmConfig.setCurrentMemory( memory );
- final boolean isMemorySet = this.vmConfig.getMemory().toString().equals( memory.toString() );
- final boolean isCurrentMemorySet = this.vmConfig.getCurrentMemory().toString().equals( memory.toString() );
+ final boolean isMemorySet = this.vmConfig.getMemory().equals( memory );
+ final boolean isCurrentMemorySet = this.vmConfig.getCurrentMemory().equals( memory );
return isMemorySet && isCurrentMemorySet;
}
@@ -421,18 +410,30 @@ public class VirtualizationConfigurationQemu extends
String targetDevName = VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( "fd", index );
floppyDiskDevice.setTargetDevice( targetDevName );
floppyDiskDevice.setReadOnly( readOnly );
- floppyDiskDevice.setStorage( StorageType.FILE, image );
+
+ if ( image == null || image.isEmpty() ) {
+ floppyDiskDevice.removeStorage();
+ } else {
+ floppyDiskDevice.setStorage( StorageType.FILE, image );
+ }
} else {
// floppy device exists, so update existing floppy device
floppyDiskDevice.setReadOnly( readOnly );
- floppyDiskDevice.setStorage( StorageType.FILE, image );
+
+ if ( image == null || image.isEmpty() ) {
+ floppyDiskDevice.removeStorage();
+ } else {
+ floppyDiskDevice.setStorage( StorageType.FILE, image );
+ }
}
}
@Override
public boolean addCdrom( String image )
{
- return this.addCdrom( this.vmDeviceIndexCdromAdd++, image );
+ int index = this.vmConfig.getDiskCdromDevices().size() - 1;
+ index = ( index > 0 ) ? index : 0;
+ return this.addCdrom( index, image );
}
/**
@@ -458,7 +459,11 @@ public class VirtualizationConfigurationQemu extends
if ( image == null ) {
cdromDiskDevice.setStorage( StorageType.BLOCK, CDROM_DEFAULT_PHYSICAL_DRIVE );
} else {
- cdromDiskDevice.setStorage( StorageType.FILE, image );
+ if ( image.isEmpty() ) {
+ cdromDiskDevice.removeStorage();
+ } else {
+ cdromDiskDevice.setStorage( StorageType.FILE, image );
+ }
}
} else {
// CDROM device exists, so update existing CDROM device
@@ -467,11 +472,15 @@ public class VirtualizationConfigurationQemu extends
if ( image == null ) {
cdromDiskDevice.setStorage( StorageType.BLOCK, CDROM_DEFAULT_PHYSICAL_DRIVE );
} else {
- cdromDiskDevice.setStorage( StorageType.FILE, image );
+ if ( image.isEmpty() ) {
+ cdromDiskDevice.removeStorage();
+ } else {
+ cdromDiskDevice.setStorage( StorageType.FILE, image );
+ }
}
}
- return false;
+ return true;
}
@Override
@@ -731,7 +740,9 @@ public class VirtualizationConfigurationQemu extends
@Override
public boolean addEthernet( EtherType type )
{
- return this.addEthernet( this.vmDeviceIndexEthernetAdd++, type );
+ int index = this.vmConfig.getInterfaceDevices().size() - 1;
+ index = ( index > 0 ) ? index : 0;
+ return this.addEthernet( index, type );
}
/**
@@ -790,7 +801,7 @@ public class VirtualizationConfigurationQemu extends
}
}
- return false;
+ return true;
}
@Override
@@ -840,4 +851,14 @@ public class VirtualizationConfigurationQemu extends
{
return VirtualizationConfigurationQemu.FILE_NAME_EXTENSION;
}
+
+ @Override
+ public void validate() throws VirtualizationConfigurationException
+ {
+ try {
+ this.vmConfig.validateXml();
+ } catch ( LibvirtXmlValidationException e ) {
+ throw new VirtualizationConfigurationException( e.getLocalizedMessage() );
+ }
+ }
}
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuUtils.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuUtils.java
index 3abc2f3..7ac3632 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuUtils.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuUtils.java
@@ -194,7 +194,7 @@ public class VirtualizationConfigurationQemuUtils
throw new IllegalArgumentException( errorMsg );
}
- return devicePrefix + ( 'a' + deviceNumber );
+ return devicePrefix + Character.valueOf( (char) ( 'a' + deviceNumber ) ).toString();
}
/**
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
index d987495..d32d496 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
@@ -508,4 +508,9 @@ public class VirtualizationConfigurationVirtualBox extends VirtualizationConfigu
{
return VirtualizationConfigurationVirtualBox.FILE_NAME_EXTENSION;
}
+
+ @Override
+ public void validate() throws VirtualizationConfigurationException
+ {
+ }
}
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java
index 894f52b..e1102b6 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java
@@ -590,7 +590,7 @@ public class VirtualizationConfigurationVmware extends VirtualizationConfigurati
public boolean addCpuCoreCount( int numCores )
{
// TODO actually add the cpu core count to the machine description
- return false;
+ return true;
}
@Override
@@ -631,4 +631,8 @@ public class VirtualizationConfigurationVmware extends VirtualizationConfigurati
return VirtualizationConfigurationVmware.FILE_NAME_EXTENSION;
}
+ @Override
+ public void validate() throws VirtualizationConfigurationException
+ {
+ }
}
diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java
index 93f3750..b59a86d 100644
--- a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java
@@ -68,14 +68,11 @@ public class VirtualizationConfigurationQemuTest
File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" );
VirtualizationConfigurationQemu vmConfig = new VirtualizationConfigurationQemu( null, file );
- final Domain vmLibvirtDomainConfig = VirtualizationConfigurationQemuTest
- .getPrivateDomainFromQemuMetaData( vmConfig );
-
final String displayName = vmConfig.getDisplayName();
assertEquals( "archlinux", displayName );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@Test
@@ -87,14 +84,11 @@ public class VirtualizationConfigurationQemuTest
File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" );
VirtualizationConfigurationQemu vmConfig = new VirtualizationConfigurationQemu( null, file );
- final Domain vmLibvirtDomainConfig = VirtualizationConfigurationQemuTest
- .getPrivateDomainFromQemuMetaData( vmConfig );
-
final boolean isVmSnapshot = vmConfig.isMachineSnapshot();
assertEquals( false, isVmSnapshot );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@Test
@@ -106,9 +100,6 @@ public class VirtualizationConfigurationQemuTest
File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" );
VirtualizationConfigurationQemu vmConfig = new VirtualizationConfigurationQemu( null, file );
- final Domain vmLibvirtDomainConfig = VirtualizationConfigurationQemuTest
- .getPrivateDomainFromQemuMetaData( vmConfig );
-
final List supportedImageFormats = vmConfig.getVirtualizer().getSupportedImageFormats();
assertNotNull( supportedImageFormats );
@@ -116,7 +107,7 @@ public class VirtualizationConfigurationQemuTest
assertEquals( true, supportedImageFormats
.containsAll( Arrays.asList( ImageFormat.QCOW2, ImageFormat.VMDK, ImageFormat.VDI ) ) );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@Test
@@ -128,16 +119,13 @@ public class VirtualizationConfigurationQemuTest
File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" );
VirtualizationConfigurationQemu vmConfig = new VirtualizationConfigurationQemu( null, file );
- final Domain vmLibvirtDomainConfig = VirtualizationConfigurationQemuTest
- .getPrivateDomainFromQemuMetaData( vmConfig );
-
final List hdds = vmConfig.getHdds();
assertNotNull( hdds );
assertEquals( 1, hdds.size() );
assertEquals( "/var/lib/libvirt/images/archlinux.qcow2", hdds.get( 0 ).diskImage );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@Test
@@ -149,9 +137,6 @@ public class VirtualizationConfigurationQemuTest
File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" );
VirtualizationConfigurationQemu vmConfig = new VirtualizationConfigurationQemu( null, file );
- final Domain vmLibvirtDomainConfig = VirtualizationConfigurationQemuTest
- .getPrivateDomainFromQemuMetaData( vmConfig );
-
final String unfilteredXmlConfig = new String( vmConfig.getConfigurationAsByteArray(), StandardCharsets.UTF_8 );
final String originalXmlConfig = FileUtils.readFileToString( file, StandardCharsets.UTF_8 );
@@ -162,7 +147,7 @@ public class VirtualizationConfigurationQemuTest
assertEquals( lengthOriginalXmlConfig, lengthUnfilteredXmlConfig );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -204,7 +189,7 @@ public class VirtualizationConfigurationQemuTest
DiskStorage addedStorageDevice = vmLibvirtDomainConfig.getDiskStorageDevices().get( 0 );
assertEquals( diskFile.getAbsolutePath(), addedStorageDevice.getStorageSource() );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -233,7 +218,7 @@ public class VirtualizationConfigurationQemuTest
DiskCdrom addedCdromDevice = vmLibvirtDomainConfig.getDiskCdromDevices().get( 0 );
assertEquals( diskFile.getAbsolutePath(), addedCdromDevice.getStorageSource() );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -261,7 +246,7 @@ public class VirtualizationConfigurationQemuTest
DiskCdrom addedCdromDevice = vmLibvirtDomainConfig.getDiskCdromDevices().get( 0 );
assertEquals( VirtualizationConfigurationQemu.CDROM_DEFAULT_PHYSICAL_DRIVE, addedCdromDevice.getStorageSource() );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -291,7 +276,7 @@ public class VirtualizationConfigurationQemuTest
assertTrue( addedFloppyDevice.isReadOnly() );
assertEquals( diskFile.getAbsolutePath(), addedFloppyDevice.getStorageSource() );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -311,7 +296,7 @@ public class VirtualizationConfigurationQemuTest
assertEquals( coreCount, vmLibvirtDomainConfig.getVCpu() );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -335,7 +320,7 @@ public class VirtualizationConfigurationQemuTest
assertEquals( SoundCardType.HD_AUDIO, soundCardType );
}
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -363,7 +348,7 @@ public class VirtualizationConfigurationQemuTest
Sound addedSoundDevice = vmLibvirtDomainConfig.getSoundDevices().get( 0 );
assertEquals( Sound.Model.SB16, addedSoundDevice.getModel() );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -387,7 +372,7 @@ public class VirtualizationConfigurationQemuTest
assertEquals( EthernetDevType.PARAVIRT, ethernetDeviceType );
}
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -410,7 +395,7 @@ public class VirtualizationConfigurationQemuTest
assertEquals( Interface.Model.E1000E, addedEthernetDevice.getModel() );
}
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -434,7 +419,7 @@ public class VirtualizationConfigurationQemuTest
assertEquals( UsbSpeed.USB3_0, maxUsbSpeed );
}
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -462,7 +447,7 @@ public class VirtualizationConfigurationQemuTest
ControllerUsb addedUsbControllerDevice = vmLibvirtDomainConfig.getUsbControllerDevices().get( 0 );
assertEquals( ControllerUsb.Model.ICH9_EHCI1, addedUsbControllerDevice.getModel() );
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
static Stream configAndEthernetTypeProvider()
@@ -518,7 +503,7 @@ public class VirtualizationConfigurationQemuTest
break;
}
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -542,7 +527,7 @@ public class VirtualizationConfigurationQemuTest
assertEquals( new Version( Short.valueOf( "3" ), Short.valueOf( "1" ) ), machineVersion );
}
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@@ -574,6 +559,6 @@ public class VirtualizationConfigurationQemuTest
assertEquals( "pc-q35-4.1", modifiedOsMachine );
}
- assertDoesNotThrow( () -> vmLibvirtDomainConfig.validateXml() );
+ assertDoesNotThrow( () -> vmConfig.validate() );
}
}
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java
index 4654957..68a39c6 100644
--- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java
@@ -1,5 +1,6 @@
package org.openslx.virtualization.configuration.logic;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
@@ -41,6 +42,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest
final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertDoesNotThrow( () -> config.validate() );
}
@Test
@@ -61,6 +63,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest
final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertDoesNotThrow( () -> config.validate() );
}
@Test
@@ -81,5 +84,6 @@ public class ConfigurationLogicDozModClientToDozModServerTest
final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertDoesNotThrow( () -> config.validate() );
}
}
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
new file mode 100644
index 0000000..b3cbd8a
--- /dev/null
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
@@ -0,0 +1,104 @@
+package org.openslx.virtualization.configuration.logic;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.openslx.bwlp.thrift.iface.OperatingSystem;
+import org.openslx.libvirt.xml.LibvirtXmlTestResources;
+import org.openslx.virtualization.configuration.VirtualizationConfiguration;
+import org.openslx.virtualization.configuration.data.ConfigurationDataDozModServerToDozModClient;
+import org.openslx.virtualization.configuration.transformation.TransformationException;
+import org.openslx.vm.disk.DiskImageTestResources;
+
+public class ConfigurationLogicDozModServerToDozModClientTest
+{
+ private static final String DEFAULT_DISPLAY_NAME = "Test";
+ private static final File DEFAULT_DISK_IMAGE = DiskImageTestResources.getDiskFile( "image-default.vmdk" );
+ private static final OperatingSystem DEFAULT_GUEST_OS = null;
+ private static final String DEFAULT_VIRTUALIZER_ID = null;
+ private static final int DEFAULT_TOTAL_MEMORY = 4096;
+
+ private static final ConfigurationDataDozModServerToDozModClient DEFAULT_CONFIG_DATA = new ConfigurationDataDozModServerToDozModClient(
+ ConfigurationLogicDozModServerToDozModClientTest.DEFAULT_DISPLAY_NAME,
+ ConfigurationLogicDozModServerToDozModClientTest.DEFAULT_DISK_IMAGE,
+ ConfigurationLogicDozModServerToDozModClientTest.DEFAULT_GUEST_OS,
+ ConfigurationLogicDozModServerToDozModClientTest.DEFAULT_VIRTUALIZER_ID,
+ ConfigurationLogicDozModServerToDozModClientTest.DEFAULT_TOTAL_MEMORY );
+
+ @BeforeAll
+ public static void setUp()
+ {
+ // disable logging with log4j
+ LogManager.getRootLogger().setLevel( Level.OFF );
+ }
+
+ @Test
+ @DisplayName( "Test transformation logic between a dozmod-server and a dozmod-client for Libvirt/QEMU configuration" )
+ public void testConfigurationLogicDozModServerToDozModClientLibvirt() throws TransformationException
+ {
+ final String inputConfigFileName = "qemu-kvm_default-ubuntu-20-04-vm_transform-privacy.xml";
+ final String expectedConfigFileName = "qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml";
+ final File inputConfig = LibvirtXmlTestResources.getLibvirtXmlFile( inputConfigFileName );
+ final File expectedConfig = LibvirtXmlTestResources.getLibvirtXmlFile( expectedConfigFileName );
+ final VirtualizationConfiguration config;
+ config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig );
+ final ConfigurationLogicDozModServerToDozModClient logic = new ConfigurationLogicDozModServerToDozModClient();
+
+ logic.apply( config, ConfigurationLogicDozModServerToDozModClientTest.DEFAULT_CONFIG_DATA );
+
+ final String transformedConfig = config.getConfigurationAsString();
+ final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
+
+ assertDoesNotThrow( () -> config.validate() );
+ assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
+ }
+
+ @Test
+ @DisplayName( "Test transformation logic between a dozmod-server and a dozmod-client for VirtualBox configuration" )
+ public void testConfigurationLogicDozModServerToDozModClientVirtualBox() throws TransformationException
+ {
+ final String inputConfigFileName = "virtualbox_default-ubuntu_transform-privacy.vbox";
+ final String expectedConfigFileName = "virtualbox_default-ubuntu_transform-editable.vbox";
+ final File inputConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( inputConfigFileName );
+ final File expectedConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( expectedConfigFileName );
+ final VirtualizationConfiguration config;
+ config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig );
+ final ConfigurationLogicDozModServerToDozModClient logic = new ConfigurationLogicDozModServerToDozModClient();
+
+ logic.apply( config, ConfigurationLogicDozModServerToDozModClientTest.DEFAULT_CONFIG_DATA );
+
+ final String transformedConfig = config.getConfigurationAsString();
+ final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
+
+ assertTrue(ConfigurationLogicTestUtils.isVirtualBoxContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertDoesNotThrow( () -> config.validate() );
+ }
+
+ @Test
+ @DisplayName( "Test transformation logic between dozmod-server and a dozmod-client for VMware configuration" )
+ public void testConfigurationLogicDozModServerToDozModClientVmware() throws TransformationException
+ {
+ final String inputConfigFileName = "vmware-player_default-ubuntu_transform-privacy.vmx";
+ final String expectedConfigFileName = "vmware-player_default-ubuntu_transform-editable.vmx";
+ final File inputConfig = ConfigurationLogicTestResources.getVmwareVmxFile( inputConfigFileName );
+ final File expectedConfig = ConfigurationLogicTestResources.getVmwareVmxFile( expectedConfigFileName );
+ final VirtualizationConfiguration config;
+ config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig );
+ final ConfigurationLogicDozModServerToDozModClient logic = new ConfigurationLogicDozModServerToDozModClient();
+
+ logic.apply( config, ConfigurationLogicDozModServerToDozModClientTest.DEFAULT_CONFIG_DATA );
+
+ final String transformedConfig = config.getConfigurationAsString();
+ final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
+
+ assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertDoesNotThrow( () -> config.validate() );
+ }
+}
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java
index 32aa344..4f85719 100644
--- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicTestUtils.java
@@ -10,6 +10,8 @@ import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.apache.commons.io.FileUtils;
@@ -33,6 +35,8 @@ public class ConfigurationLogicTestUtils
new OperatingSystem( 11, "Windows 2000 Professional", null, "x86", 4096, 4 ) ) );
// @formatter:on
+ private static final String REGEX_UUID = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
+
public static VirtualizationConfiguration newVirtualizationConfigurationInstance( File configFile )
{
VirtualizationConfiguration config = null;
@@ -75,4 +79,22 @@ public class ConfigurationLogicTestUtils
return linesContent1.equals( linesContent2 );
}
+
+ public static String removeUuid( String content )
+ {
+ final Pattern patternUuid = Pattern.compile( ConfigurationLogicTestUtils.REGEX_UUID );
+ final Matcher matcherUuidContent = patternUuid.matcher( content );
+
+ // replace all UUIDs with the empty String
+ return matcherUuidContent.replaceAll( "" );
+ }
+
+ public static boolean isVirtualBoxContentEqual( String content1, String content2 )
+ {
+ // replace all UUIDs with the empty String
+ final String filteredContent1 = ConfigurationLogicTestUtils.removeUuid( content1 );
+ final String filteredContent2 = ConfigurationLogicTestUtils.removeUuid( content2 );
+
+ return ConfigurationLogicTestUtils.isContentEqual( filteredContent1, filteredContent2 );
+ }
}
diff --git a/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml
new file mode 100644
index 0000000..ca09cf6
--- /dev/null
+++ b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml
@@ -0,0 +1,170 @@
+
+ Test
+ 8dc5433c-0228-49e4-b019-fa2b606aa544
+ Ubuntu 20.04
+ Ubuntu 20.04 desktop installation
+
+
+
+
+
+ 1572864
+ 1572864
+ 1
+
+ hvm
+
+
+
+
+
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+
+
+
+
+ /usr/bin/qemu-system-x86_64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox
new file mode 100644
index 0000000..9bfffcd
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-editable.vmx b/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-editable.vmx
new file mode 100644
index 0000000..9d1ad5e
--- /dev/null
+++ b/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-editable.vmx
@@ -0,0 +1,54 @@
+.encoding = "UTF-8"
+config.version = "8"
+displayName = "Test"
+ehci.present = "TRUE"
+ethernet0.connectionType = "nat"
+ethernet0.present = "TRUE"
+ethernet0.virtualDev = "e1000"
+floppy0.autodetect = "TRUE"
+floppy0.fileType = "device"
+floppy0.present = "TRUE"
+floppy0.startConnected = "FALSE"
+floppy1.autodetect = "TRUE"
+floppy1.fileType = "device"
+floppy1.present = "TRUE"
+floppy1.startConnected = "FALSE"
+guestOS = "ubuntu-64"
+gui.applyHostDisplayScalingToGuest = "FALSE"
+hpet0.present = "TRUE"
+ide0:0.deviceType = "cdrom-image"
+ide0:0.fileName = ""
+ide0:0.present = "TRUE"
+ide0:1.autodetect = "TRUE"
+ide0:1.deviceType = "cdrom-raw"
+ide0:1.present = "TRUE"
+memsize = "1536"
+mks.enable3d = "TRUE"
+pciBridge0.present = "TRUE"
+pciBridge4.functions = "8"
+pciBridge4.present = "TRUE"
+pciBridge4.virtualDev = "pcieRootPort"
+pciBridge5.functions = "8"
+pciBridge5.present = "TRUE"
+pciBridge5.virtualDev = "pcieRootPort"
+pciBridge6.functions = "8"
+pciBridge6.present = "TRUE"
+pciBridge6.virtualDev = "pcieRootPort"
+pciBridge7.functions = "8"
+pciBridge7.present = "TRUE"
+pciBridge7.virtualDev = "pcieRootPort"
+sata0:1.deviceType = "cdrom-raw"
+scsi0.present = "TRUE"
+scsi0.virtualDev = "lsilogic"
+scsi0:0.deviceType = "disk"
+scsi0:0.fileName = "image-default.vmdk"
+scsi0:0.present = "TRUE"
+sound.autoDetect = "TRUE"
+sound.fileName = "-1"
+sound.present = "TRUE"
+tools.syncTime = "FALSE"
+usb.mangleUsb3Speed = "TRUE"
+usb.present = "TRUE"
+usb.vbluetooth.startConnected = "TRUE"
+virtualHW.productCompatibility = "hosted"
+virtualHW.version = "18"
--
cgit v1.2.3-55-g7522
From 110afb975a086cd059b695763655bcdf5f151e1e Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 30 Apr 2021 10:22:59 +0200
Subject: Add unit tests for transformation logic (dozmod-server --> stateless
client)
---
.../configuration/VirtualizationConfiguration.java | 2 +
.../VirtualizationConfigurationDocker.java | 5 +
.../VirtualizationConfigurationQemu.java | 19 ++-
.../VirtualizationConfigurationVirtualBox.java | 6 +
.../VirtualizationConfigurationVmware.java | 7 +
...gurationLogicDozModServerToStatelessClient.java | 4 +-
...urationLogicDozModServerToDozModClientTest.java | 5 +-
...tionLogicDozModServerToStatelessClientTest.java | 99 +++++++++++++
...lt-ubuntu-20-04-vm_transform-non-persistent.xml | 164 +++++++++++++++++++++
...ox_default-ubuntu_transform-non-persistent.vbox | 53 +++++++
...yer_default-ubuntu_transform-non-persistent.vmx | 42 ++++++
11 files changed, 400 insertions(+), 6 deletions(-)
create mode 100644 src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java
create mode 100644 src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent.xml
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox
create mode 100644 src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-non-persistent.vmx
(limited to 'src/test/resources/virtualbox/xml')
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java
index c5381c5..b8e46ed 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java
@@ -326,6 +326,8 @@ public abstract class VirtualizationConfiguration
*/
public abstract String getFileNameExtension();
+ public abstract boolean addEmptyHddTemplate();
+
public abstract boolean addHddTemplate( File diskImage, String hddMode, String redoDir );
public abstract boolean addHddTemplate( String diskImagePath, String hddMode, String redoDir );
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java
index 5b1615f..d5e9abb 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java
@@ -104,6 +104,11 @@ public class VirtualizationConfigurationDocker extends VirtualizationConfigurati
public void transformPrivacy() throws VirtualizationConfigurationException {
}
+ @Override
+ public boolean addEmptyHddTemplate() {
+ return false;
+ }
+
@Override public boolean addHddTemplate(File diskImage, String hddMode, String redoDir) {
return false;
}
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
index 716a2f3..710a42d 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
@@ -312,6 +312,12 @@ public class VirtualizationConfigurationQemu extends
this.vmConfig.removeInterfaceDevicesSource();
}
+ @Override
+ public boolean addEmptyHddTemplate()
+ {
+ return this.addHddTemplate( new String(), null, null );
+ }
+
@Override
public boolean addHddTemplate( File diskImage, String hddMode, String redoDir )
{
@@ -348,13 +354,22 @@ public class VirtualizationConfigurationQemu extends
storageDiskDevice.setBusType( BusType.VIRTIO );
String targetDevName = VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( "vd", index );
storageDiskDevice.setTargetDevice( targetDevName );
- storageDiskDevice.setStorage( StorageType.FILE, diskImagePath );
+
+ if ( diskImagePath == null || diskImagePath.isEmpty() ) {
+ storageDiskDevice.removeStorage();
+ } else {
+ storageDiskDevice.setStorage( StorageType.FILE, diskImagePath );
+ }
// add new created HDD to the metadata of the QemuMetaData object, too
this.addHddMetaData( storageDiskDevice );
} else {
// HDD exists, so update existing storage (HDD) device
- storageDiskDevice.setStorage( StorageType.FILE, diskImagePath );
+ if ( diskImagePath == null || diskImagePath.isEmpty() ) {
+ storageDiskDevice.removeStorage();
+ } else {
+ storageDiskDevice.setStorage( StorageType.FILE, diskImagePath );
+ }
}
return true;
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
index d32d496..c53a7e0 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
@@ -131,6 +131,12 @@ public class VirtualizationConfigurationVirtualBox extends VirtualizationConfigu
return config.toString( true ).getBytes( StandardCharsets.UTF_8 );
}
+ @Override
+ public boolean addEmptyHddTemplate()
+ {
+ return this.addHddTemplate( "%VM_DISK_PATH%", "%VM_DISK_MODE%", "%VM_DISK_REDOLOGDIR%" );
+ }
+
@Override
public boolean addHddTemplate( String diskImage, String hddMode, String redoDir )
{
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java
index e1102b6..3e8d913 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java
@@ -238,6 +238,12 @@ public class VirtualizationConfigurationVmware extends VirtualizationConfigurati
}
}
+ @Override
+ public boolean addEmptyHddTemplate()
+ {
+ return this.addHddTemplate( "%VM_DISK_PATH%", "%VM_DISK_MODE%", "%VM_DISK_REDOLOGDIR%" );
+ }
+
@Override
public boolean addHddTemplate( File diskImage, String hddMode, String redoDir )
{
@@ -251,6 +257,7 @@ public class VirtualizationConfigurationVmware extends VirtualizationConfigurati
LOGGER.error( "Empty disk image path given!" );
return false;
}
+
DriveBusType bus;
try {
bus = DriveBusType.valueOf( config.get( "#SLX_HDD_BUS" ) );
diff --git a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClient.java b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClient.java
index 6c573bb..580b0fc 100644
--- a/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClient.java
+++ b/src/main/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClient.java
@@ -78,8 +78,8 @@ public class ConfigurationLogicDozModServerToStatelessClient
throw new TransformationException( "Can not set display name in virtualization configuration!" );
}
- // append hard disk drive
- if ( !config.addHddTemplate( "%VM_DISK_PATH%", "%VM_DISK_MODE%", "%VM_DISK_REDOLOGDIR%" ) ) {
+ // append hard disk drive (with no referenced image as content)
+ if ( !config.addEmptyHddTemplate() ) {
throw new TransformationException( "Can not configure hard disk in virtualization configuration!" );
}
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
index b3cbd8a..034269b 100644
--- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
@@ -56,8 +56,8 @@ public class ConfigurationLogicDozModServerToDozModClientTest
final String transformedConfig = config.getConfigurationAsString();
final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
- assertDoesNotThrow( () -> config.validate() );
assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertDoesNotThrow( () -> config.validate() );
}
@Test
@@ -77,7 +77,8 @@ public class ConfigurationLogicDozModServerToDozModClientTest
final String transformedConfig = config.getConfigurationAsString();
final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
- assertTrue(ConfigurationLogicTestUtils.isVirtualBoxContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertTrue(
+ ConfigurationLogicTestUtils.isVirtualBoxContentEqual( expectedTransformedConfig, transformedConfig ) );
assertDoesNotThrow( () -> config.validate() );
}
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java
new file mode 100644
index 0000000..186f422
--- /dev/null
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java
@@ -0,0 +1,99 @@
+package org.openslx.virtualization.configuration.logic;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.openslx.libvirt.xml.LibvirtXmlTestResources;
+import org.openslx.virtualization.configuration.VirtualizationConfiguration;
+import org.openslx.virtualization.configuration.data.ConfigurationDataDozModServerToStatelessClient;
+import org.openslx.virtualization.configuration.transformation.TransformationException;
+
+public class ConfigurationLogicDozModServerToStatelessClientTest
+{
+ private static final String DEFAULT_DISPLAY_NAME = "Test";
+ private static final String DEFAULT_OS_ID = null;
+ private static final boolean DEFAULT_HAS_USB_ACCESS = true;
+
+ private static final ConfigurationDataDozModServerToStatelessClient DEFAULT_CONFIG_DATA = new ConfigurationDataDozModServerToStatelessClient(
+ ConfigurationLogicDozModServerToStatelessClientTest.DEFAULT_DISPLAY_NAME,
+ ConfigurationLogicDozModServerToStatelessClientTest.DEFAULT_OS_ID,
+ ConfigurationLogicDozModServerToStatelessClientTest.DEFAULT_HAS_USB_ACCESS );
+
+ @BeforeAll
+ public static void setUp()
+ {
+ // disable logging with log4j
+ LogManager.getRootLogger().setLevel( Level.OFF );
+ }
+
+ @Test
+ @DisplayName( "Test transformation logic between a dozmod-server and a stateless client for Libvirt/QEMU configuration" )
+ public void testConfigurationLogicDozModServerToStatelessClientLibvirt() throws TransformationException
+ {
+ final String inputConfigFileName = "qemu-kvm_default-ubuntu-20-04-vm_transform-privacy.xml";
+ final String expectedConfigFileName = "qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent.xml";
+ final File inputConfig = LibvirtXmlTestResources.getLibvirtXmlFile( inputConfigFileName );
+ final File expectedConfig = LibvirtXmlTestResources.getLibvirtXmlFile( expectedConfigFileName );
+ final VirtualizationConfiguration config;
+ config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig );
+ final ConfigurationLogicDozModServerToStatelessClient logic = new ConfigurationLogicDozModServerToStatelessClient();
+
+ logic.apply( config, ConfigurationLogicDozModServerToStatelessClientTest.DEFAULT_CONFIG_DATA );
+
+ final String transformedConfig = config.getConfigurationAsString();
+ final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
+
+ assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertDoesNotThrow( () -> config.validate() );
+ }
+
+ @Test
+ @DisplayName( "Test transformation logic between a dozmod-server and a stateless client for VirtualBox configuration" )
+ public void testConfigurationLogicDozModServerToStatelessClientVirtualBox() throws TransformationException
+ {
+ final String inputConfigFileName = "virtualbox_default-ubuntu_transform-privacy.vbox";
+ final String expectedConfigFileName = "virtualbox_default-ubuntu_transform-non-persistent.vbox";
+ final File inputConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( inputConfigFileName );
+ final File expectedConfig = ConfigurationLogicTestResources.getVirtualBoxXmlFile( expectedConfigFileName );
+ final VirtualizationConfiguration config;
+ config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig );
+ final ConfigurationLogicDozModServerToStatelessClient logic = new ConfigurationLogicDozModServerToStatelessClient();
+
+ logic.apply( config, ConfigurationLogicDozModServerToStatelessClientTest.DEFAULT_CONFIG_DATA );
+
+ final String transformedConfig = config.getConfigurationAsString();
+ final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
+
+ assertTrue(
+ ConfigurationLogicTestUtils.isVirtualBoxContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertDoesNotThrow( () -> config.validate() );
+ }
+
+ @Test
+ @DisplayName( "Test transformation logic between dozmod-server and a stateless client for VMware configuration" )
+ public void testConfigurationLogicDozModServerToStatelessClientVmware() throws TransformationException
+ {
+ final String inputConfigFileName = "vmware-player_default-ubuntu_transform-privacy.vmx";
+ final String expectedConfigFileName = "vmware-player_default-ubuntu_transform-non-persistent.vmx";
+ final File inputConfig = ConfigurationLogicTestResources.getVmwareVmxFile( inputConfigFileName );
+ final File expectedConfig = ConfigurationLogicTestResources.getVmwareVmxFile( expectedConfigFileName );
+ final VirtualizationConfiguration config;
+ config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig );
+ final ConfigurationLogicDozModServerToStatelessClient logic = new ConfigurationLogicDozModServerToStatelessClient();
+
+ logic.apply( config, ConfigurationLogicDozModServerToStatelessClientTest.DEFAULT_CONFIG_DATA );
+
+ final String transformedConfig = config.getConfigurationAsString();
+ final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
+
+ assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
+ assertDoesNotThrow( () -> config.validate() );
+ }
+}
diff --git a/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent.xml b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent.xml
new file mode 100644
index 0000000..2f283ca
--- /dev/null
+++ b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-non-persistent.xml
@@ -0,0 +1,164 @@
+
+ Test
+ 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
+
+
+
+
+
+
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox
new file mode 100644
index 0000000..8ca8cde
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-non-persistent.vbox
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-non-persistent.vmx b/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-non-persistent.vmx
new file mode 100644
index 0000000..e62d33a
--- /dev/null
+++ b/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-non-persistent.vmx
@@ -0,0 +1,42 @@
+.encoding = "UTF-8"
+config.version = "8"
+displayName = "Test"
+ehci.present = "TRUE"
+ethernet0.connectionType = "custom"
+ethernet0.present = "TRUE"
+ethernet0.virtualDev = "e1000"
+ethernet0.vnet = "vmnet1"
+guestOS = "ubuntu-64"
+hpet0.present = "TRUE"
+mks.enable3d = "TRUE"
+pciBridge0.present = "TRUE"
+pciBridge4.functions = "8"
+pciBridge4.present = "TRUE"
+pciBridge4.virtualDev = "pcieRootPort"
+pciBridge5.functions = "8"
+pciBridge5.present = "TRUE"
+pciBridge5.virtualDev = "pcieRootPort"
+pciBridge6.functions = "8"
+pciBridge6.present = "TRUE"
+pciBridge6.virtualDev = "pcieRootPort"
+pciBridge7.functions = "8"
+pciBridge7.present = "TRUE"
+pciBridge7.virtualDev = "pcieRootPort"
+sata0:1.deviceType = "cdrom-raw"
+scsi0.present = "TRUE"
+scsi0.virtualDev = "lsilogic"
+scsi0:0.deviceType = "disk"
+scsi0:0.fileName = "%VM_DISK_PATH%"
+scsi0:0.mode = "%VM_DISK_MODE%"
+scsi0:0.present = "TRUE"
+scsi0:0.redo = ""
+scsi0:0.redoLogDir = "%VM_DISK_REDOLOGDIR%"
+sound.autoDetect = "TRUE"
+sound.fileName = "-1"
+sound.present = "TRUE"
+suspend.disabled = "TRUE"
+tools.syncTime = "FALSE"
+usb.present = "TRUE"
+usb.vbluetooth.startConnected = "TRUE"
+virtualHW.productCompatibility = "hosted"
+virtualHW.version = "18"
--
cgit v1.2.3-55-g7522
From 15b7fb9f9e6770696f568b0239d2ffec34000e56 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Mon, 10 May 2021 09:51:43 +0200
Subject: Fix HDD detection in VirtualBox configurations newer or equal than
v1.17
---
.../java/org/openslx/virtualization/Version.java | 32 +++++
.../VirtualizationConfigurationVirtualBox.java | 5 +
...alizationConfigurationVirtualboxFileFormat.java | 55 +++++++-
.../org/openslx/virtualization/VersionTest.java | 26 +++-
.../VirtualizationConfigurationTestResources.java | 18 +++
.../VirtualizationConfigurationVirtualBoxTest.java | 144 +++++++++++++++++++
.../xml/virtualbox_default-ubuntu_v1-15.vbox | 155 +++++++++++++++++++++
.../xml/virtualbox_default-ubuntu_v1-16.vbox | 59 ++++++++
.../xml/virtualbox_default-ubuntu_v1-17.vbox | 59 ++++++++
.../xml/virtualbox_default-ubuntu_v1-18.vbox | 56 ++++++++
10 files changed, 605 insertions(+), 4 deletions(-)
create mode 100644 src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationTestResources.java
create mode 100644 src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-15.vbox
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-16.vbox
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-17.vbox
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-18.vbox
(limited to 'src/test/resources/virtualbox/xml')
diff --git a/src/main/java/org/openslx/virtualization/Version.java b/src/main/java/org/openslx/virtualization/Version.java
index 698e22e..fbd1bda 100644
--- a/src/main/java/org/openslx/virtualization/Version.java
+++ b/src/main/java/org/openslx/virtualization/Version.java
@@ -200,6 +200,28 @@ public class Version implements Comparable
return supportedVersions.stream().filter( byMajorMinor ).findFirst().orElse( null );
}
+ /**
+ * Checks if this version is smaller than a specified {@code version}.
+ *
+ * @param version for comparison.
+ * @return state whether this version is smaller than the specified {@code version} or not.
+ */
+ public boolean isSmallerThan( Version version )
+ {
+ return ( this.compareTo( version ) < 0 ) ? true : false;
+ }
+
+ /**
+ * Checks if this version is greater than a specified {@code version}.
+ *
+ * @param version for comparison.
+ * @return state whether this version is greater than the specified {@code version} or not.
+ */
+ public boolean isGreaterThan( Version version )
+ {
+ return ( this.compareTo( version ) > 0 ) ? true : false;
+ }
+
/**
* Creates a new version parsed from a {@link String}.
*
@@ -237,6 +259,16 @@ public class Version implements Comparable
return parsedVersion;
}
+ @Override
+ public String toString()
+ {
+ if ( this.getName() == null || this.getName().isEmpty() ) {
+ return String.format( "%d.%d", this.getMajor(), this.getMinor() );
+ } else {
+ return String.format( "%d.%d %s", this.getMajor(), this.getMinor(), this.getName() );
+ }
+ }
+
@Override
public boolean equals( Object obj )
{
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
index 8225af1..81b9af8 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
@@ -382,6 +382,11 @@ public class VirtualizationConfigurationVirtualBox
{
}
+ public Version getConfigurationVersion()
+ {
+ return this.config.getVersion();
+ }
+
@Override
public Version getVirtualizerVersion()
{
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java
index 5b74e52..56e0844 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java
@@ -7,6 +7,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.xml.XMLConstants;
import javax.xml.transform.stream.StreamSource;
@@ -20,6 +22,7 @@ import javax.xml.xpath.XPathExpressionException;
import org.apache.log4j.Logger;
import org.openslx.util.Util;
import org.openslx.util.XmlHelper;
+import org.openslx.virtualization.Version;
import org.openslx.virtualization.configuration.VirtualizationConfiguration.DriveBusType;
import org.openslx.virtualization.configuration.VirtualizationConfiguration.HardDisk;
import org.w3c.dom.DOMException;
@@ -43,6 +46,11 @@ public class VirtualizationConfigurationVirtualboxFileFormat
// XPath and DOM parsing related members
private Document doc = null;
+ /**
+ * Version of the configuration file format.
+ */
+ private Version version = null;
+
// list of nodes to automatically remove when reading the vbox file
private static String[] blacklist = {
"/VirtualBox/Machine/Hardware/GuestProperties",
@@ -53,6 +61,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat
"/VirtualBox/Machine/Hardware/Network/Adapter[@enabled='true']/*",
"/VirtualBox/Machine/ExtraData",
"/VirtualBox/Machine/StorageControllers/StorageController/AttachedDevice[not(@type='HardDisk')]",
+ "/VirtualBox/Machine/Hardware/StorageControllers/StorageController/AttachedDevice[not(@type='HardDisk')]",
"/VirtualBox/Machine/MediaRegistry/FloppyImages",
"/VirtualBox/Machine/MediaRegistry/DVDImages" };
@@ -139,6 +148,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat
throw new VirtualizationConfigurationException( "Machine doesn't have a name" );
}
try {
+ this.parseConfigurationVersion();
ensureHardwareUuid();
setOsType();
fixUsb(); // Since we now support selecting specific speed
@@ -154,6 +164,27 @@ public class VirtualizationConfigurationVirtualboxFileFormat
}
}
+ private void parseConfigurationVersion() throws XPathExpressionException, VirtualizationConfigurationException
+ {
+ final String versionText = XmlHelper.XPath.compile( "/VirtualBox/@version" ).evaluate( this.doc );
+
+ if ( versionText == null || versionText.isEmpty() ) {
+ throw new VirtualizationConfigurationException( "Configuration file does not contain any version number!" );
+ } else {
+ // parse version information from textual description
+ final Pattern versionPattern = Pattern.compile( "^(\\d+\\.\\d+).*$" );
+ final Matcher versionMatcher = versionPattern.matcher( versionText );
+
+ if ( versionMatcher.find() ) {
+ this.version = Version.valueOf( versionMatcher.group( 1 ) );
+ }
+
+ if ( this.version == null ) {
+ throw new VirtualizationConfigurationException( "Configuration file version number is not valid!" );
+ }
+ }
+ }
+
private void fixUsb()
{
NodeList list = findNodes( "/VirtualBox/Machine/Hardware/USB/Controllers/Controller" );
@@ -216,6 +247,11 @@ public class VirtualizationConfigurationVirtualboxFileFormat
}
}
+ public Version getVersion()
+ {
+ return this.version;
+ }
+
/**
* Self-explanatory.
*/
@@ -243,7 +279,14 @@ public class VirtualizationConfigurationVirtualboxFileFormat
continue;
String hddUuid = hdd.getAttribute( "uuid" );
hdd.setAttribute( "uuid", PlaceHolder.HDDUUID.toString() + i + "%" );
- NodeList images = findNodes( "/VirtualBox/Machine/StorageControllers/StorageController/AttachedDevice/Image" );
+ final NodeList images;
+ if ( this.getVersion().isSmallerThan( Version.valueOf( "1.17" ) ) ) {
+ images = findNodes( "/VirtualBox/Machine/StorageControllers/StorageController/AttachedDevice/Image" );
+ } else {
+ images = findNodes(
+ "/VirtualBox/Machine/Hardware/StorageControllers/StorageController/AttachedDevice/Image" );
+ }
+
for ( int j = 0; j < images.getLength(); j++ ) {
Element image = (Element)images.item( j );
if ( image == null )
@@ -340,7 +383,15 @@ public class VirtualizationConfigurationVirtualboxFileFormat
*/
public void setHdds() throws XPathExpressionException
{
- XPathExpression hddsExpr = XmlHelper.XPath.compile( "/VirtualBox/Machine/StorageControllers/StorageController/AttachedDevice[@type='HardDisk']/Image" );
+ final XPathExpression hddsExpr;
+ if ( this.getVersion().isSmallerThan( Version.valueOf( "1.17" ) ) ) {
+ hddsExpr = XmlHelper.XPath.compile(
+ "/VirtualBox/Machine/StorageControllers/StorageController/AttachedDevice[@type='HardDisk']/Image" );
+ } else {
+ hddsExpr = XmlHelper.XPath.compile(
+ "/VirtualBox/Machine/Hardware/StorageControllers/StorageController/AttachedDevice[@type='HardDisk']/Image" );
+ }
+
NodeList nodes = (NodeList)hddsExpr.evaluate( this.doc, XPathConstants.NODESET );
if ( nodes == null ) {
LOGGER.error( "Failed to find attached hard drives." );
diff --git a/src/test/java/org/openslx/virtualization/VersionTest.java b/src/test/java/org/openslx/virtualization/VersionTest.java
index 988437a..21464d9 100644
--- a/src/test/java/org/openslx/virtualization/VersionTest.java
+++ b/src/test/java/org/openslx/virtualization/VersionTest.java
@@ -92,8 +92,19 @@ public class VersionTest
}
@Test
- @DisplayName( "Test that version is larger than" )
- public void testVersionLargerThan()
+ @DisplayName( "Test that version is smaller than with helper method" )
+ public void testVersionSmallerThanMethod()
+ {
+ final Version versionOne = new Version( Short.valueOf( "2" ), Short.valueOf( "3" ) );
+ final Version versionTwo = new Version( Short.valueOf( "3" ), Short.valueOf( "2" ) );
+
+ assertTrue( versionOne.isSmallerThan( versionTwo ) );
+ assertFalse( versionTwo.isSmallerThan( versionOne ) );
+ }
+
+ @Test
+ @DisplayName( "Test that version is greater than" )
+ public void testVersionGreaterThan()
{
final Version versionOne = new Version( Short.valueOf( "3" ), Short.valueOf( "3" ) );
final Version versionTwo = new Version( Short.valueOf( "3" ), Short.valueOf( "2" ) );
@@ -102,6 +113,17 @@ public class VersionTest
assertEquals( -1, versionTwo.compareTo( versionOne ) );
}
+ @Test
+ @DisplayName( "Test that version is greater than with helper method" )
+ public void testVersionGreaterThanMethod()
+ {
+ final Version versionOne = new Version( Short.valueOf( "3" ), Short.valueOf( "3" ) );
+ final Version versionTwo = new Version( Short.valueOf( "3" ), Short.valueOf( "2" ) );
+
+ assertTrue( versionOne.isGreaterThan( versionTwo ) );
+ assertFalse( versionTwo.isGreaterThan( versionOne ) );
+ }
+
@Test
@DisplayName( "Test that versions are equal (compareTo)" )
public void testVersionEqualCompareTo()
diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationTestResources.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationTestResources.java
new file mode 100644
index 0000000..4dfd0b7
--- /dev/null
+++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationTestResources.java
@@ -0,0 +1,18 @@
+package org.openslx.virtualization.configuration;
+
+import java.io.File;
+
+import org.openslx.virtualization.configuration.logic.ConfigurationLogicTestResources;
+
+public class VirtualizationConfigurationTestResources
+{
+ public static File getVmwareVmxFile( String vmwareVmxFileName )
+ {
+ return ConfigurationLogicTestResources.getVmwareVmxFile( vmwareVmxFileName );
+ }
+
+ public static File getVirtualBoxXmlFile( String virtualBoxXmlFileName )
+ {
+ return ConfigurationLogicTestResources.getVirtualBoxXmlFile( virtualBoxXmlFileName );
+ }
+}
diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java
new file mode 100644
index 0000000..496c080
--- /dev/null
+++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java
@@ -0,0 +1,144 @@
+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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.openslx.virtualization.Version;
+import org.openslx.vm.disk.DiskImage.ImageFormat;
+
+public class VirtualizationConfigurationVirtualBoxTest
+{
+ @BeforeAll
+ public static void setUp()
+ {
+ // disable logging with log4j
+ LogManager.getRootLogger().setLevel( Level.OFF );
+ }
+
+ @ParameterizedTest
+ @DisplayName( "Test version from VM configuration" )
+ @MethodSource( "configAndVersionProvider" )
+ public void testVirtualizationConfigurationVirtualBoxGetConfigurationVersion( String configFileName,
+ Version configVersion )
+ throws IOException, VirtualizationConfigurationException
+ {
+ final File configFile = VirtualizationConfigurationTestResources.getVirtualBoxXmlFile( configFileName );
+ final VirtualizationConfigurationVirtualBox vmConfig = new VirtualizationConfigurationVirtualBox( null,
+ configFile );
+
+ assertEquals( configVersion, vmConfig.getConfigurationVersion() );
+
+ assertDoesNotThrow( () -> vmConfig.validate() );
+ }
+
+ @ParameterizedTest
+ @DisplayName( "Test display name from VM configuration" )
+ @MethodSource( "configAndVersionProvider" )
+ public void testVirtualizationConfigurationVirtualBoxGetDisplayName( String configFileName, Version configVersion )
+ throws IOException, VirtualizationConfigurationException
+ {
+ final File configFile = VirtualizationConfigurationTestResources.getVirtualBoxXmlFile( configFileName );
+ final VirtualizationConfigurationVirtualBox vmConfig = new VirtualizationConfigurationVirtualBox( null,
+ configFile );
+
+ final String displayName = vmConfig.getDisplayName();
+
+ assertEquals( VirtualizationConfigurationVirtualBoxTest.getVmName( configVersion ), displayName );
+
+ assertDoesNotThrow( () -> vmConfig.validate() );
+ }
+
+ @ParameterizedTest
+ @DisplayName( "Test machine snapshot state from VM configuration" )
+ @MethodSource( "configAndVersionProvider" )
+ public void testVirtualizationConfigurationVirtualBoxIsMachineSnapshot( String configFileName,
+ Version configVersion )
+ throws IOException, VirtualizationConfigurationException
+ {
+ final File configFile = VirtualizationConfigurationTestResources.getVirtualBoxXmlFile( configFileName );
+ final VirtualizationConfigurationVirtualBox vmConfig = new VirtualizationConfigurationVirtualBox( null,
+ configFile );
+
+ final boolean isVmSnapshot = vmConfig.isMachineSnapshot();
+
+ assertFalse( isVmSnapshot );
+
+ assertDoesNotThrow( () -> vmConfig.validate() );
+ }
+
+ @ParameterizedTest
+ @DisplayName( "Test supported image formats from VM configuration" )
+ @MethodSource( "configAndVersionProvider" )
+ public void testVirtualizationConfigurationVirtualBoxGetSupportedImageFormats( String configFileName,
+ Version configVersion )
+ throws IOException, VirtualizationConfigurationException
+ {
+ final File configFile = VirtualizationConfigurationTestResources.getVirtualBoxXmlFile( configFileName );
+ final VirtualizationConfigurationVirtualBox vmConfig = new VirtualizationConfigurationVirtualBox( null,
+ configFile );
+
+ final List supportedImageFormats = vmConfig.getVirtualizer().getSupportedImageFormats();
+
+ assertNotNull( supportedImageFormats );
+ assertEquals( 1, supportedImageFormats.size() );
+ assertTrue( supportedImageFormats.containsAll( Arrays.asList( ImageFormat.VDI ) ) );
+
+ assertDoesNotThrow( () -> vmConfig.validate() );
+ }
+
+ @ParameterizedTest
+ @DisplayName( "Test output of HDDs from VM configuration" )
+ @MethodSource( "configAndVersionProvider" )
+ public void testVirtualizationConfigurationVirtualBoxGetHdds( String configFileName, Version configVersion )
+ throws IOException, VirtualizationConfigurationException
+ {
+ final File configFile = VirtualizationConfigurationTestResources.getVirtualBoxXmlFile( configFileName );
+ final VirtualizationConfigurationVirtualBox vmConfig = new VirtualizationConfigurationVirtualBox( null,
+ configFile );
+
+ final List hdds = vmConfig.getHdds();
+
+ final String imageFileName = VirtualizationConfigurationVirtualBoxTest.getVmName( configVersion ) + ".vdi";
+
+ assertNotNull( hdds );
+ assertEquals( 1, hdds.size() );
+ assertEquals( imageFileName, hdds.get( 0 ).diskImage );
+
+ assertDoesNotThrow( () -> vmConfig.validate() );
+ }
+
+ static String getVmName( Version version )
+ {
+ return "ubuntu_" + version.toString().replace( '.', '-' );
+ }
+
+ static Stream configAndVersionProvider()
+ {
+ return Stream.of(
+ arguments( "virtualbox_default-ubuntu_v1-15.vbox",
+ new Version( Short.valueOf( "1" ), Short.valueOf( "15" ) ) ),
+ arguments( "virtualbox_default-ubuntu_v1-16.vbox",
+ new Version( Short.valueOf( "1" ), Short.valueOf( "16" ) ) ),
+ arguments( "virtualbox_default-ubuntu_v1-17.vbox",
+ new Version( Short.valueOf( "1" ), Short.valueOf( "17" ) ) ),
+ arguments( "virtualbox_default-ubuntu_v1-18.vbox",
+ new Version( Short.valueOf( "1" ), Short.valueOf( "18" ) ) ) );
+ }
+}
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-15.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-15.vbox
new file mode 100644
index 0000000..5e04478
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-15.vbox
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-16.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-16.vbox
new file mode 100644
index 0000000..04213e8
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-16.vbox
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-17.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-17.vbox
new file mode 100644
index 0000000..d9218ab
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-17.vbox
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-18.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-18.vbox
new file mode 100644
index 0000000..6d70339
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_v1-18.vbox
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.2.3-55-g7522
From 5f971405f11b838b3075c5322140f11ca04860c7 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Wed, 12 May 2021 12:40:15 +0200
Subject: Implements XML schema validation for VirtualBox configurations
---
src/main/java/org/openslx/util/XmlHelper.java | 48 +-
.../java/org/openslx/virtualization/Version.java | 6 +
.../VirtualizationConfigurationVirtualBox.java | 1 +
...alizationConfigurationVirtualboxFileFormat.java | 153 +-
.../virtualbox/xsd/VirtualBox-settings.xsd | 1503 --------------------
.../VirtualizationConfigurationVirtualBoxTest.java | 47 +-
...urationLogicDozModClientToDozModServerTest.java | 5 +-
...urationLogicDozModServerToDozModClientTest.java | 5 +-
...tionLogicDozModServerToStatelessClientTest.java | 5 +-
.../xml/virtualbox_default-windows-7_v1-15.vbox | 56 +
.../xml/virtualbox_default-windows-7_v1-16.vbox | 53 +
.../xml/virtualbox_default-windows-7_v1-17.vbox | 55 +
.../xml/virtualbox_default-windows-7_v1-18.vbox | 56 +
13 files changed, 425 insertions(+), 1568 deletions(-)
delete mode 100644 src/main/resources/virtualbox/xsd/VirtualBox-settings.xsd
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-15.vbox
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-16.vbox
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-17.vbox
create mode 100644 src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-18.vbox
(limited to 'src/test/resources/virtualbox/xml')
diff --git a/src/main/java/org/openslx/util/XmlHelper.java b/src/main/java/org/openslx/util/XmlHelper.java
index 70c5be8..4e814a0 100644
--- a/src/main/java/org/openslx/util/XmlHelper.java
+++ b/src/main/java/org/openslx/util/XmlHelper.java
@@ -3,6 +3,8 @@ package org.openslx.util;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -14,6 +16,7 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
@@ -28,10 +31,11 @@ public class XmlHelper
private final static Logger LOGGER = Logger.getLogger( XmlHelper.class );
// TODO check thread-safety
- public static final XPath XPath = XPathFactory.newInstance().newXPath();
+ private static final XPath XPath = XPathFactory.newInstance().newXPath();
private static DocumentBuilder dBuilder;
static {
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+ dbFactory.setNamespaceAware( true );
dbFactory.setIgnoringComments( true );
try {
dBuilder = dbFactory.newDocumentBuilder();
@@ -40,6 +44,48 @@ public class XmlHelper
}
}
+ public static String globalXPathToLocalXPath( String xPath )
+ {
+ final StringBuilder exprBuilder = new StringBuilder();
+ final String[] elements = xPath.split( "/" );
+
+ for ( final String element : elements ) {
+ if ( !element.isEmpty() ) {
+ final Pattern arraySpecifierRegex = Pattern.compile( "^(.*)\\[(.*)\\]$" );
+ final Matcher arraySpecifierMatcher = arraySpecifierRegex.matcher( element );
+ final String elementName;
+ final String elementSpecifier;
+
+ if ( arraySpecifierMatcher.find() ) {
+ elementName = arraySpecifierMatcher.group( 1 );
+ elementSpecifier = arraySpecifierMatcher.group( 2 );
+ } else {
+ elementName = element;
+ elementSpecifier = null;
+ }
+
+ if ( !elementName.startsWith( "@" ) && !elementName.equals( "*" ) ) {
+ exprBuilder.append( "/*[local-name()='" + elementName + "']" );
+
+ } else {
+ exprBuilder.append( "/" + elementName );
+ }
+
+ if ( elementSpecifier != null && !elementSpecifier.isEmpty() ) {
+ exprBuilder.append( "[" + elementSpecifier + "]" );
+ }
+ }
+ }
+
+ return exprBuilder.toString();
+ }
+
+ public static XPathExpression compileXPath( String xPath ) throws XPathExpressionException
+ {
+ final String localXPath = XmlHelper.globalXPathToLocalXPath( xPath );
+ return XPath.compile( localXPath );
+ }
+
public static Document parseDocumentFromStream( InputStream is )
{
Document doc = null;
diff --git a/src/main/java/org/openslx/virtualization/Version.java b/src/main/java/org/openslx/virtualization/Version.java
index fbd1bda..51dc98b 100644
--- a/src/main/java/org/openslx/virtualization/Version.java
+++ b/src/main/java/org/openslx/virtualization/Version.java
@@ -311,4 +311,10 @@ public class Version implements Comparable
}
}
}
+
+ @Override
+ public int hashCode()
+ {
+ return ( Short.valueOf( this.getMajor() ).hashCode() ) ^ ( Short.valueOf( this.getMinor() ).hashCode() );
+ }
}
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
index 81b9af8..6922c8c 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java
@@ -553,5 +553,6 @@ public class VirtualizationConfigurationVirtualBox
@Override
public void validate() throws VirtualizationConfigurationException
{
+ this.config.validate();
}
}
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java
index 56e0844..b1c940a 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java
@@ -6,11 +6,13 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.xml.XMLConstants;
+import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
@@ -51,6 +53,26 @@ public class VirtualizationConfigurationVirtualboxFileFormat
*/
private Version version = null;
+ /**
+ * File names of XML schema files for different file format versions.
+ */
+ private final static HashMap FILE_FORMAT_SCHEMA_VERSIONS = new HashMap() {
+
+ private static final long serialVersionUID = -3163681758191475625L;
+
+ {
+ put( Version.valueOf( "1.15" ), "VirtualBox-settings_v1-15.xsd" );
+ put( Version.valueOf( "1.16" ), "VirtualBox-settings_v1-16.xsd" );
+ put( Version.valueOf( "1.17" ), "VirtualBox-settings_v1-17.xsd" );
+ put( Version.valueOf( "1.18" ), "VirtualBox-settings_v1-18.xsd" );
+ }
+ };
+
+ /**
+ * Path to the VirtualBox file format schemas within the *.jar file.
+ */
+ private final static String FILE_FORMAT_SCHEMA_PREFIX_PATH = File.separator + "virtualbox" + File.separator + "xsd";
+
// list of nodes to automatically remove when reading the vbox file
private static String[] blacklist = {
"/VirtualBox/Machine/Hardware/GuestProperties",
@@ -97,26 +119,13 @@ public class VirtualizationConfigurationVirtualboxFileFormat
*/
public VirtualizationConfigurationVirtualboxFileFormat( File file ) throws IOException, VirtualizationConfigurationException
{
- // first validate xml
- try {
- SchemaFactory factory = SchemaFactory.newInstance( XMLConstants.W3C_XML_SCHEMA_NS_URI );
- InputStream xsdStream = VirtualizationConfigurationVirtualboxFileFormat.class.getResourceAsStream( "/virtualbox/xsd/VirtualBox-settings.xsd" );
- if ( xsdStream == null ) {
- LOGGER.warn( "Cannot validate Vbox XML: No XSD found in JAR" );
- } else {
- Schema schema = factory.newSchema( new StreamSource( xsdStream ) );
- Validator validator = schema.newValidator();
- validator.validate( new StreamSource( file ) );
- }
- } catch ( SAXException e ) {
- LOGGER.error( "Selected vbox file was not validated against the XSD schema: " + e.getMessage() );
- }
- // valid xml, try to create the DOM
doc = XmlHelper.parseDocumentFromStream( new FileInputStream( file ) );
doc = XmlHelper.removeFormattingNodes( doc );
if ( doc == null )
- throw new VirtualizationConfigurationException( "Could not create DOM from given VirtualBox machine configuration file!" );
- init();
+ throw new VirtualizationConfigurationException( "Could not parse given VirtualBox machine configuration file!" );
+
+ this.parseConfigurationVersion();
+ this.init();
}
/**
@@ -130,12 +139,59 @@ public class VirtualizationConfigurationVirtualboxFileFormat
public VirtualizationConfigurationVirtualboxFileFormat( byte[] machineDescription, int length ) throws VirtualizationConfigurationException
{
ByteArrayInputStream is = new ByteArrayInputStream( machineDescription );
+
doc = XmlHelper.parseDocumentFromStream( is );
if ( doc == null ) {
- LOGGER.error( "Failed to create a DOM from given machine description." );
- throw new VirtualizationConfigurationException( "Could not create DOM from given machine description as. byte array." );
+ final String errorMsg = "Could not parse given VirtualBox machine description from byte array!";
+ LOGGER.debug( errorMsg );
+ throw new VirtualizationConfigurationException( errorMsg );
+ }
+
+ this.parseConfigurationVersion();
+ this.init();
+ }
+
+ public void validate() throws VirtualizationConfigurationException
+ {
+ this.validateFileFormatVersion( this.getVersion() );
+ }
+
+ public void validateFileFormatVersion( Version version ) throws VirtualizationConfigurationException
+ {
+ if ( this.getVersion() != null && this.doc != null ) {
+ // check if specified version is supported
+ final String fileName = FILE_FORMAT_SCHEMA_VERSIONS.get( version );
+
+ if ( fileName == null ) {
+ final String errorMsg = "File format version " + version.toString() + " is not supported!";
+ LOGGER.debug( errorMsg );
+ throw new VirtualizationConfigurationException( errorMsg );
+ } else {
+ // specified version is supported, so validate document with corresponding schema file
+ final InputStream schemaResource = VirtualizationConfigurationVirtualboxFileFormat
+ .getSchemaResource( fileName );
+
+ if ( schemaResource != null ) {
+ try {
+ final SchemaFactory factory = SchemaFactory.newInstance( XMLConstants.W3C_XML_SCHEMA_NS_URI );
+ final Schema schema = factory.newSchema( new StreamSource( schemaResource ) );
+ final Validator validator = schema.newValidator();
+ validator.validate( new DOMSource( this.doc ) );
+ } catch ( SAXException | IOException e ) {
+ final String errorMsg = "XML configuration is not a valid VirtualBox v" + version.toString()
+ + " configuration: " + e.getLocalizedMessage();
+ LOGGER.debug( errorMsg );
+ throw new VirtualizationConfigurationException( errorMsg );
+ }
+ }
+ }
}
- init();
+ }
+
+ private static InputStream getSchemaResource( String fileName )
+ {
+ final String schemaFilePath = FILE_FORMAT_SCHEMA_PREFIX_PATH + File.separator + fileName;
+ return VirtualizationConfigurationVirtualboxFileFormat.class.getResourceAsStream( schemaFilePath );
}
/**
@@ -144,11 +200,22 @@ public class VirtualizationConfigurationVirtualboxFileFormat
*/
private void init() throws VirtualizationConfigurationException
{
+ try {
+ this.validate();
+ } catch ( VirtualizationConfigurationException e ) {
+ // do not print output of failed validation if placeholders are available
+ // since thoses placeholder values violate the defined UUID pattern
+ if ( !this.checkForPlaceholders() ) {
+ final String errorMsg = "XML configuration is not a valid VirtualBox v" + version.toString()
+ + " configuration: " + e.getLocalizedMessage();
+ LOGGER.debug( errorMsg );
+ }
+ }
+
if ( Util.isEmptyString( getDisplayName() ) ) {
throw new VirtualizationConfigurationException( "Machine doesn't have a name" );
}
try {
- this.parseConfigurationVersion();
ensureHardwareUuid();
setOsType();
fixUsb(); // Since we now support selecting specific speed
@@ -164,9 +231,15 @@ public class VirtualizationConfigurationVirtualboxFileFormat
}
}
- private void parseConfigurationVersion() throws XPathExpressionException, VirtualizationConfigurationException
+ private void parseConfigurationVersion() throws VirtualizationConfigurationException
{
- final String versionText = XmlHelper.XPath.compile( "/VirtualBox/@version" ).evaluate( this.doc );
+ String versionText;
+ try {
+ versionText = XmlHelper.compileXPath( "/VirtualBox/@version" ).evaluate( this.doc );
+ } catch ( XPathExpressionException e ) {
+ throw new VirtualizationConfigurationException(
+ "Failed to parse the version number of the configuration file" );
+ }
if ( versionText == null || versionText.isEmpty() ) {
throw new VirtualizationConfigurationException( "Configuration file does not contain any version number!" );
@@ -222,7 +295,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat
private void ensureHardwareUuid() throws XPathExpressionException, VirtualizationConfigurationException
{
// we will need the machine uuid, so get it
- String machineUuid = XmlHelper.XPath.compile( "/VirtualBox/Machine/@uuid" ).evaluate( this.doc );
+ String machineUuid = XmlHelper.compileXPath( "/VirtualBox/Machine/@uuid" ).evaluate( this.doc );
if ( machineUuid.isEmpty() ) {
LOGGER.error( "Machine UUID empty, should never happen!" );
throw new VirtualizationConfigurationException( "XML doesn't contain a machine uuid" );
@@ -329,7 +402,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat
{
// iterate over the blackList
for ( String blackedTag : blacklist ) {
- XPathExpression blackedExpr = XmlHelper.XPath.compile( blackedTag );
+ XPathExpression blackedExpr = XmlHelper.compileXPath( blackedTag );
NodeList blackedNodes = (NodeList)blackedExpr.evaluate( this.doc, XPathConstants.NODESET );
for ( int i = 0; i < blackedNodes.getLength(); i++ ) {
// go through the child nodes of the blacklisted ones -> why?
@@ -347,7 +420,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat
public String getDisplayName()
{
try {
- return XmlHelper.XPath.compile( "/VirtualBox/Machine/@name" ).evaluate( this.doc );
+ return XmlHelper.compileXPath( "/VirtualBox/Machine/@name" ).evaluate( this.doc );
} catch ( XPathExpressionException e ) {
return "";
}
@@ -360,7 +433,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat
*/
public void setOsType() throws XPathExpressionException
{
- String os = XmlHelper.XPath.compile( "/VirtualBox/Machine/@OSType" ).evaluate( this.doc );
+ String os = XmlHelper.compileXPath( "/VirtualBox/Machine/@OSType" ).evaluate( this.doc );
if ( os != null && !os.isEmpty() ) {
osName = os;
}
@@ -385,10 +458,10 @@ public class VirtualizationConfigurationVirtualboxFileFormat
{
final XPathExpression hddsExpr;
if ( this.getVersion().isSmallerThan( Version.valueOf( "1.17" ) ) ) {
- hddsExpr = XmlHelper.XPath.compile(
+ hddsExpr = XmlHelper.compileXPath(
"/VirtualBox/Machine/StorageControllers/StorageController/AttachedDevice[@type='HardDisk']/Image" );
} else {
- hddsExpr = XmlHelper.XPath.compile(
+ hddsExpr = XmlHelper.compileXPath(
"/VirtualBox/Machine/Hardware/StorageControllers/StorageController/AttachedDevice[@type='HardDisk']/Image" );
}
@@ -405,7 +478,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat
if ( uuid.isEmpty() )
continue;
// got uuid, check if it was registered
- XPathExpression hddsRegistered = XmlHelper.XPath.compile( "/VirtualBox/Machine/MediaRegistry/HardDisks/HardDisk[@uuid='" + uuid + "']" );
+ XPathExpression hddsRegistered = XmlHelper.compileXPath( "/VirtualBox/Machine/MediaRegistry/HardDisks/HardDisk[@uuid='" + uuid + "']" );
NodeList hddsRegisteredNodes = (NodeList)hddsRegistered.evaluate( this.doc, XPathConstants.NODESET );
if ( hddsRegisteredNodes == null || hddsRegisteredNodes.getLength() != 1 ) {
LOGGER.error( "Found hard disk with uuid '" + uuid + "' which does not appear (unique) in the Media Registry. Skipping." );
@@ -484,7 +557,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat
{
NodeList nodes = null;
try {
- XPathExpression expr = XmlHelper.XPath.compile( xpath );
+ XPathExpression expr = XmlHelper.compileXPath( xpath );
Object nodesObject = expr.evaluate( this.doc, XPathConstants.NODESET );
nodes = (NodeList)nodesObject;
} catch ( XPathExpressionException e ) {
@@ -591,13 +664,19 @@ public class VirtualizationConfigurationVirtualboxFileFormat
public void setExtraData( String key, String value )
{
- NodeList nl = findNodes( "/VirtualBox/Machine/ExtraData/ExtraDataItem[@name='" + key + "']" );
+ NodeList nl = findNodes( "/VirtualBox/Machine/ExtraData/ExtraDataItem" );
Element e = null;
- for ( int i = 0; i < nl.getLength(); ++i ) {
- Node n = nl.item( i );
- if ( n.getNodeType() == Node.ELEMENT_NODE ) {
- e = (Element)n;
- break;
+ if ( nl != null ) {
+ for ( int i = 0; i < nl.getLength(); ++i ) {
+ Node n = nl.item( i );
+ if ( n.getNodeType() == Node.ELEMENT_NODE ) {
+ final Element ne = (Element)n;
+ final String keyValue = ne.getAttribute( "name" );
+ if ( keyValue != null && keyValue.equals( key ) ) {
+ e = ne;
+ break;
+ }
+ }
}
}
if ( e == null ) {
diff --git a/src/main/resources/virtualbox/xsd/VirtualBox-settings.xsd b/src/main/resources/virtualbox/xsd/VirtualBox-settings.xsd
deleted file mode 100644
index 396cc14..0000000
--- a/src/main/resources/virtualbox/xsd/VirtualBox-settings.xsd
+++ /dev/null
@@ -1,1503 +0,0 @@
-
-
-
-
-
-
-
- Oracle VM VirtualBox Settings Schema (common definitions).
- Copyright (c) 2004-2020 Oracle Corporation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java
index 496c080..597fffb 100644
--- a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java
@@ -1,6 +1,5 @@
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.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -35,7 +34,7 @@ public class VirtualizationConfigurationVirtualBoxTest
@ParameterizedTest
@DisplayName( "Test version from VM configuration" )
@MethodSource( "configAndVersionProvider" )
- public void testVirtualizationConfigurationVirtualBoxGetConfigurationVersion( String configFileName,
+ public void testVirtualizationConfigurationVirtualBoxGetConfigurationVersion( String name, String configFileName,
Version configVersion )
throws IOException, VirtualizationConfigurationException
{
@@ -44,14 +43,13 @@ public class VirtualizationConfigurationVirtualBoxTest
configFile );
assertEquals( configVersion, vmConfig.getConfigurationVersion() );
-
- assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@DisplayName( "Test display name from VM configuration" )
@MethodSource( "configAndVersionProvider" )
- public void testVirtualizationConfigurationVirtualBoxGetDisplayName( String configFileName, Version configVersion )
+ public void testVirtualizationConfigurationVirtualBoxGetDisplayName( String name, String configFileName,
+ Version configVersion )
throws IOException, VirtualizationConfigurationException
{
final File configFile = VirtualizationConfigurationTestResources.getVirtualBoxXmlFile( configFileName );
@@ -60,15 +58,13 @@ public class VirtualizationConfigurationVirtualBoxTest
final String displayName = vmConfig.getDisplayName();
- assertEquals( VirtualizationConfigurationVirtualBoxTest.getVmName( configVersion ), displayName );
-
- assertDoesNotThrow( () -> vmConfig.validate() );
+ assertEquals( VirtualizationConfigurationVirtualBoxTest.getVmName( name, configVersion ), displayName );
}
@ParameterizedTest
@DisplayName( "Test machine snapshot state from VM configuration" )
@MethodSource( "configAndVersionProvider" )
- public void testVirtualizationConfigurationVirtualBoxIsMachineSnapshot( String configFileName,
+ public void testVirtualizationConfigurationVirtualBoxIsMachineSnapshot( String name, String configFileName,
Version configVersion )
throws IOException, VirtualizationConfigurationException
{
@@ -79,14 +75,12 @@ public class VirtualizationConfigurationVirtualBoxTest
final boolean isVmSnapshot = vmConfig.isMachineSnapshot();
assertFalse( isVmSnapshot );
-
- assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@DisplayName( "Test supported image formats from VM configuration" )
@MethodSource( "configAndVersionProvider" )
- public void testVirtualizationConfigurationVirtualBoxGetSupportedImageFormats( String configFileName,
+ public void testVirtualizationConfigurationVirtualBoxGetSupportedImageFormats( String name, String configFileName,
Version configVersion )
throws IOException, VirtualizationConfigurationException
{
@@ -99,14 +93,13 @@ public class VirtualizationConfigurationVirtualBoxTest
assertNotNull( supportedImageFormats );
assertEquals( 1, supportedImageFormats.size() );
assertTrue( supportedImageFormats.containsAll( Arrays.asList( ImageFormat.VDI ) ) );
-
- assertDoesNotThrow( () -> vmConfig.validate() );
}
@ParameterizedTest
@DisplayName( "Test output of HDDs from VM configuration" )
@MethodSource( "configAndVersionProvider" )
- public void testVirtualizationConfigurationVirtualBoxGetHdds( String configFileName, Version configVersion )
+ public void testVirtualizationConfigurationVirtualBoxGetHdds( String name, String configFileName,
+ Version configVersion )
throws IOException, VirtualizationConfigurationException
{
final File configFile = VirtualizationConfigurationTestResources.getVirtualBoxXmlFile( configFileName );
@@ -115,30 +108,36 @@ public class VirtualizationConfigurationVirtualBoxTest
final List hdds = vmConfig.getHdds();
- final String imageFileName = VirtualizationConfigurationVirtualBoxTest.getVmName( configVersion ) + ".vdi";
+ final String imageFileName = VirtualizationConfigurationVirtualBoxTest.getVmName( name, configVersion ) + ".vdi";
assertNotNull( hdds );
assertEquals( 1, hdds.size() );
assertEquals( imageFileName, hdds.get( 0 ).diskImage );
-
- assertDoesNotThrow( () -> vmConfig.validate() );
}
- static String getVmName( Version version )
+ static String getVmName( String name, Version version )
{
- return "ubuntu_" + version.toString().replace( '.', '-' );
+ return name + "_" + version.toString().replace( '.', '-' );
}
static Stream configAndVersionProvider()
{
return Stream.of(
- arguments( "virtualbox_default-ubuntu_v1-15.vbox",
+ arguments( "ubuntu", "virtualbox_default-ubuntu_v1-15.vbox",
+ new Version( Short.valueOf( "1" ), Short.valueOf( "15" ) ) ),
+ arguments( "ubuntu", "virtualbox_default-ubuntu_v1-16.vbox",
+ new Version( Short.valueOf( "1" ), Short.valueOf( "16" ) ) ),
+ arguments( "ubuntu", "virtualbox_default-ubuntu_v1-17.vbox",
+ new Version( Short.valueOf( "1" ), Short.valueOf( "17" ) ) ),
+ arguments( "ubuntu", "virtualbox_default-ubuntu_v1-18.vbox",
+ new Version( Short.valueOf( "1" ), Short.valueOf( "18" ) ) ),
+ arguments( "windows-7", "virtualbox_default-windows-7_v1-15.vbox",
new Version( Short.valueOf( "1" ), Short.valueOf( "15" ) ) ),
- arguments( "virtualbox_default-ubuntu_v1-16.vbox",
+ arguments( "windows-7", "virtualbox_default-windows-7_v1-16.vbox",
new Version( Short.valueOf( "1" ), Short.valueOf( "16" ) ) ),
- arguments( "virtualbox_default-ubuntu_v1-17.vbox",
+ arguments( "windows-7", "virtualbox_default-windows-7_v1-17.vbox",
new Version( Short.valueOf( "1" ), Short.valueOf( "17" ) ) ),
- arguments( "virtualbox_default-ubuntu_v1-18.vbox",
+ arguments( "windows-7", "virtualbox_default-windows-7_v1-18.vbox",
new Version( Short.valueOf( "1" ), Short.valueOf( "18" ) ) ) );
}
}
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java
index 68a39c6..f078b5e 100644
--- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java
@@ -63,7 +63,10 @@ public class ConfigurationLogicDozModClientToDozModServerTest
final String expectedTransformedConfig = ConfigurationLogicTestUtils.readFileToString( expectedConfig );
assertTrue( ConfigurationLogicTestUtils.isContentEqual( expectedTransformedConfig, transformedConfig ) );
- assertDoesNotThrow( () -> config.validate() );
+
+ // do not validate the VirtualBox configuration afterwards, since the inserted
+ // place holders do not match valid primitive values from the XML schema
+ //assertDoesNotThrow( () -> config.validate() );
}
@Test
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
index 034269b..96180ed 100644
--- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
@@ -79,7 +79,10 @@ public class ConfigurationLogicDozModServerToDozModClientTest
assertTrue(
ConfigurationLogicTestUtils.isVirtualBoxContentEqual( expectedTransformedConfig, transformedConfig ) );
- assertDoesNotThrow( () -> config.validate() );
+
+ // do not validate the VirtualBox configuration afterwards, since the inserted network configuration
+ // leads to an invalid DOM although the created output after the transformation is as expected
+ //assertDoesNotThrow( () -> config.validate() );
}
@Test
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java
index 186f422..6c87526 100644
--- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java
@@ -73,7 +73,10 @@ public class ConfigurationLogicDozModServerToStatelessClientTest
assertTrue(
ConfigurationLogicTestUtils.isVirtualBoxContentEqual( expectedTransformedConfig, transformedConfig ) );
- assertDoesNotThrow( () -> config.validate() );
+
+ // do not validate the VirtualBox configuration afterwards, since the inserted
+ // place holders do not match valid primitive values from the XML schema
+ //assertDoesNotThrow( () -> config.validate() );
}
@Test
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-15.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-15.vbox
new file mode 100644
index 0000000..c654f8e
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-15.vbox
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-16.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-16.vbox
new file mode 100644
index 0000000..5f51c18
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-16.vbox
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-17.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-17.vbox
new file mode 100644
index 0000000..4a160c0
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-17.vbox
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-18.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-18.vbox
new file mode 100644
index 0000000..cf0a831
--- /dev/null
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-windows-7_v1-18.vbox
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.2.3-55-g7522