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

Revert "ifupdownaddons: bridgeutils: uncomment parsing code for brctl mc attributes"

Browse Source 
This reverts commit 65beb82662.

it's causing testifupdown2.py:TestMakoJson to fail... Basically this commit
uncomment codes which parse mc value from brctl output. So `ifquery -r` output
is different (this new attribute show up under the bridge). TestMakoJson at
some point does:
$ ifquery -a -r -t json > running_json
Then later
$ ifup -i running_json...
This ifup fails on:
...
warning: br0: unsupported attribute 'bridge-mclmt'
...
This commit is contained in:
Julien Fortin
2017-01-27 17:34:13 +03:00
parent c529c18583
commit 82f84f8278
1 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ifupdownaddons/bridgeutils.py
View File

@@ -115,40 +115,15 @@ class brctl(utilsBase):
except:
pass
try:
battrs['hashel'] = broutlines[10].split('hash elasticity')[1].split()[0].strip()
except:
pass
try:
battrs['hashmax'] = broutlines[10].split('hash max')[1].strip()
except:
pass
try:
battrs['mclmc'] = broutlines[11].split('mc last member count')[1].split()[0].strip()
except:
pass
try:
battrs['mciqc'] = broutlines[11].split('mc init query count')[1].strip()
except:
pass
try:
battrs['mcrouter'] = broutlines[12].split('mc router')[1].split()[0].strip()
except:
pass
try:
battrs['mcsnoop'] = broutlines[12].split('mc snooping')[1].strip()
except:
pass
try:
battrs['mclmt'] = broutlines[13].split('mc last member timer')[1].split()[0].strip().replace('.00', '')
except:
pass
# XXX: comment this out until mc attributes become available
# with brctl again
#battrs['hashel'] = broutlines[10].split('hash elasticity')[1].split()[0].strip()
#battrs['hashmax'] = broutlines[10].split('hash max')[1].strip()
#battrs['mclmc'] = broutlines[11].split('mc last member count')[1].split()[0].strip()
#battrs['mciqc'] = broutlines[11].split('mc init query count')[1].strip()
#battrs['mcrouter'] = broutlines[12].split('mc router')[1].split()[0].strip()
##battrs['mcsnoop'] = broutlines[12].split('mc snooping')[1].strip()
#battrs['mclmt'] = broutlines[13].split('mc last member timer')[1].split()[0].strip()
except Exception, e:
self.logger.warn('%s: error while processing bridge attributes: %s' % (bridgename, str(e)))
pass