Lior Vernia has uploaded a new change for review. Change subject: webadmin: Lift max MTU limit ......................................................................
webadmin: Lift max MTU limit Don't limit users to a maximum MTU value when configuring a network, values too high will cause errors when provisioned on a non-supporting host. Also removed the reference to the MaxMTU configuration value which had never been exposed to users anyway. Change-Id: I352ac3e00d657f00b6cec5dcb23475a143a9c8fd Bug-Url: https://bugzilla.redhat.com/1010663 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/MTUValidator.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java 5 files changed, 1 insertion(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/23482/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 1aab2da..b5c9769 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -977,10 +977,6 @@ @DefaultValueAttribute("true") LiveSnapshotEnabled, - @TypeConverterAttribute(Integer.class) - @DefaultValueAttribute("9000") - MaxMTU, - @TypeConverterAttribute(Boolean.class) @DefaultValueAttribute("true") PosixStorageEnabled, 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 8eba34f..50244f6 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 @@ -69,7 +69,6 @@ HotPlugEnabled(ConfigAuthType.User), NetworkLinkingSupported(ConfigAuthType.User), SupportBridgesReportByVDSM(ConfigAuthType.User), - MaxMTU, ManagementNetwork, ApplicationMode(ConfigAuthType.User), ShareableDiskEnabled(ConfigAuthType.User), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/MTUValidator.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/MTUValidator.java index 15cc44b..231d484 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/MTUValidator.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/MTUValidator.java @@ -3,8 +3,6 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import org.ovirt.engine.core.common.config.Config; -import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.validation.annotation.MTU; public class MTUValidator implements ConstraintValidator<MTU, Integer> { @@ -15,6 +13,6 @@ @Override public boolean isValid(Integer value, ConstraintValidatorContext context) { - return (value == 0 || (68 <= value && value <= Config.<Integer> getValue(ConfigValues.MaxMTU))); + return (value == 0 || value >= 68); } } diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java index a2c457a..64780a1 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java @@ -21,7 +21,6 @@ public class MTUValidatorTest { - private static final int TEST_MAX_MTU = 9000; private static final String TEST_MANAGEMENT_NETWORK = "ovirtmgmt"; private Validator validator; @@ -30,7 +29,6 @@ validator = ValidationUtils.getValidator(); IConfigUtilsInterface confUtils = mock(IConfigUtilsInterface.class); - when(confUtils.getValue(ConfigValues.MaxMTU, ConfigCommon.defaultConfigurationVersion)).thenReturn(TEST_MAX_MTU); when(confUtils.getValue(ConfigValues.ManagementNetwork, ConfigCommon.defaultConfigurationVersion)).thenReturn(TEST_MANAGEMENT_NETWORK); Config.setConfigUtils(confUtils); } @@ -43,13 +41,6 @@ @Test public void invalidLowMTU() { Set<ConstraintViolation<MtuContainer>> validate = validate(new MtuContainer(30)); - Assert.assertTrue(validate.size() > 0); - - } - - @Test - public void invalidHighMTU() { - Set<ConstraintViolation<MtuContainer>> validate = validate(new MtuContainer(TEST_MAX_MTU + 1)); Assert.assertTrue(validate.size() > 0); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java index 905d52e..6d02b9c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java @@ -46,8 +46,6 @@ public abstract class NetworkModel extends Model { - private static final Integer MAX_MTU = - (Integer) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.MaxMTU); protected static final String ENGINE_NETWORK = (String) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.ManagementNetwork); @@ -460,7 +458,6 @@ { IntegerValidation tempVar5 = new IntegerValidation(); tempVar5.setMinimum(68); - tempVar5.setMaximum(MAX_MTU); getMtu().validateEntity(new IValidation[] { new NotEmptyValidation(), tempVar5 }); } -- To view, visit http://gerrit.ovirt.org/23482 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I352ac3e00d657f00b6cec5dcb23475a143a9c8fd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
