openstack/neutron
Code Issues Proposed changes

Merge "[OVS] Workaround when OpenFlow controller restarts"

Browse Source
This commit is contained in:
Zuul 2021-11-01 04:44:04 +00:00 committed by Gerrit Code Review
commit 92d21eb37b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/agent/common/ovs_lib.py
View File

@ -262,6 +262,10 @@ class OVSBridge(BaseOVS):
def set_controller(self, controllers):
self.ovsdb.set_controller(self.br_name,
controllers).execute(check_error=True)
# TODO(ralonsoh): this is a workaround for LP#1948642. When a new
# controller is added, os-ken ``OfctlService`` needs to receive the
# update event and register this new datapath.
time.sleep(1)
def del_controller(self):
self.ovsdb.del_controller(self.br_name).execute(check_error=True)
@ -282,6 +286,11 @@ class OVSBridge(BaseOVS):
def add_protocols(self, *protocols):
self.ovsdb.db_add('Bridge', self.br_name,
'protocols', *protocols).execute(check_error=True)
# TODO(ralonsoh): this is a workaround for LP#1948642. When the OF
# protocols are changed, the OF controller is restarted. This sleep
# will provide time to os-ken ``OfctlService`` to receive the update
# events of the restarted controllers and set them as enabled.
time.sleep(1)
def use_at_least_protocol(self, protocol):
"""Calls to ovs-ofctl will use a protocol version >= 'protocol'"""