Eliraz Levi has uploaded a new change for review. Change subject: backend: integrate @mask to VdsNetworkInterface ......................................................................
backend: integrate @mask to VdsNetworkInterface adding annotation to subnet field Change-Id: I27141b469edfbc696d8c72279e876d2474753af6 Bug-Url: https://bugzilla.redhat.com/1012881 Signed-off-by: Eliraz Levi <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateNetworkToVdsParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java 2 files changed, 5 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/35410/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateNetworkToVdsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateNetworkToVdsParameters.java index 2cfa6fa..97dfc6b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateNetworkToVdsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateNetworkToVdsParameters.java @@ -3,11 +3,9 @@ import java.util.ArrayList; import javax.validation.Valid; -import javax.validation.constraints.Pattern; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -import org.ovirt.engine.core.common.utils.ValidationUtils; import org.ovirt.engine.core.compat.Guid; public class UpdateNetworkToVdsParameters extends AttachNetworkToVdsParameters { @@ -16,13 +14,6 @@ @Valid private ArrayList<VdsNetworkInterface> interfaces; private String bondName; - - // TODO elevi ask if different message need to be defined - @Pattern(regexp = ValidationUtils.IP_PATTERN + "^[0-32]$", message = "UPDATE_NETWORK_ADDR_IN_SUBNET_BAD_FORMAT") - @Override - public String getSubnet() { - return super.getSubnet(); - } public UpdateNetworkToVdsParameters() { } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java index be964f8..19abccb 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java @@ -11,6 +11,7 @@ import org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions; import org.ovirt.engine.core.common.utils.ObjectUtils; import org.ovirt.engine.core.common.utils.ValidationUtils; +import org.ovirt.engine.core.common.validation.annotation.Mask; import org.ovirt.engine.core.common.validation.annotation.ValidNetworkConfiguration; import org.ovirt.engine.core.common.validation.annotation.ValidNetworkLabelFormat; import org.ovirt.engine.core.compat.Guid; @@ -32,7 +33,8 @@ @Pattern(regexp = ValidationUtils.IP_PATTERN, message = "NETWORK_ADDR_IN_STATIC_IP_BAD_FORMAT") private String address; - @Pattern(regexp = ValidationUtils.IP_PATTERN, message = "NETWORK_ADDR_IN_SUBNET_BAD_FORMAT") + // @Pattern(regexp = ValidationUtils.IP_PATTERN, message = "NETWORK_ADDR_IN_SUBNET_BAD_FORMAT") + @Mask private String subnet; @Pattern(regexp = ValidationUtils.IP_PATTERN, message = "NETWORK_ADDR_IN_GATEWAY_BAD_FORMAT") @@ -404,7 +406,7 @@ return customProperties; } - public void setCustomProperties (Map<String, String> customProperties) { + public void setCustomProperties(Map<String, String> customProperties) { this.customProperties = customProperties; } @@ -610,7 +612,7 @@ /** * Holds various details about regarding the logical network implementation on the device. */ - public static class NetworkImplementationDetails implements Serializable{ + public static class NetworkImplementationDetails implements Serializable { private static final long serialVersionUID = 5213991878221362832L; private boolean inSync; -- To view, visit http://gerrit.ovirt.org/35410 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27141b469edfbc696d8c72279e876d2474753af6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eliraz Levi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
