diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-10 17:11:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-10 17:11:15 +0000 |
| commit | 9334893c836712a2abb75cbcbdfd67b0809e9fbb (patch) | |
| tree | 58c727f5245d184c47d26a08c5618954fd02805a | |
| parent | 41b4af111d4f80f51e79aeebc643ace60dee54f8 (diff) | |
| parent | 6e7b0387e417e4ef36b8ce1e0b7a7db32732838d (diff) | |
| download | nova-9334893c836712a2abb75cbcbdfd67b0809e9fbb.tar.gz nova-9334893c836712a2abb75cbcbdfd67b0809e9fbb.tar.xz nova-9334893c836712a2abb75cbcbdfd67b0809e9fbb.zip | |
Merge "Fixes bug 871877"
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | nova/network/manager.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_network.py | 14 |
3 files changed, 16 insertions, 0 deletions
@@ -4,6 +4,7 @@ Adam Johnson <adjohn@gmail.com> Ahmad Hassan <ahmad.hassan@hp.com> Alex Meade <alex.meade@rackspace.com> Alexander Sakhnov <asakhnov@mirantis.com> +Alvaro Lopez Garcia <aloga@ifca.unican.es> Andrey Brindeyev <abrindeyev@griddynamics.com> Andy Smith <code@term.ie> Andy Southgate <andy.southgate@citrix.com> diff --git a/nova/network/manager.py b/nova/network/manager.py index 0822e9b07..2c5d0b5cb 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1217,6 +1217,7 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): self.db.fixed_ip_associate(context, address, instance_id, + network['id'], reserved=True) else: address = kwargs.get('address', None) diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index 69ac4f2a6..759650839 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -300,6 +300,7 @@ class VlanNetworkTestCase(test.TestCase): db.fixed_ip_associate(mox.IgnoreArg(), mox.IgnoreArg(), mox.IgnoreArg(), + mox.IgnoreArg(), reserved=True).AndReturn('192.168.0.1') db.fixed_ip_update(mox.IgnoreArg(), mox.IgnoreArg(), @@ -312,6 +313,19 @@ class VlanNetworkTestCase(test.TestCase): network['vpn_private_address'] = '192.168.0.2' self.network.allocate_fixed_ip(None, 0, network, vpn=True) + def test_vpn_allocate_fixed_ip_no_network_id(self): + network = dict(networks[0]) + network['vpn_private_address'] = '192.168.0.2' + network['id'] = None + context_admin = context.RequestContext('testuser', 'testproject', + is_admin=True) + self.assertRaises(exception.FixedIpNotFoundForNetwork, + self.network.allocate_fixed_ip, + context_admin, + 0, + network, + vpn=True) + def test_allocate_fixed_ip(self): self.mox.StubOutWithMock(db, 'fixed_ip_associate_pool') self.mox.StubOutWithMock(db, 'fixed_ip_update') |