diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-19 23:06:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-19 23:06:13 +0000 |
| commit | 445a53c3454e402f1d4865178e01bffdf2a239e8 (patch) | |
| tree | f252fa69fededa82f7b0391e7a50a8940b20bc41 /nova/db | |
| parent | b68bea24c5b71d9e6583b2cf616f842cbd666bfb (diff) | |
| parent | 5fef12986de72e6ceb901addf84d927b636fbbfd (diff) | |
| download | nova-445a53c3454e402f1d4865178e01bffdf2a239e8.tar.gz nova-445a53c3454e402f1d4865178e01bffdf2a239e8.tar.xz nova-445a53c3454e402f1d4865178e01bffdf2a239e8.zip | |
Merge "Remove unused nova.db.api:network_get_by_bridge"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/api.py | 5 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 10 |
2 files changed, 0 insertions, 15 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() |