summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Kölker <jason@koelker.net>2011-05-26 15:17:20 -0500
committerJason Kölker <jason@koelker.net>2011-05-26 15:17:20 -0500
commite621f9c63e3ba676c3ce33ca227b96c5d6b68afa (patch)
tree76fab04560fbcbbe9ec22b5ef1c3e2fe905a0a04
parent48f2a7a152f1edd8df0267c0455e14871e083b84 (diff)
make the fakes be the correct
-rw-r--r--nova/tests/db/fakes.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py
index 8bdea359a..d8ff720b3 100644
--- a/nova/tests/db/fakes.py
+++ b/nova/tests/db/fakes.py
@@ -132,11 +132,11 @@ def stub_out_db_instance_api(stubs, injected=True):
else:
return [FakeModel(flat_network_fields)]
- def fake_instance_get_fixed_address(context, instance_id):
- return FakeModel(fixed_ip_fields).address
+ def fake_instance_get_fixed_addresses(context, instance_id):
+ return [FakeModel(fixed_ip_fields).address]
- def fake_instance_get_fixed_address_v6(context, instance_id):
- return FakeModel(fixed_ip_fields).address
+ def fake_instance_get_fixed_addresses_v6(context, instance_id):
+ return [FakeModel(fixed_ip_fields).address]
def fake_fixed_ip_get_all_by_instance(context, instance_id):
return [FakeModel(fixed_ip_fields)]
@@ -147,10 +147,10 @@ def stub_out_db_instance_api(stubs, injected=True):
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, 'instance_type_get_by_id', fake_instance_type_get_by_id)
- stubs.Set(db, 'instance_get_fixed_address',
- fake_instance_get_fixed_address)
- stubs.Set(db, 'instance_get_fixed_address_v6',
- fake_instance_get_fixed_address_v6)
+ stubs.Set(db, 'instance_get_fixed_addresses',
+ fake_instance_get_fixed_addresses)
+ stubs.Set(db, 'instance_get_fixed_addresses_v6',
+ fake_instance_get_fixed_addresses_v6)
stubs.Set(db, 'network_get_all_by_instance',
fake_network_get_all_by_instance)
stubs.Set(db, 'fixed_ip_get_all_by_instance',