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/tests/db/fakes.py | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'nova/tests') 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, -- cgit