Merge "Remove unused nova.db.api:network_get_by_bridge"

3 files changed, 3 insertions, 18 deletions

diff --git a/nova/db/api.py b/nova/db/api.py
index 0abe63cf8..e134700e5 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -838,11 +838,6 @@ def network_get_associated_fixed_ips(context, network_id, host=None):
     return IMPL.network_get_associated_fixed_ips(context, network_id, host)
 
 
-def network_get_by_bridge(context, bridge):
-    """Get a network by bridge or raise if it does not exist."""
-    return IMPL.network_get_by_bridge(context, bridge)
-
-
 def network_get_by_uuid(context, uuid):
     """Get a network by uuid or raise if it does not exist."""
     return IMPL.network_get_by_uuid(context, uuid)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 40d0c2334..646f237f4 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2237,16 +2237,6 @@ def _network_get_query(context, session=None):
 
 
 @require_admin_context
-def network_get_by_bridge(context, bridge):
-    result = _network_get_query(context).filter_by(bridge=bridge).first()
-
-    if not result:
-        raise exception.NetworkNotFoundForBridge(bridge=bridge)
-
-    return result
-
-
-@require_admin_context
 def network_get_by_uuid(context, uuid):
     result = _network_get_query(context).filter_by(uuid=uuid).first()
 
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 22b04c40f..410f7a2cb 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -1398,9 +1398,9 @@ class FlatManager(NetworkManager):
     The idea is to create a single network for the host with a command like:
     nova-manage network create 192.168.0.0/24 1 256. Creating multiple
     networks for for one manager is currently not supported, but could be
-    added by modifying allocate_fixed_ip and get_network to get the a network
-    with new logic instead of network_get_by_bridge. Arbitrary lists of
-    addresses in a single network can be accomplished with manual db editing.
+    added by modifying allocate_fixed_ip and get_network to get the network
+    with new logic. Arbitrary lists of addresses in a single network can
+    be accomplished with manual db editing.
 
     If flat_injected is True, the compute host will attempt to inject network
     config into the guest.  It attempts to modify /etc/network/interfaces and