summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-21 13:36:05 +0000
committerGerrit Code Review <review@openstack.org>2017-03-21 13:36:05 +0000
commit8253c39562f77346e1fd6cb940199eac051f5fa8 (patch)
treeccd4e123a9c6bcc0d1296023221d3d0f43b56f3d
parentc45713ead3ced90ba9fbc1d67e4db60b8b80dae8 (diff)
parent4f307da77164735c7261ea6f727fbc7d79ca1767 (diff)
Merge "text_list attributes could be empty"
-rw-r--r--nailgun/nailgun/api/v1/validators/json_schema/base_types.py6
-rw-r--r--nailgun/nailgun/fixtures/openstack.yaml1
2 files changed, 4 insertions, 3 deletions
diff --git a/nailgun/nailgun/api/v1/validators/json_schema/base_types.py b/nailgun/nailgun/api/v1/validators/json_schema/base_types.py
index 2a07a24..d5bf9f7 100644
--- a/nailgun/nailgun/api/v1/validators/json_schema/base_types.py
+++ b/nailgun/nailgun/api/v1/validators/json_schema/base_types.py
@@ -282,16 +282,16 @@ ALLOWED_VALUES_SCHEMA = {
282MULTIPLE_TEXT_FIELDS_SCHEMA = { 282MULTIPLE_TEXT_FIELDS_SCHEMA = {
283 'value': { 283 'value': {
284 'type': 'array', 284 'type': 'array',
285 'minItems': 1, 285 'minItems': 0,
286 'items': {'type': 'string'}, 286 'items': {'type': 'string'},
287 }, 287 },
288 'min': { 288 'min': {
289 'type': 'integer', 289 'type': 'integer',
290 'minimum': 1, 290 'minimum': 0,
291 }, 291 },
292 'max': { 292 'max': {
293 'type': 'integer', 293 'type': 'integer',
294 'minimum': 1, 294 'minimum': 0,
295 } 295 }
296} 296}
297 297
diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
index 4fd9efe..c9cad75 100644
--- a/nailgun/nailgun/fixtures/openstack.yaml
+++ b/nailgun/nailgun/fixtures/openstack.yaml
@@ -1305,6 +1305,7 @@
1305 description: "List of upstream DNS servers" 1305 description: "List of upstream DNS servers"
1306 weight: 10 1306 weight: 10
1307 type: "text_list" 1307 type: "text_list"
1308 min: 0
1308 max: 3 1309 max: 3
1309 regex: 1310 regex:
1310 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])$' 1311 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])$'