openstack/tap-as-a-service
Code Issues Proposed changes

Use ovs constants from neutron-lib

Browse Source 
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
This commit is contained in:
Slawek Kaplonski 2021-06-18 14:58:53 +02:00
parent 33c25b513b
commit 3ddb529589
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
neutron_taas/services/taas/drivers/linux/ovs_taas.py
View File

@ -17,9 +17,8 @@
from neutron.agent.common import ovs_lib from neutron.agent.common import ovs_lib
from neutron.agent.linux import utils from neutron.agent.linux import utils
from neutron.conf.agent import common from neutron.conf.agent import common
# from neutron.plugins.openvswitch.common import constants as ovs_consts from neutron_lib import constants as n_consts
from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants \
as ovs_consts
from neutron_taas.services.taas.agents.extensions import taas as taas_base from neutron_taas.services.taas.agents.extensions import taas as taas_base
import neutron_taas.services.taas.drivers.linux.ovs_constants \ import neutron_taas.services.taas.drivers.linux.ovs_constants \
as taas_ovs_consts as taas_ovs_consts
@ -237,8 +236,8 @@ class OvsTaasDriver(taas_base.TaasAgentDriver):
actions="output:%s" % str(patch_tap_int_id)) actions="output:%s" % str(patch_tap_int_id))
# Add flow(s) in br-tun # Add flow(s) in br-tun
for tunnel_type in ovs_consts.TUNNEL_NETWORK_TYPES: for tunnel_type in n_consts.TUNNEL_NETWORK_TYPES:
self.tun_br.add_flow(table=ovs_consts.TUN_TABLE[tunnel_type], self.tun_br.add_flow(table=n_consts.TUN_TABLE[tunnel_type],
priority=1, priority=1,
tun_id=taas_id, tun_id=taas_id,
actions=( actions=(
@ -295,8 +294,8 @@ class OvsTaasDriver(taas_base.TaasAgentDriver):
dl_vlan=taas_id) dl_vlan=taas_id)
# Delete flow(s) from br-tun # Delete flow(s) from br-tun
for tunnel_type in ovs_consts.TUNNEL_NETWORK_TYPES: for tunnel_type in n_consts.TUNNEL_NETWORK_TYPES:
self.tun_br.delete_flows(table=ovs_consts.TUN_TABLE[tunnel_type], self.tun_br.delete_flows(table=n_consts.TUN_TABLE[tunnel_type],
tun_id=taas_id) tun_id=taas_id)
self.tun_br.delete_flows(table=taas_ovs_consts.TAAS_DST_CHECK, 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) # patch_int_tap_id)
# Add flow(s) in br-tun # Add flow(s) in br-tun
for tunnel_type in ovs_consts.TUNNEL_NETWORK_TYPES: for tunnel_type in n_consts.TUNNEL_NETWORK_TYPES:
self.tun_br.add_flow(table=ovs_consts.TUN_TABLE[tunnel_type], self.tun_br.add_flow(table=n_consts.TUN_TABLE[tunnel_type],
priority=1, priority=1,
tun_id=taas_id, tun_id=taas_id,
actions=( actions=(

2
requirements.txt
View File

@ -5,7 +5,7 @@
pbr>=5.5.0 # Apache-2.0 pbr>=5.5.0 # Apache-2.0
Babel>=2.8.0 # BSD Babel>=2.8.0 # BSD
neutron>=16.0.0.0b1 # Apache-2.0 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 # Opt-in for neutron-lib consumption patches
# http://lists.openstack.org/pipermail/openstack-dev/2018-September/135063.html # http://lists.openstack.org/pipermail/openstack-dev/2018-September/135063.html