Browse Source

Merge "Fix wrong packet_type set for IPv6 GRE tunnels in OVS" into stable/stein

changes/42/770742/6
Zuul 8 months ago
committed by Gerrit Code Review
parent
commit
545b6faf2a
  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

@ -552,7 +552,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

@ -464,4 +464,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

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