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

SONAR: addons: bond: Merge if statements with the enclosing ones

Browse Source 
Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2022-05-30 22:47:58 +02:00
parent 81348c3266
commit 530e3a0b79
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ifupdown2/addons/bond.py
View File

@ -688,11 +688,10 @@ class bond(Addon, moduleBase):
'probably not supported on this system' 'probably not supported on this system'
% (ifname, attr_name, user_config)) % (ifname, attr_name, user_config))
continue continue
elif link_exists: elif link_exists and cached_value == nl_value:
# there should be a cached value if the link already exists # there should be a cached value if the link already exists
if cached_value == nl_value: # if the user value is already cached: continue
# if the user value is already cached: continue continue
continue
# else: the link doesn't exist so we create the bond with # else: the link doesn't exist so we create the bond with
# all the user/policy defined values without extra checks # all the user/policy defined values without extra checks
@ -836,10 +835,9 @@ class bond(Addon, moduleBase):
) )
# if specific attributes need to be set we need to down the bond first # if specific attributes need to be set we need to down the bond first
if ifla_info_data and is_link_up: if ifla_info_data and is_link_up and self._should_down_bond(ifla_info_data):
if self._should_down_bond(ifla_info_data): self.netlink.link_down_force(ifname)
self.netlink.link_down_force(ifname) is_link_up = False
is_link_up = False
else: else:
bond_slaves = [] bond_slaves = []
@ -938,9 +936,8 @@ class bond(Addon, moduleBase):
def _query_check_bond_slaves(self, ifaceobjcurr, attr, user_bond_slaves, running_bond_slaves): def _query_check_bond_slaves(self, ifaceobjcurr, attr, user_bond_slaves, running_bond_slaves):
query = 1 query = 1
if user_bond_slaves and running_bond_slaves: if user_bond_slaves and running_bond_slaves and not set(user_bond_slaves).symmetric_difference(running_bond_slaves):
if not set(user_bond_slaves).symmetric_difference(running_bond_slaves): query = 0
query = 0
# we want to display the same bond-slaves list as provided # we want to display the same bond-slaves list as provided
# in the interfaces file but if this list contains regexes or # in the interfaces file but if this list contains regexes or