summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-09 20:32:56 +0000
committerGerrit Code Review <review@openstack.org>2012-05-09 20:32:56 +0000
commit27873b4196a359e8d7101ff4da0785e4dd8787ab (patch)
tree1d161a6eb87039accc400936e4066de55e3b1c95 /nova/tests
parent51dc42ff41915b7bc065b01eeb8c18528542e0ca (diff)
parent7b641e9c07a0dc1a1f0312dc8b96c8f14b501633 (diff)
Merge "implement blueprint floating-ip-notification."
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/network/test_manager.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py
index c8d1851d6..de8779be1 100644
--- a/nova/tests/network/test_manager.py
+++ b/nova/tests/network/test_manager.py
@@ -552,7 +552,7 @@ class VlanNetworkTestCase(test.TestCase):
is_admin=False)
def fake1(*args, **kwargs):
- return {'address': '10.0.0.1'}
+ return {'address': '10.0.0.1', 'project_id': ctxt.project_id}
def fake2(*args, **kwargs):
return 25
@@ -584,7 +584,8 @@ class VlanNetworkTestCase(test.TestCase):
return {'address': '10.0.0.1', 'fixed_ip_id': 1}
def fake3(*args, **kwargs):
- return {'address': '10.0.0.1', 'fixed_ip_id': None}
+ return {'address': '10.0.0.1', 'fixed_ip_id': None,
+ 'project_id': ctxt.project_id}
self.stubs.Set(self.network.db, 'floating_ip_deallocate', fake1)
self.stubs.Set(self.network, '_floating_ip_owned_by_project', fake1)
@@ -740,7 +741,8 @@ class VlanNetworkTestCase(test.TestCase):
return {'address': '10.0.0.1',
'pool': 'nova',
'interface': 'eth0',
- 'fixed_ip_id': 1}
+ 'fixed_ip_id': 1,
+ 'project_id': ctxt.project_id}
# fixed ip with remote host
def fake4(*args, **kwargs):