summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-07-06 06:37:28 -0700
committerChris Behrens <cbehrens@codestud.com>2011-07-06 06:37:28 -0700
commitb19dbcf21865aa0d1b422aecdb7ff13571ecb4e8 (patch)
treec5f9259e0e9fdc45fbe632835588b61889f93403 /nova
parent1c90eb34085dbb69f37e2f63dea7496afabb06b3 (diff)
downloadnova-b19dbcf21865aa0d1b422aecdb7ff13571ecb4e8.tar.gz
nova-b19dbcf21865aa0d1b422aecdb7ff13571ecb4e8.tar.xz
nova-b19dbcf21865aa0d1b422aecdb7ff13571ecb4e8.zip
fix metadata test since fixed_ip searching now goes thru filters db api call instead of the get_by_fixed_ip call
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/test_metadata.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py
index b9b14d1ea..d63394ad6 100644
--- a/nova/tests/test_metadata.py
+++ b/nova/tests/test_metadata.py
@@ -43,16 +43,20 @@ class MetadataTestCase(test.TestCase):
'reservation_id': 'r-xxxxxxxx',
'user_data': '',
'image_ref': 7,
+ 'fixed_ips': [],
'hostname': 'test'})
def instance_get(*args, **kwargs):
return self.instance
+ def instance_get_list(*args, **kwargs):
+ return [self.instance]
+
def floating_get(*args, **kwargs):
return '99.99.99.99'
self.stubs.Set(api, 'instance_get', instance_get)
- self.stubs.Set(api, 'instance_get_by_fixed_ip', instance_get)
+ self.stubs.Set(api, 'instance_get_all_by_filters', instance_get_list)
self.stubs.Set(api, 'instance_get_floating_address', floating_get)
self.app = metadatarequesthandler.MetadataRequestHandler()