Rodolfo Alonso Hernandez
dcf7acf2c6
Add a filter in SimpleInterfaceMonitor. If provided, the Interface events received will be filtered by port. For each Interface event received, the bridge name will be retrieved and compared with the list of bridge names given. If no names are provided, the monitor won't filter any event (current behavior). This filter is meant to be used in Fullstack test only. This filtering add an extra overload (two OVS DB queries per event) that should not be needed in a production environment. Closes-Bug: #1885547 Change-Id: Ie1fc8cf7d29c71eb358e593726b446787d8022c2
93 lines
3.1 KiB
Python
93 lines
3.1 KiB
Python
# Copyright 2015 Cloudbase Solutions.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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 contextlib
|
|
|
|
import eventlet
|
|
from oslo_config import cfg
|
|
from oslo_log import log as logging
|
|
|
|
from neutron.agent.common import async_process
|
|
from neutron.agent.common import base_polling
|
|
from neutron.agent.common import ovsdb_monitor
|
|
from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
@contextlib.contextmanager
|
|
def get_polling_manager(minimize_polling=False,
|
|
ovsdb_monitor_respawn_interval=(
|
|
constants.DEFAULT_OVSDBMON_RESPAWN),
|
|
bridge_names=None, ovs=None):
|
|
if minimize_polling:
|
|
pm = InterfacePollingMinimizer(
|
|
ovsdb_monitor_respawn_interval=ovsdb_monitor_respawn_interval,
|
|
bridge_names=bridge_names, ovs=ovs)
|
|
pm.start()
|
|
else:
|
|
pm = base_polling.AlwaysPoll()
|
|
try:
|
|
yield pm
|
|
finally:
|
|
if minimize_polling:
|
|
pm.stop()
|
|
|
|
|
|
class InterfacePollingMinimizer(base_polling.BasePollingManager):
|
|
"""Monitors ovsdb to determine when polling is required."""
|
|
|
|
def __init__(
|
|
self,
|
|
ovsdb_monitor_respawn_interval=constants.DEFAULT_OVSDBMON_RESPAWN,
|
|
bridge_names=None, ovs=None):
|
|
|
|
super(InterfacePollingMinimizer, self).__init__()
|
|
self._monitor = ovsdb_monitor.SimpleInterfaceMonitor(
|
|
respawn_interval=ovsdb_monitor_respawn_interval,
|
|
ovsdb_connection=cfg.CONF.OVS.ovsdb_connection,
|
|
bridge_names=bridge_names, ovs=ovs)
|
|
|
|
def start(self):
|
|
self._monitor.start(block=True)
|
|
|
|
def stop(self):
|
|
try:
|
|
self._monitor.stop()
|
|
except async_process.AsyncProcessException:
|
|
LOG.debug("InterfacePollingMinimizer was not running when stopped")
|
|
|
|
def _is_polling_required(self):
|
|
# Maximize the chances of update detection having a chance to
|
|
# collect output.
|
|
eventlet.sleep()
|
|
return self._monitor.has_updates
|
|
|
|
def get_events(self):
|
|
return self._monitor.get_events()
|
|
|
|
|
|
def filter_bridge_names(br_names):
|
|
"""Bridge names to filter events received in the Interface monitor
|
|
|
|
This method is used only in fullstack testing. Because several OVS agents
|
|
are executed in the same host and share the same OVS switch, this filtering
|
|
will remove events of other agents; the Interface monitor will only return
|
|
events of Interfaces attached to Ports that belong to bridges "br_names".
|
|
|
|
If the list is empty, no filtering is done.
|
|
"""
|
|
return []
|