c0d101aa81
This change modifies the os-vif ovs plugin to set a default tc qdisc on ovs interface when the host os is not windows and the system datapath is used. This change fixes a "silent" bug in the functional test code due to a change in an ovsdbapp function signiture to accpet a new paramater. Closes-Bug: #2017868 Change-Id: Id9ef7074634a0f23d67a4401fa8fca363b51bb43
101 lines
3.0 KiB
Python
101 lines
3.0 KiB
Python
# 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.
|
|
|
|
import functools
|
|
import socket
|
|
|
|
from ovs.db import idl
|
|
from ovs import socket_util
|
|
from ovs import stream
|
|
from ovsdbapp.backend.ovs_idl import connection
|
|
from ovsdbapp.backend.ovs_idl import idlutils
|
|
from ovsdbapp.backend.ovs_idl import vlog
|
|
from ovsdbapp.schema.open_vswitch import impl_idl
|
|
|
|
from vif_plug_ovs.ovsdb import api
|
|
|
|
REQUIRED_TABLES = ('Interface', 'Port', 'Bridge', 'Open_vSwitch', 'QoS')
|
|
|
|
|
|
def idl_factory(config):
|
|
conn = config.connection
|
|
schema_name = 'Open_vSwitch'
|
|
helper = idlutils.get_schema_helper(conn, schema_name)
|
|
for table in REQUIRED_TABLES:
|
|
helper.register_table(table)
|
|
return idl.Idl(conn, helper)
|
|
|
|
|
|
def api_factory(config):
|
|
conn = connection.Connection(
|
|
idl=idl_factory(config),
|
|
timeout=config.timeout)
|
|
return NeutronOvsdbIdl(conn)
|
|
|
|
|
|
class NeutronOvsdbIdl(impl_idl.OvsdbIdl, api.ImplAPI):
|
|
"""IDL interface for OVS database back-end
|
|
|
|
This class provides an OVSDB IDL (Open vSwitch Database Interface
|
|
Definition Language) interface to the OVS back-end.
|
|
"""
|
|
|
|
def __init__(self, conn):
|
|
vlog.use_python_logger()
|
|
super(NeutronOvsdbIdl, self).__init__(conn)
|
|
|
|
def _get_table_columns(self, table):
|
|
return list(self.tables[table].columns)
|
|
|
|
def has_table_column(self, table, column):
|
|
return column in self._get_table_columns(table)
|
|
|
|
|
|
# this is derived form https://review.opendev.org/c/openstack/neutron/+/794892
|
|
def add_keepalives(fn):
|
|
@functools.wraps(fn)
|
|
def _open(*args, **kwargs):
|
|
error, sock = fn(*args, **kwargs)
|
|
try:
|
|
sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
|
|
except socket.error as e:
|
|
sock.close()
|
|
return socket_util.get_exception_errno(e), None
|
|
return error, sock
|
|
return _open
|
|
|
|
|
|
class NoProbesMixin:
|
|
@staticmethod
|
|
def needs_probes():
|
|
# If we are using keepalives, we can force probe_interval=0
|
|
return False
|
|
|
|
|
|
class TCPStream(stream.TCPStream, NoProbesMixin):
|
|
@classmethod
|
|
@add_keepalives
|
|
def _open(cls, suffix, dscp):
|
|
return super()._open(suffix, dscp)
|
|
|
|
|
|
class SSLStream(stream.SSLStream, NoProbesMixin):
|
|
@classmethod
|
|
@add_keepalives
|
|
def _open(cls, suffix, dscp):
|
|
return super()._open(suffix, dscp)
|
|
|
|
|
|
# Overwriting globals in a library is clearly a good idea
|
|
stream.Stream.register_method("tcp", TCPStream)
|
|
stream.Stream.register_method("ssl", SSLStream)
|