openstack
/
heat
Code Issues Proposed changes

Merge "Fix TypeError on joining list parameters"

This commit is contained in:
Jenkins 2015-07-08 01:27:19 +00:00 committed by Gerrit Code Review
parent 4b4b27d0ff 39c3bec7df
commit ac35100975
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/parameters.py
View File

@ -80,6 +80,9 @@ class Schema(constr.Schema):
raise exception.InvalidSchemaError(
message=_('Default must be a comma-delimited list '
'string: %s') % err)
elif self.type == self.LIST and isinstance(self.default, list):
default_value = [encodeutils.safe_encode(six.text_type(x))
for x in self.default]
try:
self.validate_constraints(default_value, context,
[constr.CustomConstraint])
@ -351,7 +354,8 @@ class CommaDelimitedListParam(Parameter, collections.Sequence):
def parse(self, value):
# only parse when value is not already a list
if isinstance(value, list):
return value
return [encodeutils.safe_encode(six.text_type(x))
for x in value]
try:
if value is not None:
if value == '':

7
heat/tests/test_parameters.py
View File

@ -297,6 +297,13 @@ class ParameterTestSpecific(common.HeatTestCase):
schema['Default'] = 'baz,foo,bar'
p = new_parameter('p', schema)
self.assertEqual('baz,foo,bar'.split(','), p.value())
schema['AllowedValues'] = ['1', '3', '5']
schema['Default'] = []
p = new_parameter('p', schema, [1, 3, 5])
self.assertEqual('1,3,5', str(p))
schema['Default'] = [1, 3, 5]
p = new_parameter('p', schema)
self.assertEqual('1,3,5'.split(','), p.value())
def test_list_value_list_bad(self):
schema = {'Type': 'CommaDelimitedList',