Mike Kolesnik has uploaded a new change for review. Change subject: engine: Change VLAN range validation to framework ......................................................................
engine: Change VLAN range validation to framework Use validation framework to validate the range as it's a simple validation that is more suitable to be checked this way. Change-Id: Ia2d22a3e86fc96b37ce44cdaeb1c23b7c4798624 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java 2 files changed, 18 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/10469/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java index e9ef6a4..69c3271 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java @@ -74,33 +74,23 @@ } protected boolean validateVlanId(List<Network> networks) { - if (getParameters().getNetwork().getvlan_id() != null) { - if (!isVlanInRange(getParameters().getNetwork().getvlan_id())) { - addCanDoActionMessage(VdcBllMessages.NETWORK_VLAN_OUT_OF_RANGE); - return false; - } - - else if (null != LinqUtils.firstOrNull(networks, new Predicate<Network>() { - @Override - public boolean eval(Network n) { - if (n.getvlan_id() != null) { - return n.getvlan_id().equals(getParameters().getNetwork().getvlan_id()) - && n.getstorage_pool_id().equals(getParameters().getNetwork().getstorage_pool_id()) - && !n.getId().equals(getParameters().getNetwork().getId()); + if (getParameters().getNetwork().getvlan_id() != null + && null != LinqUtils.firstOrNull(networks, new Predicate<Network>() { + @Override + public boolean eval(Network n) { + if (n.getvlan_id() != null) { + return n.getvlan_id().equals(getParameters().getNetwork().getvlan_id()) + && n.getstorage_pool_id().equals(getParameters().getNetwork().getstorage_pool_id()) + && !n.getId().equals(getParameters().getNetwork().getId()); + } + return false; } - return false; - } - })) { - addCanDoActionMessage(String.format("$vlanId %d", getParameters().getNetwork().getvlan_id())); - addCanDoActionMessage(VdcBllMessages.NETWORK_VLAN_IN_USE); - return false; - } + })) { + addCanDoActionMessage(String.format("$vlanId %d", getParameters().getNetwork().getvlan_id())); + addCanDoActionMessage(VdcBllMessages.NETWORK_VLAN_IN_USE); + return false; } return true; - } - - private boolean isVlanInRange(int vlanId) { - return (vlanId >= 0 && vlanId <= 4095); } protected boolean networkNotAttachedToCluster(final Network network) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java index 18ab8f3..b2e42e3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java @@ -10,6 +10,8 @@ import javax.persistence.JoinTable; import javax.persistence.ManyToOne; import javax.persistence.Table; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -69,6 +71,8 @@ private String gateway; @Column(name = "vlan_id") + @Min(value = 0, message = "NETWORK_VLAN_OUT_OF_RANGE", groups = { CreateEntity.class, UpdateEntity.class }) + @Max(value = 4095, message = "NETWORK_VLAN_OUT_OF_RANGE", groups = { CreateEntity.class, UpdateEntity.class }) private Integer vlanId; @Column(name = "stp") -- To view, visit http://gerrit.ovirt.org/10469 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2d22a3e86fc96b37ce44cdaeb1c23b7c4798624 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
