summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJoshua McKenty <jmckenty@joshua-mckentys-macbook-pro.local>2010-07-07 12:24:17 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2010-07-07 12:24:17 -0700
commit84c69c32297a1f79e8630102497e1e7e0041a324 (patch)
tree363a8b3698f3cf8fe5ba5140538d8531e0677551 /nova
parentd831ef39e2d84aa3e39bc3861085d563575efa43 (diff)
Off by one error in the allocation test (can someone check my subnet math?)
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/network_unittest.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py
index 67ae7ad2d..4d79758fb 100644
--- a/nova/tests/network_unittest.py
+++ b/nova/tests/network_unittest.py
@@ -21,7 +21,6 @@
import os
import logging
import unittest
-import time
from nova import vendor
import IPy
@@ -154,20 +153,20 @@ class NetworkTestCase(test.TrialTestCase):
def test_too_many_addresses(self):
"""
Network size is 32, there are 5 addresses reserved for VPN.
- So we should get 24 usable addresses
+ So we should get 23 usable addresses
"""
net = network.get_project_network("project0", "default")
hostname = "toomany-hosts"
macs = {}
addresses = {}
- for i in range(0, 23):
+ for i in range(0, 22):
macs[i] = utils.generate_mac()
addresses[i] = network.allocate_ip("netuser", "project0", macs[i])
self.dnsmasq.issue_ip(macs[i], addresses[i], hostname, net.bridge_name)
self.assertRaises(NoMoreAddresses, network.allocate_ip, "netuser", "project0", utils.generate_mac())
- for i in range(0, 23):
+ for i in range(0, 22):
rv = network.deallocate_ip(addresses[i])
self.dnsmasq.release_ip(macs[i], addresses[i], hostname, net.bridge_name)