openstack
/
fuel-web
Code Issues Proposed changes

Merge "text_list attributes could be empty"

This commit is contained in:
Jenkins 2017-03-21 13:36:05 +00:00 committed by Gerrit Code Review
parent c45713ead3 4f307da771
commit 8253c39562
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nailgun/nailgun/api/v1/validators/json_schema/base_types.py
View File

@ -282,16 +282,16 @@ ALLOWED_VALUES_SCHEMA = {
MULTIPLE_TEXT_FIELDS_SCHEMA = { MULTIPLE_TEXT_FIELDS_SCHEMA = {
'value': { 'value': {
'type': 'array', 'type': 'array',
'minItems': 1, 'minItems': 0,
'items': {'type': 'string'}, 'items': {'type': 'string'},
}, },
'min': { 'min': {
'type': 'integer', 'type': 'integer',
'minimum': 1, 'minimum': 0,
}, },
'max': { 'max': {
'type': 'integer', 'type': 'integer',
'minimum': 1, 'minimum': 0,
} }
} }

1
nailgun/nailgun/fixtures/openstack.yaml
View File

@ -1305,6 +1305,7 @@
description: "List of upstream DNS servers" description: "List of upstream DNS servers"
weight: 10 weight: 10
type: "text_list" type: "text_list"
min: 0
max: 3 max: 3
regex: regex:
source: &ipv4_regex '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$' source: &ipv4_regex '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$'