diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-09-12 12:53:56 -0400 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-09-12 12:53:56 -0400 |
| commit | cc9e254d9f28c12abe555b2ddad92ccc533bc547 (patch) | |
| tree | fb7db71769733245ebc15236b924d09fce8e7f2f /nova/tests | |
| parent | 0a8ea633b56fece6280b2ff6752e544d99d4b301 (diff) | |
| parent | 8e4cb45399ea4203bcc81d5c67e8197b482a1f8a (diff) | |
Merge from trunk
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_network.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index c947bbc58..926ea065a 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -286,7 +286,8 @@ class VlanNetworkTestCase(test.TestCase): db.fixed_ip_associate(mox.IgnoreArg(), mox.IgnoreArg(), - mox.IgnoreArg()).AndReturn('192.168.0.1') + mox.IgnoreArg(), + reserved=True).AndReturn('192.168.0.1') db.fixed_ip_update(mox.IgnoreArg(), mox.IgnoreArg(), mox.IgnoreArg()) |