ci: add inter du inter frequency ho e2e test

Author: FabianEckermann

tests/e2e/tests/handover.py

@@ -173,14 +173,18 @@ def _handover_sequentially(
     warning_as_errors: bool = True,
     stop_gnb_first: bool = False,
     verbose_cu_mac: bool = True,
+    inter_freq_ho: bool = False,
 ):
     if not gnb_array and not du_array and not cu:
-        logging.error("Invalid configuration: either gNB(s) or CU and DU(s) are required")
+        logging.error("Invalid configuration: Either gNB(s) or CU and DU(s) are required")
         return
 
     if gnb_array:
         if cu or du_array:
-            logging.error("Invalid configuration: either gNB(s) or CU and DU(s) must be provided, not both")
+            logging.error("Invalid configuration: Either gNB(s) or CU and DU(s) must be provided, not both")
+            return
+        if inter_freq_ho:
+            logging.error("Invalid configuration: Only Inter-DU inter-frequency handover is supported")
             return
     else:
         if cu and not du_array:
@@ -214,6 +218,7 @@ def _handover_sequentially(
         stop_gnb_first=stop_gnb_first,
         verbose_cu_mac=verbose_cu_mac,
         ue_startup_timeout=ue_startup_timeout,
+        inter_freq_ho=inter_freq_ho,
     ) as (ue_attach_info_dict, movements, traffic_seconds):
 
         for ue_stub, ue_attach_info in ue_attach_info_dict.items():
