diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-02 14:31:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-02 14:31:18 +0000 |
| commit | 551fad9a313278f8ce0e89c6e8922689fce3f910 (patch) | |
| tree | e7a14be6e90f5abd5d02ff6497395feb00572727 | |
| parent | f35cd43612f7d69bddde5929d6355a12c11410d0 (diff) | |
| parent | e12a6f61bb3d9ce2ebad4ea3aa97dc6455f692cc (diff) | |
Merge "Ensure datetimes can be properly serialized."
| -rw-r--r-- | nova/network/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 41b665ca4..0e8530d14 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1919,7 +1919,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): |