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 | |
| parent | aa2bb87a5e28cb19a0e9244807daacb16f59ce03 (diff) | |
| parent | 11120aa5bbdff7d61ff9418cf6e5526e5bcba180 (diff) | |
| download | nova-6375ca7eb56b13bb4794b843a5eaef8118f0dff6.tar.gz nova-6375ca7eb56b13bb4794b843a5eaef8118f0dff6.tar.xz nova-6375ca7eb56b13bb4794b843a5eaef8118f0dff6.zip | |
Merge "Removes fixed_ip_get_network"
| -rw-r--r-- | nova/db/api.py | 5 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 6 | ||||
| -rw-r--r-- | nova/tests/db/fakes.py | 11 |
3 files changed, 0 insertions, 22 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() diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py index a78fd2e12..653edf58a 100644 --- a/nova/tests/db/fakes.py +++ b/nova/tests/db/fakes.py @@ -68,7 +68,6 @@ def stub_out_db_network_api(stubs): fixed_ip_fields = {'id': 0, 'network_id': 0, - 'network': FakeModel(network_fields), 'address': '192.168.0.100', 'instance': False, 'instance_id': 0, @@ -208,15 +207,6 @@ def stub_out_db_network_api(stubs): if ips: return FakeModel(ips[0]) - def fake_fixed_ip_get_network(context, address): - ips = filter(lambda i: i['address'] == address, - fixed_ips) - if ips: - nets = filter(lambda n: n['id'] == ips[0]['network_id'], - networks) - if nets: - return FakeModel(nets[0]) - def fake_fixed_ip_update(context, address, values): ips = filter(lambda i: i['address'] == address, fixed_ips) @@ -318,7 +308,6 @@ def stub_out_db_network_api(stubs): fake_fixed_ip_disassociate_all_by_timeout, fake_fixed_ip_get_by_instance, fake_fixed_ip_get_by_address, - fake_fixed_ip_get_network, fake_fixed_ip_update, fake_instance_type_get, fake_virtual_interface_create, |