Vered Volansky has uploaded a new change for review. Change subject: webadmin: Add tooltip to storage critical threshold ......................................................................
webadmin: Add tooltip to storage critical threshold Added a tooltip in the Edit/New Storage Domain view for the critical space action blocker. Now that there's some more info as to this value, no need to limit the value to the arbitrary 100 it's currently set to. Change-Id: Ib5c7a096772be48113e2a93e1d3fb89137b1be5b Bug-Url: https://bugzilla.redhat.com/1213762 Signed-off-by: Vered Volansky <vvola...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 8 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/41816/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java index 8cf5318..50bf8c1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java @@ -58,7 +58,7 @@ private Integer warningLowSpaceIndicator; @Min(value = 0, message = "VALIDATION.STORAGE_DOMAIN.CRITICAL_SPACE_ACTION_BLOCKER.RANGE") - @Max(value = 100, message = "VALIDATION.STORAGE_DOMAIN.CRITICAL_SPACE_ACTION_BLOCKER.RANGE") + @Max(value = Integer.MAX_VALUE, message = "VALIDATION.STORAGE_DOMAIN.CRITICAL_SPACE_ACTION_BLOCKER.RANGE") private Integer criticalSpaceActionBlocker; public StorageDomainStatic() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java index d017e43..1586c8f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/StorageConstants.java @@ -10,5 +10,4 @@ public static final String SHARED = "Shared"; public static final String ISO = "ISO"; public static final short LOW_SPACE_THRESHOLD = 100; // low space threshold maximum value (%) - public static final short CRITICAL_SPACE_THRESHOLD = 100; // critical space threshold maximum value (GB) } diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index b653bd2..d72e497 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -874,7 +874,7 @@ VALIDATION.STORAGE_DOMAIN.DESCRIPTION.INVALID=Storage Domain description must be formed of "a-z0-9A-Z" or "-_" VALIDATION.STORAGE_DOMAIN.DESCRIPTION.MAX=Storage Domain description must not exceed 4000 characters VALIDATION.STORAGE_DOMAIN.WARNING_LOW_SPACE_INDICATOR.RANGE=Storage Domain's warning_low_space_indicator must be an integer between 0 and 100. -VALIDATION.STORAGE_DOMAIN.CRITICAL_SPACE_ACTION_BLOCKER.RANGE=Storage Domain's critical_space_action_blocker must be an integer between 0 and 100. +VALIDATION.STORAGE_DOMAIN.CRITICAL_SPACE_ACTION_BLOCKER.RANGE=Storage Domain's critical_space_action_blocker must be a non-negative integer. VALIDATION.VM_TEMPLATE.NAME.MAX=VM Template name must not exceed 40 characters VALIDATION.DISK_INTERFACE.NOT_NULL=Interface is required VALIDATION.VOLUME_TYPE.NOT_NULL=Volume type is required diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index ab111a8..d8c4943 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -2399,7 +2399,7 @@ @DefaultStringValue("Storage Domain's warning_low_space_indicator must be an integer between 0 and 100") String VALIDATION_STORAGE_DOMAIN_WARNING_LOW_SPACE_INDICATOR_RANGE(); - @DefaultStringValue("Storage Domain's critical_space_action_blocker must be an integer between 0 and 100") + @DefaultStringValue("Storage Domain's critical_space_action_blocker must be a non-negative integer.0") String VALIDATION_STORAGE_DOMAIN_CRITICAL_SPACE_ACTION_BLOCKER_RANGE(); @DefaultStringValue("Data Center name must be formed of \"a-z0-9A-Z\" or \"-_\"") diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java index 1c1301c..03835e6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java @@ -694,7 +694,7 @@ }); getCriticalSpaceActionBlocker().validateEntity(new IValidation[] { - new NotEmptyValidation(), new IntegerValidation(0, StorageConstants.CRITICAL_SPACE_THRESHOLD) + new NotEmptyValidation(), new IntegerValidation(0, Integer.MAX_VALUE) }); return getName().getIsValid() diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index c7fbb92..ffa26fd 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -1797,6 +1797,9 @@ @DefaultStringValue("Critical Space Action Blocker") String criticalSpaceActionBlocker(); + @DefaultStringValue("Once the free space on the Storage Domain is below this value, any new action that consumes space, even temporarily, will be blocked.") + String changeCriticalSpaceActionBlockerWarning(); + // VM @DefaultStringValue("Cluster") String clusterVm(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java index fe3b8b9..2f5c3d3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java @@ -233,6 +233,7 @@ wipeAfterDeleteEditor.setLabel(constants.wipeAfterDelete()); warningLowSpaceIndicatorEditor.setLabel(constants.warningLowSpaceIndicatorUnits()); criticalSpaceActionBlockerEditor.setLabel(constants.criticalSpaceActionBlockerUnits()); + criticalSpaceActionBlockerEditor.setLabelTooltip(constants.changeCriticalSpaceActionBlockerWarning()); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 5d036ad..66a902e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -880,7 +880,7 @@ VALIDATION.STORAGE_DOMAIN.DESCRIPTION.INVALID=Storage Domain description must be formed of "a-z0-9A-Z" or "-_" VALIDATION.STORAGE_DOMAIN.DESCRIPTION.MAX=Storage Domain description must not exceed 4000 characters VALIDATION.STORAGE_DOMAIN.WARNING_LOW_SPACE_INDICATOR.RANGE=Storage Domain's warning_low_space_indicator must be an integer between 0 and 100. -VALIDATION.STORAGE_DOMAIN.CRITICAL_SPACE_ACTION_BLOCKER.RANGE=Storage Domain's critical_space_action_blocker must be an integer between 0 and 100. +VALIDATION.STORAGE_DOMAIN.CRITICAL_SPACE_ACTION_BLOCKER.RANGE=Storage Domain's critical_space_action_blocker must be a non-negative integer. VALIDATION_DATA_CENTER_DESCRIPTION_INVALID=Data Center description must be formed of ASCII charis only VALIDATION_DATA_CENTER_NAME_INVALID=Data Center name must be formed of "a-z0-9A-Z" or "-_" VALIDATION_ID_NULL=ID is required. -- To view, visit https://gerrit.ovirt.org/41816 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5c7a096772be48113e2a93e1d3fb89137b1be5b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvola...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
