Merge "Use ovs constants from neutron-lib"

neutron_fwaas/services/firewall/service_drivers/agents/drivers/linux/l2/openvswitch_firewall/firewall.py

@@ -16,12 +16,11 @@
 import netaddr
 
 from neutron_lib import constants as lib_const
+from neutron_lib.plugins.ml2 import ovs_constants as ovs_consts
 from oslo_log import log as logging
 from oslo_utils import netutils
 
 from neutron.agent import firewall
-from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants \
-    as ovs_consts
 
 from neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.l2\
     import driver_base

neutron_fwaas/services/firewall/service_drivers/agents/drivers/linux/l2/openvswitch_firewall/rules.py

@@ -16,9 +16,8 @@
 import netaddr
 
 from neutron.common import utils
-from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants \
-    as ovs_consts
 from neutron_lib import constants as n_consts
+from neutron_lib.plugins.ml2 import ovs_constants as ovs_consts
 from oslo_log import log as logging
 
 from neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.l2.\

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/drivers/linux/l2/openvswitch_firewall/test_firewall.py

@@ -14,11 +14,10 @@
 
 import mock
 from neutron_lib import constants
+from neutron_lib.plugins.ml2 import ovs_constants as ovs_consts
 import testtools
 
 from neutron.agent.common import ovs_lib
-from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants \
-    as ovs_consts
 from neutron.plugins.ml2.drivers.openvswitch.agent import \
     ovs_agent_extension_api as ovs_ext_api
 from neutron.tests import base

requirements.txt

@@ -11,7 +11,7 @@ eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
 netaddr>=0.7.18 # BSD
 SQLAlchemy>=1.4.23 # MIT
 alembic>=1.6.5 # MIT
-neutron-lib>=1.26.0 # Apache-2.0
+neutron-lib>=2.19.0 # Apache-2.0
 os-ken >= 0.3.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.db>=4.37.0 # Apache-2.0