diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-09 01:42:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-09 01:42:48 +0000 |
| commit | 203e261d0ba69ba073c567d5bd534c09558d8bc1 (patch) | |
| tree | e3f2e182c0694885742a07e2d3702e466ac173c3 | |
| parent | 55b248b6d509d8dc61ec0e4e6e6f05417b1b590e (diff) | |
| parent | b4d43b0d0c890ccb940862719c6b88a24029d44a (diff) | |
| download | nova-203e261d0ba69ba073c567d5bd534c09558d8bc1.tar.gz nova-203e261d0ba69ba073c567d5bd534c09558d8bc1.tar.xz nova-203e261d0ba69ba073c567d5bd534c09558d8bc1.zip | |
Merge "Fix Network object encoding issue when using qpid"
| -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 a4669def0..482744a8b 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1159,7 +1159,7 @@ class NetworkManager(manager.SchedulerDependentManager): if network and cidr and subnet_v4: self._create_fixed_ips(context, network['id'], fixed_cidr) - return networks + return jsonutils.to_primitive(networks) def delete_network(self, context, fixed_range, uuid, require_disassociated=True): |