Martin Mucha has uploaded a new change for review. Change subject: core,webadmin: remove validation for multicasts MAC addresses ......................................................................
core,webadmin: remove validation for multicasts MAC addresses after modification of MAC pools, ranges definition boundaries can be non-unicast addresses. Change-Id: Ifad61210f6f04c71dd9da15a6664f6b3075b3fc2 Bug-Url: https://bugzilla.redhat.com/1188294 Signed-off-by: Martin Mucha <mmu...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/MacRange.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/MacRangeModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AnyMacAddressValidation.java R frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/UnicastMacAddressValidation.java 5 files changed, 24 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/37499/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/MacRange.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/MacRange.java index cde4f53..3d844d4 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/MacRange.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/MacRange.java @@ -14,21 +14,14 @@ private Guid macPoolId; - @Pattern.List({ - @Pattern(regexp = MacAddressValidationPatterns.VALID_MAC_ADDRESS_FORMAT, - message = VmNic.VALIDATION_MESSAGE_MAC_ADDRESS_INVALID), - @Pattern(regexp = MacAddressValidationPatterns.NON_MULTICAST_MAC_ADDRESS_FORMAT, - message = VmNic.VALIDATION_VM_NETWORK_MAC_ADDRESS_MULTICAST) - }) + @Pattern(regexp = MacAddressValidationPatterns.VALID_MAC_ADDRESS_FORMAT, + message = VmNic.VALIDATION_MESSAGE_MAC_ADDRESS_INVALID) @NotNull(message= "VALIDATION.VM.NETWORK.MAC.ADDRESS.NOT_NULL") private String macFrom; - @Pattern.List({ - @Pattern(regexp = MacAddressValidationPatterns.VALID_MAC_ADDRESS_FORMAT, - message = VmNic.VALIDATION_MESSAGE_MAC_ADDRESS_INVALID), - @Pattern(regexp = MacAddressValidationPatterns.NON_MULTICAST_MAC_ADDRESS_FORMAT, - message = VmNic.VALIDATION_VM_NETWORK_MAC_ADDRESS_MULTICAST) - }) + @Pattern(regexp = MacAddressValidationPatterns.VALID_MAC_ADDRESS_FORMAT, + message = VmNic.VALIDATION_MESSAGE_MAC_ADDRESS_INVALID) + @NotNull(message = "VALIDATION.VM.NETWORK.MAC.ADDRESS.NOT_NULL") private String macTo; public String getMacFrom() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/MacRangeModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/MacRangeModel.java index 3883340..034dfa3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/MacRangeModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/MacRangeModel.java @@ -3,8 +3,8 @@ import org.ovirt.engine.core.common.businessentities.MacRange; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.Model; +import org.ovirt.engine.ui.uicommonweb.validation.AnyMacAddressValidation; import org.ovirt.engine.ui.uicommonweb.validation.IValidation; -import org.ovirt.engine.ui.uicommonweb.validation.MacAddressValidation; import org.ovirt.engine.ui.uicommonweb.validation.MacRangeValidation; public class MacRangeModel extends Model { @@ -43,8 +43,8 @@ } public boolean validate() { - leftBound.validateEntity(new IValidation[] { new MacAddressValidation() }); - rightBound.validateEntity(new IValidation[] { new MacAddressValidation() }); + leftBound.validateEntity(new IValidation[] { new AnyMacAddressValidation() }); + rightBound.validateEntity(new IValidation[] { new AnyMacAddressValidation() }); if (leftBound.getIsValid() && rightBound.getIsValid()) { rightBound.validateEntity(new IValidation[] { new MacRangeValidation(leftBound.getEntity())}); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java index cc4c5a1..b2f5c21 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java @@ -24,7 +24,7 @@ import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.Model; import org.ovirt.engine.ui.uicommonweb.validation.IValidation; -import org.ovirt.engine.ui.uicommonweb.validation.MacAddressValidation; +import org.ovirt.engine.ui.uicommonweb.validation.UnicastMacAddressValidation; import org.ovirt.engine.ui.uicommonweb.validation.NoSpecialCharactersWithDotValidation; import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation; import org.ovirt.engine.ui.uicompat.Event; @@ -372,7 +372,7 @@ getMAC().setIsValid(true); if (getMAC().getIsChangable()) { - getMAC().validateEntity(new IValidation[] { new NotEmptyValidation(), new MacAddressValidation() }); + getMAC().validateEntity(new IValidation[] { new NotEmptyValidation(), new UnicastMacAddressValidation() }); } return getName().getIsValid() && getNicType().getIsValid() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AnyMacAddressValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AnyMacAddressValidation.java new file mode 100644 index 0000000..ab6a051 --- /dev/null +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AnyMacAddressValidation.java @@ -0,0 +1,12 @@ +package org.ovirt.engine.ui.uicommonweb.validation; + +import org.ovirt.engine.ui.uicompat.ConstantsManager; + +public class AnyMacAddressValidation extends RegexValidation +{ + public AnyMacAddressValidation() + { + setExpression("^[a-fA-F0-9]{2}(:[a-fA-F0-9]{2}){5}$"); //$NON-NLS-1$ + setMessage(ConstantsManager.getInstance().getConstants().invalidMacAddressMsg()); + } +} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/MacAddressValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/UnicastMacAddressValidation.java similarity index 74% rename from frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/MacAddressValidation.java rename to frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/UnicastMacAddressValidation.java index 53d1b39..7037e00 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/MacAddressValidation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/UnicastMacAddressValidation.java @@ -2,9 +2,9 @@ import org.ovirt.engine.ui.uicompat.ConstantsManager; -public class MacAddressValidation extends RegexValidation +public class UnicastMacAddressValidation extends RegexValidation { - public MacAddressValidation() + public UnicastMacAddressValidation() { setExpression("^[a-fA-F0-9][02468aAcCeE](:[a-fA-F0-9]{2}){5}$"); //$NON-NLS-1$ setMessage(ConstantsManager.getInstance().getConstants().invalidMacAddressMsg()); -- To view, visit http://gerrit.ovirt.org/37499 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifad61210f6f04c71dd9da15a6664f6b3075b3fc2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmu...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
