ci,e2e: fix 64 ues ping

Author: asaezper

.gitlab/ci/e2e.yml

@@ -257,7 +257,7 @@ amari 32UE [ping]:
   variables:
     MARKERS: "zmq and not smoke"
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
-    KEYWORDS: ping
+    KEYWORDS: "ping and 32"
 
 amari 32UE 2x2 mimo:
   extends: .zmq-uesim
@@ -283,7 +283,15 @@ cudu amari 32UE:
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
   parallel:
     matrix:
-      - KEYWORDS: ["ping", "iperf and tcp and not band:3 and bandwidth:50"]
+      - KEYWORDS: ["iperf and tcp and not band:3 and bandwidth:50"]
+
+cudu amari 64UE:
+  extends: .zmq
+  variables:
+    TESTBED: zmq_cudu
+    MARKERS: "zmq and not smoke"
+    RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
+    KEYWORDS: "ping and 64"
 
 ################################################################################
 # TEST MODE

.gitlab/ci/e2e/retina_request_zmq.yml

@@ -11,7 +11,7 @@
   image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
   labels: 
     - ${ZMQ_HOSTLABEL_0}
-  nof_ports: 32
+  nof_ports: 64
   requirements:
     arch: amd64
     cpu:

.gitlab/ci/e2e/retina_request_zmq_cudu.yml

@@ -11,7 +11,7 @@
   image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
   labels: 
     - ${ZMQ_HOSTLABEL_0}
-  nof_ports: 32
+  nof_ports: 64
   requirements:
     arch: amd64
     cpu:

tests/e2e/tests/ping.py

@@ -215,7 +215,66 @@ def test_android_hp(
     ],
 )
 # pylint: disable=too-many-arguments,too-many-positional-arguments
-def test_zmq(
+def test_zmq_32(
+    retina_manager: RetinaTestManager,
+    retina_data: RetinaTestData,
+    ue_32: Tuple[UEStub, ...],
+    fivegc: FiveGCStub,
+    gnb: GNBStub,
+    band: int,
+    common_scs: int,
+    bandwidth: int,
+    ciphering: bool,
+):
+    """
+    ZMQ Pings
+    """
+
+    _ping(
+        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,
+        ue_stop_timeout=3,
+        enable_security_mode=ciphering,
+        post_command=("cu_cp --inactivity_timer=600", ""),
+    )
+
+
+@mark.parametrize(
+    "band, common_scs, bandwidth, ciphering",
+    (
+        param(3, 15, 5, False, id="band:%s-scs:%s-bandwidth:%s-ciphering:%s"),
+        param(3, 15, 10, False, marks=mark.test, id="band:%s-scs:%s-bandwidth:%s-ciphering:%s"),
+        param(3, 15, 20, False, id="band:%s-scs:%s-bandwidth:%s-ciphering:%s"),
+        param(3, 15, 50, False, id="band:%s-scs:%s-bandwidth:%s-ciphering:%s"),
+        param(3, 15, 50, True, id="band:%s-scs:%s-bandwidth:%s-ciphering:%s"),
+        param(41, 30, 10, False, id="band:%s-scs:%s-bandwidth:%s-ciphering:%s"),
+        param(41, 30, 20, False, id="band:%s-scs:%s-bandwidth:%s-ciphering:%s"),
+        param(41, 30, 50, False, id="band:%s-scs:%s-bandwidth:%s-ciphering:%s"),
+        param(41, 30, 50, True, id="band:%s-scs:%s-bandwidth:%s-ciphering:%s"),
+    ),
+)
+@mark.zmq
+@mark.flaky(
+    reruns=2,
+    only_rerun=[
+        "failed to start",
+        "Attach timeout reached",
+        "Some packages got lost",
+        "socket is already closed",
+        "5GC crashed",
+    ],
+)
+# pylint: disable=too-many-arguments,too-many-positional-arguments
+def test_zmq_64(
     retina_manager: RetinaTestManager,
     retina_data: RetinaTestData,
     ue_64: Tuple[UEStub, ...],