201e8be046
OVN Octavia Provider is registering opts a soon modules (driver,
agent or helper) are imported, so in a test scope terms, when some
tests run the setUp they are broken by a DuplicateOptionError
because they are based on TestOVNFunctionalBase from Neutron
where same options are loaded to same oslo_config group.
This fix proposes some refactoring in a similar way to [1] and [2]
in order to avoid the registration of opts a soon a module is
imported, instead we switch to one charge per required class
whenever possible.
Additionally in order to fix gates and according to [3], we pin
version of OVS to d94cd0d3eec33e4290d7ca81918f5ac61444886e hash
[1] https://review.opendev.org/c/openstack/neutron/+/837392
[2] https://review.opendev.org/c/openstack/neutron/+/839783
[3] f93206ce40
Related-Bug: #1972278
Related-Bug: #1967472
Change-Id: I2f36af767a0a0a4c19488b6998a414b8672114f5
60 lines
2.3 KiB
Python
60 lines
2.3 KiB
Python
# Copyright 2020 Red Hat, Inc. 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.
|
|
|
|
from oslo_log import log as logging
|
|
|
|
from ovn_octavia_provider.common import config as ovn_conf
|
|
from ovn_octavia_provider import event as ovn_event
|
|
from ovn_octavia_provider import helper as ovn_helper
|
|
from ovn_octavia_provider.ovsdb import impl_idl_ovn
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
OVN_EVENT_LOCK_NAME = "neutron_ovn_octavia_event_lock"
|
|
|
|
|
|
def OvnProviderAgent(exit_event):
|
|
|
|
# NOTE (froyo): Move inside class in order to avoid
|
|
# the issues on test scope colliding with Neutron
|
|
# already registered options when this register was
|
|
# called from outside of the class a soon this module
|
|
# was imported, also to cover requirement from
|
|
# OvnProviderHelper and intra references modules
|
|
ovn_conf.register_opts()
|
|
helper = ovn_helper.OvnProviderHelper()
|
|
events = [ovn_event.LogicalRouterPortEvent(helper),
|
|
ovn_event.LogicalSwitchPortUpdateEvent(helper)]
|
|
sb_events = [ovn_event.ServiceMonitorUpdateEvent(helper)]
|
|
|
|
# NOTE(mjozefcz): This API is only for handling OVSDB events!
|
|
ovn_nb_idl_for_events = impl_idl_ovn.OvnNbIdlForLb(
|
|
event_lock_name=OVN_EVENT_LOCK_NAME)
|
|
ovn_nb_idl_for_events.notify_handler.watch_events(events)
|
|
ovn_nb_idl_for_events.start()
|
|
|
|
ovn_sb_idl_for_events = impl_idl_ovn.OvnSbIdlForLb(
|
|
event_lock_name=OVN_EVENT_LOCK_NAME)
|
|
ovn_sb_idl_for_events.notify_handler.watch_events(sb_events)
|
|
ovn_sb_idl_for_events.start()
|
|
|
|
LOG.info('OVN provider agent has started.')
|
|
exit_event.wait()
|
|
LOG.info('OVN provider agent is exiting.')
|
|
ovn_nb_idl_for_events.notify_handler.unwatch_events(events)
|
|
ovn_nb_idl_for_events.stop()
|
|
ovn_sb_idl_for_events.notify_handler.unwatch_events(sb_events)
|
|
ovn_sb_idl_for_events.stop()
|