Moti Asayag has uploaded a new change for review. Change subject: core: Remove IP validation check from repetitive con (#852076) ......................................................................
core: Remove IP validation check from repetitive con (#852076) https://bugzilla.redhat.com/852076 The IP Address is being validate explicitly therefore no need to refer to it with repetitive IP constraint. Change-Id: Iadc8e065d36c57f1a7c71fc373ce00748ff26b41 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraint.java 1 file changed, 2 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/7635/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraint.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraint.java index 3574fab..81d6842 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraint.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NoRepetitiveStaticIpInListConstraint.java @@ -3,15 +3,12 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import org.ovirt.engine.core.common.businessentities.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; -import org.ovirt.engine.core.common.utils.ValidationUtils; import org.ovirt.engine.core.common.validation.annotation.NoRepetitiveStaticIpInList; public class NoRepetitiveStaticIpInListConstraint implements ConstraintValidator<NoRepetitiveStaticIpInList, List<VdsNetworkInterface>> { @@ -20,8 +17,9 @@ public boolean isValid(List<VdsNetworkInterface> value, ConstraintValidatorContext context) { Collection<String> staticIps = new HashSet<String>(); for (VdsNetworkInterface networkInterface : value) { + String address = networkInterface.getAddress(); if (networkInterface.getBootProtocol() == NetworkBootProtocol.StaticIp - && validAddress(networkInterface.getAddress())) { + && address != null && !"".equals(address)) { if (staticIps.contains(networkInterface.getAddress())) { return false; } else { @@ -30,16 +28,6 @@ } } return true; - } - - private boolean validAddress(String address) { - boolean isValid = false; - if (address != null) { - Pattern pattern = Pattern.compile(ValidationUtils.IP_PATTERN); - Matcher matcher = pattern.matcher(address); - isValid = matcher.matches(); - } - return isValid; } @Override -- To view, visit http://gerrit.ovirt.org/7635 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iadc8e065d36c57f1a7c71fc373ce00748ff26b41 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
