diff options
| author | Dan Wendlandt <dan@nicira.com> | 2012-09-11 12:22:23 -0700 |
|---|---|---|
| committer | Dan Wendlandt <dan@nicira.com> | 2012-09-11 12:22:23 -0700 |
| commit | c0709bdd82c83e16cab6ed854d2ef873eb775473 (patch) | |
| tree | 348d7dcb8d3105c0d87ed27c884ffc8c2ee5a4cf /nova | |
| parent | 511807ed248fbe63cb6642c1cff6e0bd4bb8ae5d (diff) | |
workaround lack of quantum/nova floatingip integration
bug 1040956
The Nova/Quantum integration in Folsom does not yet proxy Nova
floating IP calls to Quantum. However, Horizon automatically
makes calls to Nova to list floating IPs, which prior to this
patch resulted in a Horizon error message due to the fact that
the Quantum integration code in Nova would raise an Unimplemented
error. This patch changes that behavior to instead return an
empty list.
This is a workaround for Folsom. The correct long-term behavior
is either to:
1) have Nova proxy all floating-ip calls to Quantum when quantum
is enabled.
2) have Horizon use the Quantum floating-ip API when Quantum
is enabled.
Change-Id: I5414d935e872a9da108511b50e70545d82b73347
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/quantumv2/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py index b76e5f703..5d657dc21 100644 --- a/nova/network/quantumv2/api.py +++ b/nova/network/quantumv2/api.py @@ -283,16 +283,16 @@ class API(base.Base): raise NotImplementedError() def get_floating_ip_pools(self, context): - raise NotImplementedError() + return [] def get_floating_ip_by_address(self, context, address): raise NotImplementedError() def get_floating_ips_by_project(self, context): - raise NotImplementedError() + return [] def get_floating_ips_by_fixed_address(self, context, fixed_address): - raise NotImplementedError() + return [] def get_instance_id_by_floating_address(self, context, address): raise NotImplementedError() |