ci,e2e: improve reest tests to make them faster

Author: asaezper

.gitlab/ci/e2e/.env

@@ -1,6 +1,6 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.48.13
+RETINA_VERSION=0.48.14
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

tests/e2e/tests/reestablishment.py

@@ -10,7 +10,6 @@
 Ping + Reestablishment Tests
 """
 import logging
-import time
 from contextlib import suppress
 from typing import Optional, Sequence, Union
 
@@ -179,15 +178,14 @@ def _ping_and_reestablishment_multi_ues(
         warning_as_errors=warning_as_errors,
     ):
         # Launch reestablished UEs
-        ping_task_array_reest = ping_start(reest_ue_attach_info_dict, fivegc, traffic_duration)
+        ping_task_array_reest = ping_start(reest_ue_attach_info_dict, fivegc, traffic_duration, time_step=0)
         # Launch other UEs
-        ping_task_array_other = ping_start(other_ue_attach_info_dict, fivegc, traffic_duration)
+        ping_task_array_other = ping_start(other_ue_attach_info_dict, fivegc, traffic_duration, time_step=0)
 
         # Trigger reestablishments
         for ue_stub in reest_ue_attach_info_dict:
             for _ in range(int(traffic_duration / reestablishment_interval)):
                 ue_reestablishment(ue_stub, reestablishment_interval)
-                time.sleep(reestablishment_interval)
 
         # Wait and ignore reestablished UEs
         with suppress(Failed):
@@ -248,7 +246,6 @@ def _iperf_and_reestablishment_multi_ues(
         for ue_stub in reest_ue_attach_info_dict:
             for _ in range(int(traffic_duration / reestablishment_interval)):
                 ue_reestablishment(ue_stub, reestablishment_interval)
-                time.sleep(reestablishment_interval)
 
         # Wait for reestablished UEs
         for ue_attached_info, task, iperf_request in iperf_dict:

tests/e2e/tests/steps/stub.py

@@ -13,7 +13,7 @@
 from concurrent.futures import as_completed, ThreadPoolExecutor
 from contextlib import contextmanager, suppress
 from dataclasses import dataclass
-from time import sleep
+from time import sleep, time
 from typing import Dict, Generator, List, Optional, Sequence, Tuple
 
 import grpc
@@ -244,7 +244,7 @@ def ping(ue_attach_info_dict: Dict[UEStub, UEAttachedInfo], fivegc: FiveGCStub,
 
 
 def ping_start(
-    ue_attach_info_dict: Dict[UEStub, UEAttachedInfo], fivegc: FiveGCStub, ping_count, time_step: int = 1
+    ue_attach_info_dict: Dict[UEStub, UEAttachedInfo], fivegc: FiveGCStub, ping_count, time_step: float = 1
 ) -> List[grpc.Future]:
     """
     Ping command between an UE and a 5GC
@@ -501,11 +501,14 @@ def ue_reestablishment(
     """
     Reestablishment one UE from already running gnb and 5gc
     """
+    t_before = time()
     result: ReestablishmentInfo = ue_stub.Reestablishment(UInt32Value(value=reestablishment_interval))
     log_fn = logging.info if result.status else logging.error
     log_fn("Reestablishment UE [%s]:\n%s", id(ue_stub), MessageToString(result, indent=2))
     if not result.status:
         pytest.fail("Reestablishment failed")
+    with suppress(ValueError):
+        sleep(reestablishment_interval - (time() - t_before))
 
 
 def ue_move(ue_stub: UEStub, x_coordinate: float, y_coordinate: float = 0, z_coordinate: float = 0):