@@ -335,6 +340,7 @@ def _handover_multi_ues(
     stop_gnb_first: bool = False,
     verbose_cu_mac: bool = True,
     ue_startup_timeout: int = UE_STARTUP_TIMEOUT,
+    inter_freq_ho: bool = False,
 ) -> Generator[
     Tuple[
         Dict[UEStub, UEAttachedInfo],
@@ -350,7 +356,7 @@ def _handover_multi_ues(
         else:
             logging.info("Inter-CU Handover Test (Ping)")
     else:
-        logging.info("Inter-DU Handover Test (Ping)")
+        logging.info("Inter-DU %sHandover Test (Ping)", "Inter-Frequency " if inter_freq_ho else "")
 
     original_position = (0, 0, 0)
 
@@ -370,6 +376,7 @@ def _handover_multi_ues(
         nof_antennas_dl=nof_antennas_dl,
         prach_config_index=prach_config_index,
         enable_2gnbs=(gnb_array is not None and len(gnb_array) == 2),
+        inter_freq_ho=inter_freq_ho,
     )
 
     configure_artifacts(

tests/e2e/tests/inter_du_handover.py

@@ -67,3 +67,39 @@ def test_zmq_sequentially(
         noise_spd=noise_spd,
         sleep_between_movement_steps=1,
     )
+
+
+@mark.zmq
+@mark.flaky(
+    reruns=1, only_rerun=["failed to start", "Attach timeout reached", "StatusCode.ABORTED", "StatusCode.UNKNOWN"]
+)
+# pylint: disable=too-many-arguments,too-many-positional-arguments
+def test_zmq_inter_freq_sequentially(
+    retina_manager: RetinaTestManager,
+    retina_data: RetinaTestData,
+    ue_8: UEStub,
+    fivegc: FiveGCStub,
+    cu: CUStub,
+    du_2: DUStub,
+    metrics_summary: MetricsSummary,
+):
+    """
+    ZMQ Inter-DU Handover tests
+    """
+
+    # _inter_du_inter_frequency_handover_sequentially(
+    _handover_sequentially(
+        retina_manager=retina_manager,
+        retina_data=retina_data,
+        ue_array=ue_8,
+        fivegc=fivegc,
+        cu=cu,
+        du_array=du_2,
+        metrics_summary=metrics_summary,
+        band=3,
+        common_scs=15,
+        bandwidth=50,
+        noise_spd=0,
+        sleep_between_movement_steps=1,
+        inter_freq_ho=True,
+    )

tests/e2e/tests/steps/configuration.py

@@ -139,6 +139,7 @@ def configure_test_parameters(
     ue_sds: Optional[List[str]] = None,
     warning_allowlist: Optional[List[str]] = None,
     enable_2gnbs: bool = False,
+    inter_freq_ho: bool = False,
 ):
     """
     Configure test parameters
@@ -163,16 +164,71 @@ def configure_test_parameters(
                 },
             },
         ]
+    du_node_list = []
+    ue_cell_bands = []
+    if inter_freq_ho:
+        inter_freq_band = 78
+        inter_freq_cell_1_dl_arfcn = 649980
+        inter_freq_cell_2_dl_arfcn = 650000
+        inter_freq_ssb_nr_arfcn = 649632
+        inter_freq_scs = 30
+        inter_freq_bandwidth = 20
+
+        du_node_list = [
+            {
+                "name": "du0-0",
+                "parameters": {
+                    "band": inter_freq_band,
+                    "dl_arfcn": inter_freq_cell_1_dl_arfcn,
+                    "common_scs": inter_freq_scs,
+                    "bandwidth": inter_freq_bandwidth,
+                },
+            },
+            {
+                "name": "du1-0",
+                "parameters": {
+                    "band": inter_freq_band,
+                    "dl_arfcn": inter_freq_cell_2_dl_arfcn,
+                    "common_scs": inter_freq_scs,
+                    "bandwidth": inter_freq_bandwidth,
+                },
+            },
+        ]
+
+        ue_cell_bands = [
+            {
+                "band": inter_freq_band,
+                "bandwidth": inter_freq_bandwidth,
+                "dl_nr_arfcn": inter_freq_cell_1_dl_arfcn,
+                "ssb_nr_arfcn": inter_freq_ssb_nr_arfcn,
+                "subcarrier_spacing": inter_freq_scs,
+                "ssb_subcarrier_spacing": inter_freq_scs,
+            },
+            {
+                "band": inter_freq_band,
+                "bandwidth": inter_freq_bandwidth,
+                "dl_nr_arfcn": inter_freq_cell_2_dl_arfcn,
+                "ssb_nr_arfcn": inter_freq_ssb_nr_arfcn,
+                "subcarrier_spacing": inter_freq_scs,
+                "ssb_subcarrier_spacing": inter_freq_scs,
+            },
+        ]
+    else:
+        ue_cell_bands = [
+            {
+                "band": band,
+                "bandwidth": bandwidth,
+                "dl_nr_arfcn": _get_dl_arfcn(band),
+                "ssb_nr_arfcn": _get_ssb_arfcn(band, bandwidth),
+                "subcarrier_spacing": common_scs,
+                "ssb_subcarrier_spacing": common_scs,
+            }
+            for _ in range(num_cells)
+        ]
 
     retina_data.test_config = {
         "ue": {
             "parameters": {
-                "band": band,
-                "dl_arfcn": _get_dl_arfcn(band),
-                "ssb_arfcn": _get_ssb_arfcn(band, bandwidth),
-                "common_scs": common_scs,
-                "ssb_scs": common_scs,
-                "bandwidth": bandwidth,
                 "global_timing_advance": global_timing_advance,
                 "log_ip_level": log_ip_level,
                 "ul_noise_spd": ul_noise_spd,
@@ -184,6 +240,7 @@ def configure_test_parameters(
                 "nof_antennas_ul": nof_antennas_ul,
                 "pdcch_log": pdcch_log,
                 "ue_sds": ue_sds if ue_sds is not None else [],
+                "cells": ue_cell_bands,
             },
         },
         "gnb": {
@@ -217,6 +274,7 @@ def configure_test_parameters(
             },
         },
         "du": {
+            "node_list": du_node_list,
             "parameters": {
                 "band": band,
                 "dl_arfcn": _get_dl_arfcn(band),