diff options
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 5 | ||||
| -rw-r--r-- | nova/compute/manager.py | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 538bfbcf1..de4042de9 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -40,6 +40,7 @@ import nova.image from nova import log as logging from nova import network from nova.openstack.common import cfg +from nova.openstack.common import jsonutils import nova.policy from nova import quota from nova import rpc @@ -652,7 +653,7 @@ class API(BaseAPI): locals()) request_spec = { - 'image': utils.to_primitive(image), + 'image': jsonutils.to_primitive(image), 'instance_properties': base_options, 'instance_type': instance_type, 'num_instances': num_instances, @@ -1482,7 +1483,7 @@ class API(BaseAPI): "instance_type_id": new_instance_type['id'], "image": image, "update_db": False, - "request_spec": utils.to_primitive(request_spec), + "request_spec": jsonutils.to_primitive(request_spec), "filter_properties": filter_properties, } self._cast_scheduler_message(context, diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 9f405a934..75c401acc 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -64,6 +64,7 @@ from nova.notifier import api as notifier 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 rpc from nova import utils from nova.virt import driver @@ -397,7 +398,7 @@ class ComputeManager(manager.SchedulerDependentManager): bdm['device_name']) self.db.block_device_mapping_update( context, bdm['id'], - {'connection_info': utils.dumps(cinfo)}) + {'connection_info': jsonutils.dumps(cinfo)}) block_device_mapping.append({'connection_info': cinfo, 'mount_device': bdm['device_name']}) @@ -635,7 +636,7 @@ class ComputeManager(manager.SchedulerDependentManager): bdms = self._get_instance_volume_bdms(context, instance_uuid) block_device_mapping = [] for bdm in bdms: - cinfo = utils.loads(bdm['connection_info']) + cinfo = jsonutils.loads(bdm['connection_info']) block_device_mapping.append({'connection_info': cinfo, 'mount_device': bdm['device_name']}) @@ -1775,7 +1776,7 @@ class ComputeManager(manager.SchedulerDependentManager): mountpoint) values = { 'instance_uuid': instance_ref['uuid'], - 'connection_info': utils.dumps(connection_info), + 'connection_info': jsonutils.dumps(connection_info), 'device_name': mountpoint, 'delete_on_termination': False, 'virtual_name': None, @@ -1799,7 +1800,7 @@ class ComputeManager(manager.SchedulerDependentManager): if instance_name not in self.driver.list_instances(): LOG.warn(_('Detaching volume from unknown instance'), context=context, instance=instance) - self.driver.detach_volume(utils.loads(bdm['connection_info']), + self.driver.detach_volume(jsonutils.loads(bdm['connection_info']), instance_name, mp) |