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

Change-Id: Idb743bbfd5454b8d245c4dd4b8c3d7021e90d238
changes/78/778178/1
Slawek Kaplonski 2 months ago
parent
commit
1dbe389392
3 changed files with 3 additions and 2 deletions
  1. +1
    -1
      neutron/agent/common/ovs_lib.py
  2. +1
    -1
      neutron/tests/functional/agent/common/test_ovs_lib.py
  3. +1
    -0
      neutron/tests/functional/agent/test_ovs_lib.py

+ 1
- 1
neutron/agent/common/ovs_lib.py View File

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


+ 1
- 1
neutron/tests/functional/agent/common/test_ovs_lib.py View File

@ -485,7 +485,7 @@ 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'))
def test_set_igmp_snooping_flood(self):
port_name = 'test_output_port_2'


+ 1
- 0
neutron/tests/functional/agent/test_ovs_lib.py View File

@ -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)


Loading…
Cancel
Save