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
This commit is contained in:
parent
4fcd68b458
commit
11120aa5bb
@ -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)
|
||||
|
@ -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()
|
||||
|
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user