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

Modified lacp-bypass-all-active support to use the new sysfs

Browse Source 
node /sys/class/net/bondx/bonding/lacp_bypass.

Ticket: CM-9266
Reviewed-by: trivial
Testing-done:
This commit is contained in:
wkok
2016-02-12 09:18:55 -08:00
parent a63b57d5a5
commit bb22d4d339
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
addons/bond.py
View File

@@ -95,11 +95,11 @@ class bond(moduleBase):
#'bond-lacp-bypass-priority': #'bond-lacp-bypass-priority':
# {'help' : 'slave priority for lacp bypass', # {'help' : 'slave priority for lacp bypass',
# 'example' : ['bond-lacp-bypass-priority swp1=1 swp2=1 swp3=2']}, # 'example' : ['bond-lacp-bypass-priority swp1=1 swp2=1 swp3=2']},
#'bond-lacp-bypass-all-active': 'bond-lacp-bypass-all-active':
# {'help' : 'allow all slaves to be active in lacp bypass irrespective of priority', {'help' : 'allow all slaves to be active in lacp bypass irrespective of priority',
# 'validvals' : ['0', '1'], 'validvals' : ['0', '1'],
# 'default' : '0', 'default' : '0',
# 'example' : ['bond-lacp-bypass-all-active 1']}, 'example' : ['bond-lacp-bypass-all-active 1']},
'bond-slaves' : 'bond-slaves' :
{'help' : 'bond slaves', {'help' : 'bond slaves',
'required' : True, 'required' : True,
@@ -206,7 +206,7 @@ class bond(moduleBase):
('bond-lacp-fallback-allow', 'lacp_bypass_allow'), ('bond-lacp-fallback-allow', 'lacp_bypass_allow'),
('bond-lacp-fallback-period', 'lacp_bypass_period'), ('bond-lacp-fallback-period', 'lacp_bypass_period'),
('bond-lacp-bypass-allow', 'lacp_bypass_allow'), ('bond-lacp-bypass-allow', 'lacp_bypass_allow'),
('bond-lacp-bypass-all-active', 'lacp_bypass_all_active'), ('bond-lacp-bypass-all-active', 'lacp_bypass'),
('bond-lacp-bypass-period', 'lacp_bypass_period')]) ('bond-lacp-bypass-period', 'lacp_bypass_period')])
linkup = self.ipcmd.is_link_up(ifaceobj.name) linkup = self.ipcmd.is_link_up(ifaceobj.name)
try: try:

18
ifupdownaddons/bondutil.py
View File

@@ -49,12 +49,14 @@ class bondutil(utilsBase):
linkCache.set_attr([bondname, 'linkinfo', 'ad_sys_mac_addr'], linkCache.set_attr([bondname, 'linkinfo', 'ad_sys_mac_addr'],
self.read_file_oneline('/sys/class/net/%s/bonding/ad_sys_mac_addr' self.read_file_oneline('/sys/class/net/%s/bonding/ad_sys_mac_addr'
%bondname)) %bondname))
linkCache.set_attr([bondname, 'linkinfo', 'lacp_bypass'],
self.read_file_oneline('/sys/class/net/%s/bonding/lacp_bypass'
%bondname).split()[1])
map(lambda x: linkCache.set_attr([bondname, 'linkinfo', x], map(lambda x: linkCache.set_attr([bondname, 'linkinfo', x],
self.read_file_oneline('/sys/class/net/%s/bonding/%s' self.read_file_oneline('/sys/class/net/%s/bonding/%s'
%(bondname, x))), %(bondname, x))),
['use_carrier', 'miimon', 'min_links', 'num_unsol_na', ['use_carrier', 'miimon', 'min_links', 'num_unsol_na',
'num_grat_arp', 'lacp_bypass_allow', 'lacp_bypass_period', 'num_grat_arp', 'lacp_bypass_allow', 'lacp_bypass_period'])
'lacp_bypass_all_active'])
except Exception, e: except Exception, e:
pass pass
@@ -142,7 +144,7 @@ class bondutil(utilsBase):
if ((attrname not in ['lacp_rate', if ((attrname not in ['lacp_rate',
'lacp_bypass_allow', 'lacp_bypass_allow',
'lacp_bypass_period', 'lacp_bypass_period',
'lacp_bypass_all_active']) or 'lacp_bypass']) or
('mode', '802.3ad') in attrdict.items()): ('mode', '802.3ad') in attrdict.items()):
self.write_file('/sys/class/net/%s/bonding/%s' self.write_file('/sys/class/net/%s/bonding/%s'
%(bondname, attrname), attrval) %(bondname, attrname), attrval)
@@ -312,24 +314,24 @@ class bondutil(utilsBase):
return prio_str return prio_str
def set_lacp_fallback_all_active(self, bondname, useprio, prehook=None, posthook=None): def set_lacp_fallback_all_active(self, bondname, useprio, prehook=None, posthook=None):
if (self._cache_check([bondname, 'linkinfo', 'lacp_bypass_all_active'], if (self._cache_check([bondname, 'linkinfo', 'lacp_bypass'],
lacp_bypass_all_active)): lacp_bypass)):
return return
if prehook: if prehook:
prehook(bondname) prehook(bondname)
try: try:
self.write_file('/sys/class/net/%s' %bondname + self.write_file('/sys/class/net/%s' %bondname +
'/bonding/lacp_bypass_all_active', useprio) '/bonding/lacp_bypass', useprio)
except: except:
raise raise
finally: finally:
if posthook: if posthook:
posthook(bondname) posthook(bondname)
self._cache_update([bondname, 'linkinfo', self._cache_update([bondname, 'linkinfo',
'lacp_bypass_all_active'], useprio) 'lacp_bypass'], useprio)
def get_lacp_fallback_all_active(self, bondname): def get_lacp_fallback_all_active(self, bondname):
return self._cache_get([bondname, 'linkinfo', 'lacp_bypass_all_active']) return self._cache_get([bondname, 'linkinfo', 'lacp_bypass'])
def get_ad_sys_mac_addr(self, bondname): def get_ad_sys_mac_addr(self, bondname):
return self._cache_get([bondname, 'linkinfo', 'ad_sys_mac_addr']) return self._cache_get([bondname, 'linkinfo', 'ad_sys_mac_addr'])