Browse Source

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 1dbe389392)
changes/00/778400/1
Slawek Kaplonski 5 months ago
parent
commit
467e5d8645
  1. 2
      neutron/agent/common/ovs_lib.py
  2. 2
      neutron/tests/functional/agent/common/test_ovs_lib.py
  3. 1
      neutron/tests/functional/agent/test_ovs_lib.py

2
neutron/agent/common/ovs_lib.py

@ -528,7 +528,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)

2
neutron/tests/functional/agent/common/test_ovs_lib.py

@ -485,4 +485,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'))

1
neutron/tests/functional/agent/test_ovs_lib.py

@ -233,6 +233,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)

Loading…
Cancel
Save