Merge remote-tracking branch 'origin/fix_ntn_reestablishment' into integration_2025_wk26 (!3360)

NR UE: fix reestablishment for NTN

With these changes in place we should extend the NTN/GEO rfsim CI test
to include reestablishment, too.

ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf

@@ -195,6 +195,15 @@ gNBs =
   }
 );
 
+rlc = {
+  srb = {
+    t_poll_retransmit = "ms2000"
+  }
+  drb_am = {
+    t_poll_retransmit = "ms2000"
+  }
+}
+
 MACRLCs = (
 {
   num_cc                      = 1;

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -33,6 +33,11 @@
  000003
  020001
  020002
+ 040001
+ 020022
+ 040002
+ 020001
+ 020002
  100001
  222222
         </TestCaseRequestedList>
@@ -98,6 +103,33 @@
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
+        <testCase id="040001">
+                <class>Custom_Command</class>
+                <desc>Trigger Reestablishment</desc>
+                <node>cacofonix</node>
+                <command>echo ci force_reestab | nc 192.168.71.140 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+                <command_fail>yes</command_fail>
+        </testCase>
+
+        <testCase id="020022">
+                <class>Ping</class>
+                <desc>Ping ext-dn from NR-UE</desc>
+                <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
+                <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</svr_node>
+                <ping_args>-c 20 -i0.5 -w25</ping_args>
+                <ping_packetloss_threshold>80</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040002">
+                <class>Custom_Command</class>
+                <desc>Verify Reestablishment</desc>
+                <node>cacofonix</node>
+                <command>echo ci get_reestab_count | nc 192.168.71.140 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+                <command_fail>yes</command_fail>
+        </testCase>
+
         <testCase id="100001">
                 <class>Undeploy_Object</class>
                 <always_exec>true</always_exec>

ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml

@@ -94,7 +94,9 @@ services:
             - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+                                    --telnetsrv --telnetsrv.listenaddr 192.168.71.140
+                                    --telnetsrv.shrmod ci
+            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-ext-dn
         networks: