Martin Mucha has uploaded a new change for review. Change subject: webadmin: call&add name validation when creating/editing Provider URL for Network Provider ......................................................................
webadmin: call&add name validation when creating/editing Provider URL for Network Provider - validation will be called when "Test" button is clicked - validation will be called when "OK" button is clicked - when "isTypeOpenStackNetwork()" UrlValidation is also used to validate provider name. Change-Id: I0b9e9a6b66d800c973334629fa34b3b5443290df Bug-Url: https://bugzilla.redhat.com/1111974 Signed-off-by: Martin Mucha <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/31330/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java index 1199682..4097688 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java @@ -222,7 +222,7 @@ } private boolean validate() { - getName().validateEntity(new IValidation[] { new NotEmptyValidation(), new AsciiNameValidation() }); + getName().validateEntity(createNameValidations()); getType().validateSelectedItem(new IValidation[] { new NotEmptyValidation() }); getUsername().validateEntity(new IValidation[] { new NotEmptyValidation() }); getPassword().validateEntity(new IValidation[] { new NotEmptyValidation() }); @@ -233,6 +233,17 @@ return getName().getIsValid() && getType().getIsValid() && getUrl().getIsValid() && getUsername().getIsValid() && getPassword().getIsValid() && getTenantName().getIsValid() && getNeutronAgentModel().getIsValid(); + } + + private IValidation[] createNameValidations() { + final List<IValidation> validations = new ArrayList<IValidation>(Arrays.asList(new NotEmptyValidation(), + new AsciiNameValidation())); + + if (isTypeOpenStackNetwork()) { + validations.add(new UrlValidation(Uri.SCHEME_HTTP, Uri.SCHEME_HTTPS)); + } + + return validations.toArray(new IValidation[validations.size()]); } private void cancel() { @@ -303,6 +314,14 @@ } private void onTest() { + if (!validate()) { + return; + } + + doTest(); + } + + private void doTest() { flush(); startProgress(null); Frontend.getInstance().runAction(VdcActionType.TestProviderConnectivity, -- To view, visit http://gerrit.ovirt.org/31330 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b9e9a6b66d800c973334629fa34b3b5443290df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
