mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

addons: vxlan: add support for vxlan-mcastgrp-map with ipmr-lo dummy physdev

Browse Source 
Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2021-03-17 00:04:32 +01:00
parent aa4c8a2d94
commit 1609696fe3
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ifupdown2/addons/vxlan.py
View File

@ -192,7 +192,7 @@ class vxlan(Addon, moduleBase):
# if we detect a vxlan we check if mcastgrp is set (if so we set vxlan_mcastgrp_ref)
# to know when to delete this device.
if not self.vxlan_mcastgrp_ref and ifaceobj.get_attr_value("vxlan-mcastgrp"):
if not self.vxlan_mcastgrp_ref and (ifaceobj.get_attr_value("vxlan-mcastgrp") or ifaceobj.get_attr_value("vxlan-mcastgrp-map")):
self.vxlan_mcastgrp_ref = True
elif ifaceobj.name == 'lo' and not old_ifaceobjs:
@ -747,7 +747,7 @@ class vxlan(Addon, moduleBase):
self.logger.info("%s: set vxlan-udp-csum %s" % (ifaceobj.name, "on" if vxlan_udp_csum else "off"))
user_request_vxlan_info_data[Link.IFLA_VXLAN_UDP_CSUM] = vxlan_udp_csum
def __get_vxlan_physdev(self, ifaceobj, mcastgrp):
def __get_vxlan_physdev(self, ifaceobj, mcastgrp, mcastgrp_map):
"""
vxlan-physdev wrapper, special handling is required for mcastgrp is provided
the vxlan needs to use a dummy or real device for tunnel endpoint communication
@ -762,12 +762,17 @@ class vxlan(Addon, moduleBase):
# if the user provided a physdev we need to honor his config
# or if mcastgrp wasn't specified we don't need to go further
if physdev or not mcastgrp:
if physdev or (not mcastgrp and not mcastgrp_map):
return physdev
physdev = self.vxlan_physdev_mcast
if not self.cache.link_exists(physdev):
if mcastgrp_map:
self.logger.info("%s: needs a dummy device (%s) to use for "
"multicast termination (vxlan-mcastgrp-map %s)"
% (ifaceobj.name, physdev, mcastgrp))
else:
self.logger.info("%s: needs a dummy device (%s) to use for "
"multicast termination (vxlan-mcastgrp %s)"
% (ifaceobj.name, physdev, mcastgrp))
@ -846,7 +851,9 @@ class vxlan(Addon, moduleBase):
vxlan_mcast_grp6 = self.__get_vxlan_attribute(ifaceobj, "vxlan-mcastgrp6")
vxlan_svcnodeip6 = self.__get_vxlan_attribute(ifaceobj, "vxlan-svcnodeip6")
vxlan_physdev = self.__get_vxlan_physdev(ifaceobj, vxlan_mcast_grp)
vxlan_mcast_grp_map = self.__get_vxlan_attribute(ifaceobj, "vxlan-mcastgrp-map")
vxlan_physdev = self.__get_vxlan_physdev(ifaceobj, vxlan_mcast_grp, vxlan_mcast_grp_map)
vxlan_physdev_changed = self.__config_vxlan_physdev(
link_exists,
@ -928,7 +935,7 @@ class vxlan(Addon, moduleBase):
mac, _, dst, _, src_vni = entry.split()[0:5]
current_fdb.append((mac, src_vni, dst))
user_config_fdb = self.get_vxlan_fdb_src_vni(ifaceobj.get_attr_value("vxlan-mcastgrp-map"))
user_config_fdb = self.get_vxlan_fdb_src_vni(vxlan_mcast_grp_map)
fdb_to_remove = set(current_fdb) - set(user_config_fdb)