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: support for vxlan-support-mix-dev-types policy (default yes)

Browse Source 
Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2021-06-15 17:39:40 +02:00
parent db4371de3c
commit 782aff35ce
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ifupdown2/addons/vxlan.py
View File

@ -170,6 +170,14 @@ class vxlan(Vxlan, moduleBase):
attr="vxlan-physdev-mcastgrp" attr="vxlan-physdev-mcastgrp"
) or self.VXLAN_PHYSDEV_MCASTGRP_DEFAULT ) or self.VXLAN_PHYSDEV_MCASTGRP_DEFAULT
self.tvd_svd_mix_support = utils.get_boolean_from_string(
policymanager.policymanager_api.get_module_globals(
module_name=self.__class__.__name__,
attr="vxlan-support-mix-dev-types"
),
default=True
)
self.svd_tvd_errors = {} self.svd_tvd_errors = {}
def reset(self): def reset(self):
@ -182,6 +190,9 @@ class vxlan(Vxlan, moduleBase):
if not ifaceobj.get_attr_value_first('vxlan-local-tunnelip') and not self._vxlan_local_tunnelip: if not ifaceobj.get_attr_value_first('vxlan-local-tunnelip') and not self._vxlan_local_tunnelip:
self.logger.warning('%s: missing vxlan-local-tunnelip' % ifaceobj.name) self.logger.warning('%s: missing vxlan-local-tunnelip' % ifaceobj.name)
return False return False
self.check_and_raise_svd_tvd_errors(ifaceobj)
return self.syntax_check_localip_anycastip_equal( return self.syntax_check_localip_anycastip_equal(
ifaceobj.name, ifaceobj.name,
ifaceobj.get_attr_value_first('vxlan-local-tunnelip') or self._vxlan_local_tunnelip, ifaceobj.get_attr_value_first('vxlan-local-tunnelip') or self._vxlan_local_tunnelip,
@ -207,7 +218,7 @@ class vxlan(Vxlan, moduleBase):
ifaceobj.link_kind |= ifaceLinkKind.VXLAN ifaceobj.link_kind |= ifaceLinkKind.VXLAN
self._set_global_local_ip(ifaceobj) self._set_global_local_ip(ifaceobj)
if not old_ifaceobjs: if not old_ifaceobjs and not self.tvd_svd_mix_support:
# mixing TVD and SVD is not supported - we need to warn the user # mixing TVD and SVD is not supported - we need to warn the user
# we use a dictionary to make sure to only warn once and prevent each # we use a dictionary to make sure to only warn once and prevent each
# vxlan from being configured on the system # vxlan from being configured on the system