openstack
/
neutron
Code Issues Proposed changes

Merge "Remove duplicate tunnel id check in sync_allocations"

This commit is contained in:
Jenkins 2015-06-24 11:40:11 +00:00 committed by Gerrit Code Review
parent a5786f8ec8 a5bf502fab
commit 98f39643ec
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/plugins/ml2/drivers/type_gre.py
View File

@ -89,12 +89,7 @@ class GreTypeDriver(type_tunnel.EndpointTunnelTypeDriver):
gre_ids = set()
for gre_id_range in self.tunnel_ranges:
tun_min, tun_max = gre_id_range
if tun_max + 1 - tun_min > 1000000:
LOG.error(_LE("Skipping unreasonable gre ID range "
"%(tun_min)s:%(tun_max)s"),
{'tun_min': tun_min, 'tun_max': tun_max})
else:
gre_ids |= set(moves.range(tun_min, tun_max + 1))
gre_ids |= set(moves.range(tun_min, tun_max + 1))
session = db_api.get_session()
try:

7
neutron/plugins/ml2/drivers/type_vxlan.py
View File

@ -91,12 +91,7 @@ class VxlanTypeDriver(type_tunnel.EndpointTunnelTypeDriver):
# determine current configured allocatable vnis
vxlan_vnis = set()
for tun_min, tun_max in self.tunnel_ranges:
if tun_max + 1 - tun_min > p_const.MAX_VXLAN_VNI:
LOG.error(_LE("Skipping unreasonable VXLAN VNI range "
"%(tun_min)s:%(tun_max)s"),
{'tun_min': tun_min, 'tun_max': tun_max})
else:
vxlan_vnis |= set(moves.range(tun_min, tun_max + 1))
vxlan_vnis |= set(moves.range(tun_min, tun_max + 1))
session = db_api.get_session()
with session.begin(subtransactions=True):