openstack/deb-heat
Code Issues Proposed changes

Reusing PARAMETER_CONSTRAINTS value

Browse Source 
The variable PARAMETER_CONSTRAINTS is not used, also this variable
makes code a little confused, because according to documetation
constraints for parameters don't include MIN, MAX and CONSTRAINTS
definitions. This patch makes this definition clear.

Change-Id: I47b49e3ed23720ed652f688f2901ae9bc6b01632
This commit is contained in:
Sergey Kraynev 2014-07-23 09:48:26 -04:00
parent 21abdc026d
commit 89df8c6a79
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
heat/engine/hot/parameters.py
View File

@ -18,13 +18,15 @@ from heat.engine import parameters
PARAM_CONSTRAINTS = (
CONSTRAINTS, DESCRIPTION, LENGTH, RANGE, MIN, MAX,
ALLOWED_VALUES, ALLOWED_PATTERN, CUSTOM_CONSTRAINT,
DESCRIPTION, LENGTH, RANGE, ALLOWED_VALUES, ALLOWED_PATTERN,
CUSTOM_CONSTRAINT,
) = (
'constraints', 'description', 'length', 'range', 'min', 'max',
'allowed_values', 'allowed_pattern', 'custom_constraint',
'description', 'length', 'range', 'allowed_values', 'allowed_pattern',
'custom_constraint',
)
RANGE_KEYS = (MIN, MAX) = ('min', 'max')
class HOTParamSchema(parameters.Schema):
"""HOT parameter schema."""
@ -59,7 +61,7 @@ class HOTParamSchema(parameters.Schema):
cls._validate_dict(param_name, schema_dict)
def constraints():
constraints = schema_dict.get(CONSTRAINTS)
constraints = schema_dict.get(cls.CONSTRAINTS)
if constraints is None:
return
@ -68,22 +70,19 @@ class HOTParamSchema(parameters.Schema):
message=_("Invalid parameter constraints for parameter "
"%s, expected a list") % param_name)
valid_keys = (DESCRIPTION, LENGTH, RANGE, ALLOWED_VALUES,
ALLOWED_PATTERN, CUSTOM_CONSTRAINT)
for constraint in constraints:
cls._check_dict(constraint, valid_keys,
cls._check_dict(constraint, PARAM_CONSTRAINTS,
'parameter constraints')
desc = constraint.get(DESCRIPTION)
if RANGE in constraint:
cdef = constraint.get(RANGE)
cls._check_dict(cdef, (MIN, MAX), 'range constraint')
cls._check_dict(cdef, RANGE_KEYS, 'range constraint')
yield constr.Range(parameters.Schema.get_num(MIN, cdef),
parameters.Schema.get_num(MAX, cdef),
desc)
elif LENGTH in constraint:
cdef = constraint.get(LENGTH)
cls._check_dict(cdef, (MIN, MAX), 'length constraint')
cls._check_dict(cdef, RANGE_KEYS, 'length constraint')
yield constr.Length(parameters.Schema.get_num(MIN, cdef),
parameters.Schema.get_num(MAX, cdef),
desc)