Merge "Improve field validation"

This commit is contained in:
Jenkins 2016-02-18 14:06:20 +00:00 committed by Gerrit Code Review
commit 825c658be9
1 changed files with 6 additions and 6 deletions

View File

@ -1,13 +1,13 @@
attributes: attributes:
domain: domain:
value: '' value: ''
label: 'LDAP domain' label: 'Domain name'
description: 'LDAP domain name' description: 'Name of the Keystone domain'
weight: 20 weight: 20
type: "text" type: "text"
regex: regex:
source: '^[a-zA-Z0-9._-]+$' source: '^[a-zA-Z0-9._-]+$'
error: "Domain do not match regex, e.g.: 'example.com' ." error: "Domain name contains unexpected value. Must only contain letters, numbers and characters . / _ / -"
url: url:
value: '' value: ''
label: 'LDAP URL' label: 'LDAP URL'
@ -15,8 +15,8 @@ attributes:
weight: 25 weight: 25
type: "text" type: "text"
regex: regex:
source: '^ldap:\/\/([a-zA-Z0-9._-]+)(:[0-9]+)?$' source: '^ldap[si]?:\/\/([a-zA-Z0-9._-]+)(:[0-9]+)?$'
error: "LDAP URL do not match regex, e.g.: 'ldap://example.com' ." error: "LDAP URL is not valid. Should be e.g. 'ldap://example.com'."
suffix: suffix:
value: 'cn=example,cn=com' value: 'cn=example,cn=com'
label: 'LDAP Suffix' label: 'LDAP Suffix'
@ -37,7 +37,7 @@ attributes:
type: "password" type: "password"
regex: regex:
source: '^\S+$' source: '^\S+$'
error: "Plesase remove spaces." error: "Password must not contain spaces."
query_scope: query_scope:
value: 'one' value: 'one'
label: 'LDAP Query Scope' label: 'LDAP Query Scope'