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
)
This commit is contained in:
parent
4381f792c8
commit
346866777f
|
@ -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)
|
||||
|
|
|
@ -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'))
|
||||
|
|
|
@ -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…
Reference in New Issue