diff options
Diffstat (limited to 'src/test/java/org/openslx/vm')
4 files changed, 25 insertions, 490 deletions
diff --git a/src/test/java/org/openslx/vm/QemuMetaDataTest.java b/src/test/java/org/openslx/vm/QemuMetaDataTest.java deleted file mode 100644 index 3217fda..0000000 --- a/src/test/java/org/openslx/vm/QemuMetaDataTest.java +++ /dev/null @@ -1,468 +0,0 @@ -package org.openslx.vm; - -import static org.junit.jupiter.api.Assertions.assertEquals; -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.lang.reflect.Field; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Stream; - -import org.apache.commons.io.FileUtils; -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.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.junit.jupiter.params.provider.ValueSource; -import org.openslx.libvirt.domain.Domain; -import org.openslx.libvirt.domain.device.ControllerUsb; -import org.openslx.libvirt.domain.device.DiskCdrom; -import org.openslx.libvirt.domain.device.DiskFloppy; -import org.openslx.libvirt.domain.device.DiskStorage; -import org.openslx.libvirt.domain.device.Interface; -import org.openslx.libvirt.domain.device.Sound; -import org.openslx.libvirt.xml.LibvirtXmlTestResources; -import org.openslx.vm.VmMetaData.EtherType; -import org.openslx.vm.VmMetaData.EthernetDevType; -import org.openslx.vm.VmMetaData.SoundCardType; -import org.openslx.vm.VmMetaData.UsbSpeed; -import org.openslx.vm.disk.DiskImage; -import org.openslx.vm.disk.DiskImageTestResources; -import org.openslx.vm.disk.DiskImage.ImageFormat; - -public class QemuMetaDataTest -{ - private static Domain getPrivateDomainFromQemuMetaData( QemuMetaData qemuMetadata ) - throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException - { - Field privateDomainField = QemuMetaData.class.getDeclaredField( "vmConfig" ); - privateDomainField.setAccessible( true ); - return Domain.class.cast( privateDomainField.get( qemuMetadata ) ); - } - - @BeforeAll - public static void setUp() - { - // disable logging with log4j - LogManager.getRootLogger().setLevel( Level.OFF ); - } - - @Test - @DisplayName( "Test display name from VM configuration" ) - public void testQemuMetaDataGetDisplayName() throws UnsupportedVirtualizerFormatException, IOException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - final String displayName = vmConfig.getDisplayName(); - - assertEquals( "archlinux", displayName ); - } - - @Test - @DisplayName( "Test machine snapshot state from VM configuration" ) - public void testQemuMetaDataIsMachineSnapshot() throws UnsupportedVirtualizerFormatException, IOException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - final boolean isVmSnapshot = vmConfig.isMachineSnapshot(); - - assertEquals( false, isVmSnapshot ); - } - - @Test - @DisplayName( "Test supported image formats from VM configuration" ) - public void testQemuMetaDataGetSupportedImageFormats() throws UnsupportedVirtualizerFormatException, IOException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - final List<DiskImage.ImageFormat> supportedImageFormats = vmConfig.getSupportedImageFormats(); - - assertNotNull( supportedImageFormats ); - assertEquals( 3, supportedImageFormats.size() ); - assertEquals( true, supportedImageFormats - .containsAll( Arrays.asList( ImageFormat.QCOW2, ImageFormat.VMDK, ImageFormat.VDI ) ) ); - } - - @Test - @DisplayName( "Test output of HDDs from VM configuration" ) - public void testQemuMetaDataGetHdds() throws UnsupportedVirtualizerFormatException, IOException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - final List<VmMetaData.HardDisk> hdds = vmConfig.getHdds(); - - assertNotNull( hdds ); - assertEquals( 1, hdds.size() ); - assertEquals( "/var/lib/libvirt/images/archlinux.qcow2", hdds.get( 0 ).diskImage ); - } - - @Test - @DisplayName( "Test output of unfiltered VM configuration" ) - public void testQemuMetaDataGetDefinitionArray() throws UnsupportedVirtualizerFormatException, IOException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - final String unfilteredXmlConfig = new String( vmConfig.getDefinitionArray(), StandardCharsets.UTF_8 ); - final String originalXmlConfig = FileUtils.readFileToString( file, StandardCharsets.UTF_8 ); - - assertNotNull( unfilteredXmlConfig ); - - final int lengthUnfilteredXmlConfig = unfilteredXmlConfig.split( System.lineSeparator() ).length; - final int lengthOriginalXmlConfig = originalXmlConfig.split( System.lineSeparator() ).length; - - assertEquals( lengthOriginalXmlConfig, lengthUnfilteredXmlConfig ); - } - - @Test - @DisplayName( "Test output of filtered VM configuration" ) - public void testQemuMetaDataGetFilteredDefinitionArray() throws UnsupportedVirtualizerFormatException, IOException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - final int numberOfDeletedElements = 4; - - final String filteredXmlConfig = new String( vmConfig.getFilteredDefinitionArray(), StandardCharsets.UTF_8 ); - final String originalXmlConfig = FileUtils.readFileToString( file, StandardCharsets.UTF_8 ); - - assertNotNull( filteredXmlConfig ); - - final int lengthFilteredXmlConfig = filteredXmlConfig.split( System.lineSeparator() ).length; - final int lengthOriginalXmlConfig = originalXmlConfig.split( System.lineSeparator() ).length; - - assertEquals( lengthOriginalXmlConfig, lengthFilteredXmlConfig + numberOfDeletedElements ); - } - - @ParameterizedTest - @DisplayName( "Test add HDD to VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-no-hdd.xml" } ) - public void testQemuMetaDataAddHdd( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File diskFile = DiskImageTestResources.getDiskFile( "image-default.qcow2" ); - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - final int numHddsLibvirtDomainXmlBeforeAdd = vmLibvirtDomainConfig.getDiskStorageDevices().size(); - final int numHddsQemuMetaDataBeforeAdd = vmConfig.hdds.size(); - - vmConfig.addHddTemplate( diskFile, null, null ); - - final int numHddsLibvirtDomainXmlAfterAdd = vmLibvirtDomainConfig.getDiskStorageDevices().size(); - final int numHddsQemuMetaDataAfterAdd = vmConfig.hdds.size(); - - assertTrue( numHddsLibvirtDomainXmlBeforeAdd == numHddsQemuMetaDataBeforeAdd ); - assertTrue( numHddsLibvirtDomainXmlAfterAdd == numHddsQemuMetaDataAfterAdd ); - assertTrue( numHddsQemuMetaDataBeforeAdd >= 0 ); - assertTrue( numHddsQemuMetaDataAfterAdd > 0 ); - - if ( numHddsQemuMetaDataBeforeAdd >= 1 ) { - // update existing HDD in the Libvirt XML config, but do not add a new HDD - assertEquals( numHddsQemuMetaDataBeforeAdd, numHddsQemuMetaDataAfterAdd ); - } else { - // numHddsQemuMetaDataBeforeAdd == 0 - // add a HDD to the Libvirt XML config, since there was no HDD available - assertEquals( numHddsQemuMetaDataBeforeAdd + 1, numHddsQemuMetaDataAfterAdd ); - } - - DiskStorage addedStorageDevice = vmLibvirtDomainConfig.getDiskStorageDevices().get( 0 ); - assertEquals( diskFile.getAbsolutePath(), addedStorageDevice.getStorageSource() ); - } - - @ParameterizedTest - @DisplayName( "Test add CDROM to VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-cdrom.xml" } ) - public void testQemuMetaDataAddCdrom( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File diskFile = DiskImageTestResources.getDiskFile( "image-default.qcow2" ); - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - final int numCdromsLibvirtDomainXmlBeforeAdd = vmLibvirtDomainConfig.getDiskCdromDevices().size(); - - vmConfig.addCdrom( 0, diskFile.getAbsolutePath() ); - - final int numCdromsLibvirtDomainXmlAfterAdd = vmLibvirtDomainConfig.getDiskCdromDevices().size(); - - assertTrue( numCdromsLibvirtDomainXmlBeforeAdd >= 0 ); - assertTrue( numCdromsLibvirtDomainXmlAfterAdd > 0 ); - - DiskCdrom addedCdromDevice = vmLibvirtDomainConfig.getDiskCdromDevices().get( 0 ); - assertEquals( diskFile.getAbsolutePath(), addedCdromDevice.getStorageSource() ); - } - - @ParameterizedTest - @DisplayName( "Test add physical CDROM drive to VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-cdrom.xml" } ) - public void testQemuMetaDataAddPhysicalCdromDrive( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - final int numCdromsLibvirtDomainXmlBeforeAdd = vmLibvirtDomainConfig.getDiskCdromDevices().size(); - - vmConfig.addCdrom( 0, null ); - - final int numCdromsLibvirtDomainXmlAfterAdd = vmLibvirtDomainConfig.getDiskCdromDevices().size(); - - assertTrue( numCdromsLibvirtDomainXmlBeforeAdd >= 0 ); - assertTrue( numCdromsLibvirtDomainXmlAfterAdd > 0 ); - - DiskCdrom addedCdromDevice = vmLibvirtDomainConfig.getDiskCdromDevices().get( 0 ); - assertEquals( QemuMetaData.CDROM_DEFAULT_PHYSICAL_DRIVE, addedCdromDevice.getStorageSource() ); - } - - @ParameterizedTest - @DisplayName( "Test add floppy to VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-floppy.xml" } ) - public void testQemuMetaDataAddFloppy( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File diskFile = DiskImageTestResources.getDiskFile( "image-default.qcow2" ); - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - final int numFloppiesLibvirtDomainXmlBeforeAdd = vmLibvirtDomainConfig.getDiskFloppyDevices().size(); - - vmConfig.addFloppy( 0, diskFile.getAbsolutePath(), true ); - - final int numFloppiesLibvirtDomainXmlAfterAdd = vmLibvirtDomainConfig.getDiskFloppyDevices().size(); - - assertTrue( numFloppiesLibvirtDomainXmlBeforeAdd >= 0 ); - assertTrue( numFloppiesLibvirtDomainXmlAfterAdd > 0 ); - - DiskFloppy addedFloppyDevice = vmLibvirtDomainConfig.getDiskFloppyDevices().get( 0 ); - assertTrue( addedFloppyDevice.isReadOnly() ); - assertEquals( diskFile.getAbsolutePath(), addedFloppyDevice.getStorageSource() ); - } - - @ParameterizedTest - @DisplayName( "Test add CPU core count to VM configuration" ) - @ValueSource( ints = { 2, 4, 6, 8 } ) - public void testQemuMetaDataAddCpuCoreCount( int coreCount ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( "qemu-kvm_default-archlinux-vm.xml" ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - vmConfig.addCpuCoreCount( coreCount ); - - assertEquals( coreCount, vmLibvirtDomainConfig.getVCpu() ); - } - - @ParameterizedTest - @DisplayName( "Test get sound card from VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-no-sound.xml" } ) - public void testQemuMetaDataGetSoundCardType( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - SoundCardType soundCardType = vmConfig.getSoundCard(); - - if ( vmLibvirtDomainConfig.getSoundDevices().isEmpty() ) { - assertEquals( SoundCardType.NONE, soundCardType ); - } else { - assertEquals( SoundCardType.HD_AUDIO, soundCardType ); - } - } - - @ParameterizedTest - @DisplayName( "Test set sound card in VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-no-sound.xml" } ) - public void testQemuMetaDataSetSoundCardType( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - final int numSoundDevsLibvirtDomainXmlBeforeAdd = vmLibvirtDomainConfig.getSoundDevices().size(); - - vmConfig.setSoundCard( SoundCardType.SOUND_BLASTER ); - - final int numSoundDevsLibvirtDomainXmlAfterAdd = vmLibvirtDomainConfig.getSoundDevices().size(); - - assertTrue( numSoundDevsLibvirtDomainXmlBeforeAdd >= 0 ); - assertTrue( numSoundDevsLibvirtDomainXmlAfterAdd > 0 ); - - Sound addedSoundDevice = vmLibvirtDomainConfig.getSoundDevices().get( 0 ); - assertEquals( Sound.Model.SB16, addedSoundDevice.getModel() ); - } - - @ParameterizedTest - @DisplayName( "Test get ethernet device type from VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-no-nic.xml" } ) - public void testQemuMetaDataGetEthernetDevType( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - EthernetDevType ethernetDeviceType = vmConfig.getEthernetDevType( 0 ); - - if ( vmLibvirtDomainConfig.getInterfaceDevices().isEmpty() ) { - assertEquals( EthernetDevType.NONE, ethernetDeviceType ); - } else { - assertEquals( EthernetDevType.PARAVIRT, ethernetDeviceType ); - } - } - - @ParameterizedTest - @DisplayName( "Test set ethernet device type in VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-no-nic.xml" } ) - public void testQemuMetaDataSetEthernetDevType( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - vmConfig.setEthernetDevType( 0, EthernetDevType.E1000E ); - - if ( !vmLibvirtDomainConfig.getInterfaceDevices().isEmpty() ) { - Interface addedEthernetDevice = vmLibvirtDomainConfig.getInterfaceDevices().get( 0 ); - assertEquals( Interface.Model.E1000E, addedEthernetDevice.getModel() ); - } - } - - @ParameterizedTest - @DisplayName( "Test get maximal USB speed from VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-no-usb.xml" } ) - public void testQemuMetaDataGetMaxUsbSpeed( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - UsbSpeed maxUsbSpeed = vmConfig.getMaxUsbSpeed(); - - if ( vmLibvirtDomainConfig.getUsbControllerDevices().isEmpty() ) { - assertEquals( UsbSpeed.NONE, maxUsbSpeed ); - } else { - assertEquals( UsbSpeed.USB3_0, maxUsbSpeed ); - } - } - - @ParameterizedTest - @DisplayName( "Test set maximal USB speed in VM configuration" ) - @ValueSource( strings = { "qemu-kvm_default-archlinux-vm.xml", "qemu-kvm_default-archlinux-vm-no-usb.xml" } ) - public void testQemuMetaDataSetMaxUsbSpeed( String xmlFileName ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - final int numUsbControllersLibvirtDomainXmlBeforeAdd = vmLibvirtDomainConfig.getUsbControllerDevices().size(); - - vmConfig.setMaxUsbSpeed( UsbSpeed.USB2_0 ); - - final int numUsbControllersLibvirtDomainXmlAfterAdd = vmLibvirtDomainConfig.getUsbControllerDevices().size(); - - assertTrue( numUsbControllersLibvirtDomainXmlBeforeAdd >= 0 ); - assertTrue( numUsbControllersLibvirtDomainXmlAfterAdd > 0 ); - - ControllerUsb addedUsbControllerDevice = vmLibvirtDomainConfig.getUsbControllerDevices().get( 0 ); - assertEquals( ControllerUsb.Model.ICH9_EHCI1, addedUsbControllerDevice.getModel() ); - } - - static Stream<Arguments> configAndEthernetTypeProvider() - { - return Stream.of( - arguments( "qemu-kvm_default-archlinux-vm.xml", EtherType.BRIDGED ), - arguments( "qemu-kvm_default-archlinux-vm.xml", EtherType.HOST_ONLY ), - arguments( "qemu-kvm_default-archlinux-vm.xml", EtherType.NAT ), - arguments( "qemu-kvm_default-archlinux-vm-no-usb.xml", EtherType.BRIDGED ), - arguments( "qemu-kvm_default-archlinux-vm-no-usb.xml", EtherType.HOST_ONLY ), - arguments( "qemu-kvm_default-archlinux-vm-no-usb.xml", EtherType.NAT ) ); - } - - @ParameterizedTest - @DisplayName( "Test add ethernet device to VM configuration" ) - @MethodSource( "configAndEthernetTypeProvider" ) - public void testQemuMetaDataAddEthernet( String xmlFileName, EtherType ethernetType ) - throws UnsupportedVirtualizerFormatException, NoSuchFieldException, SecurityException, - IllegalArgumentException, IllegalAccessException - { - File file = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - QemuMetaData vmConfig = new QemuMetaData( null, file ); - - Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig ); - - final int numEthernetDevsLibvirtDomainXmlBeforeAdd = vmLibvirtDomainConfig.getInterfaceDevices().size(); - - vmConfig.addEthernet( ethernetType ); - - final int numEthernetDevsLibvirtDomainXmlAfterAdd = vmLibvirtDomainConfig.getInterfaceDevices().size(); - - assertTrue( numEthernetDevsLibvirtDomainXmlBeforeAdd >= 0 ); - assertTrue( numEthernetDevsLibvirtDomainXmlAfterAdd > 0 ); - - Interface addedEthernetDevice = vmLibvirtDomainConfig.getInterfaceDevices().get( 0 ); - switch ( ethernetType ) { - case BRIDGED: - assertEquals( Interface.Type.BRIDGE, addedEthernetDevice.getType() ); - assertEquals( Interface.Model.VIRTIO, addedEthernetDevice.getModel() ); - assertEquals( QemuMetaData.NETWORK_DEFAULT_BRIDGE, addedEthernetDevice.getSource() ); - break; - case HOST_ONLY: - assertEquals( Interface.Type.NETWORK, addedEthernetDevice.getType() ); - assertEquals( Interface.Model.VIRTIO, addedEthernetDevice.getModel() ); - assertEquals( QemuMetaData.NETWORK_DEFAULT_HOST_ONLY, addedEthernetDevice.getSource() ); - break; - case NAT: - assertEquals( Interface.Type.NETWORK, addedEthernetDevice.getType() ); - assertEquals( Interface.Model.VIRTIO, addedEthernetDevice.getModel() ); - assertEquals( QemuMetaData.NETWORK_DEFAULT_NAT, addedEthernetDevice.getSource() ); - break; - } - } -} diff --git a/src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java b/src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java index 530cd60..7804d7d 100644 --- a/src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java +++ b/src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java @@ -7,6 +7,7 @@ import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.openslx.virtualization.Version; import org.openslx.vm.disk.DiskImage.ImageFormat; public class DiskImageQcow2Test @@ -16,7 +17,7 @@ public class DiskImageQcow2Test public void testQcow2DiskImage() throws DiskImageException, IOException { final DiskImage image = DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image-default.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -32,7 +33,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-on_l2-on.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -48,7 +49,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-on_l2-off.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -64,7 +65,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-off_l2-on.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -80,7 +81,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-off_l2-off.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -96,7 +97,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-on_l2-on.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -112,7 +113,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-on_l2-off.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -128,7 +129,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-off_l2-on.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -144,7 +145,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-off_l2-off.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -160,7 +161,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-on_l2-on.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -176,7 +177,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-on_l2-off.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -192,7 +193,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-off_l2-on.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -208,7 +209,7 @@ public class DiskImageQcow2Test { final DiskImage image = DiskImage .newInstance( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-off_l2-off.qcow2" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); diff --git a/src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java b/src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java index 492c6aa..85112cc 100644 --- a/src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java +++ b/src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java @@ -7,6 +7,7 @@ import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.openslx.virtualization.Version; import org.openslx.vm.disk.DiskImage.ImageFormat; public class DiskImageVdiTest @@ -16,7 +17,7 @@ public class DiskImageVdiTest public void testVdiDiskImage() throws DiskImageException, IOException { final DiskImage image = DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image-default.vdi" ) ); - final int imageVersion = DiskImageUtils.versionFromMajorMinor( Short.valueOf( "1" ), Short.valueOf( "1" ) ); + final Version imageVersion = new Version( Short.valueOf( "1" ), Short.valueOf( "1" ) ); assertEquals( ImageFormat.VDI.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -25,13 +26,13 @@ public class DiskImageVdiTest assertEquals( imageVersion, image.getVersion() ); assertNotNull( image.getDescription() ); } - + @Test @DisplayName( "Test detection of VDI disk image snapshot" ) public void testVdiDiskImageSnapshot() throws DiskImageException, IOException { final DiskImage image = DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image-default_snapshot.vdi" ) ); - final int imageVersion = DiskImageUtils.versionFromMajorMinor( Short.valueOf( "1" ), Short.valueOf( "1" ) ); + final Version imageVersion = new Version( Short.valueOf( "1" ), Short.valueOf( "1" ) ); assertEquals( ImageFormat.VDI.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); diff --git a/src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java b/src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java index 00cf561..4c8be82 100644 --- a/src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java +++ b/src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java @@ -8,6 +8,7 @@ import java.io.IOException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.openslx.virtualization.Version; import org.openslx.vm.disk.DiskImage.ImageFormat; public class DiskImageVmdkTest @@ -17,8 +18,8 @@ public class DiskImageVmdkTest public void testVmdkDiskImage() throws DiskImageException, IOException { final DiskImage image = DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image-default.vmdk" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "1" ) ); - final int imageHwVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "18" ) ); + final Version imageVersion = new Version( Short.valueOf( "1" ) ); + final Version imageHwVersion = new Version( Short.valueOf( "18" ) ); assertEquals( ImageFormat.VMDK.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -37,8 +38,8 @@ public class DiskImageVmdkTest public void testVmdkDiskImageType0() throws DiskImageException, IOException { final DiskImage image = DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image_t0.vmdk" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "1" ) ); - final int imageHwVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "18" ) ); + final Version imageVersion = new Version( Short.valueOf( "1" ) ); + final Version imageHwVersion = new Version( Short.valueOf( "18" ) ); assertEquals( ImageFormat.VMDK.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); @@ -93,8 +94,8 @@ public class DiskImageVmdkTest public void testVmdkDiskImageType5() throws DiskImageException, IOException { final DiskImage image = DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image_t5.vmdk" ) ); - final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) ); - final int imageHwVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "18" ) ); + final Version imageVersion = new Version( Short.valueOf( "3" ) ); + final Version imageHwVersion = new Version( Short.valueOf( "18" ) ); assertEquals( ImageFormat.VMDK.toString(), image.getFormat().toString() ); assertEquals( true, image.isStandalone() ); |