diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java | 52 |
1 files changed, 26 insertions, 26 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 9b04518a..ee5e259e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java @@ -24,11 +24,11 @@ import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.thrifthelper.TConst; -import org.openslx.virtualization.configuration.VmMetaData; -import org.openslx.virtualization.configuration.VmMetaData.UsbSpeed; -import org.openslx.virtualization.configuration.machine.QemuMetaData; -import org.openslx.virtualization.configuration.machine.VboxMetaData; -import org.openslx.virtualization.configuration.machine.VmwareMetaData; +import org.openslx.virtualization.configuration.VirtualizationConfigurationQemu; +import org.openslx.virtualization.configuration.VirtualizationConfigurationVirtualBox; +import org.openslx.virtualization.configuration.VirtualizationConfigurationVmware; +import org.openslx.virtualization.configuration.VirtualizationConfiguration; +import org.openslx.virtualization.configuration.VirtualizationConfiguration.UsbSpeed; import org.openslx.vm.disk.DiskImage; import org.openslx.vm.disk.DiskImageException; import org.openslx.vm.disk.DiskImageVmdk; @@ -60,32 +60,32 @@ public class VmWrapper { } } // Handle machine description to generate configuration file - VmMetaData<?, ?, ?, ?, ?> vmMeta = VmMetaData.getInstance(MetaDataCache.getOperatingSystems(), - machineDescription, machineDescription.length); + VirtualizationConfiguration<?, ?, ?, ?, ?> virtualizationConfig = VirtualizationConfiguration + .getInstance(MetaDataCache.getOperatingSystems(), machineDescription, machineDescription.length); // Append disk & NAT - if (!vmMeta.addDefaultNat() || !vmMeta.addHddTemplate(diskFile, null, null)) { + if (!virtualizationConfig.addDefaultNat() || !virtualizationConfig.addHddTemplate(diskFile, null, null)) { throw new MetaDataMissingException(); } - // The guestOS should be in the vmx, but the user could have changed it + // The guestOS should be in the virtualization configuration, but the user could have changed it // by editing // the image via the GUI. Those changes are not written back to the - // stored vmx + // stored virtualization configuration int osMaxMemMb = 0; if (virtualizerId != null && osId != 0) { OperatingSystem os = MetaDataCache.getOsById(osId); if (os != null && os.virtualizerOsId != null) { String virtOsId = os.virtualizerOsId.get(virtualizerId); if (virtOsId != null) { - vmMeta.setOs(virtOsId); + virtualizationConfig.setOs(virtOsId); } if (os.maxMemMb > 0) { osMaxMemMb = os.maxMemMb; } } } - vmMeta.addDisplayName(imageName); + virtualizationConfig.addDisplayName(imageName); int mem = getMainMemoryMb() / 2 - 512; if (mem < 1024) { mem = 1024; @@ -93,16 +93,16 @@ public class VmWrapper { if (osMaxMemMb > 0 && mem > osMaxMemMb) { mem = osMaxMemMb; } - vmMeta.addCpuCoreCount(1); - vmMeta.addRam((mem / 4) * 4); - vmMeta.addFloppy(0, null, true); - vmMeta.addFloppy(1, null, true); - vmMeta.addCdrom(""); // ISO-Based with no disk in drive - vmMeta.addCdrom(null); // Autodetect real drive - if (vmMeta.getMaxUsbSpeed() != UsbSpeed.USB3_0) { - vmMeta.setMaxUsbSpeed(UsbSpeed.USB2_0); + virtualizationConfig.addCpuCoreCount(1); + virtualizationConfig.addRam((mem / 4) * 4); + virtualizationConfig.addFloppy(0, null, true); + virtualizationConfig.addFloppy(1, null, true); + virtualizationConfig.addCdrom(""); // ISO-Based with no disk in drive + virtualizationConfig.addCdrom(null); // Autodetect real drive + if (virtualizationConfig.getMaxUsbSpeed() != UsbSpeed.USB3_0) { + virtualizationConfig.setMaxUsbSpeed(UsbSpeed.USB2_0); } - vmMeta.applySettingsForLocalEdit(); + virtualizationConfig.applySettingsForLocalEdit(); // Output vm String base = diskFile.getAbsolutePath(); @@ -112,7 +112,7 @@ public class VmWrapper { } String fileType = null; - if (vmMeta instanceof VmwareMetaData) { + if (virtualizationConfig instanceof VirtualizationConfigurationVmware) { fileType = ".vmx"; // Copy BIOS with both floppies enabled try { @@ -123,9 +123,9 @@ public class VmWrapper { Gui.asyncMessageBox("Konnte das BIOS für die VM nicht kopieren", MessageType.ERROR, LOGGER, e); } - } else if (vmMeta instanceof VboxMetaData) { + } else if (virtualizationConfig instanceof VirtualizationConfigurationVirtualBox) { fileType = ".vbox"; - } else if (vmMeta instanceof QemuMetaData) { + } else if (virtualizationConfig instanceof VirtualizationConfigurationQemu) { fileType = ".xml"; } if (fileType == null) { @@ -134,8 +134,8 @@ public class VmWrapper { File vmFile = new File(base + fileType); vmFile.delete(); - // actually write vmx to disk - FileUtils.writeByteArrayToFile(vmFile, vmMeta.getFilteredDefinitionArray()); + // actually write virtualization configuration to disk + FileUtils.writeByteArrayToFile(vmFile, virtualizationConfig.getFilteredDefinitionArray()); } private static byte[] getFallbackVmx(DiskImageVmdk diskImageInfo) throws IOException, DiskImageException { |