openstack
/
neutron
Code Issues Proposed changes

Merge "Add OpenFlow10 protocol in OVSAgentBridge.setup_controllers()"

This commit is contained in:
Zuul 2020-12-05 17:00:55 +00:00 committed by Gerrit Code Review
parent 2b45716bd4 8ae10de297
commit 50d72b9345
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge.py
View File

@ -74,7 +74,7 @@ class OVSAgentBridge(ofswitch.OpenFlowSwitchMixin,
url = ipv6_utils.valid_ipv6_url(conf.OVS.of_listen_address,
conf.OVS.of_listen_port)
controllers = ["tcp:" + url]
self.add_protocols(ovs_consts.OPENFLOW13)
self.add_protocols(ovs_consts.OPENFLOW10, ovs_consts.OPENFLOW13)
self.set_controller(controllers)
# NOTE(ivc): Force "out-of-band" controller connection mode (see

9
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge_test_base.py
View File

@ -150,9 +150,12 @@ class OVSBridgeTestBase(ovs_test_base.OVSOSKenTestBase):
'set_controllers_connection_mode')
with m_set_ccm as set_ccm:
with m_set_controller, m_add_protocols, m_set_probe:
self.br.setup_controllers(cfg)
set_ccm.assert_called_once_with("out-of-band")
with m_add_protocols as add_protocols:
with m_set_controller, m_set_probe:
self.br.setup_controllers(cfg)
set_ccm.assert_called_once_with("out-of-band")
add_protocols.assert_called_once_with(
constants.OPENFLOW10, constants.OPENFLOW13)
class OVSDVRProcessTestMixin(object):