Refactors and abstracts version information in config logic and disk image

5 files changed, 73 insertions, 1 deletions

diff --git a/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java b/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java
index e74d15e..ac3a4ec 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java
@@ -2,6 +2,7 @@ package org.openslx.virtualization.virtualizer;
 
 import java.util.List;
 
+import org.openslx.virtualization.Version;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 
 /**
@@ -57,4 +58,11 @@ public abstract class Virtualizer
 	 * @return list of supported disk image formats by the virtualizer.
 	 */
 	public abstract List<ImageFormat> getSupportedImageFormats();
+
+	/**
+	 * Returns a list of supported versions of the virtualizer.
+	 * 
+	 * @return list of supported versions of the virtualizer.
+	 */
+	public abstract List<Version> getSupportedVersions();
 }
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java
index 4461595..673447b 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java
@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.openslx.thrifthelper.TConst;
+import org.openslx.virtualization.Version;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 
@@ -28,11 +29,16 @@ public class VirtualizerDocker extends Virtualizer
 			.unmodifiableList( Arrays.asList( ImageFormat.NONE ) );
 
 	/**
+	 * List of supported versions of the Docker virtualizer.
+	 */
+	private static final List<Version> VIRTUALIZER_SUPPORTED_VERSIONS = null;
+
+	/**
 	 * Creates a new Docker virtualizer.
 	 */
 	public VirtualizerDocker()
 	{
-		super( new org.openslx.bwlp.thrift.iface.Virtualizer( TConst.VIRT_DOCKER, VirtualizerDocker.VIRTUALIZER_NAME ));
+		super( new org.openslx.bwlp.thrift.iface.Virtualizer( TConst.VIRT_DOCKER, VirtualizerDocker.VIRTUALIZER_NAME ) );
 	}
 
 	@Override
@@ -40,4 +46,10 @@ public class VirtualizerDocker extends Virtualizer
 	{
 		return VirtualizerDocker.VIRTUALIZER_SUPPORTED_IMAGE_FORMATS;
 	}
+
+	@Override
+	public List<Version> getSupportedVersions()
+	{
+		return VirtualizerDocker.VIRTUALIZER_SUPPORTED_VERSIONS;
+	}
 }
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java
index 731209b..4456538 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java
@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.openslx.thrifthelper.TConst;
+import org.openslx.virtualization.Version;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 
@@ -28,6 +29,11 @@ public class VirtualizerQemu extends Virtualizer
 			.unmodifiableList( Arrays.asList( ImageFormat.QCOW2, ImageFormat.VMDK, ImageFormat.VDI ) );
 
 	/**
+	 * List of supported versions of the QEMU virtualizer.
+	 */
+	private static final List<Version> VIRTUALIZER_SUPPORTED_VERSIONS = null;
+
+	/**
 	 * Creates a new QEMU virtualizer.
 	 */
 	public VirtualizerQemu()
@@ -40,4 +46,10 @@ public class VirtualizerQemu extends Virtualizer
 	{
 		return VirtualizerQemu.VIRTUALIZER_SUPPORTED_IMAGE_FORMATS;
 	}
+
+	@Override
+	public List<Version> getSupportedVersions()
+	{
+		return VirtualizerQemu.VIRTUALIZER_SUPPORTED_VERSIONS;
+	}
 }
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java
index 77662ab..6be7cbf 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java
@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.openslx.thrifthelper.TConst;
+import org.openslx.virtualization.Version;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 
@@ -28,6 +29,11 @@ public class VirtualizerVirtualBox extends Virtualizer
 			.unmodifiableList( Arrays.asList( ImageFormat.VDI ) );
 
 	/**
+	 * List of supported version of the VirtualBox virtualizer.
+	 */
+	private static final List<Version> VIRTUALIZER_SUPPORTED_VERSIONS = null;
+
+	/**
 	 * Creates a new VirtualBox virtualizer.
 	 */
 	public VirtualizerVirtualBox()
@@ -41,4 +47,10 @@ public class VirtualizerVirtualBox extends Virtualizer
 	{
 		return VirtualizerVirtualBox.VIRTUALIZER_SUPPORTED_IMAGE_FORMATS;
 	}
+
+	@Override
+	public List<Version> getSupportedVersions()
+	{
+		return VirtualizerVirtualBox.VIRTUALIZER_SUPPORTED_VERSIONS;
+	}
 }
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java
index 7b766eb..6e676f3 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java
@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.openslx.thrifthelper.TConst;
+import org.openslx.virtualization.Version;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 
@@ -28,6 +29,26 @@ public class VirtualizerVmware extends Virtualizer
 			.unmodifiableList( Arrays.asList( ImageFormat.VMDK ) );
 
 	/**
+	 * List of supported versions of the VMware virtualizer.
+	 */
+	private static final List<Version> VIRTUALIZER_SUPPORTED_VERSIONS = Collections.unmodifiableList(
+			Arrays.asList(
+					new Version( Short.valueOf( "03" ), "Workstation 4/5, Player 1" ),
+					new Version( Short.valueOf( "04" ), "Workstation 4/5, Player 1/2, Fusion 1" ),
+					new Version( Short.valueOf( "06" ), "Workstation 6" ),
+					new Version( Short.valueOf( "07" ), "Workstation 6.5/7, Player 3, Fusion 2/3" ),
+					new Version( Short.valueOf( "08" ), "Workstation 8, Player/Fusion 4" ),
+					new Version( Short.valueOf( "09" ), "Workstation 9, Player/Fusion 5" ),
+					new Version( Short.valueOf( "10" ), "Workstation 10, Player/Fusion 6" ),
+					new Version( Short.valueOf( "11" ), "Workstation 11, Player/Fusion 7" ),
+					new Version( Short.valueOf( "12" ), "Workstation/Player 12, Fusion 8" ),
+					new Version( Short.valueOf( "14" ), "Workstation/Player 14, Fusion 10" ),
+					new Version( Short.valueOf( "15" ), "Workstation/Player 15, Fusion 11" ),
+					new Version( Short.valueOf( "16" ), "Workstation/Player 15.1, Fusion 11.1" ),
+					new Version( Short.valueOf( "17" ), "Workstation/Player 16, Fusion 12" ),
+					new Version( Short.valueOf( "18" ), "Workstation/Player 16.1, Fusion 12.1" ) ) );
+
+	/**
 	 * Creates a new VMware virtualizer.
 	 */
 	public VirtualizerVmware()
@@ -40,4 +61,11 @@ public class VirtualizerVmware extends Virtualizer
 	{
 		return VirtualizerVmware.VIRTUALIZER_SUPPORTED_IMAGE_FORMATS;
 	}
+
+	@Override
+	public List<Version> getSupportedVersions()
+	{
+		return VirtualizerVmware.VIRTUALIZER_SUPPORTED_VERSIONS;
+	}
+
 }