openstack/ovn-bgp-agent
Code Issues Proposed changes

Ensure ovs-ofctl command works with different flow formats

Browse Source 
Depending on the ovs version, different OpenFlow formats are needed
This commit does not add a specific format, and only if it fails with
ProcessExecutionError it tries with OpenFlow13

Change-Id: I1a5028ff3b91603c0ac1739c248797d367bc40c7
This commit is contained in:
Luis Tomas Bolivar 2021-11-22 18:23:03 +01:00
parent 0da4fbb8ee
commit 892e43ac0b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ovn_bgp_agent/privileged/ovs_vsctl.py
View File

@ -23,13 +23,19 @@ LOG = logging.getLogger(__name__)
@ovn_bgp_agent.privileged.ovs_vsctl_cmd.entrypoint
def ovs_cmd(command, args, timeout=None):
full_args = [command]
if command == 'ovs-ofctl':
full_args += ['-O', 'OpenFlow13']
if timeout is not None:
full_args += ['--timeout=%s' % timeout]
full_args += args
try:
return processutils.execute(*full_args)
except processutils.ProcessExecutionError:
full_args += ['-O', 'OpenFlow13']
try:
return processutils.execute(*full_args)
except Exception as e:
LOG.exception("Unable to execute %s %s. Exception: %s",
command, full_args, e)
raise
except Exception as e:
LOG.exception("Unable to execute %s %s. Exception: %s", command,
full_args, e)