openstack
/
neutron
Code Issues Proposed changes

Merge "Fix OVSBridge.set_protocols arg" into stable/mitaka

This commit is contained in:
Jenkins 2016-07-28 12:29:54 +00:00 committed by Gerrit Code Review
parent 77d2bd63bf b0d16a0898
commit df7bf3b1fe
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/linux/openvswitch_firewall/firewall.py
View File

@ -163,13 +163,13 @@ class SGPortMap(object):
class OVSFirewallDriver(firewall.FirewallDriver):
REQUIRED_PROTOCOLS = ",".join([
REQUIRED_PROTOCOLS = [
ovs_consts.OPENFLOW10,
ovs_consts.OPENFLOW11,
ovs_consts.OPENFLOW12,
ovs_consts.OPENFLOW13,
ovs_consts.OPENFLOW14,
])
]
provides_arp_spoofing_protection = True

3
neutron/cmd/sanity/checks.py
View File

@ -338,8 +338,7 @@ def ovs_conntrack_supported():
with ovs_lib.OVSBridge(br_name) as br:
try:
br.set_protocols(
"OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14")
br.set_protocols(["OpenFlow%d" % i for i in range(10, 15)])
except RuntimeError as e:
LOG.debug("Exception while checking ovs conntrack support: %s", e)
return False