From 4490571e0395ce8f6997f7b9a5b60e6e81b21a64 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Wed, 16 Jul 2025 11:10:35 +0200
Subject: [PATCH 1/2] CI 5G RFsim nFAPI u0/25PRB: Add Ping test on second PDU
 session

---
 ci-scripts/ci_infra.yaml                             |  6 ++++++
 ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml | 12 ++++++++++++
 .../5g_rfsimulator_u0_25prb/docker-compose.yaml      |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml
index cda6258244..6e750d75b2 100644
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -301,6 +301,12 @@ rfsim5g_ue:
   AttachScript: docker start rfsim5g-oai-nr-ue
   DetachScript: docker stop rfsim5g-oai-nr-ue
   MTU: 1500
+# for tests with second PDU session ID 2, needs to match requested PDU session name
+rfsim5g_ue_pdu_2:
+  Host: "%%current_host%%"
+  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1p2
+  CmdPrefix: docker exec rfsim5g-oai-nr-ue
+  IF: oaitun_ue1p2
 
 rfsim5g_ue2:
   Host: "%%current_host%%"
diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
index 82011e3cc2..6a81c53e69 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -32,6 +32,7 @@
  000003
  020001
  020002
+ 020003
  030001
  030002
  100001
@@ -98,6 +99,17 @@
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
+        <testCase id="020003">
+                <class>Ping</class>
+                <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>
+                <id>rfsim5g_ue_pdu_2</id>
+                <nodes>acamas</nodes>
+                <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>acamas</svr_node>
+                <ping_args>-c 20 -i 0.25</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
         <testCase id="030001">
                 <class>Iperf</class>
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
index 24a9edd8d7..a1b873eb96 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
@@ -147,7 +147,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48 --rfsimulator.serveraddr 192.168.71.141 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48 --rfsimulator.serveraddr 192.168.71.141 --extra-pdu-id 2 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-pnf
         networks:

From c9aa985e233ac97eeae6ca6a861d7f280c26a5a7 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 17 Jul 2025 14:36:18 +0200
Subject: [PATCH 2/2] Verify 2nd PDU session is up

---
 ci-scripts/ci_infra.yaml                             | 3 +++
 ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml
index 6e750d75b2..266f0db7cc 100644
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -307,6 +307,9 @@ rfsim5g_ue_pdu_2:
   NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1p2
   CmdPrefix: docker exec rfsim5g-oai-nr-ue
   IF: oaitun_ue1p2
+  AttachScript: docker start rfsim5g-oai-nr-ue
+  DetachScript: docker stop rfsim5g-oai-nr-ue
+  MTU: 1500
 
 rfsim5g_ue2:
   Host: "%%current_host%%"
diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
index 6a81c53e69..40f3ad4607 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -32,6 +32,7 @@
  000003
  020001
  020002
+ 000004
  020003
  030001
  030002
@@ -99,6 +100,13 @@
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
+        <testCase id="000004">
+                <class>Attach_UE</class>
+                <desc>Verify 2nd PDU session is up</desc>
+                <id>rfsim5g_ue_pdu_2</id>
+                <nodes>acamas</nodes>
+        </testCase>
+
         <testCase id="020003">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>