From 08f3633990018a80dfc12dfe8ac8d9e010a8530f Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Tue, 31 Mar 2020 20:39:13 +0200 Subject: [PATCH] Add trunk subports to be one of dvr serviced device owners When "trunk:subport" wasn't added to the list of device owners which are supported by dvr, there was no proper config in br-int's openflow rules for such port, e.g. there was no dvr_to_src_mac rule in table 1 added and traffic from such port was never going through br-int. Trunk ports should be added to this dvr serviced device owners list and that patch is adding it there. Conflicts: neutron/common/utils.py Change-Id: Ic21089adfa32dbf5d0e29a89713e6e2bf28f0f05 Closes-Bug: #1870114 (cherry picked from commit d0a16522272bce64bceca1ccdb8d98a38d953cf5) --- neutron/common/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neutron/common/utils.py b/neutron/common/utils.py index 6d8d64b48e9..6f2e00e3a11 100644 --- a/neutron/common/utils.py +++ b/neutron/common/utils.py @@ -36,6 +36,7 @@ from eventlet.green import subprocess import netaddr from neutron_lib import constants as n_const from neutron_lib.db import api as db_api +from neutron_lib.services.trunk import constants as trunk_constants from neutron_lib.utils import helpers from oslo_config import cfg from oslo_db import exception as db_exc @@ -170,7 +171,8 @@ def get_other_dvr_serviced_device_owners(host_dvr_for_dhcp=True): separately (see is_dvr_serviced() below) """ device_owners = [n_const.DEVICE_OWNER_LOADBALANCER, - n_const.DEVICE_OWNER_LOADBALANCERV2] + n_const.DEVICE_OWNER_LOADBALANCERV2, + trunk_constants.TRUNK_SUBPORT_OWNER] if host_dvr_for_dhcp: device_owners.append(n_const.DEVICE_OWNER_DHCP) return device_owners