diff --git a/nova/notifier/api.py b/nova/notifier/api.py index b3bfbf9c..bc269007 100644 --- a/nova/notifier/api.py +++ b/nova/notifier/api.py @@ -21,6 +21,7 @@ from nova import flags from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import jsonutils from nova import utils @@ -121,7 +122,7 @@ def notify(context, publisher_id, event_type, priority, payload): _('%s not in valid priorities') % priority) # Ensure everything is JSON serializable. - payload = utils.to_primitive(payload, convert_instances=True) + payload = jsonutils.to_primitive(payload, convert_instances=True) driver = importutils.import_module(FLAGS.notification_driver) msg = dict(message_id=str(uuid.uuid4()), diff --git a/nova/rpc/common.py b/nova/rpc/common.py index 33aea9bc..23a191a9 100644 --- a/nova/rpc/common.py +++ b/nova/rpc/common.py @@ -25,7 +25,7 @@ from nova import exception from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils -from nova import utils +from nova.openstack.common import jsonutils LOG = logging.getLogger(__name__) @@ -174,13 +174,13 @@ def serialize_remote_exception(failure_info): 'kwargs': kwargs } - json_data = utils.dumps(data) + json_data = jsonutils.dumps(data) return json_data def deserialize_remote_exception(conf, data): - failure = utils.loads(str(data)) + failure = jsonutils.loads(str(data)) trace = failure.get('tb', []) message = failure.get('message', "") + "\n" + "\n".join(trace) diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py index 32304380..128b16cb 100644 --- a/nova/tests/baremetal/test_proxy_bare_metal.py +++ b/nova/tests/baremetal/test_proxy_bare_metal.py @@ -20,9 +20,9 @@ import mox import StringIO from nova import flags -from nova import utils from nova import test from nova.compute import power_state +from nova.openstack.common import jsonutils from nova.tests import fake_utils from nova import exception @@ -95,8 +95,8 @@ class DomainReadWriteTestCase(test.TestCase): def assertJSONEquals(self, x, y): """Check if two json strings represent the equivalent Python object""" - self.assertEquals(utils.loads(x), utils.loads(y)) - return utils.loads(x) == utils.loads(y) + self.assertEquals(jsonutils.loads(x), jsonutils.loads(y)) + return jsonutils.loads(x) == jsonutils.loads(y) def test_write_domain(self): """Write the domain to file""" diff --git a/nova/tests/notifier/test_capacity_notifier.py b/nova/tests/notifier/test_capacity_notifier.py index e41c5270..3b642a77 100644 --- a/nova/tests/notifier/test_capacity_notifier.py +++ b/nova/tests/notifier/test_capacity_notifier.py @@ -15,8 +15,8 @@ import nova.db.api from nova.notifier import capacity_notifier as cn +from nova.openstack.common import jsonutils from nova import test -from nova import utils class CapacityNotifierTestCase(test.TestCase): @@ -24,7 +24,7 @@ class CapacityNotifierTestCase(test.TestCase): def _make_msg(self, host, event): usage_info = dict(memory_mb=123, disk_gb=456) - payload = utils.to_primitive(usage_info, convert_instances=True) + payload = jsonutils.to_primitive(usage_info, convert_instances=True) return dict( publisher_id="compute.%s" % host, event_type="compute.instance.%s" % event, diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index b0b165c7..db804ace 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -38,6 +38,7 @@ from nova import exception from nova import flags from nova import log as logging from nova.openstack.common import importutils +from nova.openstack.common import jsonutils from nova import test from nova.tests import fake_network from nova.tests import fake_libvirt_utils @@ -1405,7 +1406,7 @@ class LibvirtConnTestCase(test.TestCase): self.mox.ReplayAll() conn = connection.LibvirtConnection(False) info = conn.get_instance_disk_info(instance_ref.name) - info = utils.loads(info) + info = jsonutils.loads(info) self.assertEquals(info[0]['type'], 'raw') self.assertEquals(info[0]['path'], '/test/disk') self.assertEquals(info[0]['disk_size'], 10737418240) @@ -2507,7 +2508,7 @@ class LibvirtConnectionTestCase(test.TestCase): 'virt_disk_size': '10737418240', 'backing_file': '/base/disk.local', 'disk_size':'83886080'}] - disk_info_text = utils.dumps(disk_info) + disk_info_text = jsonutils.dumps(disk_info) def fake_get_instance_disk_info(instance): return disk_info_text @@ -2578,7 +2579,7 @@ class LibvirtConnectionTestCase(test.TestCase): 'local_gb': 10, 'backing_file': '/base/disk'}, {'type': 'raw', 'path': '/test/disk.local', 'local_gb': 10, 'backing_file': '/base/disk.local'}] - disk_info_text = utils.dumps(disk_info) + disk_info_text = jsonutils.dumps(disk_info) def fake_extend(path, size): pass @@ -2668,4 +2669,4 @@ class LibvirtNonblockingTestCase(test.TestCase): """Test bug 962840""" import nova.virt.libvirt.connection connection = nova.virt.libvirt.connection.get_connection('') - utils.to_primitive(connection._conn, convert_instances=True) + jsonutils.to_primitive(connection._conn, convert_instances=True)