openstack-attic/melange
Code Issues Proposed changes

Vinkesh/Deepak | Validating gateway and braodcast ips are not allocatable

Browse Source
This commit is contained in:
vinkesh banka
2011-08-05 16:07:38 +05:30
committed by Rajaram Mallya
parent ea870d0fa9
commit 4ecf8597d0
3 changed files with 65 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
melange/ipam/models.py
View File

@@ -355,16 +355,19 @@ class IpBlock(ModelBase):
#TODO: very inefficient way to generate ips,
#will look at better algos for this
allocated_addresses = [ip.address for ip in self.addresses()]
unavailable_addresses = allocated_addresses + [self.gateway,
self.broadcast]
policy = self.policy()
for ip in IPNetwork(self.cidr):
if (IpBlock.allowed_by_policy(self, policy, str(ip))
and (str(ip) not in allocated_addresses)):
and (str(ip) not in unavailable_addresses)):
return str(ip)
return None
def _validate_address(self, address):
if self.get_address(address) is not None:
if (address in [self.broadcast, self.gateway]
or (self.get_address(address) is not None)):
raise DuplicateAddressError()
if not self.contains(address):