diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-05 22:17:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-05 22:17:07 +0000 |
| commit | 4d648c4b3d480dc3cc2dbb4d77f561f0bd4de426 (patch) | |
| tree | 69d86361bf93726db1470732471db3b377c5f44a | |
| parent | 729263a0bb03e09e664f7f006d78dc8a4a4c83cb (diff) | |
| parent | 02f4b1b9f674a074a91c30585a190e3e5ed85c7a (diff) | |
| download | nova-4d648c4b3d480dc3cc2dbb4d77f561f0bd4de426.tar.gz nova-4d648c4b3d480dc3cc2dbb4d77f561f0bd4de426.tar.xz nova-4d648c4b3d480dc3cc2dbb4d77f561f0bd4de426.zip | |
Merge "Ensure prep_resize arguments can be serialized."
| -rw-r--r-- | nova/scheduler/rpcapi.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 1c5db939b..f368e95a0 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -77,11 +77,13 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): request_spec, filter_properties, reservations): instance_p = jsonutils.to_primitive(instance) instance_type_p = jsonutils.to_primitive(instance_type) + reservations_p = jsonutils.to_primitive(reservations) + image_p = jsonutils.to_primitive(image) self.cast(ctxt, self.make_msg('prep_resize', instance=instance_p, instance_type=instance_type_p, - image=image, request_spec=request_spec, + image=image_p, request_spec=request_spec, filter_properties=filter_properties, - reservations=reservations)) + reservations=reservations_p)) def show_host_resources(self, ctxt, host): return self.call(ctxt, self.make_msg('show_host_resources', host=host)) |