diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-14 03:23:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-14 03:23:56 +0000 |
| commit | 6375ca7eb56b13bb4794b843a5eaef8118f0dff6 (patch) | |
| tree | dd2522444842506461fef45a914fed97ce590ebb /nova/db | |
| parent | aa2bb87a5e28cb19a0e9244807daacb16f59ce03 (diff) | |
| parent | 11120aa5bbdff7d61ff9418cf6e5526e5bcba180 (diff) | |
Merge "Removes fixed_ip_get_network"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/api.py | 5 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index ea47e5f43..a9ffc0e4d 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -488,11 +488,6 @@ def fixed_ips_by_virtual_interface(context, vif_id): return IMPL.fixed_ips_by_virtual_interface(context, vif_id) -def fixed_ip_get_network(context, address): - """Get a network for a fixed ip by address.""" - return IMPL.fixed_ip_get_network(context, address) - - def fixed_ip_update(context, address, values): """Create a fixed ip from the values dictionary.""" return IMPL.fixed_ip_update(context, address, values) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index ec78a87e6..42cedc4b2 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1188,12 +1188,6 @@ def fixed_ips_by_virtual_interface(context, vif_id): return result -@require_admin_context -def fixed_ip_get_network(context, address): - fixed_ip_ref = fixed_ip_get_by_address(context, address) - return fixed_ip_ref.network - - @require_context def fixed_ip_update(context, address, values): session = get_session() |
