ci: reest test

Author: qarlosalberto

.gitlab/ci/e2e.yml

@@ -266,7 +266,7 @@ amari 32UE:
     - *retina-needs
   parallel:
     matrix:
-      - KEYWORDS: ["attach_detach", "ping", "iperf and udp", "iperf and tcp"]
+      - KEYWORDS: ["attach_detach", "reestablishment", "ping", "iperf and udp", "iperf and tcp"]
 
 amari 32UE asan:
   extends: .zmq

.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.42.2
+RETINA_VERSION=0.42.3
 AMARISOFT_VERSION=2023-03-17
 SRSUE_VERSION=23.11
 OPEN5GS_VERSION=2.6.1

tests/e2e/tests/ping_reestablishment.py

@@ -0,0 +1,126 @@
+#
+# Copyright 2021-2024 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+"""
+Ping / Reestablishment Tests
+"""
+import logging
+import time
+from typing import Optional, Sequence, Tuple, Union
+
+from pytest import mark
+from retina.client.manager import RetinaTestManager
+from retina.launcher.artifacts import RetinaTestData
+from retina.launcher.utils import configure_artifacts, param
+from retina.protocol.fivegc_pb2_grpc import FiveGCStub
+from retina.protocol.gnb_pb2_grpc import GNBStub
+from retina.protocol.ue_pb2_grpc import UEStub
+
+from .steps.configuration import configure_test_parameters
+from .steps.stub import ping_start, ping_wait_until_finish, start_network, stop, ue_reestablishment, ue_start_and_attach
+
+
+@mark.parametrize(
+    "band, common_scs, bandwidth, always_download_artifacts",
+    (
+        param(3, 15, 50, True, id="band:%s-scs:%s-bandwidth:%s-artifacts:%s"),
+        param(41, 30, 50, False, id="band:%s-scs:%s-bandwidth:%s-artifacts:%s"),
+    ),
+)
+@mark.zmq
+@mark.flaky(reruns=3, only_rerun=["failed to start"])
+# pylint: disable=too-many-arguments
+def test_zmq_reestablishment(
+    retina_manager: RetinaTestManager,
+    retina_data: RetinaTestData,
+    ue_32: Tuple[UEStub, ...],
+    fivegc: FiveGCStub,
+    gnb: GNBStub,
+    band: int,
+    common_scs: int,
+    bandwidth: int,
+    always_download_artifacts: bool,
+):
+    """
+    ZMQ Attach / reestablishment
+    """
+
+    test_duration_sec = 15 * 60
+    reestablishment_interval = 3  # seconds
+    reestablishment_count = int(test_duration_sec / reestablishment_interval)
+
+    _ping_and_reestablishment_multi_ues(
+        retina_manager=retina_manager,
+        retina_data=retina_data,
+        ue_array=ue_32,
+        gnb=gnb,
+        fivegc=fivegc,
+        band=band,
+        common_scs=common_scs,
+        bandwidth=bandwidth,
+        sample_rate=None,  # default from testbed
+        global_timing_advance=0,
+        time_alignment_calibration=0,
+        always_download_artifacts=always_download_artifacts,
+        reestablishment_count=reestablishment_count,
+        reestablishment_interval=reestablishment_interval,
+        ping_count=test_duration_sec,
+        warning_as_errors=True,
+    )
+
+
+# pylint: disable=too-many-arguments,too-many-locals
+def _ping_and_reestablishment_multi_ues(
+    retina_manager: RetinaTestManager,
+    retina_data: RetinaTestData,
+    ue_array: Sequence[UEStub],
+    fivegc: FiveGCStub,
+    gnb: GNBStub,
+    band: int,
+    common_scs: int,
+    bandwidth: int,
+    sample_rate: Optional[int],
+    global_timing_advance: int,
+    time_alignment_calibration: Union[int, str],
+    always_download_artifacts: bool,
+    ping_count: int,
+    warning_as_errors: bool = True,
+    reestablishment_count: int = 1,
+    reestablishment_interval: int = 3,
+):
+    logging.info("Reestablishment / Ping Test")
+
+    configure_test_parameters(
+        retina_manager=retina_manager,
+        retina_data=retina_data,
+        band=band,
+        common_scs=common_scs,
+        bandwidth=bandwidth,
+        sample_rate=sample_rate,
+        global_timing_advance=global_timing_advance,
+        time_alignment_calibration=time_alignment_calibration,
+        pcap=False,
+    )
+
+    configure_artifacts(
+        retina_data=retina_data,
+        always_download_artifacts=always_download_artifacts,
+    )
+
+    start_network(ue_array, gnb, fivegc)
+
+    ue_attach_info_dict = ue_start_and_attach(ue_array, gnb, fivegc)
+    ping_task_array = ping_start(ue_attach_info_dict, fivegc, ping_count)
+
+    for _ in range(reestablishment_count):
+        ue_reestablishment(ue_array)
+        time.sleep(reestablishment_interval)
+
+    ping_wait_until_finish(ping_task_array)
+
+    stop(ue_array, gnb, fivegc, retina_data, warning_as_errors=warning_as_errors)

tests/e2e/tests/steps/stub.py

@@ -226,6 +226,16 @@ def ping(ue_attach_info_dict: Dict[UEStub, UEAttachedInfo], fivegc: FiveGCStub,
     """
     Ping command between an UE and a 5GC
     """
+    ping_task_array = ping_start(ue_attach_info_dict, fivegc, ping_count, time_step)
+    ping_wait_until_finish(ping_task_array)
+
+
+def ping_start(
+    ue_attach_info_dict: Dict[UEStub, UEAttachedInfo], fivegc: FiveGCStub, ping_count, time_step: int = 1
+) -> List[grpc.Future]:
+    """
+    Ping command between an UE and a 5GC
+    """
 
     # Launch ping (ue -> 5gc and 5gc -> ue) for each attached ue in parallel
 
@@ -245,6 +255,13 @@ def ping(ue_attach_info_dict: Dict[UEStub, UEAttachedInfo], fivegc: FiveGCStub,
         ping_task_array.append(fivegc_to_ue)
         sleep(time_step)
 
+    return ping_task_array
+
+
+def ping_wait_until_finish(ping_task_array: List[grpc.Future]) -> None:
+    """
+    Wait until the requested ping has finished.
+    """
     ping_success = True
     for ping_task in ping_task_array:
         ping_success &= ping_task.result().status
@@ -254,6 +271,9 @@ def ping(ue_attach_info_dict: Dict[UEStub, UEAttachedInfo], fivegc: FiveGCStub,
 
 
 def _print_ping_result(msg: str, result: PingResponse):
+    """
+    Print ping result
+    """
     log_fn = logging.info
     if not result.status:
         log_fn = logging.error
@@ -589,6 +609,18 @@ def _stop_stub(
     return error_msg
 
 
+def ue_reestablishment(
+    ue_array: Sequence[UEStub],
+):
+    """
+    Reestablishment an array of UEs from already running gnb and 5gc
+    """
+    for index, ue_stub in enumerate(ue_array):
+        name = f"UE_{index+1}"
+        logging.info("Reestablishment %s", name)
+        ue_stub.Reestablishment(Empty())
+
+
 def _get_metrics(stub: RanStub, name: str, fail_if_kos: bool = False) -> str:
     error_msg = ""