Refactor disk image representation and add unit tests

18 files changed, 486 insertions, 267 deletions

diff --git a/src/test/java/org/openslx/util/vm/DiskImageTest.java b/src/test/java/org/openslx/util/vm/DiskImageTest.java
deleted file mode 100644
index e1105d8..0000000
--- a/src/test/java/org/openslx/util/vm/DiskImageTest.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package org.openslx.util.vm;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.openslx.util.vm.DiskImage.ImageFormat;
-import org.openslx.util.vm.DiskImage.UnknownImageFormatException;
-
-public class DiskImageTest
-{
-	@BeforeAll
-	public static void setUp()
-	{
-		// disable logging with log4j
-		LogManager.getRootLogger().setLevel( Level.OFF );
-	}
-
-	@Test
-	@DisplayName( "Test detection of VMDK disk image" )
-	public void testVmdkDiskImage() throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		File file = DiskImageTestResources.getDiskFile( "image-default.vmdk" );
-		DiskImage image = new DiskImage( file );
-
-		assertEquals( ImageFormat.VMDK.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( false, image.isCompressed );
-		assertEquals( 18, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of VDI disk image" )
-	public void testVdiDiskImage() throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image-default.vdi" ) );
-
-		assertEquals( ImageFormat.VDI.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( false, image.isCompressed );
-		assertEquals( 0, image.hwVersion );
-		assertNotNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of default QCOW2 disk image" )
-	public void testQcow2DiskImage() throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image-default.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( false, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of compressed, 16384 byte cluster QCOW2 disk image with extended L2 tables" )
-	public void testQcow2DetectionL2Compressed16384DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-on_l2-on.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( true, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of compressed, 16384 byte cluster QCOW2 disk image without extended L2 tables" )
-	public void testQcow2DetectionNonL2Compressed16384DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-on_l2-off.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( true, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of non-compressed, 16384 byte cluster QCOW2 disk image with extended L2 tables" )
-	public void testQcow2DetectionL2NonCompressed16384DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-off_l2-on.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( false, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of non-compressed, 16384 byte cluster QCOW2 disk image without extended L2 tables" )
-	public void testQcow2DetectionNonL2NonCompressed16384DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-off_l2-off.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( false, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of compressed, 65536 byte cluster QCOW2 disk image with extended L2 tables" )
-	public void testQcow2DetectionL2Compressed65536DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-on_l2-on.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( true, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of compressed, 65536 byte cluster QCOW2 disk image without extended L2 tables" )
-	public void testQcow2DetectionNonL2Compressed65536DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-on_l2-off.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( true, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of non-compressed, 65536 byte cluster QCOW2 disk image with extended L2 tables" )
-	public void testQcow2DetectionL2NonCompressed65536DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-off_l2-on.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( false, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of non-compressed, 65536 byte cluster QCOW2 disk image without extended L2 tables" )
-	public void testQcow2DetectionNonL2NonCompressed65536DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-off_l2-off.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( false, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of compressed, 2097152 byte cluster QCOW2 disk image with extended L2 tables" )
-	public void testQcow2DetectionL2Compressed2097152DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-on_l2-on.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( true, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of compressed, 2097152 byte cluster QCOW2 disk image without extended L2 tables" )
-	public void testQcow2DetectionNonL2Compressed2097152DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-on_l2-off.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( true, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of non-compressed, 2097152 byte cluster QCOW2 disk image with extended L2 tables" )
-	public void testQcow2DetectionL2NonCompressed2097152DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-off_l2-on.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( false, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test detection of non-compressed, 2097152 byte cluster QCOW2 disk image without extended L2 tables" )
-	public void testQcow2DetectionNonL2NonCompressed2097152DiskImage()
-			throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		DiskImage image = new DiskImage( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-off_l2-off.qcow2" ) );
-
-		assertEquals( ImageFormat.QCOW2.toString(), image.getImageFormat().toString() );
-		assertEquals( true, image.isStandalone );
-		assertEquals( false, image.isSnapshot );
-		assertEquals( false, image.isCompressed );
-		assertEquals( 3, image.hwVersion );
-		assertNull( image.diskDescription );
-	}
-
-	@Test
-	@DisplayName( "Test of invalid disk image" )
-	public void testInvalidDiskImage() throws FileNotFoundException, IOException, UnknownImageFormatException
-	{
-		Assertions.assertThrows( UnknownImageFormatException.class, () -> {
-			new DiskImage( DiskImageTestResources.getDiskFile( "image-default.invalid" ) );
-		} );
-	}
-}
diff --git a/src/test/java/org/openslx/util/vm/QemuMetaDataTest.java b/src/test/java/org/openslx/vm/QemuMetaDataTest.java
index f201a77..3217fda 100644
--- a/src/test/java/org/openslx/util/vm/QemuMetaDataTest.java
+++ b/src/test/java/org/openslx/vm/QemuMetaDataTest.java
@@ -1,4 +1,4 @@
-package org.openslx.util.vm;
+package org.openslx.vm;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -31,11 +31,13 @@ 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.util.vm.DiskImage.ImageFormat;
-import org.openslx.util.vm.VmMetaData.EtherType;
-import org.openslx.util.vm.VmMetaData.EthernetDevType;
-import org.openslx.util.vm.VmMetaData.SoundCardType;
-import org.openslx.util.vm.VmMetaData.UsbSpeed;
+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
 {
diff --git a/src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java b/src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java
new file mode 100644
index 0000000..530cd60
--- /dev/null
+++ b/src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java
@@ -0,0 +1,220 @@
+package org.openslx.vm.disk;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.openslx.vm.disk.DiskImage.ImageFormat;
+
+public class DiskImageQcow2Test
+{
+	@Test
+	@DisplayName( "Test detection of default QCOW2 disk image" )
+	public void testQcow2DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image-default.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of compressed, 16384 byte cluster QCOW2 disk image with extended L2 tables" )
+	public void testQcow2DetectionL2Compressed16384DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-on_l2-on.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( true, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of compressed, 16384 byte cluster QCOW2 disk image without extended L2 tables" )
+	public void testQcow2DetectionNonL2Compressed16384DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-on_l2-off.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( true, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of non-compressed, 16384 byte cluster QCOW2 disk image with extended L2 tables" )
+	public void testQcow2DetectionL2NonCompressed16384DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-off_l2-on.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of non-compressed, 16384 byte cluster QCOW2 disk image without extended L2 tables" )
+	public void testQcow2DetectionNonL2NonCompressed16384DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-16384_cp-off_l2-off.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of compressed, 65536 byte cluster QCOW2 disk image with extended L2 tables" )
+	public void testQcow2DetectionL2Compressed65536DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-on_l2-on.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( true, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of compressed, 65536 byte cluster QCOW2 disk image without extended L2 tables" )
+	public void testQcow2DetectionNonL2Compressed65536DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-on_l2-off.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( true, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of non-compressed, 65536 byte cluster QCOW2 disk image with extended L2 tables" )
+	public void testQcow2DetectionL2NonCompressed65536DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-off_l2-on.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of non-compressed, 65536 byte cluster QCOW2 disk image without extended L2 tables" )
+	public void testQcow2DetectionNonL2NonCompressed65536DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-65536_cp-off_l2-off.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of compressed, 2097152 byte cluster QCOW2 disk image with extended L2 tables" )
+	public void testQcow2DetectionL2Compressed2097152DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-on_l2-on.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( true, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of compressed, 2097152 byte cluster QCOW2 disk image without extended L2 tables" )
+	public void testQcow2DetectionNonL2Compressed2097152DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-on_l2-off.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( true, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of non-compressed, 2097152 byte cluster QCOW2 disk image with extended L2 tables" )
+	public void testQcow2DetectionL2NonCompressed2097152DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-off_l2-on.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of non-compressed, 2097152 byte cluster QCOW2 disk image without extended L2 tables" )
+	public void testQcow2DetectionNonL2NonCompressed2097152DiskImage() throws DiskImageException, IOException
+	{
+		final DiskImage image = DiskImage
+				.newInstance( DiskImageTestResources.getDiskFile( "image_cs-2097152_cp-off_l2-off.qcow2" ) );
+		final int imageVersion = DiskImageUtils.versionFromMajor( Short.valueOf( "3" ) );
+
+		assertEquals( ImageFormat.QCOW2.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+	}
+}
diff --git a/src/test/java/org/openslx/vm/disk/DiskImageTest.java b/src/test/java/org/openslx/vm/disk/DiskImageTest.java
new file mode 100644
index 0000000..2572c58
--- /dev/null
+++ b/src/test/java/org/openslx/vm/disk/DiskImageTest.java
@@ -0,0 +1,19 @@
+package org.openslx.vm.disk;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+public class DiskImageTest
+{
+	@Test
+	@DisplayName( "Test of invalid disk image" )
+	public void testInvalidDiskImage() throws IOException
+	{
+		Assertions.assertThrows( DiskImageException.class, () -> {
+			DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image-default.invalid" ) );
+		} );
+	}
+}
diff --git a/src/test/java/org/openslx/util/vm/DiskImageTestResources.java b/src/test/java/org/openslx/vm/disk/DiskImageTestResources.java
index 1f164bd..2ec2e05 100644
--- a/src/test/java/org/openslx/util/vm/DiskImageTestResources.java
+++ b/src/test/java/org/openslx/vm/disk/DiskImageTestResources.java
@@ -1,4 +1,4 @@
-package org.openslx.util.vm;
+package org.openslx.vm.disk;
 
 import java.io.File;
 import java.net.URL;
diff --git a/src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java b/src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java
new file mode 100644
index 0000000..492c6aa
--- /dev/null
+++ b/src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java
@@ -0,0 +1,43 @@
+package org.openslx.vm.disk;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.openslx.vm.disk.DiskImage.ImageFormat;
+
+public class DiskImageVdiTest
+{
+	@Test
+	@DisplayName( "Test detection of default VDI disk image" )
+	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" ) );
+
+		assertEquals( ImageFormat.VDI.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		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" ) );
+
+		assertEquals( ImageFormat.VDI.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( true, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNotNull( image.getDescription() );
+	}
+}
diff --git a/src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java b/src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java
new file mode 100644
index 0000000..00cf561
--- /dev/null
+++ b/src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java
@@ -0,0 +1,110 @@
+package org.openslx.vm.disk;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+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.vm.disk.DiskImage.ImageFormat;
+
+public class DiskImageVmdkTest
+{
+	@Test
+	@DisplayName( "Test detection of default VMDK disk image" )
+	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" ) );
+
+		assertEquals( ImageFormat.VMDK.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+
+		// test special features of the VMDK disk image format
+		final DiskImageVmdk vmdkImage = DiskImageVmdk.class.cast( image );
+		assertEquals( imageHwVersion, vmdkImage.getHwVersion() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of VMDK disk image (type 0: single growable virtual disk)" )
+	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" ) );
+
+		assertEquals( ImageFormat.VMDK.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( false, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+
+		// test special features of the VMDK disk image format
+		final DiskImageVmdk vmdkImage = DiskImageVmdk.class.cast( image );
+		assertEquals( imageHwVersion, vmdkImage.getHwVersion() );
+	}
+
+	@Test
+	@DisplayName( "Test detection of VMDK disk image (type 1: growable virtual disk split into multiple files)" )
+	public void testVmdkDiskImageType1() throws DiskImageException, IOException
+	{
+		Assertions.assertThrows( DiskImageException.class, () -> {
+			DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image_t1.vmdk" ) );
+		} );
+	}
+
+	@Test
+	@DisplayName( "Test detection of VMDK disk image (type 2: preallocated virtual disk)" )
+	public void testVmdkDiskImageType2() throws DiskImageException, IOException
+	{
+		Assertions.assertThrows( DiskImageException.class, () -> {
+			DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image_t2.vmdk" ) );
+		} );
+	}
+
+	@Test
+	@DisplayName( "Test detection of VMDK disk image (type 3: preallocated virtual disk split into multiple files)" )
+	public void testVmdkDiskImageType3() throws DiskImageException, IOException
+	{
+		Assertions.assertThrows( DiskImageException.class, () -> {
+			DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image_t3.vmdk" ) );
+		} );
+	}
+
+	@Test
+	@DisplayName( "Test detection of VMDK disk image (type 4: preallocated ESX-type virtual disk)" )
+	public void testVmdkDiskImageType4() throws DiskImageException, IOException
+	{
+		Assertions.assertThrows( DiskImageException.class, () -> {
+			DiskImage.newInstance( DiskImageTestResources.getDiskFile( "image_t4.vmdk" ) );
+		} );
+	}
+
+	@Test
+	@DisplayName( "Test detection of VMDK disk image (type 5: compressed disk optimized for streaming)" )
+	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" ) );
+
+		assertEquals( ImageFormat.VMDK.toString(), image.getFormat().toString() );
+		assertEquals( true, image.isStandalone() );
+		assertEquals( false, image.isSnapshot() );
+		assertEquals( true, image.isCompressed() );
+		assertEquals( imageVersion, image.getVersion() );
+		assertNull( image.getDescription() );
+
+		// test special features of the VMDK disk image format
+		final DiskImageVmdk vmdkImage = DiskImageVmdk.class.cast( image );
+		assertEquals( imageHwVersion, vmdkImage.getHwVersion() );
+	}
+}
diff --git a/src/test/resources/disk/image-default_snapshot.vdi b/src/test/resources/disk/image-default_snapshot.vdi
new file mode 100644
index 0000000..f07502a
--- /dev/null
+++ b/src/test/resources/disk/image-default_snapshot.vdi
diff --git a/src/test/resources/disk/image_t0.vmdk b/src/test/resources/disk/image_t0.vmdk
new file mode 100644
index 0000000..08047a0
--- /dev/null
+++ b/src/test/resources/disk/image_t0.vmdk
diff --git a/src/test/resources/disk/image_t1-s001.vmdk b/src/test/resources/disk/image_t1-s001.vmdk
new file mode 100644
index 0000000..a3ce425
--- /dev/null
+++ b/src/test/resources/disk/image_t1-s001.vmdk
diff --git a/src/test/resources/disk/image_t1.vmdk b/src/test/resources/disk/image_t1.vmdk
new file mode 100644
index 0000000..7f780c2
--- /dev/null
+++ b/src/test/resources/disk/image_t1.vmdk
@@ -0,0 +1,21 @@
+# Disk DescriptorFile
+version=1
+CID=f879aea6
+parentCID=ffffffff
+createType="twoGbMaxExtentSparse"
+
+# Extent description
+RW 20480 SPARSE "image_t1-s001.vmdk"
+
+# The Disk Data Base 
+#DDB
+
+ddb.adapterType = "ide"
+ddb.deletable = "true"
+ddb.encoding = "UTF-8"
+ddb.geometry.cylinders = "20"
+ddb.geometry.heads = "16"
+ddb.geometry.sectors = "63"
+ddb.longContentID = "a586da03e45ef91444741b5e03dd9850"
+ddb.uuid = "60 00 C2 95 f2 fc 95 8b-59 71 f0 58 a4 63 3d d9"
+ddb.virtualHWVersion = "18"
diff --git a/src/test/resources/disk/image_t2-flat.vmdk b/src/test/resources/disk/image_t2-flat.vmdk
new file mode 100644
index 0000000..3cfe668
--- /dev/null
+++ b/src/test/resources/disk/image_t2-flat.vmdk
diff --git a/src/test/resources/disk/image_t2.vmdk b/src/test/resources/disk/image_t2.vmdk
new file mode 100644
index 0000000..2907c8d
--- /dev/null
+++ b/src/test/resources/disk/image_t2.vmdk
@@ -0,0 +1,21 @@
+# Disk DescriptorFile
+version=1
+CID=f879aea6
+parentCID=ffffffff
+createType="monolithicFlat"
+
+# Extent description
+RW 20480 FLAT "image_t2-flat.vmdk" 0
+
+# The Disk Data Base 
+#DDB
+
+ddb.adapterType = "ide"
+ddb.deletable = "true"
+ddb.encoding = "UTF-8"
+ddb.geometry.cylinders = "20"
+ddb.geometry.heads = "16"
+ddb.geometry.sectors = "63"
+ddb.longContentID = "b104a6d8dbe1d6adfe5c3c2422159584"
+ddb.uuid = "60 00 C2 91 13 fb 32 ae-b1 94 6c 90 7e a7 dc fd"
+ddb.virtualHWVersion = "18"
diff --git a/src/test/resources/disk/image_t3-f001.vmdk b/src/test/resources/disk/image_t3-f001.vmdk
new file mode 100644
index 0000000..3cfe668
--- /dev/null
+++ b/src/test/resources/disk/image_t3-f001.vmdk
diff --git a/src/test/resources/disk/image_t3.vmdk b/src/test/resources/disk/image_t3.vmdk
new file mode 100644
index 0000000..3a9755a
--- /dev/null
+++ b/src/test/resources/disk/image_t3.vmdk
@@ -0,0 +1,21 @@
+# Disk DescriptorFile
+version=1
+CID=f879aea6
+parentCID=ffffffff
+createType="twoGbMaxExtentFlat"
+
+# Extent description
+RW 20480 FLAT "image_t3-f001.vmdk" 0
+
+# The Disk Data Base 
+#DDB
+
+ddb.adapterType = "ide"
+ddb.deletable = "true"
+ddb.encoding = "UTF-8"
+ddb.geometry.cylinders = "20"
+ddb.geometry.heads = "16"
+ddb.geometry.sectors = "63"
+ddb.longContentID = "1d2f0fc53996e4dd85d6348a9cb54a70"
+ddb.uuid = "60 00 C2 92 6f 18 ff eb-66 28 54 8e f4 fb 0d e6"
+ddb.virtualHWVersion = "18"
diff --git a/src/test/resources/disk/image_t4-flat.vmdk b/src/test/resources/disk/image_t4-flat.vmdk
new file mode 100644
index 0000000..3cfe668
--- /dev/null
+++ b/src/test/resources/disk/image_t4-flat.vmdk
diff --git a/src/test/resources/disk/image_t4.vmdk b/src/test/resources/disk/image_t4.vmdk
new file mode 100644
index 0000000..c9b56db
--- /dev/null
+++ b/src/test/resources/disk/image_t4.vmdk
@@ -0,0 +1,22 @@
+# Disk DescriptorFile
+version=1
+CID=f879aea6
+parentCID=ffffffff
+createType="vmfs"
+
+# Extent description
+RW 20480 VMFS "image_t4-flat.vmdk" 0
+
+# The Disk Data Base 
+#DDB
+
+ddb.adapterType = "ide"
+ddb.deletable = "true"
+ddb.encoding = "UTF-8"
+ddb.geometry.cylinders = "20"
+ddb.geometry.heads = "16"
+ddb.geometry.sectors = "63"
+ddb.longContentID = "c1c7f78748a6d9a7f9233c312a8362c6"
+ddb.thinProvisioned = "1"
+ddb.uuid = "60 00 C2 9a 0f 63 7a 30-b4 d5 1c 32 b3 3c e6 bb"
+ddb.virtualHWVersion = "18"
diff --git a/src/test/resources/disk/image_t5.vmdk b/src/test/resources/disk/image_t5.vmdk
new file mode 100644
index 0000000..318ab09
--- /dev/null
+++ b/src/test/resources/disk/image_t5.vmdk