Martin Mucha has uploaded a new change for review. Change subject: call validation when creating/editing Provider URL for Network Provider ......................................................................
call validation when creating/editing Provider URL for Network Provider added call to validate connection details when testing settings from ProviderModel. 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, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/32220/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 b0168c8..0f8351b 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 @@ -224,15 +224,26 @@ private boolean validate() { getName().validateEntity(new IValidation[] { new NotEmptyValidation(), new AsciiNameValidation() }); getType().validateSelectedItem(new IValidation[] { new NotEmptyValidation() }); + getNeutronAgentModel().validate(); + boolean connectionSettingsValid = validateConnectionSettings(); + + return connectionSettingsValid && + getName().getIsValid() && + getType().getIsValid() && + getNeutronAgentModel().getIsValid(); + } + + private boolean validateConnectionSettings() { getUsername().validateEntity(new IValidation[] { new NotEmptyValidation() }); getPassword().validateEntity(new IValidation[] { new NotEmptyValidation() }); getTenantName().validateEntity(new IValidation[] { new NotEmptyValidation()} ); getUrl().validateEntity(new IValidation[] { new NotEmptyValidation(), new UrlValidation(Uri.SCHEME_HTTP, Uri.SCHEME_HTTPS) }); - getNeutronAgentModel().validate(); - return getName().getIsValid() && getType().getIsValid() && getUrl().getIsValid() && getUsername().getIsValid() - && getPassword().getIsValid() && getTenantName().getIsValid() && getNeutronAgentModel().getIsValid(); + return getUrl().getIsValid() && + getUsername().getIsValid() && + getPassword().getIsValid() && + getTenantName().getIsValid(); } private void cancel() { @@ -303,6 +314,10 @@ } private void onTest() { + if (!validateConnectionSettings()) { + return; + } + flush(); startProgress(null); Frontend.getInstance().runAction(VdcActionType.TestProviderConnectivity, -- To view, visit http://gerrit.ovirt.org/32220 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b9e9a6b66d800c973334629fa34b3b5443290df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
