Merge "fixed_ips by vif does not raise"

2 files changed, 3 insertions, 6 deletions

diff --git a/nova/db/api.py b/nova/db/api.py
index 0e459ae67..eafa5664f 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -416,9 +416,9 @@ def fixed_ip_get_by_network_host(context, network_id, host):
     return IMPL.fixed_ip_get_by_network_host(context, network_id, host)
 
 
-def fixed_ip_get_by_virtual_interface(context, vif_id):
+def fixed_ips_by_virtual_interface(context, vif_id):
     """Get fixed ips by virtual interface or raise if none exist."""
-    return IMPL.fixed_ip_get_by_virtual_interface(context, vif_id)
+    return IMPL.fixed_ips_by_virtual_interface(context, vif_id)
 
 
 def fixed_ip_get_network(context, address):
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 04f59256e..c59ecf5cd 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -876,15 +876,12 @@ def fixed_ip_get_by_network_host(context, network_id, host):
 
 
 @require_context
-def fixed_ip_get_by_virtual_interface(context, vif_id):
+def fixed_ips_by_virtual_interface(context, vif_id):
     result = model_query(context, models.FixedIp, read_deleted="no").\
                  options(joinedload('floating_ips')).\
                  filter_by(virtual_interface_id=vif_id).\
                  all()
 
-    if not result:
-        raise exception.FixedIpNotFoundForVirtualInterface(vif_id=vif_id)
-
     return result