From 3ddb529589c3475be198e6cdec51db00f817ecc2 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Fri, 18 Jun 2021 14:58:53 +0200 Subject: [PATCH] Use ovs constants from neutron-lib Ovs constants were moved from neutron to neutron_lib some time ago. This patch switches to use them from neutron-lib already. This patch bumps min version of neutron-lib to 2.11 as it is version which has those constants already. It also fixes some small issue in grouping of imports. Depends-On: https://review.opendev.org/c/x/tap-as-a-service-tempest-plugin/+/797318 Change-Id: I7c44501b129673cc72fd48f3b508ea6278027762 --- .../services/taas/drivers/linux/ovs_taas.py | 17 ++++++++--------- requirements.txt | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/neutron_taas/services/taas/drivers/linux/ovs_taas.py b/neutron_taas/services/taas/drivers/linux/ovs_taas.py index fd4833c7..6ffb5858 100644 --- a/neutron_taas/services/taas/drivers/linux/ovs_taas.py +++ b/neutron_taas/services/taas/drivers/linux/ovs_taas.py @@ -17,9 +17,8 @@ from neutron.agent.common import ovs_lib from neutron.agent.linux import utils from neutron.conf.agent import common -# from neutron.plugins.openvswitch.common import constants as ovs_consts -from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants \ - as ovs_consts +from neutron_lib import constants as n_consts + from neutron_taas.services.taas.agents.extensions import taas as taas_base import neutron_taas.services.taas.drivers.linux.ovs_constants \ as taas_ovs_consts @@ -237,8 +236,8 @@ class OvsTaasDriver(taas_base.TaasAgentDriver): actions="output:%s" % str(patch_tap_int_id)) # Add flow(s) in br-tun - for tunnel_type in ovs_consts.TUNNEL_NETWORK_TYPES: - self.tun_br.add_flow(table=ovs_consts.TUN_TABLE[tunnel_type], + for tunnel_type in n_consts.TUNNEL_NETWORK_TYPES: + self.tun_br.add_flow(table=n_consts.TUN_TABLE[tunnel_type], priority=1, tun_id=taas_id, actions=( @@ -295,8 +294,8 @@ class OvsTaasDriver(taas_base.TaasAgentDriver): dl_vlan=taas_id) # Delete flow(s) from br-tun - for tunnel_type in ovs_consts.TUNNEL_NETWORK_TYPES: - self.tun_br.delete_flows(table=ovs_consts.TUN_TABLE[tunnel_type], + for tunnel_type in n_consts.TUNNEL_NETWORK_TYPES: + self.tun_br.delete_flows(table=n_consts.TUN_TABLE[tunnel_type], tun_id=taas_id) self.tun_br.delete_flows(table=taas_ovs_consts.TAAS_DST_CHECK, @@ -364,8 +363,8 @@ class OvsTaasDriver(taas_base.TaasAgentDriver): # patch_int_tap_id) # Add flow(s) in br-tun - for tunnel_type in ovs_consts.TUNNEL_NETWORK_TYPES: - self.tun_br.add_flow(table=ovs_consts.TUN_TABLE[tunnel_type], + for tunnel_type in n_consts.TUNNEL_NETWORK_TYPES: + self.tun_br.add_flow(table=n_consts.TUN_TABLE[tunnel_type], priority=1, tun_id=taas_id, actions=( diff --git a/requirements.txt b/requirements.txt index a5f43f58..740ee63b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ pbr>=5.5.0 # Apache-2.0 Babel>=2.8.0 # BSD neutron>=16.0.0.0b1 # Apache-2.0 -neutron-lib>=2.6.0 # Apache-2.0 +neutron-lib>=2.11.0 # Apache-2.0 # Opt-in for neutron-lib consumption patches # http://lists.openstack.org/pipermail/openstack-dev/2018-September/135063.html