diff options
| author | Victor Mocanu | 2018-04-16 16:12:42 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-04-16 16:12:42 +0200 |
| commit | ebd9d933431fdf2cd8cc2da2720a0be8362c0849 (patch) | |
| tree | fac61f345ba6117e580d22eed889ace224068636 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | |
| parent | [server] Calculate DNBD3-CRC32 list of incoming transfers and dump to disk (diff) | |
| download | tutor-module-ebd9d933431fdf2cd8cc2da2720a0be8362c0849.tar.gz tutor-module-ebd9d933431fdf2cd8cc2da2720a0be8362c0849.tar.xz tutor-module-ebd9d933431fdf2cd8cc2da2720a0be8362c0849.zip | |
[*] Add virtualbox support
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 18 |
1 files changed, 12 insertions, 6 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 58c7bdb2..e7a1299c 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 @@ -28,9 +28,8 @@ import org.openslx.bwlp.thrift.iface.NetShare; import org.openslx.bwlp.thrift.iface.TNotFoundException; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.util.Json; +import org.openslx.util.vm.UnsupportedVirtualizerFormatException; import org.openslx.util.vm.VmMetaData; -import org.openslx.util.vm.VmwareMetaData; -import org.openslx.util.vm.VmwareMetaData.EthernetType; import com.google.gson.JsonParseException; @@ -518,7 +517,8 @@ public class DbLecture { } } - public static VmMetaData getClientLaunchData(String lectureId) throws SQLException, TNotFoundException { + public static VmMetaData<?, ?, ?, ?> getClientLaunchData(String lectureId) throws SQLException, + TNotFoundException, UnsupportedVirtualizerFormatException { byte[] config; String lectureName; String osKeyword; @@ -557,13 +557,19 @@ public class DbLecture { if (config == null) { return null; } - VmwareMetaData meta = new VmwareMetaData(OperatingSystemList.get(), config, config.length); + VmMetaData<?, ?, ?, ?> meta = null; + try { + meta = VmMetaData.getInstance(OperatingSystemList.get(), config, config.length); + } catch (Exception e) { + LOGGER.error("meta could not be initialized", e); + return null; + } meta.addDisplayName(lectureName); if (osKeyword != null) { meta.setOs(osKeyword); } meta.addHddTemplate("%VM_DISK_PATH%", "%VM_DISK_MODE%", "%VM_DISK_REDOLOGDIR%"); - meta.addEthernet(EthernetType.NAT); // TODO: Use config + meta.addEthernet(VmMetaData.EtherType.NAT); // TODO: Use config meta.enableUsb(usbAccess); meta.disableSuspend(); return meta; @@ -580,7 +586,7 @@ public class DbLecture { throw e; } } - + public static List<LectureSummary> getLecturesUsingImageVersion(MysqlConnection connection, String imageVersionId) throws SQLException { MysqlStatement stmt = connection.prepareStatement(summaryBaseSql |