From 806be83875d6cdf66e4751fcef92d6c3fe5e548a Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 16 Apr 2021 11:13:33 +0200
Subject: [client,server] Rename VmMetaData classes

---
 .../bwlp/sat/database/mappers/DbLecture.java       | 26 +++++++++++-----------
 .../java/org/openslx/bwlp/sat/web/WebServer.java   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
index aeae06cf..48915664 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
@@ -30,8 +30,8 @@ import org.openslx.bwlp.thrift.iface.TNotFoundException;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.util.Json;
 import org.openslx.util.Util;
-import org.openslx.virtualization.configuration.VmMetaData;
-import org.openslx.virtualization.configuration.VmMetaData.UsbSpeed;
+import org.openslx.virtualization.configuration.VirtualizationConfiguration;
+import org.openslx.virtualization.configuration.VirtualizationConfiguration.UsbSpeed;
 
 import com.google.gson.JsonParseException;
 
@@ -558,7 +558,7 @@ public class DbLecture {
 		String lectureName;
 		String osKeyword;
 		boolean usbAccess;
-		VmMetaData<?, ?, ?, ?, ?> meta = null;
+		VirtualizationConfiguration<?, ?, ?, ?, ?> virtualizationConfig = null;
 		try (MysqlConnection connection = Database.getConnection()) {
 			// Get required data about lecture and used image
 			MysqlStatement stmt = connection.prepareStatement("SELECT"
@@ -580,15 +580,15 @@ public class DbLecture {
 				return null;
 			}
 			try {
-				meta = VmMetaData.getInstance(OperatingSystemList.get(), config, config.length);
+				virtualizationConfig = VirtualizationConfiguration.getInstance(OperatingSystemList.get(), config, config.length);
 			} catch (Exception e) {
-				LOGGER.error("meta could not be initialized", e);
+				LOGGER.error("virtualization config could not be initialized", e);
 				return null;
 			}
 			lectureName = rs.getString("lecturename");
 			osKeyword = rs.getString("virtoskeyword");
 			usbAccess = rs.getBoolean("hasusbaccess");
-			retval.vmx = meta;
+			retval.virtualizationConfig = virtualizationConfig;
 			retval.legacyRunScript = rs.getString("runscript");
 			retval.netShares = DbLectureNetshare.getCombinedForLecture(connection, lectureId);
 			retval.runScript = DbRunScript.getRunScriptsForLaunch(connection, lectureId, rs.getInt("osid"));
@@ -603,16 +603,16 @@ public class DbLecture {
 			LOGGER.error("Query failed in DbLecture.getClientLaunchData()", e);
 			throw e;
 		}
-		meta.addDisplayName(lectureName);
+		virtualizationConfig.addDisplayName(lectureName);
 		if (osKeyword != null) {
-			meta.setOs(osKeyword);
+			virtualizationConfig.setOs(osKeyword);
 		}
-		meta.addHddTemplate("%VM_DISK_PATH%", "%VM_DISK_MODE%", "%VM_DISK_REDOLOGDIR%");
-		meta.addEthernet(VmMetaData.EtherType.NAT); // TODO: Use config
+		virtualizationConfig.addHddTemplate("%VM_DISK_PATH%", "%VM_DISK_MODE%", "%VM_DISK_REDOLOGDIR%");
+		virtualizationConfig.addEthernet(VirtualizationConfiguration.EtherType.NAT); // TODO: Use config
 		if (!usbAccess) {
-			meta.setMaxUsbSpeed(UsbSpeed.NONE);
+			virtualizationConfig.setMaxUsbSpeed(UsbSpeed.NONE);
 		}
-		meta.tweakForNonPersistent();
+		virtualizationConfig.tweakForNonPersistent();
 		return retval;
 	}
 
@@ -709,7 +709,7 @@ public class DbLecture {
 	}
 	
 	public static class LaunchData {
-		public VmMetaData<?, ?, ?, ?, ?> vmx;
+		public VirtualizationConfiguration<?, ?, ?, ?, ?> virtualizationConfig;
 		public List<NetShare> netShares;
 		public String legacyRunScript;
 		public List<RunScript> runScript;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
index b6e0592c..59b15e7a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
@@ -154,7 +154,7 @@ public class WebServer extends NanoHTTPD {
 				@Override
 				public void run() {
 					try {
-						tarPutFile(output, "vmx", ld.vmx.getFilteredDefinitionArray());
+						tarPutFile(output, "vmx", ld.virtualizationConfig.getFilteredDefinitionArray());
 						tarPutFile(output, "runscript", ld.legacyRunScript);
 						tarPutFile(output, "netshares", serializeNetShares(ld.netShares));
 						if (ld.runScript != null) {
-- 
cgit v1.2.3-55-g7522