From 65beb82662576c047a281389bd663589dcba09db Mon Sep 17 00:00:00 2001
From: Julien Fortin <julien@cumulusnetworks.com>
Date: Thu, 19 Jan 2017 12:22:44 +0300
Subject: [PATCH] ifupdownaddons: bridgeutils: uncomment parsing code for brctl
 mc attributes

Ticket: None
Reviewed By: Roopa, Nikhil G
Testing Done: ssim ifupdown2-tests

runtests.sh -T ~/result_smoke/single/ifupdown2-tests.log -r ~/result_smoke/single/summary_ifupdown2tests.txt -d cel-redxp-06 -t nightly -l INFO -k $VM_BASE_KERNEL -i $VM_BASE_IMG $TESTS_HOME/tests/smoke/testOneConfigifupdown2.py:Testifupdown2OneConfig

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
---
 ifupdownaddons/bridgeutils.py | 43 +++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/ifupdownaddons/bridgeutils.py b/ifupdownaddons/bridgeutils.py
index 159a87f..ed850fa 100644
--- a/ifupdownaddons/bridgeutils.py
+++ b/ifupdownaddons/bridgeutils.py
@@ -115,15 +115,40 @@ class brctl(utilsBase):
             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()
+            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
         except Exception, e:
             self.logger.warn('%s: error while processing bridge attributes: %s' % (bridgename, str(e)))
             pass