summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhiyanliu <lzy.dev@gmail.com>2012-12-24 11:22:45 +0800
committerzhiyanliu <lzy.dev@gmail.com>2012-12-24 11:22:45 +0800
commite12a6f61bb3d9ce2ebad4ea3aa97dc6455f692cc (patch)
tree52b3dcf839f5a65b2164efa4ed6b645d55a86286
parent1836ede3c57ecb255fe9dcf0f2ea3c880af3d201 (diff)
downloadnova-e12a6f61bb3d9ce2ebad4ea3aa97dc6455f692cc.tar.gz
nova-e12a6f61bb3d9ce2ebad4ea3aa97dc6455f692cc.tar.xz
nova-e12a6f61bb3d9ce2ebad4ea3aa97dc6455f692cc.zip
Ensure datetimes can be properly serialized.
The nova-network manager was returning db models from methods invoked via rpc.call(). These db models include non-primitive types that can not be properly serialized (namely datetime objects). Use to_primitive() to ensure that the data gets serialized properly. Fix bug: #1089430 Change-Id: I0519e88444b8fcc3af5e43170ea07dd966ccef05 Signed-off-by: zhiyanliu <lzy.dev@gmail.com>
-rw-r--r--nova/network/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 97d4fa10d..1ae746611 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -1912,7 +1912,7 @@ class NetworkManager(manager.SchedulerDependentManager):
@wrap_check_policy
def get_network(self, context, network_uuid):
network = self.db.network_get_by_uuid(context.elevated(), network_uuid)
- return dict(network.iteritems())
+ return jsonutils.to_primitive(network)
@wrap_check_policy
def get_all_networks(self, context):