From 9af386c761d29e664f66e5464f6dc9dbfe8c7bc5 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 29 Feb 2024 18:57:43 +0100
Subject: [PATCH] CI: RFsim tests: Wait for IP

Ensure that the UE has an IP address before continuing the test.
Otherwise, it might happen we ping before the UE is connected.

Do not do this in do-ra and phytest, as they use --noS1, which implies
statically assigned IP address, so IP address check always succeeds(!).
---
 ci-scripts/xml_files/container_5g_e1_rfsim.xml            | 7 +++++++
 ci-scripts/xml_files/container_5g_f1_rfsim.xml            | 7 +++++++
 ci-scripts/xml_files/container_5g_fdd_rfsim.xml           | 7 +++++++
 ci-scripts/xml_files/container_5g_rfsim_24prb.xml         | 7 +++++++
 ci-scripts/xml_files/container_5g_rfsim_2x2.xml           | 7 +++++++
 ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml | 7 +++++++
 ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml      | 7 +++++++
 7 files changed, 49 insertions(+)

diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
index e23cffd0dd..e4ddb9e4d7 100644
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -30,6 +30,7 @@
  000021
  000022
  000023
+ 000024
  020021
  100021
         </TestCaseRequestedList>
@@ -66,6 +67,12 @@
                 <nb_healthy>14</nb_healthy>
         </testCase>
 
+        <testCase id="000024">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+        </testCase>
+
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
index 769de69e35..09b69730a3 100644
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -29,6 +29,7 @@
  100021
  000021
  000022
+ 000023
  020021
  030021
  030022
@@ -59,6 +60,12 @@
                 <nb_healthy>8</nb_healthy>
         </testCase>
 
+        <testCase id="000023">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+        </testCase>
+
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
index 463cb3f2e8..59be0e3738 100644
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -30,6 +30,7 @@
  100011
  000011
  000012
+ 000013
  020011
  020012
  030011
@@ -61,6 +62,12 @@
                 <nb_healthy>7</nb_healthy>
         </testCase>
 
+        <testCase id="000013">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+        </testCase>
+
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
index 4f838658ec..e90cbc309b 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -30,6 +30,7 @@
  100001
  000001
  000002
+ 000003
  020001
  020002
  030001
@@ -61,6 +62,12 @@
                 <nb_healthy>7</nb_healthy>
         </testCase>
 
+        <testCase id="000003">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+        </testCase>
+
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
index 45c311fd97..2b3f3413db 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -30,6 +30,7 @@
  100001
  000001
  000002
+ 000003
  020001
  020002
  030001
@@ -61,6 +62,12 @@
                 <nb_healthy>7</nb_healthy>
         </testCase>
 
+        <testCase id="000003">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+        </testCase>
+
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
index 5baa950549..fe02da00a0 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
@@ -27,6 +27,7 @@
         <TestCaseRequestedList>
  111111
  000020
+ 000021
  020021
  100021
  100022
@@ -48,6 +49,12 @@
                 <nb_healthy>2</nb_healthy>
         </testCase>
 
+        <testCase id="000021">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+        </testCase>
+
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Test Connectivity (ping)</desc>
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 c31d6c1843..f2f4d5e78e 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -30,6 +30,7 @@
  100001
  000001
  000002
+ 000003
  020001
  020002
  030001
@@ -61,6 +62,12 @@
                 <nb_healthy>7</nb_healthy>
         </testCase>
 
+        <testCase id="000003">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+        </testCase>
+
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>