From 346866777f11db4e1860aabb9c780393edecdb88 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Tue, 2 Mar 2021 13:01:39 +0100 Subject: [PATCH] Fix wrong packet_type set for IPv6 GRE tunnels in OVS In patch [1] it was by mistake set to "legacy" but it should be "legacy_l2". This patch fixes that mistake. Closes-bug: #1917448 [1] https://review.opendev.org/c/openstack/neutron/+/763204 Conflicts: neutron/tests/functional/agent/common/test_ovs_lib.py Change-Id: Idb743bbfd5454b8d245c4dd4b8c3d7021e90d238 (cherry picked from commit 1dbe389392bbfadebe8c12b06171cf04a24d32ff) --- neutron/agent/common/ovs_lib.py | 2 +- neutron/tests/functional/agent/common/test_ovs_lib.py | 2 +- neutron/tests/functional/agent/test_ovs_lib.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py index 1aebb986314..f14c5877c6a 100644 --- a/neutron/agent/common/ovs_lib.py +++ b/neutron/agent/common/ovs_lib.py @@ -542,7 +542,7 @@ class OVSBridge(BaseOVS): if tunnel_type == TYPE_GRE_IP6: # NOTE(slaweq) According to the OVS documentation L3 GRE tunnels # over IPv6 are not supported. - options['packet_type'] = 'legacy' + options['packet_type'] = 'legacy_l2' attrs.append(('options', options)) return self.add_port(port_name, *attrs) diff --git a/neutron/tests/functional/agent/common/test_ovs_lib.py b/neutron/tests/functional/agent/common/test_ovs_lib.py index e2248e2e12f..8573daa3ef9 100644 --- a/neutron/tests/functional/agent/common/test_ovs_lib.py +++ b/neutron/tests/functional/agent/common/test_ovs_lib.py @@ -480,4 +480,4 @@ class BaseOVSTestCase(base.BaseSudoTestCase): ipv6_port_options = interface['options'] self.assertEqual(p_const.TYPE_GRE, ipv4_port_type) self.assertEqual(ovs_lib.TYPE_GRE_IP6, ipv6_port_type) - self.assertEqual('legacy', ipv6_port_options.get('packet_type')) + self.assertEqual('legacy_l2', ipv6_port_options.get('packet_type')) diff --git a/neutron/tests/functional/agent/test_ovs_lib.py b/neutron/tests/functional/agent/test_ovs_lib.py index c3ea20d438d..10513531ba6 100644 --- a/neutron/tests/functional/agent/test_ovs_lib.py +++ b/neutron/tests/functional/agent/test_ovs_lib.py @@ -234,6 +234,7 @@ class OVSBridgeTestCase(OVSBridgeTestBase): attrs = { 'remote_ip': '2001:db8:200::1', 'local_ip': '2001:db8:100::1', + 'packet_type': 'legacy_l2', } self._test_add_tunnel_port( attrs, expected_tunnel_type=ovs_lib.TYPE_GRE_IP6)