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

SONAR: addressvirtual: Rename method "addr_metric_support"

Browse Source 
Rename method "addr_metric_support" to prevent any misunderstanding/clash
with field "ADDR_METRIC_SUPPORT" defined on line 80

Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2022-05-30 22:35:45 +02:00
parent e8b9d3ab5d
commit 2b8aedc960
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ifupdown2/addons/addressvirtual.py
View File

@ -107,7 +107,7 @@ class addressvirtual(AddonWithIpBlackList, moduleBase):
self.logger.info('address metric support: KO') self.logger.info('address metric support: KO')
@classmethod @classmethod
def addr_metric_support(cls): def get_addr_metric_support(cls):
return cls.ADDR_METRIC_SUPPORT return cls.ADDR_METRIC_SUPPORT
@classmethod @classmethod
@ -497,7 +497,7 @@ class addressvirtual(AddonWithIpBlackList, moduleBase):
) )
hw_address_list.append(macvlan_hwaddr) hw_address_list.append(macvlan_hwaddr)
if self.addressvirtual_with_route_metric and self.addr_metric_support(): if self.addressvirtual_with_route_metric and self.get_addr_metric_support():
metric = self.get_default_ip_metric() metric = self.get_default_ip_metric()
else: else:
metric = None metric = None
@ -517,7 +517,7 @@ class addressvirtual(AddonWithIpBlackList, moduleBase):
# If link existed before, flap the link # If link existed before, flap the link
if not link_created: if not link_created:
if not self.addressvirtual_with_route_metric or not self.addr_metric_support(): if not self.addressvirtual_with_route_metric or not self.get_addr_metric_support():
# if the system doesn't support ip addr set METRIC # if the system doesn't support ip addr set METRIC
# we need to do manually check the ordering of the ip4 routes # we need to do manually check the ordering of the ip4 routes
self._fix_connected_route(ifaceobj, macvlan_ifname, ips[0]) self._fix_connected_route(ifaceobj, macvlan_ifname, ips[0])
@ -538,7 +538,7 @@ class addressvirtual(AddonWithIpBlackList, moduleBase):
self.netlink.link_up(macvlan_ifname) self.netlink.link_up(macvlan_ifname)
else: else:
try: try:
if not self.addressvirtual_with_route_metric or not self.addr_metric_support(): if not self.addressvirtual_with_route_metric or not self.get_addr_metric_support():
# if the system doesn't support ip addr set METRIC # if the system doesn't support ip addr set METRIC
# we need to do manually check the ordering of the ip6 routes # we need to do manually check the ordering of the ip6 routes
self.iproute2.fix_ipv6_route_metric(ifaceobj, macvlan_ifname, ips) self.iproute2.fix_ipv6_route_metric(ifaceobj, macvlan_ifname, ips)