Merge "Force list when returning map(replaced_list_value, template_part)"

This commit is contained in:
Zuul 2019-03-17 13:39:18 +00:00 committed by Gerrit Code Review
commit dbce4e9e64
2 changed files with 13 additions and 1 deletions

View File

@ -811,6 +811,12 @@ class TestReplaceLinks(TestCase):
source = (
'description: my template\n'
'heat_template_version: "2014-10-16"\n'
'parameters:\n'
' foo:\n'
' default: ["bar"]\n'
' type: json\n'
' bar:\n'
' default: []\n'
'resources:\n'
' test_config:\n'
' properties:\n'
@ -820,6 +826,12 @@ class TestReplaceLinks(TestCase):
expected = (
'description: my template\n'
'heat_template_version: "2014-10-16"\n'
'parameters:\n'
' foo:\n'
' default: ["bar"]\n'
' type: json\n'
' bar:\n'
' default: []\n'
'resources:\n'
' test_config:\n'
' properties:\n'

View File

@ -901,7 +901,7 @@ def replace_links_in_template(template_part, link_replacement):
return {k: replaced_dict_value(k, v)
for k, v in six.iteritems(template_part)}
elif isinstance(template_part, list):
return map(replaced_list_value, template_part)
return list(map(replaced_list_value, template_part))
else:
return template_part