Merge pull request #967 from NordSecurity/collect-tcpdumps-from-gateways

Collect tcpdumps from gateways

Author: tomaszklak

.unreleased/collect-tcpdumps-from-gateways

@@ -9,7 +9,13 @@
 from mesh_api import start_tcpdump, stop_tcpdump
 from utils.bindings import TelioAdapterType
 from utils.connection import DockerConnection
-from utils.connection_util import ConnectionTag, LAN_ADDR_MAP, new_connection_raw
+from utils.connection_util import (
+    ConnectionTag,
+    container_id,
+    DOCKER_GW_MAP,
+    LAN_ADDR_MAP,
+    new_connection_raw,
+)
 from utils.process import ProcessExecError
 from utils.router import IPStack
 from utils.vm import windows_vm_util, mac_vm_util
@@ -321,12 +327,25 @@ def pytest_runtest_makereport(item, call):
         stop_tcpdump([f"nat-lab-dns-server-{i}-1" for i in range(1, 3)])
 
 
+# pylint: disable=unused-argument
+def pytest_sessionstart(session):
+    if os.environ.get("NATLAB_SAVE_LOGS") is None:
+        return
+
+    if not session.config.option.collectonly:
+        start_tcpdump({container_id(gw_tag) for gw_tag in DOCKER_GW_MAP.values()})
+
+
 # pylint: disable=unused-argument
 def pytest_sessionfinish(session, exitstatus):
     if os.environ.get("NATLAB_SAVE_LOGS") is None:
         return
 
     if not session.config.option.collectonly:
+        stop_tcpdump(
+            {container_id(gw_tag) for gw_tag in DOCKER_GW_MAP.values()}, "./logs"
+        )
+
         collect_nordderper_logs()
         collect_dns_server_logs()
         asyncio.run(collect_kernel_logs(session.items, "after_tests"))

nat-lab/tests/conftest.py

@@ -5,6 +5,8 @@
 import random
 import time
 import uuid
+from collections.abc import Iterable
+from concurrent.futures import ThreadPoolExecutor
 from config import DERP_SERVERS, LIBTELIO_IPV6_WG_SUBNET, WG_SERVERS
 from datetime import datetime
 from ipaddress import ip_address
@@ -444,10 +446,11 @@ def config_dynamic_nodes(
         return tuple(list(self.nodes.values())[current_node_list_len:])
 
 
-def start_tcpdump(container_names: List[str]):
+def start_tcpdump(container_names: Iterable[str]):
     if os.environ.get("NATLAB_SAVE_LOGS") is None:
         return
-    for container_name in container_names:
+
+    def aux(container_name):
         # First make sure that no leftover processes/files will interfere
         cmd = f"docker exec --privileged {container_name} killall -w tcpdump"
         os.system(cmd)
@@ -456,22 +459,31 @@ def start_tcpdump(container_names: List[str]):
         cmd = f"docker exec -d --privileged {container_name} tcpdump -i any -U -w {PCAP_FILE_PATH}"
         os.system(cmd)
 
+    with ThreadPoolExecutor() as executor:
+        executor.map(aux, container_names)
+
 
-def stop_tcpdump(container_names):
+def stop_tcpdump(container_names, store_in=None):
     if os.environ.get("NATLAB_SAVE_LOGS") is None:
         return
     log_dir = get_current_test_log_path()
     os.makedirs(log_dir, exist_ok=True)
-    for container_name in container_names:
+
+    def aux(container_name):
         cmd = f"docker exec --privileged {container_name} killall -w tcpdump"
         os.system(cmd)
-        path = find_unique_path_for_tcpdump(log_dir, container_name)
+        path = find_unique_path_for_tcpdump(
+            store_in if store_in else log_dir, container_name
+        )
         cmd = f"docker container cp {container_name}:{PCAP_FILE_PATH} {path}"
         os.system(cmd)
 
+    with ThreadPoolExecutor() as executor:
+        executor.map(aux, container_names)
+
 
 def find_unique_path_for_tcpdump(log_dir, container_name):
-    candidate_path = f"./{log_dir}/{container_name}.pcap"
+    candidate_path = f"{log_dir}/{container_name}.pcap"
     counter = 1
     # NOTE: counter starting from '1' means that the file will either have no suffix or
     # will have a suffix starting from '2'. This is to make it clear that it's not the