From a8dc27b54ee991f0370ba587918db2317618c6ec Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Tue, 19 Feb 2013 00:19:52 +0000 Subject: Remove unused nova.db.api:network_get_by_instance Change-Id: I908aaafa149c6548271fd9a3cc91225f2cbdb841 --- nova/tests/db/fakes.py | 10 +--------- nova/tests/hyperv/db_fakes.py | 13 ------------- nova/tests/vmwareapi/db_fakes.py | 13 ------------- 3 files changed, 1 insertion(+), 35 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py index b14f248e6..d77e189df 100644 --- a/nova/tests/db/fakes.py +++ b/nova/tests/db/fakes.py @@ -421,13 +421,6 @@ def stub_out_db_instance_api(stubs, injected=True): return inst_type return None - def fake_network_get_by_instance(context, instance_id): - # Even instance numbers are on vlan networks - if instance_id % 2 == 0: - return FakeModel(vlan_network_fields) - else: - return FakeModel(flat_network_fields) - def fake_network_get_all_by_instance(context, instance_id): # Even instance numbers are on vlan networks if instance_id % 2 == 0: @@ -438,8 +431,7 @@ def stub_out_db_instance_api(stubs, injected=True): def fake_fixed_ip_get_by_instance(context, instance_id): return [FakeModel(fixed_ip_fields)] - funcs = [fake_network_get_by_instance, - fake_network_get_all_by_instance, + funcs = [fake_network_get_all_by_instance, fake_instance_type_get_all, fake_instance_type_get_by_name, fake_instance_type_get, diff --git a/nova/tests/hyperv/db_fakes.py b/nova/tests/hyperv/db_fakes.py index e384e909a..7169edf8d 100644 --- a/nova/tests/hyperv/db_fakes.py +++ b/nova/tests/hyperv/db_fakes.py @@ -153,18 +153,6 @@ def stub_out_db_instance_api(stubs): } return FakeModel(base_options) - def fake_network_get_by_instance(context, instance_id): - """Stubs out the db.network_get_by_instance method.""" - - fields = { - 'bridge': 'vmnet0', - 'netmask': '255.255.255.0', - 'gateway': '10.10.10.1', - 'broadcast': '10.10.10.255', - 'dns1': 'fake', - 'vlan': 100} - return FakeModel(fields) - def fake_instance_type_get_all(context, inactive=0, filters=None): return INSTANCE_TYPES.values() @@ -175,7 +163,6 @@ def stub_out_db_instance_api(stubs): return {} stubs.Set(db, 'instance_create', fake_instance_create) - stubs.Set(db, 'network_get_by_instance', fake_network_get_by_instance) stubs.Set(db, 'instance_type_get_all', fake_instance_type_get_all) stubs.Set(db, 'instance_type_get_by_name', fake_instance_type_get_by_name) stubs.Set(db, 'block_device_mapping_get_all_by_instance', diff --git a/nova/tests/vmwareapi/db_fakes.py b/nova/tests/vmwareapi/db_fakes.py index dd19f4929..f3191670d 100644 --- a/nova/tests/vmwareapi/db_fakes.py +++ b/nova/tests/vmwareapi/db_fakes.py @@ -81,18 +81,6 @@ def stub_out_db_instance_api(stubs): } return FakeModel(base_options) - def fake_network_get_by_instance(context, instance_id): - """Stubs out the db.network_get_by_instance method.""" - - fields = { - 'bridge': 'vmnet0', - 'netmask': '255.255.255.0', - 'gateway': '10.10.10.1', - 'broadcast': '10.10.10.255', - 'dns1': 'fake', - 'vlan': 100} - return FakeModel(fields) - def fake_instance_type_get_all(context, inactive=0, filters=None): return INSTANCE_TYPES.values() @@ -100,6 +88,5 @@ def stub_out_db_instance_api(stubs): return INSTANCE_TYPES[name] stubs.Set(db, 'instance_create', fake_instance_create) - stubs.Set(db, 'network_get_by_instance', fake_network_get_by_instance) stubs.Set(db, 'instance_type_get_all', fake_instance_type_get_all) stubs.Set(db, 'instance_type_get_by_name', fake_instance_type_get_by_name) -- cgit