ofri masad has uploaded a new change for review. Change subject: webadmin: Fix QoS validator error tooltip ......................................................................
webadmin: Fix QoS validator error tooltip Fixed the validator of the QoS popup window (integer fields) to check a specific int range. Change-Id: I43448a1a6fed4551fbcfde8c50eb14c1ca3b3ac9 Bug-Url: https://bugzilla.redhat.com/987959 Signed-off-by: Ofri Masad <oma...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java 2 files changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/17369/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java index 4ac0434..b82aa5b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java @@ -94,6 +94,9 @@ VirtIoScsiEnabled(ConfigAuthType.User), SshSoftFencingCommand, MemorySnapshotSupported(ConfigAuthType.User), + MaxAverageNetworkQoSValue, + MaxPeakNetworkQoSValue, + MaxBurstNetworkQoSValue, AverageToPeakRatio, AverageToBurstRatio ; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java index d0d2b68..595626c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java @@ -68,13 +68,19 @@ } public boolean validate() { - getName().validateEntity(new IValidation[]{new NotEmptyValidation(), new AsciiNameValidation()}); - getInboundAverage().validateEntity(new IValidation[]{new NotEmptyValidation(), new IntegerValidation()}); - getInboundPeak().validateEntity(new IValidation[]{new NotEmptyValidation(), new IntegerValidation()}); - getInboundBurst().validateEntity(new IValidation[]{new NotEmptyValidation(), new IntegerValidation()}); - getOutboundAverage().validateEntity(new IValidation[]{new NotEmptyValidation(), new IntegerValidation()}); - getOutboundPeak().validateEntity(new IValidation[]{new NotEmptyValidation(), new IntegerValidation()}); - getOutboundBurst().validateEntity(new IValidation[]{new NotEmptyValidation(), new IntegerValidation()}); + getName().validateEntity(new IValidation[] { new NotEmptyValidation(), new AsciiNameValidation() }); + getInboundAverage().validateEntity(new IValidation[] { new NotEmptyValidation(), new IntegerValidation(0, + (Integer) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.MaxAverageNetworkQoSValue))}); + getInboundPeak().validateEntity(new IValidation[] { new NotEmptyValidation(), new IntegerValidation(0, + (Integer) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.MaxPeakNetworkQoSValue))}); + getInboundBurst().validateEntity(new IValidation[] { new NotEmptyValidation(), new IntegerValidation(0, + (Integer) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.MaxBurstNetworkQoSValue))}); + getOutboundAverage().validateEntity(new IValidation[] { new NotEmptyValidation(), new IntegerValidation(0, + (Integer) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.MaxAverageNetworkQoSValue))}); + getOutboundPeak().validateEntity(new IValidation[] { new NotEmptyValidation(), new IntegerValidation(0, + (Integer) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.MaxPeakNetworkQoSValue))}); + getOutboundBurst().validateEntity(new IValidation[] { new NotEmptyValidation(), new IntegerValidation(0, + (Integer) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.MaxBurstNetworkQoSValue))}); boolean inboundDisabled = Boolean.FALSE.equals(getInboundEnabled().getEntity()); boolean outboundDisabled = Boolean.FALSE.equals(getOutboundEnabled().getEntity()); -- To view, visit http://gerrit.ovirt.org/17369 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43448a1a6fed4551fbcfde8c50eb14c1ca3b3ac9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <oma...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
