Shahar Havivi has uploaded a new change for review. Change subject: UI: Cloud-Init gateway is not mandatory ......................................................................
UI: Cloud-Init gateway is not mandatory Remove the force validation for gateway when choosing Clout-Init at run-once. Change-Id: I9b8fb3fd84158ee7c80662e85125b26d22148daa Bug-Url: https://bugzilla.redhat.com/1047345 Signed-off-by: Shahar Havivi <shah...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/25301/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java index 9831b0b..7163f6f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java @@ -646,7 +646,7 @@ || !validateHidden(getNetworkNetmask(), params.getNetmask(), null, new IValidation[] { new SubnetMaskValidation() }) || !validateHidden(getNetworkGateway(), params.getGateway(), null, - new IValidation[] { new IpAddressValidation() })) { + new IValidation[] { new IpAddressValidation(true) })) { getNetworkList().setSelectedItem(name); networkIsValid = false; break; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java index 97d146d..f68ea84 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java @@ -6,10 +6,15 @@ { protected static final String IP_ADDRESS_REGEX = "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"; //$NON-NLS-1$ - + protected static final String EMPTY_REGEX = "|^$"; //$NON-NLS-1$ public IpAddressValidation() { - setExpression("^" + IP_ADDRESS_REGEX + "$"); //$NON-NLS-1$ $NON-NLS-2$ + this(false); + } + + public IpAddressValidation(boolean allowEmpty) { + String empty = (allowEmpty) ? EMPTY_REGEX : ""; //$NON-NLS-1$ + setExpression("^" + IP_ADDRESS_REGEX + empty + "$"); //$NON-NLS-1$ $NON-NLS-2$ setMessage(ConstantsManager.getInstance().getConstants().thisFieldMustContainIPaddressInFormatMsg()); } } -- To view, visit http://gerrit.ovirt.org/25301 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b8fb3fd84158ee7c80662e85125b26d22148daa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
