diff options
| author | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-09-12 02:11:43 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-09-12 02:11:43 +0000 |
| commit | 020d4e735977ffa4f632500f7b977c64721861e9 (patch) | |
| tree | 9436dc049ca68209847b03007f1094b70135764d /nova/tests | |
| parent | e587fc09545eebe71b9d3bd9ed5d7fe62424a8a6 (diff) | |
| parent | 7e96a2d7c5f2ac8572c6d0fd20e4e8c7e146dce9 (diff) | |
When vpn=true in allocate ip, it attempts to allocate the ip that is reserved in the network. Unfortunately fixed_ip_associate attempts to ignore reserved ips.
This fix allows to filter reserved ip address only when vpn=True.
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()) |