855df3a483
When ovs commands fail, we re-try after adding `-O OpenFlow13`, but that
is only valid for `ovs-ofctl`.
To fix this issue, this patch implements a small refactor of the module
in order to separete calls to ovs-ofctl and ovs-vsctl.
Related-Bug: #2080258
Change-Id: Ib8ee872d4bd587ade325bc4f6da3e9d8804c28c0
(cherry picked from commit 7e348daca0)
45 lines
1.4 KiB
Python
45 lines
1.4 KiB
Python
# Copyright 2021 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from oslo_concurrency import processutils
|
|
from oslo_log import log as logging
|
|
|
|
import ovn_bgp_agent.privileged.ovs_vsctl
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
@ovn_bgp_agent.privileged.ovs_vsctl_cmd.entrypoint
|
|
def ovs_cmd(command, args, timeout=None):
|
|
full_args = [command]
|
|
if timeout is not None:
|
|
full_args += ['--timeout=%s' % timeout]
|
|
full_args += args
|
|
try:
|
|
return processutils.execute(*full_args)
|
|
except Exception:
|
|
LOG.error("Unable to execute %s %s", command, full_args)
|
|
raise
|
|
|
|
|
|
def ovs_vsctl(args, timeout=None):
|
|
return ovs_cmd('ovs-vsctl', args, timeout)
|
|
|
|
|
|
def ovs_ofctl(args, timeout=None):
|
|
try:
|
|
return ovs_cmd('ovs-ofctl', args, timeout)
|
|
except processutils.ProcessExecutionError:
|
|
return ovs_cmd('ovs-ofctl', args + ['-O', 'OpenFlow13'], timeout)
|