tests: save bmp pcap in logdir instead of /tmp

DEBUG_PCAP can be set True to manually enable pcap debugging when
running bmp tests.

Save bmp pcap in logdir (ie. /tmp/topotests/bgp_bmp.bgp_bmp_X/ instead
of /tmp.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/tests/topotests/bgp_bmp/test_bgp_bmp_1.py b/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
index 493f357f4b4bc040be72c792856b375defa7461e..9fc8e127720fa05db747fd0b6f2b979baa925947 100644 (file)
--- a/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
+++ b/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
@@ -73,9 +73,9 @@ def setup_module(mod):
     tgen.start_topology()
 
     if DEBUG_PCAP:
-        tgen.gears["r1"].run("rm /tmp/bmp.pcap")
+        pcap_file = os.path.join(tgen.logdir, "r1/bmp.pcap")
         tgen.gears["r1"].run(
-            "tcpdump -nni r1-eth0 -s 0 -w /tmp/bmp.pcap &", stdout=None
+            "tcpdump -nni r1-eth0 -s 0 -w {} &".format(pcap_file), stdout=None
         )
 
     for rname, router in tgen.routers().items():

diff --git a/tests/topotests/bgp_bmp/test_bgp_bmp_2.py b/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
index 82d3824a1b93c93c93e218179bce9bff5e79b4ed..21e4ce8abeaee5244b2063fcefb5505687942747 100644 (file)
--- a/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
+++ b/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
@@ -85,9 +85,9 @@ ip link set r1vrf-eth1 master vrf1
     )
     bmp_reset_seq()
     if DEBUG_PCAP:
-        tgen.gears["r1vrf"].run("rm /tmp/bmp_vrf.pcap")
+        pcap_file = os.path.join(tgen.logdir, "r1vrf/bmp.pcap")
         tgen.gears["r1vrf"].run(
-            "tcpdump -nni r1vrf-eth0 -s 0 -w /tmp/bmp_vrf.pcap &", stdout=None
+            "tcpdump -nni r1vrf-eth0 -s 0 -w {} &".format(pcap_file), stdout=None
         )
 
     for rname, router in tgen.routers().items():

diff --git a/tests/topotests/lib/bmp_collector/bmpserver.py b/tests/topotests/lib/bmp_collector/bmpserver.py
index a7c9743c9604560f6aa743630c6eb289697882ef..c42c3875633fb2445617e03d4910c526a62c94a2 100755 (executable)
--- a/tests/topotests/lib/bmp_collector/bmpserver.py
+++ b/tests/topotests/lib/bmp_collector/bmpserver.py
@@ -5,6 +5,8 @@
 # Authored by Farid Mihoub <farid.mihoub@6wind.com>
 #
 import argparse
+import errno
+import logging
 
 # XXX: something more reliable should be used "Twisted" a great choice.
 import os