Vered Volansky has uploaded a new change for review. Change subject: core: Size info in GB along side % ......................................................................
core: Size info in GB along side % Change-Id: I6a4032a16909d66186e98d4535983fb8cce86f46 Bug-Url: https://bugzilla.redhat.com/ Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeTextBoxLabel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java 3 files changed, 44 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/40729/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java index 0133716..ccbee8e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java @@ -147,6 +147,14 @@ staticData.setWarningLowSpaceIndicator(warningLowSpaceIndicator); } + public Integer getWarningLowSpaceSize() { + if (getWarningLowSpaceIndicator() == null) { + return null; + } + Integer warningLowSpaceSize = getTotalDiskSize() * getWarningLowSpaceIndicator() / 100; + return warningLowSpaceSize; + } + public Integer getCriticalSpaceActionBlocker() { return staticData.getCriticalSpaceActionBlocker(); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeTextBoxLabel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeTextBoxLabel.java new file mode 100644 index 0000000..0495743 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeTextBoxLabel.java @@ -0,0 +1,12 @@ +package org.ovirt.engine.ui.common.widget.label; + +import org.ovirt.engine.core.common.utils.SizeConverter; +import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer; + +public class StorageSizeTextBoxLabel<T extends Number> extends TextBoxLabelBase<T> { + + public StorageSizeTextBoxLabel() { + super(new DiskSizeRenderer<T>(SizeConverter.SizeUnit.GB)); + } + +} diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java index 90c04eb..82b05bf 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java @@ -10,12 +10,15 @@ import org.ovirt.engine.ui.common.widget.form.FormItem; import org.ovirt.engine.ui.common.widget.form.GeneralFormPanel; import org.ovirt.engine.ui.common.widget.label.StorageSizeLabel; +import org.ovirt.engine.ui.common.widget.label.StorageSizeTextBoxLabel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; +import org.ovirt.engine.ui.common.widget.label.TextBoxLabelBase; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.gin.AssetProvider; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.storage.SubTabStorageGeneralPresenter; +import org.ovirt.engine.ui.webadmin.widget.label.DetailsTextBoxLabel; import org.ovirt.engine.ui.webadmin.widget.label.PercentLabel; import com.google.gwt.core.client.GWT; @@ -25,6 +28,10 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; +import org.ovirt.engine.ui.webadmin.widget.label.PercentTextBoxLabel; + +import java.util.ArrayList; +import java.util.Arrays; public class SubTabStorageGeneralView extends AbstractSubTabFormView<StorageDomain, StorageListModel, StorageGeneralModel> implements SubTabStorageGeneralPresenter.ViewDef, Editor<StorageGeneralModel> { @@ -55,7 +62,14 @@ PercentLabel<Integer> overAllocationRatio = new PercentLabel<Integer>(); @Ignore - PercentLabel<Integer> warningLowSpaceIndicator = new PercentLabel<Integer>(); + private PercentTextBoxLabel<Integer> warningLowSpaceIndicator = new PercentTextBoxLabel<>(); + + @Ignore + private StorageSizeTextBoxLabel<Integer> warningLowSpaceSize = new StorageSizeTextBoxLabel<>(); + + @Ignore + DetailsTextBoxLabel<ArrayList<TextBoxLabelBase<Integer>>, Integer> warningLowSpaceDetails = + new DetailsTextBoxLabel<ArrayList<TextBoxLabelBase<Integer>>, Integer>(constants.empty(), constants.empty()); @Ignore StorageSizeLabel<Integer> criticalSpaceActionBlocker = new StorageSizeLabel<Integer>(); @@ -156,8 +170,8 @@ } }); - formBuilder.addFormItem(new FormItem(constants.warningLowSpaceIndicator(), warningLowSpaceIndicator, 12, 0)); - formBuilder.addFormItem(new FormItem(constants.criticalSpaceActionBlocker(), criticalSpaceActionBlocker, 13, 0)); + formBuilder.addFormItem(new FormItem(constants.warningLowSpaceIndicator(), warningLowSpaceDetails, 12, 0) {}); + formBuilder.addFormItem(new FormItem(constants.criticalSpaceActionBlocker(), criticalSpaceActionBlocker, 13, 0) {}); } @Override @@ -178,10 +192,17 @@ allocatedSize.setValue(entity.getCommittedDiskSize()); overAllocationRatio.setValue(entity.getStorageDomainOverCommitPercent()); warningLowSpaceIndicator.setValue(entity.getWarningLowSpaceIndicator()); + warningLowSpaceSize.setValue(entity.getWarningLowSpaceSize()); + + ArrayList<TextBoxLabelBase<Integer>> warningLowSpaceDetailsArray = + new ArrayList<TextBoxLabelBase<Integer>>(Arrays.asList(warningLowSpaceIndicator, warningLowSpaceSize)); + + warningLowSpaceDetails.setValue(warningLowSpaceDetailsArray); criticalSpaceActionBlocker.setValue(entity.getCriticalSpaceActionBlocker()); } formBuilder.update(getDetailModel()); } + } -- To view, visit https://gerrit.ovirt.org/40729 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a4032a16909d66186e98d4535983fb8cce86f46 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
