diff --git a/lower-constraints.txt b/lower-constraints.txt index cee619c3351..f5bfcd9ac16 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -78,8 +78,8 @@ oslo.utils==4.4.0 oslo.versionedobjects==1.35.1 oslotest==3.2.0 osprofiler==2.3.0 -ovs==2.8.0 -ovsdbapp==1.4.0 +ovs==2.10.0 +ovsdbapp==1.6.0 packaging==20.4 Paste==2.0.2 PasteDeploy==1.5.0 diff --git a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py index c1299998400..4951aa73fb0 100644 --- a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py +++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py @@ -27,7 +27,6 @@ from ovs.stream import Stream from ovsdbapp.backend.ovs_idl import connection from ovsdbapp.backend.ovs_idl import event as row_event from ovsdbapp.backend.ovs_idl import idlutils -from ovsdbapp import event from neutron.common.ovn import constants as ovn_const from neutron.common.ovn import exceptions @@ -358,7 +357,7 @@ class NeutronPgDropPortGroupCreated(row_event.WaitEvent): self.event_name = 'PortGroupCreated' -class OvnDbNotifyHandler(event.RowEventHandler): +class OvnDbNotifyHandler(row_event.RowEventHandler): def __init__(self, driver): super(OvnDbNotifyHandler, self).__init__() self.driver = driver @@ -374,7 +373,7 @@ class Ml2OvnIdlBase(connection.OvsdbIdl): class BaseOvnIdl(Ml2OvnIdlBase): def __init__(self, remote, schema): - self.notify_handler = event.RowEventHandler() + self.notify_handler = row_event.RowEventHandler() super(BaseOvnIdl, self).__init__(remote, schema) @classmethod diff --git a/requirements.txt b/requirements.txt index 5a1cb5b1e86..de95667617f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,8 +44,8 @@ oslo.utils>=4.4.0 # Apache-2.0 oslo.versionedobjects>=1.35.1 # Apache-2.0 osprofiler>=2.3.0 # Apache-2.0 os-ken >= 0.3.0 # Apache-2.0 -ovs>=2.8.0 # Apache-2.0 -ovsdbapp>=1.4.0 # Apache-2.0 +ovs>=2.10.0 # Apache-2.0 +ovsdbapp>=1.6.0 # Apache-2.0 packaging>=20.4 # Apache-2.0 psutil>=5.3.0 # BSD pyroute2>=0.5.13;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)