x/python-ganttclient
Code Issues Proposed changes

initial cleanup of tests for network

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-08-09 15:34:05 -07:00
parent c614c520e9
commit 4e7d7f8418
1 changed files with 68 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
nova/tests/network_unittest.py
View File

@@ -54,6 +54,7 @@ class NetworkTestCase(test.TrialTestCase):
self.projects.append(self.manager.create_project(name, self.projects.append(self.manager.create_project(name,
'netuser', 'netuser',
name)) name))
vpn.NetworkData.create(self.projects[i].id)
self.network = model.PublicNetworkController() self.network = model.PublicNetworkController()
self.service = service.VlanNetworkService() self.service = service.VlanNetworkService()
@@ -70,7 +71,7 @@ class NetworkTestCase(test.TrialTestCase):
self.assertTrue(IPy.IP(address) in self.network.network) self.assertTrue(IPy.IP(address) in self.network.network)
def test_allocate_deallocate_fixed_ip(self): def test_allocate_deallocate_fixed_ip(self):
result = yield self.service.allocate_fixed_ip( result = self.service.allocate_fixed_ip(
self.user.id, self.projects[0].id) self.user.id, self.projects[0].id)
address = result['private_dns_name'] address = result['private_dns_name']
mac = result['mac_address'] mac = result['mac_address']
@@ -89,11 +90,11 @@ class NetworkTestCase(test.TrialTestCase):
def test_range_allocation(self): def test_range_allocation(self):
hostname = "test-host" hostname = "test-host"
result = yield self.service.allocate_fixed_ip( result = self.service.allocate_fixed_ip(
self.user.id, self.projects[0].id) self.user.id, self.projects[0].id)
mac = result['mac_address'] mac = result['mac_address']
address = result['private_dns_name'] address = result['private_dns_name']
result = yield self.service.allocate_fixed_ip( result = self.service.allocate_fixed_ip(
self.user, self.projects[1].id) self.user, self.projects[1].id)
secondmac = result['mac_address'] secondmac = result['mac_address']
secondaddress = result['private_dns_name'] secondaddress = result['private_dns_name']
@@ -123,21 +124,21 @@ class NetworkTestCase(test.TrialTestCase):
self.assertEqual(False, is_in_project(secondaddress, self.projects[1].id)) self.assertEqual(False, is_in_project(secondaddress, self.projects[1].id))
def test_subnet_edge(self): def test_subnet_edge(self):
result = yield self.service.allocate_fixed_ip(self.user.id, result = self.service.allocate_fixed_ip(self.user.id,
self.projects[0].id) self.projects[0].id)
firstaddress = result['private_dns_name'] firstaddress = result['private_dns_name']
hostname = "toomany-hosts" hostname = "toomany-hosts"
for i in range(1,5): for i in range(1,5):
project_id = self.projects[i].id project_id = self.projects[i].id
result = yield self.service.allocate_fixed_ip( result = self.service.allocate_fixed_ip(
self.user, project_id) self.user, project_id)
mac = result['mac_address'] mac = result['mac_address']
address = result['private_dns_name'] address = result['private_dns_name']
result = yield self.service.allocate_fixed_ip( result = self.service.allocate_fixed_ip(
self.user, project_id) self.user, project_id)
mac2 = result['mac_address'] mac2 = result['mac_address']
address2 = result['private_dns_name'] address2 = result['private_dns_name']
result = yield self.service.allocate_fixed_ip( result = self.service.allocate_fixed_ip(
self.user, project_id) self.user, project_id)
mac3 = result['mac_address'] mac3 = result['mac_address']
address3 = result['private_dns_name'] address3 = result['private_dns_name']
@@ -155,8 +156,7 @@ class NetworkTestCase(test.TrialTestCase):
rv = self.service.deallocate_fixed_ip(firstaddress) rv = self.service.deallocate_fixed_ip(firstaddress)
self.dnsmasq.release_ip(mac, firstaddress, hostname, net.bridge_name) self.dnsmasq.release_ip(mac, firstaddress, hostname, net.bridge_name)
def test_212_vpn_ip_and_port_looks_valid(self): def test_vpn_ip_and_port_looks_valid(self):
vpn.NetworkData.create(self.projects[0].id)
self.assert_(self.projects[0].vpn_ip) self.assert_(self.projects[0].vpn_ip)
self.assert_(self.projects[0].vpn_port >= FLAGS.vpn_start_port) self.assert_(self.projects[0].vpn_port >= FLAGS.vpn_start_port)
self.assert_(self.projects[0].vpn_port <= FLAGS.vpn_end_port) self.assert_(self.projects[0].vpn_port <= FLAGS.vpn_end_port)
@@ -169,55 +169,85 @@ class NetworkTestCase(test.TrialTestCase):
for network_datum in vpns: for network_datum in vpns:
network_datum.destroy() network_datum.destroy()
def test_release_before_deallocate(self): def test_ips_are_reused(self):
pass """Makes sure that ip addresses that are deallocated get reused"""
def test_deallocate_before_issued(self): result = self.service.allocate_fixed_ip(
pass self.user.id, self.projects[0].id)
mac = result['mac_address']
address = result['private_dns_name']
def test_too_many_addresses(self): hostname = "reuse-host"
""" net = model.get_project_network(self.projects[0].id, "default")
Here, we test that a proper NoMoreAddresses exception is raised.
However, the number of available IP addresses depends on the test self.dnsmasq.issue_ip(mac, address, hostname, net.bridge_name)
rv = self.service.deallocate_fixed_ip(address)
self.dnsmasq.release_ip(mac, address, hostname, net.bridge_name)
result = self.service.allocate_fixed_ip(
self.user, self.projects[0].id)
secondmac = result['mac_address']
secondaddress = result['private_dns_name']
self.assertEqual(address, secondaddress)
rv = self.service.deallocate_fixed_ip(secondaddress)
self.dnsmasq.issue_ip(secondmac,
secondaddress,
hostname,
net.bridge_name)
self.dnsmasq.release_ip(secondmac,
secondaddress,
hostname,
net.bridge_name)
def test_available_ips(self):
"""Make sure the number of available ips for the network is correct
The number of available IP addresses depends on the test
environment's setup. environment's setup.
Network size is set in test fixture's setUp method. Network size is set in test fixture's setUp method.
There are FLAGS.cnt_vpn_clients addresses reserved for VPN (NUM_RESERVED_VPN_IPS) There are ips reserved at the bottom and top of the range.
services (network, gateway, CloudPipe, broadcast)
And there are NUM_STATIC_IPS that are always reserved by Nova for the necessary
services (gateway, CloudPipe, etc)
So we should get flags.network_size - (NUM_STATIC_IPS +
NUM_PREALLOCATED_IPS +
NUM_RESERVED_VPN_IPS)
usable addresses
""" """
net = model.get_project_network(self.projects[0].id, "default") net = model.get_project_network(self.projects[0].id, "default")
# Determine expected number of available IP addresses
num_static_ips = net.num_static_ips
num_preallocated_ips = len(net.hosts.keys()) num_preallocated_ips = len(net.hosts.keys())
num_reserved_vpn_ips = flags.FLAGS.cnt_vpn_clients num_available_ips = flags.FLAGS.network_size - (net.num_bottom_reserved_ips +
num_available_ips = flags.FLAGS.network_size - (num_static_ips +
num_preallocated_ips + num_preallocated_ips +
num_reserved_vpn_ips) net.num_top_reserved_ips)
self.assertEqual(num_available_ips, len(list(net.available)))
def test_too_many_addresses(self):
"""Test for a NoMoreAddresses exception when all fixed ips are used.
"""
net = model.get_project_network(self.projects[0].id, "default")
hostname = "toomany-hosts" hostname = "toomany-hosts"
macs = {} macs = {}
addresses = {} addresses = {}
for i in range(0, (num_available_ips - 1)): # Number of availaible ips is len of the available list
result = yield self.service.allocate_fixed_ip(self.user.id, self.projects[0].id) num_available_ips = len(list(net.available))
for i in range(num_available_ips):
result = self.service.allocate_fixed_ip(self.user.id,
self.projects[0].id)
macs[i] = result['mac_address'] macs[i] = result['mac_address']
addresses[i] = result['private_dns_name'] addresses[i] = result['private_dns_name']
self.dnsmasq.issue_ip(macs[i], addresses[i], hostname, net.bridge_name) self.dnsmasq.issue_ip(macs[i],
addresses[i],
hostname,
net.bridge_name)
self.assertFailure(self.service.allocate_fixed_ip(self.user.id, self.projects[0].id), NoMoreAddresses) self.assertEqual(len(list(net.available)), 0)
self.assertRaises(NoMoreAddresses, self.service.allocate_fixed_ip,
self.user.id, self.projects[0].id)
for i in range(0, (num_available_ips - 1)): for i in range(len(addresses)):
rv = self.service.deallocate_fixed_ip(addresses[i]) rv = self.service.deallocate_fixed_ip(addresses[i])
self.dnsmasq.release_ip(macs[i], addresses[i], hostname, net.bridge_name) self.dnsmasq.release_ip(macs[i],
addresses[i],
hostname,
net.bridge_name)
self.assertEqual(len(list(net.available)), num_available_ips)
def is_in_project(address, project_id): def is_in_project(address, project_id):
return address in model.get_project_network(project_id).list_addresses() return address in model.get_project_network(project_id).list_addresses()