[Engine-patches] Change in ovirt-engine[master]: webadmin: Added bond name validation

[lvernia]

Lior Vernia has uploaded a new change for review.

Change subject: webadmin: Added bond name validation
......................................................................

webadmin: Added bond name validation

Now that the user may add new bond names, it is necessary to check that
the given name is of the correct format.

Change-Id: I8f5ea2b582f3117817ef72f7d3350977a124681f
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostBondInterfaceModel.java
A 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/BondNameValidation.java
M 
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
3 files changed, 25 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/12532/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostBondInterfaceModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostBondInterfaceModel.java
index aafecea..0235a73 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostBondInterfaceModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostBondInterfaceModel.java
@@ -8,6 +8,7 @@
 import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
 import org.ovirt.engine.ui.uicommonweb.models.ListModel;
 import org.ovirt.engine.ui.uicommonweb.models.Model;
+import org.ovirt.engine.ui.uicommonweb.validation.BondNameValidation;
 import org.ovirt.engine.ui.uicommonweb.validation.IValidation;
 import org.ovirt.engine.ui.uicommonweb.validation.IpAddressValidation;
 import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation;
@@ -255,7 +256,7 @@
     public boolean Validate()
     {
         getNetwork().ValidateSelectedItem(new IValidation[] { new 
NotEmptyValidation() });
-        getBond().ValidateSelectedItem(new IValidation[] { new 
NotEmptyValidation() });
+        getBond().ValidateSelectedItem(new IValidation[] { new 
BondNameValidation() });
 
         getAddress().setIsValid(true);
         getSubnet().setIsValid(true);
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/BondNameValidation.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/BondNameValidation.java
new file mode 100644
index 0000000..0fc7454
--- /dev/null
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/BondNameValidation.java
@@ -0,0 +1,20 @@
+package org.ovirt.engine.ui.uicommonweb.validation;
+
+import org.ovirt.engine.core.common.businessentities.network.Bond;
+import org.ovirt.engine.ui.uicompat.ConstantsManager;
+
+public class BondNameValidation extends RegexValidation {
+
+    public static String BOND_PREFIX = "bond"; //$NON-NLS-1$
+
+    public BondNameValidation() {
+        setExpression("^" + BOND_PREFIX + "\\d+$"); //$NON-NLS-1$ $NON-NLS-2$
+        
setMessage(ConstantsManager.getInstance().getConstants().bondNameInvalid());
+    }
+
+    @Override
+    public ValidationResult Validate(Object bond) {
+        return super.Validate(((Bond) bond).getName());
+    }
+
+}
diff --git 
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
 
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
index f7a3d80..ec26b7c 100644
--- 
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
+++ 
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
@@ -1006,6 +1006,9 @@
     @DefaultStringValue("This field must contain integer number")
     String thisFieldMustContainIntegerNumberInvalidReason();
 
+    @DefaultStringValue("A bond name must start with the prefix \"bond\", 
followed by a number.")
+    String bondNameInvalid();
+
     // Role tree tooltip
     @DefaultStringValue("Allow to Add/Remove Users from the System")
     String allowToAddRemoveUsersFromTheSystemRoleTreeTooltip();


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

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