OVS agent: configure both OF10 and OF13

This change avoids issues where a piece of code restricts
a bridge to OF13 while there is code still needing OF10, and
vice-versa, by configuring bridge to both versions.

This is aimed to be a less complex and easier to merge fix than
Id5ac7e6431c97fc70d8404b16f89533b6f270eee.

Change-Id: I4475865c4f83cb9f3e12c709af752bc490692ca3
Closes-Bug: 1622644
This commit is contained in:
Thomas Morin 2016-09-19 09:39:57 +02:00
parent 2fc9c3e75f
commit 039673c2a4
2 changed files with 2 additions and 2 deletions

View File

@ -75,7 +75,7 @@ class OVSAgentBridge(ofswitch.OpenFlowSwitchMixin,
"port": conf.OVS.of_listen_port,
}
]
self.set_protocols(ovs_consts.OPENFLOW13)
self.set_protocols([ovs_consts.OPENFLOW10, ovs_consts.OPENFLOW13])
self.set_controller(controllers)
# NOTE(ivc): Force "out-of-band" controller connection mode (see

View File

@ -29,7 +29,7 @@ class OVSAgentBridge(ofswitch.OpenFlowSwitchMixin,
"""Common code for bridges used by OVS agent"""
def setup_controllers(self, conf):
self.set_protocols(ovs_consts.OPENFLOW10)
self.set_protocols([ovs_consts.OPENFLOW10, ovs_consts.OPENFLOW13])
self.del_controller()
def drop_port(self, in_port):