openstack/neutron
Code Issues Proposed changes

Merge "Bump ovs library minimum version to 2.12.0"

Browse Source
This commit is contained in:
Zuul 2024-11-14 19:15:06 +00:00 committed by Gerrit Code Review
commit 5e63b512ea
4 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neutron/agent/ovn/agent/ovsdb.py
View File

@ -38,12 +38,7 @@ class MonitorAgentOvnSbIdl(ovsdb_monitor.OvnIdl):
helper = self._get_ovsdb_helper(connection_string)
for table in tables:
helper.register_table(table)
try:
super().__init__(None, connection_string, helper,
leader_only=False)
except TypeError:
# TODO(twilson) We can remove this when we require ovs>=2.12.0
super().__init__(None, connection_string, helper)
super().__init__(None, connection_string, helper, leader_only=False)
if chassis:
for table in set(tables).intersection({'Chassis',
'Chassis_Private'}):
@ -76,12 +71,7 @@ class MonitorAgentOvnNbIdl(ovsdb_monitor.OvnIdl):
helper = self._get_ovsdb_helper(connection_string)
for table in tables:
helper.register_table(table)
try:
super().__init__(None, connection_string, helper,
leader_only=False)
except TypeError:
# TODO(twilson) We can remove this when we require ovs>=2.12.0
super().__init__(None, connection_string, helper)
super().__init__(None, connection_string, helper, leader_only=False)
if events:
self.notify_handler.watch_events(events)

8
neutron/agent/ovn/metadata/ovsdb.py
View File

@ -40,13 +40,7 @@ class MetadataAgentOvnSbIdl(ovsdb_monitor.OvnIdl):
'SB_Global')
for table in tables:
helper.register_table(table)
try:
super().__init__(
None, connection_string, helper, leader_only=False)
except TypeError:
# TODO(twilson) We can remove this when we require ovs>=2.12.0
super().__init__(
None, connection_string, helper)
super().__init__(None, connection_string, helper, leader_only=False)
if chassis:
for table in set(tables).intersection({'Chassis',
'Chassis_Private'}):

12
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py
View File

@ -787,11 +787,7 @@ class BaseOvnSbIdl(Ml2OvnIdlBase):
helper.register_table('Encap')
helper.register_table('Port_Binding')
helper.register_table('Datapath_Binding')
try:
return cls(connection_string, helper, leader_only=False)
except TypeError:
# TODO(twilson) We can remove this when we require ovs>=2.12.0
return cls(connection_string, helper)
return cls(connection_string, helper, leader_only=False)
class OvnIdl(BaseOvnIdl):
@ -933,11 +929,7 @@ class OvnSbIdl(OvnIdlDistributedLock):
helper.register_table('Port_Binding')
helper.register_table('Datapath_Binding')
helper.register_columns('SB_Global', ['external_ids'])
try:
return cls(driver, connection_string, helper, leader_only=False)
except TypeError:
# TODO(twilson) We can remove this when we require ovs>=2.12.0
return cls(driver, connection_string, helper)
return cls(driver, connection_string, helper, leader_only=False)
def post_connect(self):
"""Watch Chassis events.

2
requirements.txt
View File

@ -44,7 +44,7 @@ oslo.versionedobjects>=1.35.1 # Apache-2.0
osprofiler>=2.3.0 # Apache-2.0
os-ken>=2.2.0 # Apache-2.0
os-resource-classes>=1.1.0 # Apache-2.0
ovs>=2.10.0 # Apache-2.0
ovs>=2.12.0 # Apache-2.0
ovsdbapp>=2.7.1 # Apache-2.0
psutil>=5.3.0 # BSD
pyroute2>=0.7.3;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)