x/python-ganttclient
Code Issues Proposed changes

Fixes bug 871877

Browse Source 
Added an aditional testunit to the VlanNetworkTestCase to check
if the FixedIpNotFoundForNetwork exception is raised properly.

Change-Id: I92a0ca22aadcfa9a7fd434375e239be8ccf4f387
This commit is contained in:
Alvaro Lopez
2011-11-09 16:18:39 +01:00
parent 4bd8e4b468
commit 9184600dc9
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@@ -4,6 +4,7 @@ Adam Johnson <adjohn@gmail.com>
Ahmad Hassan <ahmad.hassan@hp.com> Ahmad Hassan <ahmad.hassan@hp.com>
Alex Meade <alex.meade@rackspace.com> Alex Meade <alex.meade@rackspace.com>
Alexander Sakhnov <asakhnov@mirantis.com> Alexander Sakhnov <asakhnov@mirantis.com>
Alvaro Lopez Garcia <aloga@ifca.unican.es>
Andrey Brindeyev <abrindeyev@griddynamics.com> Andrey Brindeyev <abrindeyev@griddynamics.com>
Andy Smith <code@term.ie> Andy Smith <code@term.ie>
Andy Southgate <andy.southgate@citrix.com> Andy Southgate <andy.southgate@citrix.com>

14
nova/tests/test_network.py
View File

@@ -298,6 +298,7 @@ class VlanNetworkTestCase(test.TestCase):
'virtual_interface_get_by_instance_and_network') 'virtual_interface_get_by_instance_and_network')
db.fixed_ip_associate(mox.IgnoreArg(), db.fixed_ip_associate(mox.IgnoreArg(),
mox.IgnoreArg(),
mox.IgnoreArg(), mox.IgnoreArg(),
mox.IgnoreArg(), mox.IgnoreArg(),
reserved=True).AndReturn('192.168.0.1') reserved=True).AndReturn('192.168.0.1')
@@ -312,6 +313,19 @@ class VlanNetworkTestCase(test.TestCase):
network['vpn_private_address'] = '192.168.0.2' network['vpn_private_address'] = '192.168.0.2'
self.network.allocate_fixed_ip(None, 0, network, vpn=True) 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): def test_allocate_fixed_ip(self):
self.mox.StubOutWithMock(db, 'fixed_ip_associate_pool') self.mox.StubOutWithMock(db, 'fixed_ip_associate_pool')
self.mox.StubOutWithMock(db, 'fixed_ip_update') self.mox.StubOutWithMock(db, 'fixed_ip_update')