From 7559eb5c623e2ef40f52f8487eaaae2cd1907ccc Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 23 Jul 2015 14:04:04 +0200
Subject: Vm meta parser: Add virtualizer getter, change type of description

---
 src/main/java/org/openslx/util/vm/VmMetaData.java     |  6 +++++-
 src/main/java/org/openslx/util/vm/VmwareMetaData.java | 12 +++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/openslx/util/vm/VmMetaData.java b/src/main/java/org/openslx/util/vm/VmMetaData.java
index ff50920..d7b407e 100644
--- a/src/main/java/org/openslx/util/vm/VmMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VmMetaData.java
@@ -1,11 +1,13 @@
 package org.openslx.util.vm;
 
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
 
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
+import org.openslx.bwlp.thrift.iface.Virtualizer;
 
 /**
  * Describes a configured virtual machine. This class is parsed from a machine description, like a
@@ -85,7 +87,7 @@ public abstract class VmMetaData
 	 * CD/DVD/FLoppy drives, serial or parallel ports, shared folders, or anything else that could be
 	 * considered sensible information (absolute paths containing the local user's name).
 	 */
-	public abstract String getFilteredDefinition();
+	public abstract ByteBuffer getFilteredDefinition();
 
 	/*
 	 * Methods
@@ -121,5 +123,7 @@ public abstract class VmMetaData
 		}
 		this.os = lazyMatch;
 	}
+	
+	public abstract Virtualizer getVirtualizer();
 
 }
diff --git a/src/main/java/org/openslx/util/vm/VmwareMetaData.java b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
index 37ee1b3..e37a1f5 100644
--- a/src/main/java/org/openslx/util/vm/VmwareMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
@@ -7,6 +7,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -18,12 +19,15 @@ 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.util.Util;
 
 public class VmwareMetaData extends VmMetaData
 {
 
 	private static final Logger LOGGER = Logger.getLogger( VmwareMetaData.class );
+	
+	private static final Virtualizer virtualizer = new Virtualizer( "vmware", "VMware" );
 
 	private static class Device
 	{
@@ -223,7 +227,7 @@ public class VmwareMetaData extends VmMetaData
 	}
 
 	@Override
-	public String getFilteredDefinition()
+	public ByteBuffer getFilteredDefinition()
 	{
 		// TODO Auto-generated method stub
 		return null;
@@ -241,4 +245,10 @@ public class VmwareMetaData extends VmMetaData
 		}
 	}
 
+	@Override
+	public Virtualizer getVirtualizer()
+	{
+		return virtualizer;
+	}
+
 }
-- 
cgit v1.2.3-55-g7522