x/python-ganttclient
Code Issues Proposed changes

fixed bug , when logic searched for next avail cidr it would return cidrs that were out of range of original requested cidr block. added test for it

Browse Source
This commit is contained in:
John Tran
2011-08-04 18:37:36 -07:00
parent d40d3ec3bf
commit 919cb206e7
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nova/tests/test_network.py
View File

@@ -351,12 +351,26 @@ class CommonNetworkTestCase(test.TestCase):
nets = manager._validate_cidrs(None, '192.168.2.0/24', 3, 32)
self.assertEqual(3, len(nets))
cidrs = [str(net) for net in nets]
print cidrs
exp_cidrs = ['192.168.2.32', '192.168.2.64', '192.168.2.96']
for exp_cidr in exp_cidrs:
self.assertTrue(exp_cidr + '/27' in cidrs)
self.assertFalse('192.168.2.0/27' in cidrs)
def test__validate_cidrs_split_all_in_use(self):
manager = self.FakeNetworkManager()
self.mox.StubOutWithMock(manager.db, 'network_get_all')
ctxt = mox.IgnoreArg()
in_use = [{'id': 1, 'cidr': '192.168.2.9/29'},
{'id': 2, 'cidr': '192.168.2.64/26'},
{'id': 3, 'cidr': '192.168.2.128/26'}
]
manager.db.network_get_all(ctxt).AndReturn(in_use)
self.mox.ReplayAll()
args = [None, '192.168.2.0/24', 3, 64]
# ValueError: Not enough subnets avail to satisfy requested num_networks
# - some subnets in requested range already in use
self.assertRaises(ValueError, manager._validate_cidrs, *args)
def test__validate_cidrs_one_in_use(self):
manager = self.FakeNetworkManager()
args = [None, '192.168.0.0/24', 2, 256]
@@ -385,7 +399,6 @@ class CommonNetworkTestCase(test.TestCase):
manager = self.FakeNetworkManager()
nets = manager._validate_cidrs(None, '192.168.0.0/16', 2, 256)
returned_cidrs = [str(net) for net in nets]
print returned_cidrs
self.assertTrue('192.168.0.0/24' in returned_cidrs)
self.assertTrue('192.168.1.0/24' in returned_cidrs)