From e4bb63179edac6752622e460854f6e2298db1a70 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 24 Apr 2018 11:47:46 +0200
Subject: Constants for virtId

---
 src/main/java/org/openslx/thrifthelper/TConst.java    | 13 +++++++++++++
 src/main/java/org/openslx/util/vm/DiskImage.java      |  8 +++++---
 src/main/java/org/openslx/util/vm/QemuMetaData.java   | 10 +++++-----
 src/main/java/org/openslx/util/vm/VboxMetaData.java   |  7 ++++---
 src/main/java/org/openslx/util/vm/VmwareMetaData.java |  7 ++++---
 5 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/org/openslx/thrifthelper/TConst.java

(limited to 'src/main')

diff --git a/src/main/java/org/openslx/thrifthelper/TConst.java b/src/main/java/org/openslx/thrifthelper/TConst.java
new file mode 100644
index 0000000..2ff902e
--- /dev/null
+++ b/src/main/java/org/openslx/thrifthelper/TConst.java
@@ -0,0 +1,13 @@
+package org.openslx.thrifthelper;
+
+public class TConst
+{
+
+	/*
+	 * Fort virtId in e.g. Virtualizer class, ImageBase etc.
+	 */
+	public static final String VIRT_VMWARE = "vmware";
+	public static final String VIRT_VIRTUALBOX = "virtualbox";
+	public static final String VIRT_QEMU  = "qemukvm";
+	
+}
diff --git a/src/main/java/org/openslx/util/vm/DiskImage.java b/src/main/java/org/openslx/util/vm/DiskImage.java
index 26fca19..3ceebd8 100644
--- a/src/main/java/org/openslx/util/vm/DiskImage.java
+++ b/src/main/java/org/openslx/util/vm/DiskImage.java
@@ -7,7 +7,9 @@ import java.io.RandomAccessFile;
 import java.util.Arrays;
 
 import org.apache.log4j.Logger;
+import org.apache.thrift.protocol.TCompactProtocol;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
+import org.openslx.thrifthelper.TConst;
 import org.openslx.util.Util;
 
 public class DiskImage
@@ -42,11 +44,11 @@ public class DiskImage
 		{
 			if ( virtId == null )
 				return null;
-			if ( virtId.equals( "vmware" ) )
+			if ( virtId.equals( TConst.VIRT_VMWARE ) )
 				return VMDK;
-			if ( virtId.equals( "virtualbox" ) )
+			if ( virtId.equals( TConst.VIRT_VIRTUALBOX ) )
 				return VDI;
-			if ( virtId.equals( "qemukvm" ) )
+			if ( virtId.equals( TConst.VIRT_QEMU ) )
 				return QCOW2;
 			return null;
 		}
diff --git a/src/main/java/org/openslx/util/vm/QemuMetaData.java b/src/main/java/org/openslx/util/vm/QemuMetaData.java
index f470376..742fa40 100644
--- a/src/main/java/org/openslx/util/vm/QemuMetaData.java
+++ b/src/main/java/org/openslx/util/vm/QemuMetaData.java
@@ -9,6 +9,7 @@ import java.util.Map;
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
+import org.openslx.thrifthelper.TConst;
 
 public class QemuMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta, VBoxHWVersionMeta, VBoxEthernetDevTypeMeta>
 {
@@ -18,13 +19,13 @@ public class QemuMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta,
 	private static String config = "qemu-system-i386 <args> <image> -enable-kvm \n\r qemu-system-x86_64 <args> <image> -enable-kvm";
 	private static final Logger LOGGER = Logger.getLogger( QemuMetaData.class );
 
-	private static final Virtualizer virtualizer = new Virtualizer( "qemukvm", "QEMU-KVM" );
+	private static final Virtualizer virtualizer = new Virtualizer( TConst.VIRT_QEMU, "QEMU-KVM" );
 
 	public QemuMetaData( List<OperatingSystem> osList, File file )
 	{
 		super( osList );
 		displayName = file.getName().substring( 0, file.getName().indexOf( "." ) );
-		setOs( "qemukvm", "anyOs" );
+		setOs( "anyOs" );
 		hdds.add( new HardDisk( "anychipset", DriveBusType.IDE, file.getAbsolutePath() ) );
 		makeStartSequence();
 	}
@@ -34,7 +35,7 @@ public class QemuMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta,
 		super( osList );
 		config = new String( vmContent );
 		displayName = "QemuVM";
-		setOs( "qemukvm", "anyOs" );
+		setOs( "anyOs" );
 	}
 
 	// initiates the arguments map with a default working sequence that will later be used in the definition array
