JSON/YAML conversion ignores inline keys

[Kent Wang]

I noticed this while working on a related bug: https://bugs.launchpad.net/heat/+bug/1286380

In a previous patch https://review.openstack.org/#/c/102229/
the assignee said:

"""
I went through the template which you have mentioned and the template that i am using. The difference in both is that the template which i am using has the value in next line
"F17": {
 "32": "F17-i386-cfntools",
 "64": "F17-x86_64-cfntools"
},
and the template that you have mentioned has the values in same line i.e.
"F17": { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }

"""

After digging around with the errors, it looks like the parser in heat.common.template_format.py is ignoring the inline keys. It treats the whole line ({ "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }) as the value of the key (F17), without recursively looking at the inline keys.

To check this, I debugged the convert_json_to_yaml method and looks like the '__order__' substring was never appended to the inline keys.

When the template is in the form of:
"F17": {
 "32": "F17-i386-cfntools",
 "64": "F17-x86_64-cfntools"
},
the keys get parsed correctly

[Kent Wang (k.wang)]

Fix here: https://review.openstack.org/#/c/191311/2