From f18733d27c228c4d861fa1aa1b9045b434855402 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Mon, 30 Jan 2012 17:44:07 -0600 Subject: fixes melange ipam lib Melange can have multiple ip_blocks assigned to a network. However the ipam lib assumes that each block is its own L2 network and assigns ips from each ip_block for every instance. From internal bug. Change-Id: I72699f178cfeb214b2911200a7e9ed9b255252f1 --- nova/network/quantum/melange_ipam_lib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nova') 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, -- cgit