diff options
| author | Tiago Mello <tmello@linux.vnet.ibm.com> | 2013-06-05 20:25:12 -0300 |
|---|---|---|
| committer | Tiago Mello <tmello@linux.vnet.ibm.com> | 2013-06-05 21:45:01 -0300 |
| commit | 1a3cf98038ecb431fe2986824ad9740e7ca8b8f9 (patch) | |
| tree | f68d2368c5250f814a4da462961b7beaaed1a7ee | |
| parent | 86e12403ccb851199457bd0eaadc3f1d3c75679f (diff) | |
| download | nova-1a3cf98038ecb431fe2986824ad9740e7ca8b8f9.tar.gz nova-1a3cf98038ecb431fe2986824ad9740e7ca8b8f9.tar.xz nova-1a3cf98038ecb431fe2986824ad9740e7ca8b8f9.zip | |
Converts 'image' to json primitive on compute.rpcapi.prep_resize
The 'image' should be converted to primitive since it contains
complex structures. Today it works because it relies on
scheduler.rpcapi.prep_resize which does the conversion.
This is part of other changes that will move resize/cold migration
to conductor. scheduler.rpcapi.prep_resize will be moved and then
compute.rpcapi.prep_resize has to properly convert parameters.
Partially implements bp cold-migrations-to-conductor
Change-Id: Id89896bfb379ab9eb8bf13c3513b9290d88408fd
| -rw-r--r-- | nova/compute/rpcapi.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index a8d7eaa47..2305810a9 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -422,9 +422,10 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy): filter_properties=None, node=None): instance_p = jsonutils.to_primitive(instance) instance_type_p = jsonutils.to_primitive(instance_type) + image_p = jsonutils.to_primitive(image) self.cast(ctxt, self.make_msg('prep_resize', instance=instance_p, instance_type=instance_type_p, - image=image, reservations=reservations, + image=image_p, reservations=reservations, request_spec=request_spec, filter_properties=filter_properties, node=node), |