@@ -93,8 +94,7 @@ public class QemuMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta,
 	@Override
 	public void setOs( String vendorOsId )
 	{
-		// TODO Auto-generated method stub
-
+		setOs( TConst.VIRT_QEMU, vendorOsId );
 	}
 
 	@Override
diff --git a/src/main/java/org/openslx/util/vm/VboxMetaData.java b/src/main/java/org/openslx/util/vm/VboxMetaData.java
index de41787..a1cff54 100644
--- a/src/main/java/org/openslx/util/vm/VboxMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VboxMetaData.java
@@ -12,6 +12,7 @@ import java.util.UUID;
 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.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -63,7 +64,7 @@ public class VboxMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta,
 {
 	private static final Logger LOGGER = Logger.getLogger( VboxMetaData.class );
 
-	private static final Virtualizer virtualizer = new Virtualizer( "virtualbox", "VirtualBox" );
+	private static final Virtualizer virtualizer = new Virtualizer( TConst.VIRT_VIRTUALBOX, "VirtualBox" );
 
 	private final VboxConfig config;
 
@@ -99,7 +100,7 @@ public class VboxMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta,
 
 		this.config.init();
 		displayName = config.getDisplayName();
-		setOs( "virtualbox", config.getOsName() );
+		setOs( config.getOsName() );
 		this.isMachineSnapshot = config.isMachineSnapshot();
 		for ( HardDisk hardDisk : config.getHdds() ) {
 			hdds.add( hardDisk );
@@ -202,7 +203,7 @@ public class VboxMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta,
 	public void setOs( String vendorOsId )
 	{
 		config.changeAttribute( "Machine", "OSType", vendorOsId );
-		setOs( "virtualbox", vendorOsId );
+		setOs( TConst.VIRT_VIRTUALBOX, vendorOsId );
 	}
 
 	@Override
diff --git a/src/main/java/org/openslx/util/vm/VmwareMetaData.java b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
index f1efb8c..cf190d4 100644
--- a/src/main/java/org/openslx/util/vm/VmwareMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
@@ -13,6 +13,7 @@ import java.util.regex.Pattern;
 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.util.Util;
 import org.openslx.util.vm.VmwareConfig.ConfigEntry;
 
@@ -63,7 +64,7 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
 
 	private static final Logger LOGGER = Logger.getLogger( VmwareMetaData.class );
 
-	private static final Virtualizer virtualizer = new Virtualizer( "vmware", "VMware" );
+	private static final Virtualizer virtualizer = new Virtualizer( TConst.VIRT_VMWARE, "VMware" );
 
 	private static final Pattern hddKey = Pattern.compile( "^(ide\\d|scsi\\d|sata\\d):?(\\d)?\\.(.*)", Pattern.CASE_INSENSITIVE );
 
@@ -182,7 +183,7 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
 		// Dig Usable meta data
 		String value = entry.getValue().getValue();
 		if ( lowerKey.equals( "guestos" ) ) {
-			setOs( "vmware", value );
+			setOs( value );
 			return;
 		}
 		if ( lowerKey.equals( "displayname" ) ) {
@@ -400,7 +401,7 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
 	public void setOs( String vendorOsId )
 	{
 		addFiltered( "guestOS", vendorOsId );
-		setOs( "vmware", vendorOsId );
+		setOs( TConst.VIRT_VMWARE, vendorOsId );
 	}
 
 	@Override
-- 
cgit v1.2.3-55-g7522