openstack/heat
Code Issues Proposed changes

Merge "Fix String Parameter Receive a unicode" into stable/icehouse

Browse Source
This commit is contained in:
Jenkins 2014-06-25 07:39:26 +00:00 committed by Gerrit Code Review
commit b534ff5271
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/parameters.py
View File

@ -15,9 +15,11 @@
import collections
import itertools
import json
import six
from heat.engine import constraints as constr
from heat.common import exception
from heat.openstack.common import strutils
PARAMETER_KEYS = (
@ -251,7 +253,7 @@ class Parameter(object):
if self.hidden():
return '******'
else:
return str(value)
return strutils.safe_encode(six.text_type(value))
class NumberParam(Parameter):

13
heat/tests/test_parameters.py
View File

@ -164,6 +164,11 @@ class ParameterTest(testtools.TestCase):
p = self.new_parameter('p', schema, 'bar')
self.assertEqual('bar', p.value())
def test_string_value_unicode(self):
schema = {'Type': 'String'}
p = self.new_parameter('p', schema, u'test\u2665')
self.assertEqual(u'test\u2665', p.value())
def test_string_value_list_bad(self):
schema = {'Type': 'String',
'ConstraintDescription': 'wibble',
@ -375,13 +380,17 @@ class ParametersTest(testtools.TestCase):
def test_map_str(self):
template = {'Parameters': {'Foo': {'Type': 'String'},
'Bar': {'Type': 'Number'}}}
'Bar': {'Type': 'Number'},
'Uni': {'Type': 'String'}}}
stack_name = 'test_params'
params = self.new_parameters(stack_name, template,
{'Foo': 'foo', 'Bar': '42'})
{'Foo': 'foo',
'Bar': '42',
'Uni': u'test\u2665'})
expected = {'Foo': 'foo',
'Bar': '42',
'Uni': 'test\xe2\x99\xa5',
'AWS::Region': 'ap-southeast-1',
'AWS::StackId':
'arn:openstack:heat:::stacks/{0}/{1}'.format(