openstack
/
neutron
Code Issues Proposed changes

Merge "Reduce IP address collision during port creating" into stable/queens

This commit is contained in:
Zuul 2018-07-30 16:44:04 +00:00 committed by Gerrit Code Review
parent c79841c736 1511c5f9dd
commit 2cf334b8ce
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/ipam/drivers/neutrondb_ipam/driver.py
View File

@ -167,10 +167,11 @@ class NeutronDbSubnet(ipam_base.Subnet):
window = 1
else:
# Compute a value for the selection window
window = min(av_set.size, 10)
window = min(av_set.size, 30)
ip_index = random.randint(1, window)
candidate_ips = list(itertools.islice(av_set, ip_index))
allocated_ip = candidate_ips[-1]
allocated_ip = candidate_ips[
random.randint(0, len(candidate_ips) - 1)]
return str(allocated_ip), ip_pool.id
raise ipam_exc.IpAddressGenerationFailure(