From 4412a2d318d1f5cdd315b2bbe011ff84ae0d695f Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Tue, 6 Dec 2022 10:22:02 +0100
Subject: [PATCH 1/4] Set t-Reordering to 100ms to prevent packet loss

---
 openair2/RRC/NR/rrc_gNB_radio_bearers.c | 2 +-
 openair2/RRC/NR/rrc_gNB_reconfig.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openair2/RRC/NR/rrc_gNB_radio_bearers.c b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
index 6c8f2ecdda..b049ba066a 100644
--- a/openair2/RRC/NR/rrc_gNB_radio_bearers.c
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
@@ -116,7 +116,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
   DRB_config->pdcp_Config->moreThanOneRLC            = NULL;
   
   DRB_config->pdcp_Config->t_Reordering  = calloc(1, sizeof(*DRB_config->pdcp_Config->t_Reordering));
-  *DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms0;
+  *DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms100;
   DRB_config->pdcp_Config->ext1          = NULL;
   
   if (do_drb_integrity) {
diff --git a/openair2/RRC/NR/rrc_gNB_reconfig.c b/openair2/RRC/NR/rrc_gNB_reconfig.c
index 1fe4cb30e9..aee8a3cc47 100644
--- a/openair2/RRC/NR/rrc_gNB_reconfig.c
+++ b/openair2/RRC/NR/rrc_gNB_reconfig.c
@@ -648,7 +648,7 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
   drb_ToAddMod->pdcp_Config->moreThanOneRLC = NULL;
 
   drb_ToAddMod->pdcp_Config->t_Reordering = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->t_Reordering));
-  *drb_ToAddMod->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms0;
+  *drb_ToAddMod->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms100;
   drb_ToAddMod->pdcp_Config->ext1 = NULL;
 
   ASN_SEQUENCE_ADD(&rbconfig->drb_ToAddModList->list,drb_ToAddMod);

From 9c165e3992f93763d4439cf06c22bbd8b88f8366 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 12 Jan 2023 17:31:10 +0100
Subject: [PATCH 2/4] Reduce 180Mbps in CI test for 162 PRB

Due to t-Reordering, if requesting more than 100% of resources allow,
leads to dropped packets at RLC that PDCP waits for in reordering
---
 ci-scripts/xml_files/fr1_sa_quectel_162prb.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
index 693848cd39..29d93902de 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
@@ -98,8 +98,8 @@
 
 	<testCase id="072000">
 		<class>Iperf</class>
-		<desc>iperf (DL/200Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 200M -t 60</iperf_args>
+		<desc>iperf (DL/180Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 180M -t 60</iperf_args>
 		<direction>DL</direction>
 		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>

From 1f458c7107d007c82c1f7f3bb0819db99caa65ac Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 12 Jan 2023 17:32:05 +0100
Subject: [PATCH 3/4] Adapt retx thresholds to CI env

---
 ci-scripts/xml_files/fr1_sa_quectel.xml        | 4 ++--
 ci-scripts/xml_files/fr1_sa_quectel_162prb.xml | 4 ++--
 ci-scripts/xml_files/fr1_sa_quectel_stages.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml
index 0a9d17b63d..75b0dbe4b7 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel.xml
@@ -144,8 +144,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
-		<d_retx_th>5,50,100,100</d_retx_th>
-		<u_retx_th>5,50,100,100</u_retx_th>
+		<d_retx_th>5,80,100,100</d_retx_th>
+		<u_retx_th>5,80,100,100</u_retx_th>
 	</testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
index 29d93902de..6b8c143ec6 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
@@ -134,8 +134,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
-		<d_retx_th>5,50,100,100</d_retx_th>
-		<u_retx_th>5,50,100,100</u_retx_th>
+		<d_retx_th>5,80,100,100</d_retx_th>
+		<u_retx_th>5,80,100,100</u_retx_th>
 	</testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
index 0a2e721ce7..8b01949ba5 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
@@ -170,8 +170,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
-		<d_retx_th>5,50,100,100</d_retx_th>
-		<u_retx_th>5,50,100,100</u_retx_th>
+		<d_retx_th>5,80,100,100</d_retx_th>
+		<u_retx_th>5,80,100,100</u_retx_th>
 	</testCase>
 
 </testCaseList>

From 1b297013680e799d946b8d3aa14bc23ed744657c Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Fri, 10 Mar 2023 14:05:29 +0100
Subject: [PATCH 4/4] Threshold for NSA traffic lowered

---
 ci-scripts/xml_files/container_nsa_b200_quectel.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
index 3734c91229..4007e59619 100644
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -144,8 +144,8 @@
 
 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/125Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 125M -t 60 -i 1 -fm</iperf_args>
+		<desc>iperf (DL/90Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 90M -t 60 -i 1 -fm</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>