Move VmMetaData classes to new virtualization config directories

13 files changed, 45 insertions, 29 deletions

diff --git a/src/main/java/org/openslx/util/ThriftUtil.java b/src/main/java/org/openslx/util/ThriftUtil.java
index 3c2c9ea..2cfc770 100644
--- a/src/main/java/org/openslx/util/ThriftUtil.java
+++ b/src/main/java/org/openslx/util/ThriftUtil.java
@@ -7,7 +7,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openslx.vm.VmwareConfig;
+import org.openslx.virtualization.configuration.machine.VmwareConfig;
 
 public class ThriftUtil {
 
diff --git a/src/main/java/org/openslx/vm/UnsupportedVirtualizerFormatException.java b/src/main/java/org/openslx/virtualization/configuration/UnsupportedVirtualizerFormatException.java
index a6f3197..3040669 100644
--- a/src/main/java/org/openslx/vm/UnsupportedVirtualizerFormatException.java
+++ b/src/main/java/org/openslx/virtualization/configuration/UnsupportedVirtualizerFormatException.java
@@ -1,4 +1,4 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration;
 
 public class UnsupportedVirtualizerFormatException extends Exception
 {
diff --git a/src/main/java/org/openslx/vm/VmMetaData.java b/src/main/java/org/openslx/virtualization/configuration/VmMetaData.java
index 3f4a8b1..ae94fe0 100644
--- a/src/main/java/org/openslx/vm/VmMetaData.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VmMetaData.java
@@ -1,4 +1,4 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,6 +13,10 @@ import java.util.Map.Entry;
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
+import org.openslx.virtualization.configuration.container.DockerMetaDataDummy;
+import org.openslx.virtualization.configuration.machine.QemuMetaData;
+import org.openslx.virtualization.configuration.machine.VboxMetaData;
+import org.openslx.virtualization.configuration.machine.VmwareMetaData;
 import org.openslx.vm.disk.DiskImage;
 
 /**
@@ -151,7 +155,7 @@ public abstract class VmMetaData<T, U, V, W, X>
 	 * Members
 	 */
 
-	protected final List<HardDisk> hdds = new ArrayList<>();
+	protected final List<HardDisk> hdds = new ArrayList<HardDisk>();
 
 	private final List<OperatingSystem> osList;
 
diff --git a/src/main/java/org/openslx/vm/DockerMetaDataDummy.java b/src/main/java/org/openslx/virtualization/configuration/container/DockerMetaDataDummy.java
index 7381361..321953e 100644
--- a/src/main/java/org/openslx/vm/DockerMetaDataDummy.java
+++ b/src/main/java/org/openslx/virtualization/configuration/container/DockerMetaDataDummy.java
@@ -1,9 +1,11 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration.container;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
 import org.openslx.thrifthelper.TConst;
+import org.openslx.virtualization.configuration.UnsupportedVirtualizerFormatException;
+import org.openslx.virtualization.configuration.VmMetaData;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 
diff --git a/src/main/java/org/openslx/vm/KeyValuePair.java b/src/main/java/org/openslx/virtualization/configuration/machine/KeyValuePair.java
index c5650ec..ecd4f2a 100644
--- a/src/main/java/org/openslx/vm/KeyValuePair.java
+++ b/src/main/java/org/openslx/virtualization/configuration/machine/KeyValuePair.java
@@ -1,4 +1,4 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration.machine;
 
 class KeyValuePair
 {
diff --git a/src/main/java/org/openslx/vm/QemuMetaData.java b/src/main/java/org/openslx/virtualization/configuration/machine/QemuMetaData.java
index e758d64..5dd86be 100644
--- a/src/main/java/org/openslx/vm/QemuMetaData.java
+++ b/src/main/java/org/openslx/virtualization/configuration/machine/QemuMetaData.java
@@ -1,4 +1,4 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration.machine;
 
 import java.io.File;
 import java.math.BigInteger;
@@ -27,6 +27,8 @@ import org.openslx.libvirt.xml.LibvirtXmlDocumentException;
 import org.openslx.libvirt.xml.LibvirtXmlSerializationException;
 import org.openslx.libvirt.xml.LibvirtXmlValidationException;
 import org.openslx.thrifthelper.TConst;
+import org.openslx.virtualization.configuration.UnsupportedVirtualizerFormatException;
+import org.openslx.virtualization.configuration.VmMetaData;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 
diff --git a/src/main/java/org/openslx/vm/QemuMetaDataUtils.java b/src/main/java/org/openslx/virtualization/configuration/machine/QemuMetaDataUtils.java
index a6142ab..34510e5 100644
--- a/src/main/java/org/openslx/vm/QemuMetaDataUtils.java
+++ b/src/main/java/org/openslx/virtualization/configuration/machine/QemuMetaDataUtils.java
@@ -1,13 +1,13 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration.machine;
 
 import java.util.ArrayList;
 
 import org.openslx.libvirt.domain.device.Disk;
 import org.openslx.libvirt.domain.device.Interface;
 import org.openslx.libvirt.domain.device.Disk.BusType;
-import org.openslx.vm.VmMetaData.DriveBusType;
-import org.openslx.vm.VmMetaData.EthernetDevType;
-import org.openslx.vm.VmMetaData.SoundCardType;
+import org.openslx.virtualization.configuration.VmMetaData.DriveBusType;
+import org.openslx.virtualization.configuration.VmMetaData.EthernetDevType;
+import org.openslx.virtualization.configuration.VmMetaData.SoundCardType;
 import org.openslx.libvirt.domain.device.Sound;
 
 /**
diff --git a/src/main/java/org/openslx/vm/VboxConfig.java b/src/main/java/org/openslx/virtualization/configuration/machine/VboxConfig.java
index 9724b6a..82b7384 100644
--- a/src/main/java/org/openslx/vm/VboxConfig.java
+++ b/src/main/java/org/openslx/virtualization/configuration/machine/VboxConfig.java
@@ -1,4 +1,4 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration.machine;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -20,8 +20,9 @@ import javax.xml.xpath.XPathExpressionException;
 import org.apache.log4j.Logger;
 import org.openslx.util.Util;
 import org.openslx.util.XmlHelper;
-import org.openslx.vm.VmMetaData.DriveBusType;
-import org.openslx.vm.VmMetaData.HardDisk;
+import org.openslx.virtualization.configuration.UnsupportedVirtualizerFormatException;
+import org.openslx.virtualization.configuration.VmMetaData.DriveBusType;
+import org.openslx.virtualization.configuration.VmMetaData.HardDisk;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/src/main/java/org/openslx/vm/VboxMetaData.java b/src/main/java/org/openslx/virtualization/configuration/machine/VboxMetaData.java
index 326291b..63e734d 100644
--- a/src/main/java/org/openslx/vm/VboxMetaData.java
+++ b/src/main/java/org/openslx/virtualization/configuration/machine/VboxMetaData.java
@@ -1,4 +1,4 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration.machine;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,7 +15,9 @@ import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
 import org.openslx.thrifthelper.TConst;
-import org.openslx.vm.VboxConfig.PlaceHolder;
+import org.openslx.virtualization.configuration.UnsupportedVirtualizerFormatException;
+import org.openslx.virtualization.configuration.VmMetaData;
+import org.openslx.virtualization.configuration.machine.VboxConfig.PlaceHolder;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 import org.w3c.dom.Attr;
@@ -317,7 +319,7 @@ public class VboxMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta,
 	}
 
 	@Override
-	public void setSoundCard( org.openslx.vm.VmMetaData.SoundCardType type )
+	public void setSoundCard( org.openslx.virtualization.configuration.VmMetaData.SoundCardType type )
 	{
 		VBoxSoundCardMeta sound = soundCards.get( type );
 		config.changeAttribute( "/VirtualBox/Machine/Hardware/AudioAdapter", "enabled", Boolean.toString( sound.isPresent ) );
diff --git a/src/main/java/org/openslx/vm/VmwareConfig.java b/src/main/java/org/openslx/virtualization/configuration/machine/VmwareConfig.java
index d98a1d4..e5d05b3 100644
--- a/src/main/java/org/openslx/vm/VmwareConfig.java
+++ b/src/main/java/org/openslx/virtualization/configuration/machine/VmwareConfig.java
@@ -1,4 +1,4 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration.machine;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -18,6 +18,7 @@ import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
 import org.openslx.util.Util;
+import org.openslx.virtualization.configuration.UnsupportedVirtualizerFormatException;
 
 public class VmwareConfig
 {
diff --git a/src/main/java/org/openslx/vm/VmwareMetaData.java b/src/main/java/org/openslx/virtualization/configuration/machine/VmwareMetaData.java
index cebff17..114d4f7 100644
--- a/src/main/java/org/openslx/vm/VmwareMetaData.java
+++ b/src/main/java/org/openslx/virtualization/configuration/machine/VmwareMetaData.java
@@ -1,4 +1,4 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration.machine;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,7 +17,9 @@ import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
 import org.openslx.thrifthelper.TConst;
 import org.openslx.util.Util;
-import org.openslx.vm.VmwareConfig.ConfigEntry;
+import org.openslx.virtualization.configuration.UnsupportedVirtualizerFormatException;
+import org.openslx.virtualization.configuration.VmMetaData;
+import org.openslx.virtualization.configuration.machine.VmwareConfig.ConfigEntry;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 
diff --git a/src/main/java/org/openslx/vm/disk/DiskImageVmdk.java b/src/main/java/org/openslx/vm/disk/DiskImageVmdk.java
index c9bfdbf..591be3d 100644
--- a/src/main/java/org/openslx/vm/disk/DiskImageVmdk.java
+++ b/src/main/java/org/openslx/vm/disk/DiskImageVmdk.java
@@ -6,8 +6,8 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 
 import org.openslx.util.Util;
-import org.openslx.vm.UnsupportedVirtualizerFormatException;
-import org.openslx.vm.VmwareConfig;
+import org.openslx.virtualization.configuration.UnsupportedVirtualizerFormatException;
+import org.openslx.virtualization.configuration.machine.VmwareConfig;
 
 /**
  * VMDK (sparse extent) disk image for virtual machines.
diff --git a/src/test/java/org/openslx/vm/QemuMetaDataTest.java b/src/test/java/org/openslx/virtualization/configuration/machine/QemuMetaDataTest.java
index 30607db..3ede8e6 100644
--- a/src/test/java/org/openslx/vm/QemuMetaDataTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/machine/QemuMetaDataTest.java
@@ -1,4 +1,4 @@
-package org.openslx.vm;
+package org.openslx.virtualization.configuration.machine;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,10 +32,12 @@ 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.virtualization.configuration.UnsupportedVirtualizerFormatException;
+import org.openslx.virtualization.configuration.VmMetaData;
+import org.openslx.virtualization.configuration.VmMetaData.EtherType;
+import org.openslx.virtualization.configuration.VmMetaData.EthernetDevType;
+import org.openslx.virtualization.configuration.VmMetaData.SoundCardType;
+import org.openslx.virtualization.configuration.VmMetaData.UsbSpeed;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImageTestResources;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
@@ -200,12 +202,12 @@ public class QemuMetaDataTest
 		final Domain vmLibvirtDomainConfig = QemuMetaDataTest.getPrivateDomainFromQemuMetaData( vmConfig );
 
 		final int numHddsLibvirtDomainXmlBeforeAdd = vmLibvirtDomainConfig.getDiskStorageDevices().size();
-		final int numHddsQemuMetaDataBeforeAdd = vmConfig.hdds.size();
+		final int numHddsQemuMetaDataBeforeAdd = vmConfig.getHdds().size();
 
 		vmConfig.addHddTemplate( diskFile, null, null );
 
 		final int numHddsLibvirtDomainXmlAfterAdd = vmLibvirtDomainConfig.getDiskStorageDevices().size();
-		final int numHddsQemuMetaDataAfterAdd = vmConfig.hdds.size();
+		final int numHddsQemuMetaDataAfterAdd = vmConfig.getHdds().size();
 
 		assertTrue( numHddsLibvirtDomainXmlBeforeAdd == numHddsQemuMetaDataBeforeAdd );
 		assertTrue( numHddsLibvirtDomainXmlAfterAdd == numHddsQemuMetaDataAfterAdd );