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 Activity

addressvirtual: address: add default metric to ip4 and ip6 (if available)

Browse Source 
Reviewed-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2018-06-16 19:56:57 +02:00
parent aa895ecddf
commit dfaa8a2d19
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ifupdown2/addons/addressvirtual.py
View File

@@ -223,8 +223,13 @@ class addressvirtual(moduleBase):
# customer could have used UPPERCASE for MAC
self.ipcmd.link_set_hwaddress(macvlan_ifacename, mac)
hwaddress.append(mac)
self.ipcmd.addr_add_multiple(ifaceobj, macvlan_ifacename, ips,
purge_existing)
self.ipcmd.addr_add_multiple(
ifaceobj,
macvlan_ifacename,
ips,
purge_existing,
metric=self.ipcmd.get_default_ip_metric() if self.ipcmd.addr_metric_support() else None
)
# If link existed before, flap the link
if not link_created:
@@ -249,7 +254,10 @@ class addressvirtual(moduleBase):
netlink.link_set_updown(macvlan_ifacename, "up")
else:
try:
self.ipcmd.fix_ipv6_route_metric(ifaceobj, macvlan_ifacename, ips)
if not self.ipcmd.addr_metric_support():
# if the system doesn't support ip addr set METRIC
# we need to do manually check the ordering of the ip6 routes
self.ipcmd.fix_ipv6_route_metric(ifaceobj, macvlan_ifacename, ips)
except Exception as e:
self.logger.debug('fix_vrf_slave_ipv6_route_metric: failed: %s' % e)