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 <[email protected]> --- 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 M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 3 files changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/26212/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 90ba968..6559e2a 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 @@ -575,7 +575,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 94354db..d77af84 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,20 @@ { public 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$ - public IpAddressValidation() { - setExpression("^" + IP_ADDRESS_REGEX + "$"); //$NON-NLS-1$ $NON-NLS-2$ - setMessage(ConstantsManager.getInstance().getConstants().thisFieldMustContainIPaddressInFormatMsg()); + this(false); + } + + public IpAddressValidation(boolean allowEmpty) { + String empty = ""; //$NON-NLS-1$ + if (allowEmpty) { + empty = "|^$"; //$NON-NLS-1$ + setMessage(ConstantsManager.getInstance().getConstants().emptyOrValidIPaddressInFormatMsg()); + } else { + setMessage(ConstantsManager.getInstance().getConstants().thisFieldMustContainIPaddressInFormatMsg()); + } + setExpression("^" + IP_ADDRESS_REGEX + "$" + empty); //$NON-NLS-1$ $NON-NLS-2$ + } } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index db18978..ec32e8b 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -848,6 +848,9 @@ @DefaultStringValue("This field must contain an IP address in format xxx.xxx.xxx.xxx") String thisFieldMustContainIPaddressInFormatMsg(); + @DefaultStringValue("This field can be empty or contain an IP address in format xxx.xxx.xxx.xxx") + String emptyOrValidIPaddressInFormatMsg(); + @DefaultStringValue("This field must contain a subnet in format xxx.xxx.xxx.xxx") String thisFieldMustContainSubnetInFormatMsg(); -- To view, visit http://gerrit.ovirt.org/26212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b8fb3fd84158ee7c80662e85125b26d22148daa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
