From 11120aa5bbdff7d61ff9418cf6e5526e5bcba180 Mon Sep 17 00:00:00 2001 From: Chris Yeoh Date: Mon, 12 Nov 2012 14:22:26 +1030 Subject: Removes fixed_ip_get_network Removes fixed_ip_get_network since it doesn't actually work anymore (at some point in the past the network must have been stored along with the network_uuid but this is no longer the case) and nothing else uses it anyway. Also cleans up fake db test model to remove the fake_fixed_ip_get_network and underlying network reference which makes it closer in sync to what is actually implemented now Change-Id: I01dc0f88a8bc7cfef01c4e7f328bcdba75a8e0bc --- nova/db/api.py | 5 ----- nova/db/sqlalchemy/api.py | 6 ------ 2 files changed, 11 deletions(-) (limited to 'nova/db') diff --git a/nova/db/api.py b/nova/db/api.py index 8349c7c25..2ae9522bf 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -480,11 +480,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 ba5a7150e..c85d3e9c7 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1187,12 +1187,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() -- cgit