From e132d3838377ed97976e0206a3e986c436bf08ac Mon Sep 17 00:00:00 2001 From: "zhang.yufei@99cloud.net" <1004988384@qq.com> Date: Mon, 7 Sep 2015 11:36:18 +0800 Subject: [PATCH] Use JSON format instead of json format The format could be JSON format or XML format, should not be json format. Change-Id: Iba340f3b29545bacd1e51333ef9c491dc1267392 --- nova/tests/unit/virt/libvirt/test_imagecache.py | 2 +- nova/virt/hardware.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/tests/unit/virt/libvirt/test_imagecache.py b/nova/tests/unit/virt/libvirt/test_imagecache.py index 1c39c0426bd8..65dfb3d5053e 100644 --- a/nova/tests/unit/virt/libvirt/test_imagecache.py +++ b/nova/tests/unit/virt/libvirt/test_imagecache.py @@ -960,7 +960,7 @@ class VerifyChecksumTestCase(test.NoDBTestCase): log = stream.getvalue() # 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. self.assertNotEqual(log.find('image verification skipped'), -1) diff --git a/nova/virt/hardware.py b/nova/virt/hardware.py index 0d678482d2e3..55a35575fea4 100644 --- a/nova/virt/hardware.py +++ b/nova/virt/hardware.py @@ -1242,7 +1242,7 @@ def host_topology_and_format_from_host(host): get beck either None, or an instance of objects.NUMATopology class. :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 try: