diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-31 18:17:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-31 18:17:04 +0000 |
| commit | 9dad01cffb21564e9966e2cd19c0df3d7289aab2 (patch) | |
| tree | 3ea42bbad17c8d52d14d1a8b356c5414d0c7c812 /nova | |
| parent | 59c0a723cc6d9e0c298d581952bde6853c2288c7 (diff) | |
| parent | f18733d27c228c4d861fa1aa1b9045b434855402 (diff) | |
| download | nova-9dad01cffb21564e9966e2cd19c0df3d7289aab2.tar.gz nova-9dad01cffb21564e9966e2cd19c0df3d7289aab2.tar.xz nova-9dad01cffb21564e9966e2cd19c0df3d7289aab2.zip | |
Merge "fixes melange ipam lib"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/quantum/melange_ipam_lib.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/network/quantum/melange_ipam_lib.py b/nova/network/quantum/melange_ipam_lib.py index e880907b2..4495f1aa2 100644 --- a/nova/network/quantum/melange_ipam_lib.py +++ b/nova/network/quantum/melange_ipam_lib.py @@ -114,13 +114,13 @@ class QuantumMelangeIPAMLib(object): db.network_delete_safe(context, network['id']) def get_networks_by_tenant(self, admin_context, tenant_id): - nets = [] + nets = {} blocks = self.m_conn.get_blocks(tenant_id) for ip_block in blocks['ip_blocks']: network_id = ip_block['network_id'] network = db.network_get_by_uuid(admin_context, network_id) - nets.append(network) - return nets + nets[network_id] = network + return nets.values() def get_global_networks(self, admin_context): return self.get_networks_by_tenant(admin_context, |