summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-26 12:44:40 +0000
committerGerrit Code Review <review@openstack.org>2014-11-26 12:44:40 +0000
commitdedd11a209d23e5b47c0b221777c702ccfc2c9a0 (patch)
tree204c99b9ee8160afe25170da379329fbbd417a7d
parentc00b4b31276f9ae21fa0a7a213391277bda4cfa7 (diff)
parent56b0029014ff7e844c2fde45f7b52b7f115757e8 (diff)
downloadneutron-dedd11a209d23e5b47c0b221777c702ccfc2c9a0.tar.gz
Merge "linuxbridge-agent: make vxlan unicast check more efficent" into stable/juno
-rwxr-xr-xneutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
index 8011c0d4bd..d9f7f686f5 100755
--- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
+++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
@@ -27,6 +27,7 @@ import eventlet
eventlet.monkey_patch()
from oslo.config import cfg
+from six import moves
from neutron.agent import l2population_rpc as l2pop_rpc
from neutron.agent.linux import ip_lib
@@ -523,7 +524,7 @@ class LinuxBridgeManager:
'command': 'bridge fdb',
'mode': 'VXLAN UCAST'})
return False
- for segmentation_id in range(1, constants.MAX_VXLAN_VNI + 1):
+ for segmentation_id in moves.xrange(1, constants.MAX_VXLAN_VNI + 1):
if not ip_lib.device_exists(
self.get_vxlan_device_name(segmentation_id)):
break