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: addressvirtual: make sure vrr macvlans names are 15 chars long max

Browse Source 
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2019-02-19 23:14:03 +01:00
parent 709f7942a2
commit 8fb6dd67b2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ifupdown2/addons/addressvirtual.py
View File

@ -92,6 +92,10 @@ class addressvirtual(moduleBase):
def _get_macvlan_prefix(self, ifaceobj):
return '%s-v' %ifaceobj.name[0:13].replace('.', '-')
@staticmethod
def get_vrr_prefix(ifname, family):
return "%s-%sv" % (ifname[0:10].replace(".", "-"), family)
def _add_addresses_to_bridge(self, ifaceobj, hwaddress):
# XXX: batch the addresses
if ifaceobj.link_kind & ifaceLinkKind.VLAN:
@ -525,9 +529,6 @@ class addressvirtual(moduleBase):
# add the vid to the bridge
self._add_addresses_to_bridge(ifaceobj, hw_address_list)
def get_vrr_prefix(self, ifname, family):
return '%s-%sv' % (ifname[0:10].replace('.', '-'), family)
def translate_vrr_user_config_to_list(self, ifaceobj, vrr_config_list, ifquery=False):
"""
If (IPv4 addresses provided):
@ -552,7 +553,7 @@ class addressvirtual(moduleBase):
ifname = ifaceobj.name
user_config_list = []
for config in vrr_config_list or []:
for index, config in enumerate(vrr_config_list or []):
vrrp_id, ip_addrs = config.split(" ", 1)
hex_id = '%02x' % int(vrrp_id)
ip4 = []
@ -567,8 +568,8 @@ class addressvirtual(moduleBase):
else:
ip4.append(ip_addr)
macvlan_ip4_ifname = "%s%s" % (self.get_vrr_prefix(ifname, "4"), vrrp_id)
macvlan_ip6_ifname = "%s%s" % (self.get_vrr_prefix(ifname, "6"), vrrp_id)
macvlan_ip4_ifname = "%s%s" % (self.get_vrr_prefix(ifname, "4"), index)
macvlan_ip6_ifname = "%s%s" % (self.get_vrr_prefix(ifname, "6"), index)
merged_with_existing_obj = False
# if the vrr config is defined in different lines for the same ID