openstack-attic
/
melange
Code Issues Proposed changes

Merge "Do not assume that a gateway is needed"

This commit is contained in:
Jenkins 2012-02-09 21:41:33 +00:00 committed by Gerrit Code Review
parent 05612066e9 b7edf8ca88
commit d972581d1b
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
melange/ipam/models.py
View File

@ -539,9 +539,6 @@ class IpBlock(ModelBase):
self._convert_cidr_to_lowest_address()
def _before_save(self):
network = netaddr.IPNetwork(self.cidr)
if not self.gateway and network.size > 1:
self.gateway = str(network[1])
self.dns1 = self.dns1 or config.Config.get("dns1")
self.dns2 = self.dns2 or config.Config.get("dns2")

48
melange/tests/unit/test_ipam_models.py
View File

@ -425,15 +425,6 @@ class TestIpBlock(tests.BaseTest):
self.assertEqual(block.cidr, "10.0.0.0/31")
def test_save_sets_the_gateway_ip_when_not_provided(self):
block = factory_models.IpBlockFactory(cidr="10.0.0.0/24",
gateway=None)
self.assertEqual(block.gateway, "10.0.0.1")
block = factory_models.IpBlockFactory(cidr="20.0.0.0/24",
gateway="20.0.0.10")
self.assertEqual(block.gateway, "20.0.0.10")
def test_gateway_ip_is_not_auto_set_if_ip_block_has_only_one_ip(self):
ipv4_block = factory_models.IpBlockFactory(cidr="10.0.0.0/32",
gateway=None)
@ -567,7 +558,7 @@ class TestIpBlock(tests.BaseTest):
interface = factory_models.InterfaceFactory()
#allocate all ips except last ip(broadcast)
for i in range(0, 2):
for i in range(0, 3):
block.allocate_ip(interface=interface)
self.assertRaises(exception.NoMoreAddressesError,
@ -633,7 +624,7 @@ class TestIpBlock(tests.BaseTest):
interface = factory_models.InterfaceFactory()
ip_block = factory_models.PrivateIpBlockFactory(cidr="10.0.0.0/30")
for i in range(0, 2):
for i in range(0, 3):
ip_block.allocate_ip(interface=interface)
self.assertRaises(exception.NoMoreAddressesError,
@ -716,7 +707,7 @@ class TestIpBlock(tests.BaseTest):
block = factory_models.PrivateIpBlockFactory(cidr="10.0.0.0/30")
interface = factory_models.InterfaceFactory()
for i in range(0, 2):
for i in range(0, 3):
block.allocate_ip(interface=interface)
self.assertRaises(exception.NoMoreAddressesError,
@ -728,7 +719,7 @@ class TestIpBlock(tests.BaseTest):
interface = factory_models.InterfaceFactory()
self.assertEqual(block.allocate_ip(interface).address, "10.0.0.0")
self.assertEqual(block.allocate_ip(interface).address, "10.0.0.2")
self.assertEqual(block.allocate_ip(interface).address, "10.0.0.1")
def test_allocate_ip_for_ipv6_block_uses_pluggable_algo(self):
block = factory_models.IpV6IpBlockFactory(cidr="ff::/120")
@ -829,14 +820,14 @@ class TestIpBlock(tests.BaseTest):
address=ip.address,
interface=interface)
def test_data(self):
def test_data_with_gateway(self):
policy = factory_models.PolicyFactory()
parent_block = factory_models.PrivateIpBlockFactory(
cidr="10.0.0.0/24")
ip_block = factory_models.PrivateIpBlockFactory(cidr="10.0.0.0/29",
policy_id=policy.id,
parent_id=parent_block.id)
parent_id=parent_block.id,
gateway="10.0.0.1")
data = ip_block.data()
self.assertEqual(data['id'], ip_block.id)
@ -853,6 +844,29 @@ class TestIpBlock(tests.BaseTest):
self.assertEqual(data['dns1'], ip_block.dns1)
self.assertEqual(data['dns2'], ip_block.dns2)
def test_data_without_gateway(self):
policy = factory_models.PolicyFactory()
parent_block = factory_models.PrivateIpBlockFactory(
cidr="10.0.0.0/24")
ip_block = factory_models.PrivateIpBlockFactory(cidr="10.0.0.0/29",
policy_id=policy.id,
parent_id=parent_block.id)
data = ip_block.data()
self.assertEqual(data['id'], ip_block.id)
self.assertEqual(data['cidr'], ip_block.cidr)
self.assertEqual(data['network_id'], ip_block.network_id)
self.assertEqual(data['tenant_id'], ip_block.tenant_id)
self.assertEqual(data['policy_id'], ip_block.policy_id)
self.assertEqual(data['parent_id'], ip_block.parent_id)
self.assertEqual(data['created_at'], ip_block.created_at)
self.assertEqual(data['updated_at'], ip_block.updated_at)
self.assertEqual(data['broadcast'], "10.0.0.7")
self.assertEqual(data['gateway'], None)
self.assertEqual(data['netmask'], "255.255.255.248")
self.assertEqual(data['dns1'], ip_block.dns1)
self.assertEqual(data['dns2'], ip_block.dns2)
def test_find_all_ip_blocks(self):
factory_models.PrivateIpBlockFactory(cidr="10.2.0.0/28")
factory_models.PrivateIpBlockFactory(cidr="10.3.0.0/28")
@ -1002,7 +1016,7 @@ class TestIpBlock(tests.BaseTest):
def test_is_full_flag_reset_when_addresses_are_deleted(self):
interface = factory_models.InterfaceFactory()
ip_block = factory_models.PrivateIpBlockFactory(cidr="10.0.0.0/30")
for i in range(0, 2):
for i in range(0, 3):
ip = _allocate_ip(ip_block, interface=interface)
ip.deallocate()
self.assertRaises(exception.NoMoreAddressesError,