openstack
/
heat
Code Issues Proposed changes

Merge "Sort JSON output in intrinsic functions"

This commit is contained in:
Jenkins 2017-01-25 18:34:10 +00:00 committed by Gerrit Code Review
parent 74b15df353 e8a5ce0720
commit be1720156e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/hot/functions.py
View File

@ -475,7 +475,7 @@ class ReplaceJson(Replace):
float, bool)):
if isinstance(value, (collections.Mapping, collections.Sequence)):
try:
return jsonutils.dumps(value, default=None)
return jsonutils.dumps(value, default=None, sort_keys=True)
except TypeError:
raise TypeError(_('"%(name)s" params must be strings, '
'numbers, list or map. '
@ -654,7 +654,7 @@ class JoinMultiple(function.Function):
return s
elif isinstance(s, (collections.Mapping, collections.Sequence)):
try:
return jsonutils.dumps(s, default=None)
return jsonutils.dumps(s, default=None, sort_keys=True)
except TypeError:
msg = _('Items to join must be string, map or list. '
'%s failed json serialization'