diff options
| author | Simon Rettberg | 2015-09-11 14:05:08 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-11 14:05:08 +0200 |
| commit | 163a023986282994c46ab69d03e2a4603124a2a4 (patch) | |
| tree | 8473843217dbd3bcd50cabccad65ff5249ffb08b | |
| parent | [server] Handle deletion/undeletion flags (diff) | |
| download | tutor-module-163a023986282994c46ab69d03e2a4603124a2a4.tar.gz tutor-module-163a023986282994c46ab69d03e2a4603124a2a4.tar.xz tutor-module-163a023986282994c46ab69d03e2a4603124a2a4.zip | |
[*] Adapt to MSS changes
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java | 2 | ||||
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java index 36c64fdf..2a192171 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java @@ -38,7 +38,7 @@ public class VmWrapper { machineDescription.length); } // Append disk & NAT - if (!vmwareConfig.addDefaultNat() || !vmwareConfig.addHddTemplate(diskFile.getName())) { + if (!vmwareConfig.addDefaultNat() || !vmwareConfig.addHddTemplate(diskFile.getName(), null, null)) { throw new MetaDataMissingException(); } // The guestOS should be in the vmx, but the user could have changed it by editing 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 0e6b4ec1..d0fb4d22 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 @@ -464,7 +464,7 @@ public class DbLecture { if (meta.getOs() == null) { meta.setOs(rs.getString("virtoskeyword")); } - meta.addHddTemplate("%VM_DISK_PATH%"); + meta.addHddTemplate("%VM_DISK_PATH%", "%VM_DISK_MODE%", "%VM_DISK_REDO%"); meta.addEthernet(EthernetType.NAT); // TODO: Use config // Everything worked so far, update statistics counters MysqlStatement upStmt = connection.prepareStatement("UPDATE" |