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

addons: bond: replace bond-ad-sys-priority and bond-ad-sys-mac-addr with equivalent upstream attributes

Browse Source 
Ticket: CM-9677
Reviewed By: nikhil
Testing Done: Tested with bond config file in CM-9677

This patch replaces the following attributes:
bond-ad-sys-priority with bond-ad-actor-sys-prio
bond-ad-sys-mac-addr with bond-ad-actor-system

The new attributes correspond to the new sysfs files below:
/sys/class/net/sidelink/bonding/ad_actor_sys_prio
/sys/class/net/sidelink/bonding/ad_actor_system

Old values will be accepted with a deprecated warning:
warning: attribute bond-ad-sys-priority is deprecated. Use bond-ad-actor-sys-prio instead
warning: attribute bond-ad-sys-mac-addr is deprecated. Use bond-ad-actor-system instead
This commit is contained in:
Roopa Prabhu
2016-03-03 16:39:59 -08:00
parent aa05217080
commit 1553a88121
4 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
addons/bond.py
View File

@@ -61,11 +61,23 @@ class bond(moduleBase):
'bond-ad-sys-priority':
{'help' : '802.3ad system priority',
'default' : '65535',
'example' : ['bond-ad-sys-priority 65535']},
'example' : ['bond-ad-sys-priority 65535'],
'deprecated' : True,
'new-attribute' : 'bond-ad-actor-sys-prio'},
'bond-ad-actor-sys-prio':
{'help' : '802.3ad system priority',
'default' : '65535',
'example' : ['bond-ad-actor-sys-prio 65535']},
'bond-ad-sys-mac-addr':
{'help' : '802.3ad system mac address',
'default' : '00:00:00:00:00:00',
'example' : ['bond-ad-sys-mac-addr 00:00:00:00:00:00']},
'example' : ['bond-ad-sys-mac-addr 00:00:00:00:00:00'],
'deprecated' : True,
'new-attribute' : 'bond-ad-actor-system'},
'bond-ad-actor-system':
{'help' : '802.3ad system mac address',
'default' : '00:00:00:00:00:00',
'example' : ['bond-ad-actor-system 00:00:00:00:00:00'],},
'bond-lacp-bypass-allow':
{'help' : 'allow lacp bypass',
'validvals' : ['0', '1'],
@@ -174,8 +186,10 @@ class bond(moduleBase):
('bond-min-links' , 'min_links'),
('bond-num-grat-arp' , 'num_grat_arp'),
('bond-num-unsol-na' , 'num_unsol_na'),
('bond-ad-sys-mac-addr' , 'ad_sys_mac_addr'),
('bond-ad-sys-priority' , 'ad_sys_priority'),
('bond-ad-sys-mac-addr' , 'ad_actor_system'),
('bond-ad-actor-system' , 'ad_actor_system'),
('bond-ad-sys-priority' , 'ad_actor_sys_prio'),
('bond-ad-actor-sys-prio' , 'ad_actor_sys_prio'),
('bond-lacp-bypass-allow', 'lacp_bypass')])
linkup = self.ipcmd.is_link_up(ifaceobj.name)
try:
@@ -306,14 +320,18 @@ class bond(moduleBase):
self.bondcmd.get_lacp_rate(bondname),
'bond-min-links' :
self.bondcmd.get_min_links(bondname),
'bond-ad-sys-mac-addr' :
self.bondcmd.get_ad_sys_mac_addr(bondname),
'bond-ad-sys-priority' :
self.bondcmd.get_ad_sys_priority(bondname),
'bond-ad-actor-system' :
self.bondcmd.get_ad_actor_system(bondname),
'bond-ad-actor-sys-prio' :
self.bondcmd.get_ad_actor_sys_prio(bondname),
'bond-xmit-hash-policy' :
self.bondcmd.get_xmit_hash_policy(bondname),
'bond-lacp-bypass-allow' :
self.bondcmd.get_lacp_bypass_allow(bondname)}
self.bondcmd.get_lacp_bypass_allow(bondname),
'bond-num-unsol-na' :
self.bondcmd.get_num_unsol_na(bondname),
'bond-num-grat-arp' :
self.bondcmd.get_num_grat_arp(bondname)}
slaves = self.bondcmd.get_slaves(bondname)
if slaves:
bondattrs['bond-slaves'] = slaves