[Engine-patches] Change in ovirt-engine[master]: core: Change Storage Domain description validation to ValidD...

[tnisan]

Tal Nisan has uploaded a new change for review.

Change subject: core: Change Storage Domain description validation to 
ValidDescription
......................................................................

core: Change Storage Domain description validation to ValidDescription

Change the validation of Storage Domain description field to ValidDescription
instead of ValidName, the description can contain special characters which
the name cannot

Change-Id: I5d8fb4f12cd74c376c27eab9dc939b56d9fc6da1
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
M 
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/12037/1

diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
index 531d44f..1638052 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
@@ -2,6 +2,7 @@
 
 import javax.validation.constraints.Size;
 
+import org.ovirt.engine.core.common.validation.annotation.ValidDescription;
 import org.ovirt.engine.core.common.validation.annotation.ValidName;
 import org.ovirt.engine.core.common.validation.group.CreateEntity;
 import org.ovirt.engine.core.common.validation.group.UpdateEntity;
@@ -20,7 +21,7 @@
     @Size(min = 1, max = BusinessEntitiesDefinitions.STORAGE_NAME_SIZE)
     private String name = "";
 
-    @ValidName(message = "VALIDATION.STORAGE_DOMAIN.DESCRIPTION.INVALID", 
groups = { CreateEntity.class,
+    @ValidDescription(message = 
"VALIDATION.STORAGE_DOMAIN.DESCRIPTION.INVALID", groups = { CreateEntity.class,
             UpdateEntity.class })
     @Size(min = 1, max = BusinessEntitiesDefinitions.GENERAL_MAX_SIZE,
             message = "VALIDATION.STORAGE_DOMAIN.DESCRIPTION.MAX",
diff --git 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index 5de0263..bec1d2a 100644
--- 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++ 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -1623,7 +1623,7 @@
     @DefaultStringValue("Storage Domain name must be formed of \"a-z0-9A-Z\" 
or \"-_\"")
     String VALIDATION_STORAGE_DOMAIN_NAME_INVALID();
 
-    @DefaultStringValue("Storage Domain name must be formed of \"a-z0-9A-Z\" 
or \"-_\"")
+    @DefaultStringValue("Storage Domain description must be formed of 
\"a-z0-9A-Z\" or \"-_\"")
     String VALIDATION_STORAGE_DOMAIN_DESCRIPTION_INVALID();
 
     @DefaultStringValue("Storage Domain description must not exceed 4000 
characters")


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

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