openstack
/
heat
Code Issues Proposed changes

Merge "Fix parameter constraint formatting"

This commit is contained in:
Jenkins 2016-03-02 13:34:05 +00:00 committed by Gerrit Code Review
parent 1211d6340e 21840ee3e1
commit 653d324a40
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
heat/engine/properties.py
View File

@ -534,21 +534,27 @@ class Properties(collections.Mapping):
if schema.default is not None:
yield hot_param.HOTParamSchema.DEFAULT, schema.default
for constraint in schema.constraints:
if (isinstance(constraint, constr.Length) or
isinstance(constraint, constr.Range)):
def constraint_items(constraint):
def range_min_max(constraint):
if constraint.min is not None:
yield hot_param.MIN, constraint.min
if constraint.max is not None:
yield hot_param.MAX, constraint.max
if isinstance(constraint, constr.Length):
yield hot_param.LENGTH, dict(range_min_max(constraint))
elif isinstance(constraint, constr.Range):
yield hot_param.RANGE, dict(range_min_max(constraint))
elif isinstance(constraint, constr.AllowedValues):
yield hot_param.ALLOWED_VALUES, list(constraint.allowed)
elif isinstance(constraint, constr.AllowedPattern):
yield hot_param.ALLOWED_PATTERN, constraint.pattern
if schema.type == schema.BOOLEAN:
yield hot_param.ALLOWED_VALUES, ['True', 'true',
'False', 'false']
if schema.constraints:
yield (hot_param.HOTParamSchema.CONSTRAINTS,
[dict(constraint_items(constraint)) for constraint
in schema.constraints])
return dict(param_items())

11
heat/tests/test_resource.py
View File

@ -1290,17 +1290,14 @@ class ResourceTest(common.HeatTestCase):
'description': 'Initial template of TestResource',
'parameters': {
'name': {'type': 'string'},
'bool': {'type': 'boolean',
'allowed_values': ['True', 'true', 'False', 'false']},
'bool': {'type': 'boolean'},
'implemented': {
'type': 'string',
'allowed_pattern': '.*',
'max': 7,
'min': 2
'constraints': [{'length': {'max': 7, 'min': 2}},
{'allowed_pattern': '.*'}]
},
'number': {'type': 'number',
'max': 77,
'min': 41,
'constraints': [{'range': {'max': 77, 'min': 41}}],
'default': 42},
'list': {'type': 'comma_delimited_list'},
'map': {'type': 'json'}