Make use of openstack.common.jsonutils.

This patch imports jsonutils from openstack-common.  It removes the
equivalent code from nova.utils and then converts the code base to use
jsonutils.  The primary motivator for this change was to remove the rest
of the dependencies from nova.rpc on nova.utils.

Change-Id: If43658b9b098ed56cba018c81be268b8c3e2916a

2 files changed, 13 insertions, 11 deletions

diff --git a/nova/virt/baremetal/dom.py b/nova/virt/baremetal/dom.py
index 04c889277..de027be2e 100644
--- a/nova/virt/baremetal/dom.py
+++ b/nova/virt/baremetal/dom.py
@@ -18,7 +18,7 @@ from nova.compute import power_state
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import utils
+from nova.openstack.common import jsonutils
 from nova.virt.baremetal import nodes
 
 FLAGS = flags.FLAGS
@@ -31,14 +31,14 @@ def read_domains(fname):
         f = open(fname, 'r')
         json = f.read()
         f.close()
-        domains = utils.loads(json)
+        domains = jsonutils.loads(json)
         return domains
     except IOError:
         raise exception.NotFound()
 
 
 def write_domains(fname, domains):
-    json = utils.dumps(domains)
+    json = jsonutils.dumps(domains)
     f = open(fname, 'w')
     f.write(json)
     f.close()
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index a5c65ff04..77ee8cad2 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -66,6 +66,7 @@ from nova import log as logging
 from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
+from nova.openstack.common import jsonutils
 from nova import utils
 from nova.virt import driver
 from nova.virt.disk import api as disk
@@ -2017,7 +2018,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
         cpu_info['topology'] = topology
         cpu_info['features'] = features
-        return utils.dumps(cpu_info)
+        return jsonutils.dumps(cpu_info)
 
     def block_stats(self, instance_name, disk):
         """
@@ -2102,7 +2103,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
         """
 
-        info = utils.loads(cpu_info)
+        info = jsonutils.loads(cpu_info)
         LOG.info(_('Instance launched has CPU info:\n%s') % cpu_info)
         cpu = config.LibvirtConfigCPU()
         cpu.arch = info['arch']
@@ -2277,7 +2278,7 @@ class LibvirtConnection(driver.ComputeDriver):
             json strings specified in get_instance_disk_info
 
         """
-        disk_info = utils.loads(disk_info_json)
+        disk_info = jsonutils.loads(disk_info_json)
 
         # make instance directory
         instance_dir = os.path.join(FLAGS.instances_path, instance_ref['name'])
@@ -2414,7 +2415,7 @@ class LibvirtConnection(driver.ComputeDriver):
                               'virt_disk_size': virt_size,
                               'backing_file': backing_file,
                               'disk_size': dk_size})
-        return utils.dumps(disk_info)
+        return jsonutils.dumps(disk_info)
 
     def get_disk_available_least(self):
         """Return disk available least size.
@@ -2434,7 +2435,8 @@ class LibvirtConnection(driver.ComputeDriver):
         instances_sz = 0
         for i_name in instances_name:
             try:
-                disk_infos = utils.loads(self.get_instance_disk_info(i_name))
+                disk_infos = jsonutils.loads(
+                        self.get_instance_disk_info(i_name))
                 for info in disk_infos:
                     i_vt_sz = int(info['virt_disk_size'])
                     i_dk_sz = int(info['disk_size'])
@@ -2495,7 +2497,7 @@ class LibvirtConnection(driver.ComputeDriver):
         LOG.debug(_("Starting migrate_disk_and_power_off"),
                    instance=instance)
         disk_info_text = self.get_instance_disk_info(instance['name'])
-        disk_info = utils.loads(disk_info_text)
+        disk_info = jsonutils.loads(disk_info_text)
 
         self._destroy(instance, network_info, cleanup=False)
 
@@ -2561,7 +2563,7 @@ class LibvirtConnection(driver.ComputeDriver):
         LOG.debug(_("Starting finish_migration"), instance=instance)
 
         # resize disks. only "disk" and "disk.local" are necessary.
-        disk_info = utils.loads(disk_info)
+        disk_info = jsonutils.loads(disk_info)
         for info in disk_info:
             fname = os.path.basename(info['path'])
             if fname == 'disk':
@@ -2647,7 +2649,7 @@ class HostState(object):
         data = {}
         data["vcpus"] = self.connection.get_vcpu_total()
         data["vcpus_used"] = self.connection.get_vcpu_used()
-        data["cpu_info"] = utils.loads(self.connection.get_cpu_info())
+        data["cpu_info"] = jsonutils.loads(self.connection.get_cpu_info())
         data["disk_total"] = self.connection.get_local_gb_total()
         data["disk_used"] = self.connection.get_local_gb_used()
         data["disk_available"] = data["disk_total"] - data["disk_used"]