diff options
| author | Manuel Bentele | 2021-04-23 17:30:37 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2021-04-23 17:30:37 +0200 |
| commit | 44e974cc175b61f46ef5fd588b03a85ace15dfed (patch) | |
| tree | 790d23240aaf840ac162f485b14edb639d4768af /dozentenmodulserver | |
| parent | [client,server] Encapsulate transformation logic for virtualization configura... (diff) | |
| download | tutor-module-44e974cc175b61f46ef5fd588b03a85ace15dfed.tar.gz tutor-module-44e974cc175b61f46ef5fd588b03a85ace15dfed.tar.xz tutor-module-44e974cc175b61f46ef5fd588b03a85ace15dfed.zip | |
[client,server] Refactors and abstracts version information in config logic and disk image
Diffstat (limited to 'dozentenmodulserver')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 8 | ||||
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java | 2 |
2 files changed, 6 insertions, 4 deletions
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 8701a722..4b327ac9 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 @@ -585,7 +585,7 @@ public class DbLecture { final boolean usbAccess = rs.getBoolean("hasusbaccess"); // prepare virtualization configuration as part of the launch data - VirtualizationConfiguration<?, ?, ?, ?, ?> virtualizationConfig = null; + VirtualizationConfiguration<?, ?, ?, ?> virtualizationConfig = null; try { virtualizationConfig = VirtualizationConfiguration.getInstance(OperatingSystemList.get(), config, config.length); } catch (Exception e) { @@ -594,16 +594,18 @@ public class DbLecture { } // modify virtualization configuration + String configuration = null; try { final ConfigurationLogicDozModServerToStatelessClient downloadLogic = new ConfigurationLogicDozModServerToStatelessClient(); downloadLogic.apply(virtualizationConfig, new ConfigurationDataDozModServerToStatelessClient(lectureName, osKeyword, usbAccess)); + configuration = virtualizationConfig.getConfigurationAsString(); } catch (TransformationException e) { LOGGER.error("Virtualization configuration could not be modified", e); return null; } - retval.virtualizationConfig = virtualizationConfig; + retval.configuration = configuration; retval.legacyRunScript = rs.getString("runscript"); retval.netShares = DbLectureNetshare.getCombinedForLecture(connection, lectureId); retval.runScript = DbRunScript.getRunScriptsForLaunch(connection, lectureId, rs.getInt("osid")); @@ -716,7 +718,7 @@ public class DbLecture { } public static class LaunchData { - public VirtualizationConfiguration<?, ?, ?, ?, ?> virtualizationConfig; + public String configuration; 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 59b15e7a..e9394b5e 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.virtualizationConfig.getFilteredDefinitionArray()); + tarPutFile(output, "vmx", ld.configuration); tarPutFile(output, "runscript", ld.legacyRunScript); tarPutFile(output, "netshares", serializeNetShares(ld.netShares)); if (ld.runScript != null) { |