Merge "Fix nova-manage floating list (fixes bug 918804)"

2 files changed, 13 insertions, 0 deletions

diff --git a/nova/db/api.py b/nova/db/api.py
index 9d29a0218..c9ffec7e4 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -290,6 +290,11 @@ def floating_ip_fixed_ip_associate(context, floating_address,
                                                host)
 
 
+def floating_ip_get_all(context):
+    """Get all floating ips."""
+    return IMPL.floating_ip_get_all(context)
+
+
 def floating_ip_get_all_by_host(context, host):
     """Get all floating ips by host."""
     return IMPL.floating_ip_get_all_by_host(context, host)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index b81de6d61..df6e5ddfe 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -624,6 +624,14 @@ def _floating_ip_get_all(context):
 
 
 @require_admin_context
+def floating_ip_get_all(context):
+    floating_ip_refs = _floating_ip_get_all(context).all()
+    if not floating_ip_refs:
+        raise exception.NoFloatingIpsDefined()
+    return floating_ip_refs
+
+
+@require_admin_context
 def floating_ip_get_all_by_host(context, host):
     floating_ip_refs = _floating_ip_get_all(context).\
                             filter_by(host=host).\