From 898f86cef99b386b22fec1cd47515ffe991e5eb9 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sun, 18 Mar 2012 20:37:43 -0700 Subject: Stub-implement floating-ip functions on FlatManager This was messing up horizon in a way that would probably be difficult to fix. It also is probably a bit tricky to implement floating ips properly for FlatManager at this stage of the release cycle. Stub them out for now, to keep horizon happy. Bug #954580 Bug #937227 Change-Id: Icb8d689860b893ebeeee02e248e836c52830b2de --- nova/network/manager.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/nova/network/manager.py b/nova/network/manager.py index 160bae1ef..8e18ba28e 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1635,6 +1635,35 @@ class FlatManager(NetworkManager): """Tear down network on this host.""" pass + # NOTE(justinsb): The floating ip functions are stub-implemented. + # We were throwing an exception, but this was messing up horizon. + # Timing makes it difficult to implement floating ips here, in Essex. + + @wrap_check_policy + def get_floating_ip(self, context, id): + """Returns a floating IP as a dict""" + return None + + @wrap_check_policy + def get_floating_pools(self, context): + """Returns list of floating pools""" + return {} + + @wrap_check_policy + def get_floating_ip_by_address(self, context, address): + """Returns a floating IP as a dict""" + return None + + @wrap_check_policy + def get_floating_ips_by_project(self, context): + """Returns the floating IPs allocated to a project""" + return [] + + @wrap_check_policy + def get_floating_ips_by_fixed_address(self, context, fixed_address): + """Returns the floating IPs associated with a fixed_address""" + return [] + class FlatDHCPManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): """Flat networking with dhcp. -- cgit