From fd280dac74a199e32819dd46efd04d8f3e9fd8ee Mon Sep 17 00:00:00 2001 From: Tomoe Sugihara Date: Mon, 20 Feb 2012 17:35:07 +0900 Subject: Fix quantum get_all_networks() signature (lp#936797) The base NetworkManager get_all_networks() method requires a context argument. Change-Id: I8276caf879c3711f411cb16a0fc288cfc9b47965 --- nova/network/quantum/manager.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py index f623bd549..6099a097d 100644 --- a/nova/network/quantum/manager.py +++ b/nova/network/quantum/manager.py @@ -94,7 +94,7 @@ class QuantumManager(manager.FloatingIP, manager.FlatManager): self.init_host_floating_ips() # Set up all the forwarding rules for any network that has a # gateway set. - networks = self.get_all_networks() + networks = self.get_all_networks(context.get_admin_context()) cidrs = [] for net in networks: if net['gateway']: @@ -114,11 +114,10 @@ class QuantumManager(manager.FloatingIP, manager.FlatManager): else: return FLAGS.node_availability_zone - def get_all_networks(self): + def get_all_networks(self, context): networks = [] - admin_context = context.get_admin_context() - networks.extend(self.ipam.get_global_networks(admin_context)) - networks.extend(self.ipam.get_project_networks(admin_context)) + networks.extend(self.ipam.get_global_networks(context)) + networks.extend(self.ipam.get_project_networks(context)) return networks def create_networks(self, context, label, cidr, multi_host, num_networks, -- cgit