Fix OVSBridge.set_protocols arg

For native ovsdb_interface compatibility, use a list instead of a comma separated string for set_protocols argument. The native interface failed silently. Change-Id: Idc6fce9f943b2fe64f668bcfaf9ed40fcf47034c Closes-Bug: 1597613 (cherry picked from commit ce644b8)
openstack · Jul 25, 2016 · b0d16a0 · b0d16a0
1 parent 9ad13f4
commit b0d16a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/neutron/agent/linux/openvswitch_firewall/firewall.py b/neutron/agent/linux/openvswitch_firewall/firewall.py
@@ -163,13 +163,13 @@ def update_members(self, sg_id, members):
 
 
 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
 

diff --git a/neutron/cmd/sanity/checks.py b/neutron/cmd/sanity/checks.py
@@ -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