diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java | 7 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java index 4be287d7..8b521c9a 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java @@ -592,7 +592,12 @@ public abstract class MainWindow { try { SatelliteStatus status = ThriftManager.getSatClient().getStatus(); failures = 0; - remoteString = " [Store: " + FormatHelper.bytes(status.availableStorageBytes, false) + "]"; + remoteString = " [Store: " + FormatHelper.bytes(status.availableStorageBytes, false); + long maxSize = Session.getSatelliteConfig().vmSizeLimit; + if (maxSize > 0) { + remoteString += ", VM-Limit: " + FormatHelper.bytes(maxSize, false); + } + remoteString += "]"; if (!timeDiffChecked) { final long now = System.currentTimeMillis() / 1000; final long diffSecs = Math.abs(now - status.serverTime); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java index d0b491e3..44ae307f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java @@ -35,6 +35,7 @@ import org.openslx.dozmod.thrift.ThriftError; import org.openslx.dozmod.thrift.UploadInitiator; import org.openslx.dozmod.thrift.WrappedException; import org.openslx.dozmod.thrift.cache.MetaDataCache; +import org.openslx.dozmod.util.FormatHelper; import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.TConst; import org.openslx.virtualization.configuration.VirtualizationConfigurationVmware; @@ -335,6 +336,18 @@ public class ImageUploadPage extends ImageUploadPageLayout { return; } + // Check imposed size limit by server + long maxSize = Session.getSatelliteConfig().vmSizeLimit; + if (maxSize > 0 && maxSize < vmDiskFileInfo.length()) { + Gui.showMessageBox( + I18n.PAGE.getString("ImageUpload.Message.warning.diskImageTooBig", + FormatHelper.bytes(maxSize, false), FormatHelper.bytes(vmDiskFileInfo.length(), false)), + MessageType.WARNING, null, null); + setErrorMessage(I18n.PAGE.getString("ImageUpload.WizardPage.errorMessage.diskImageTooBig")); + setPageComplete(false); + return; + } + // everything seems fine so far state.diskFile = vmDiskFileInfo; state.descriptionFile = file; |