[Engine-patches] Change in ovirt-engine[master]: ui: Adding fields validation

[ybronhei]

Yaniv Bronhaim has uploaded a new change for review.

Change subject: ui: Adding fields validation
......................................................................

ui: Adding fields validation

1. For root password during provisioning host
2. For url in adding external provider

Change-Id: Icfc3e500ad06728fc8c410baa13405633fc90da2
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
M 
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
3 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/31178/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
index fa3a748..5407b4a 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
@@ -1680,6 +1680,12 @@
                 new LengthValidation(255),
                 new HostAddressValidation() });
 
+        if (getIsDiscorveredHosts().getEntity()) {
+            getUserPassword().validateEntity(new IValidation[] {
+                    new NotEmptyValidation(),
+                    new LengthValidation(255)
+            });
+        }
         getAuthSshPort().validateEntity(new IValidation[] {new 
NotEmptyValidation(), new IntegerValidation(1, 65535)});
 
         if (getConsoleAddressEnabled().getEntity()) {
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..6982222 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
@@ -304,6 +304,14 @@
 
     private void onTest() {
         flush();
+        if (provider.getUrl() == 
ConstantsManager.getInstance().getConstants().empty()
+                ||
+                (requiresAuthentication.getEntity() && provider.getUsername() 
== ConstantsManager.getInstance()
+                        .getConstants()
+                        .empty())) {
+            
getTestResult().setEntity(ConstantsManager.getInstance().getConstants().testFailedInsufficentParams());
+            return;
+        }
         startProgress(null);
         
Frontend.getInstance().runAction(VdcActionType.TestProviderConnectivity,
                 new ProviderParameters(provider),
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 df639de..03e3dc5 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
@@ -2366,5 +2366,7 @@
     @DefaultStringValue("Configure")
     String allowToUseMacPoolTooltip();
 
+    @DefaultStringValue("Insufficient parameters to test connectivity")
+    String testFailedInsufficentParams();
 }
 


-- 
To view, visit http://gerrit.ovirt.org/31178
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfc3e500ad06728fc8c410baa13405633fc90da2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches