From f862fe55a48ea5177a04971c6a0b810d46dfa3e6 Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Sun, 22 Aug 2021 02:28:24 -0400 Subject: [PATCH] tests: use common exa-receive.py script New generic script uses a new default node specific log dir to avoid collisions when running in parallel. Signed-off-by: Christian Hopps --- .../bgp_ecmp_topo1/peer1/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer10/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer11/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer12/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer13/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer14/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer15/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer16/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer17/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer18/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer19/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer2/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer20/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer3/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer4/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer5/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer6/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer7/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer8/exa-receive.py | 38 ------------------- .../bgp_ecmp_topo1/peer9/exa-receive.py | 38 ------------------- .../bgp_multiview_topo1/peer1/exa-receive.py | 38 ------------------- .../bgp_multiview_topo1/peer2/exa-receive.py | 38 ------------------- .../bgp_multiview_topo1/peer3/exa-receive.py | 38 ------------------- .../bgp_multiview_topo1/peer4/exa-receive.py | 38 ------------------- .../bgp_multiview_topo1/peer5/exa-receive.py | 38 ------------------- .../bgp_multiview_topo1/peer6/exa-receive.py | 38 ------------------- .../bgp_multiview_topo1/peer7/exa-receive.py | 38 ------------------- .../bgp_multiview_topo1/peer8/exa-receive.py | 38 ------------------- .../peer1/exa-receive.py | 38 ------------------- .../peer2/exa-receive.py | 38 ------------------- .../peer3/exa-receive.py | 38 ------------------- .../peer4/exa-receive.py | 38 ------------------- .../bgp_prefix_sid/peer2/exa-receive.py | 37 ------------------ .../topotests/bgp_prefix_sid/peer2/exabgp.cfg | 2 +- .../bgp_prefix_sid/test_bgp_prefix_sid.py | 5 ++- .../bgp_vrf_netns/peer1/exa-receive.py | 38 ------------------- 36 files changed, 4 insertions(+), 1294 deletions(-) delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer1/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer10/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer11/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer12/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer13/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer14/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer15/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer16/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer17/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer18/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer19/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer2/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer20/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer3/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer4/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer5/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer6/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer7/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer8/exa-receive.py delete mode 100755 tests/topotests/bgp_ecmp_topo1/peer9/exa-receive.py delete mode 100755 tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py delete mode 100755 tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py delete mode 100755 tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py delete mode 100755 tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py delete mode 100755 tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py delete mode 100755 tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py delete mode 100755 tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py delete mode 100755 tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py delete mode 100755 tests/topotests/bgp_peer_type_multipath_relax/peer1/exa-receive.py delete mode 100755 tests/topotests/bgp_peer_type_multipath_relax/peer2/exa-receive.py delete mode 100755 tests/topotests/bgp_peer_type_multipath_relax/peer3/exa-receive.py delete mode 100755 tests/topotests/bgp_peer_type_multipath_relax/peer4/exa-receive.py delete mode 100755 tests/topotests/bgp_prefix_sid/peer2/exa-receive.py delete mode 100755 tests/topotests/bgp_vrf_netns/peer1/exa-receive.py diff --git a/tests/topotests/bgp_ecmp_topo1/peer1/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer1/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer1/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer10/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer10/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer10/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer11/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer11/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer11/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer12/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer12/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer12/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer13/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer13/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer13/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer14/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer14/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer14/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer15/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer15/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer15/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer16/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer16/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer16/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer17/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer17/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer17/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer18/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer18/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer18/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer19/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer19/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer19/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer2/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer2/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer2/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer20/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer20/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer20/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer3/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer3/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer3/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer4/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer4/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer4/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer5/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer5/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer5/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer6/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer6/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer6/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer7/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer7/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer7/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer8/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer8/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer8/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_ecmp_topo1/peer9/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer9/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_ecmp_topo1/peer9/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_peer_type_multipath_relax/peer1/exa-receive.py b/tests/topotests/bgp_peer_type_multipath_relax/peer1/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_peer_type_multipath_relax/peer1/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_peer_type_multipath_relax/peer2/exa-receive.py b/tests/topotests/bgp_peer_type_multipath_relax/peer2/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_peer_type_multipath_relax/peer2/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_peer_type_multipath_relax/peer3/exa-receive.py b/tests/topotests/bgp_peer_type_multipath_relax/peer3/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_peer_type_multipath_relax/peer3/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_peer_type_multipath_relax/peer4/exa-receive.py b/tests/topotests/bgp_peer_type_multipath_relax/peer4/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_peer_type_multipath_relax/peer4/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_prefix_sid/peer2/exa-receive.py b/tests/topotests/bgp_prefix_sid/peer2/exa-receive.py deleted file mode 100755 index f1ec9fa5ba..0000000000 --- a/tests/topotests/bgp_prefix_sid/peer2/exa-receive.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - routesavefile.write(line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() diff --git a/tests/topotests/bgp_prefix_sid/peer2/exabgp.cfg b/tests/topotests/bgp_prefix_sid/peer2/exabgp.cfg index dabd88e03d..379d0a3f43 100644 --- a/tests/topotests/bgp_prefix_sid/peer2/exabgp.cfg +++ b/tests/topotests/bgp_prefix_sid/peer2/exabgp.cfg @@ -1,7 +1,7 @@ group controller { process receive-routes { - run "/etc/exabgp/exa-receive.py 2"; + run "/etc/exabgp/exa-receive.py --no-timestamp 2"; receive-routes; encoder json; } diff --git a/tests/topotests/bgp_prefix_sid/test_bgp_prefix_sid.py b/tests/topotests/bgp_prefix_sid/test_bgp_prefix_sid.py index 8acf7feae1..49a4049c00 100644 --- a/tests/topotests/bgp_prefix_sid/test_bgp_prefix_sid.py +++ b/tests/topotests/bgp_prefix_sid/test_bgp_prefix_sid.py @@ -120,7 +120,7 @@ def test_r1_receive_and_advertise_prefix_sid_type1(): def exabgp_get_update_prefix(filename, afi, nexthop, prefix): - with open("/tmp/peer2-received.log") as f: + with open(filename) as f: for line in f.readlines(): output = json.loads(line) ret = output.get("neighbor") @@ -151,10 +151,11 @@ def exabgp_get_update_prefix(filename, afi, nexthop, prefix): def test_peer2_receive_prefix_sid_type1(): tgen = get_topogen() peer2 = tgen.gears["peer2"] + logfile = "{}/{}-received.log".format(peer2.gearlogdir, peer2.name) def _check_type1_peer2(prefix, labelindex): output = exabgp_get_update_prefix( - "/tmp/peer2-received.log", "ipv4 nlri-mpls", "10.0.0.101", prefix + logfile, "ipv4 nlri-mpls", "10.0.0.101", prefix ) expected = { "type": "update", diff --git a/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py b/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py deleted file mode 100755 index 031ff455ca..0000000000 --- a/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -""" -exa-receive.py: Save received routes form ExaBGP into file -""" - -from sys import stdin, argv -from datetime import datetime - -# 1st arg is peer number -peer = int(argv[1]) - -# When the parent dies we are seeing continual newlines, so we only access so many before stopping -counter = 0 - -routesavefile = open("/tmp/peer%s-received.log" % peer, "w") - -while True: - try: - line = stdin.readline() - timestamp = datetime.now().strftime("%Y%m%d_%H:%M:%S - ") - routesavefile.write(timestamp + line) - routesavefile.flush() - - if line == "": - counter += 1 - if counter > 100: - break - continue - - counter = 0 - except KeyboardInterrupt: - pass - except IOError: - # most likely a signal during readline - pass - -routesavefile.close() -- 2.39.5