From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Wed, 13 Sep 2017 15:07:35 +0000 (-0300)
Subject: topogen: save zebra version output
X-Git-Tag: frr-7.1-dev~151^2~213
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d34f613477e9257c6eef12b3d8f2d5a1dcd2a097;p=mirror%2Ffrr.git

topogen: save zebra version output

Keep the zebra version output for later problem diagnostics.
---

diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index e39803420b..eda4e3128b 100644
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -955,6 +955,13 @@ def diagnose_env():
 
                 logger.warning('could not find {} in {}'.format(fname, frrdir))
                 ret = False
+            else:
+                if fname != 'zebra':
+                    continue
+
+                os.system(
+                    '{} -v 2>&1 >/tmp/topotests/frr_zebra.txt'.format(path)
+                )
 
     # Assert that Quagga utilities exist
     quaggadir = config.get('topogen', 'quaggadir')
@@ -987,6 +994,13 @@ def diagnose_env():
             if not os.path.isfile(path):
                 logger.warning('could not find {} in {}'.format(fname, quaggadir))
                 ret = False
+            else:
+                if fname != 'zebra':
+                    continue
+
+                os.system(
+                    '{} -v 2>&1 >/tmp/topotests/quagga_zebra.txt'.format(path)
+                )
 
     if not os.path.isdir('/tmp'):
         logger.warning('could not find /tmp for logs')