diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-07-09 20:20:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 20:20:36 -0400 |
| commit | af83fd8b7b0e9d18384bc6f0ff16542d7fd204b5 (patch) | |
| tree | 5bf98debe8e21acbb239fbcb268f5b03c0df8b74 /tests/topotests/lib/topotest.py | |
| parent | 4030687aab47da7ea11ff2420fdda016e0e7f9d5 (diff) | |
| parent | 8b547a6dab841c878bdd3c048e5d89cb96ed70f4 (diff) | |
Merge pull request #6709 from mjstapp/fix_topo_ipaddr
tests: use ipaddress module; tolerate missing support bundle file
Diffstat (limited to 'tests/topotests/lib/topotest.py')
| -rw-r--r-- | tests/topotests/lib/topotest.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index 22ed4b4d0f..bffb8208e7 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -1180,9 +1180,11 @@ class Router(Node): def startRouterDaemons(self, daemons=None): "Starts all FRR daemons for this router." - bundle_data = subprocess.check_output( - ["cat /etc/frr/support_bundle_commands.conf"], shell=True - ) + bundle_data = '' + + if os.path.exists('/etc/frr/support_bundle_commands.conf'): + bundle_data = subprocess.check_output( + ["cat /etc/frr/support_bundle_commands.conf"], shell=True) self.cmd( "echo '{}' > /etc/frr/support_bundle_commands.conf".format(bundle_data) ) |