openstack/nova
Code Issues Proposed changes

Use JSON format instead of json format

Browse Source 
The format could be JSON format or XML format, should not
be json format.

Change-Id: Iba340f3b29545bacd1e51333ef9c491dc1267392
This commit is contained in:
zhang.yufei@99cloud.net 2015-09-07 11:36:18 +08:00 committed by octopuszhang
parent c52f18bcf1
commit e132d38383
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/libvirt/test_imagecache.py
View File

@ -960,7 +960,7 @@ class VerifyChecksumTestCase(test.NoDBTestCase):
log = stream.getvalue() log = stream.getvalue()
# NOTE(mikal): this is a skip not a fail because the file is # NOTE(mikal): this is a skip not a fail because the file is
# present, but is not in valid json format and therefore is # present, but is not in valid JSON format and therefore is
# skipped. # skipped.
self.assertNotEqual(log.find('image verification skipped'), -1) self.assertNotEqual(log.find('image verification skipped'), -1)

2
nova/virt/hardware.py
View File

@ -1242,7 +1242,7 @@ def host_topology_and_format_from_host(host):
get beck either None, or an instance of objects.NUMATopology class. get beck either None, or an instance of objects.NUMATopology class.
:returns: A two-tuple, first element is the topology itself or None, second :returns: A two-tuple, first element is the topology itself or None, second
is a boolean set to True if topology was in json format. is a boolean set to True if topology was in JSON format.
""" """
was_json = False was_json = False
try: try: