From 6bbcc1d275d08dad60812eab8ecf76d26e4f500b Mon Sep 17 00:00:00 2001
From: Jaroslava Fiedlerova <Jaroslava.Fiedlerova@openairinterface.org>
Date: Mon, 1 Apr 2024 18:24:53 +0200
Subject: [PATCH] Improve LTE-2x2 radio behavior and log collection

- change testcase IDs to get all logs
---
 .../enb.band38.lte_2x2.100prb.usrpn310.conf   |  8 +++----
 ...nb.band38.lte_2x2_tm2.100prb.usrpn310.conf |  8 +++----
 .../container_lte_n3xx_tdd_2x2_tm2.xml        | 24 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
index 183b91407c..cd3842ed5b 100644
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
@@ -204,8 +204,8 @@ MACRLCs = (
         bler_target_upper = 20.0;
         bler_target_lower = 10.0;
         max_ul_rb_index   = 27;
-        puSch10xSnr     =  190;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  250;
+        puCch10xSnr     =  230;
         }  
 );
 
@@ -224,8 +224,8 @@ RUs = (
        local_rf       = "yes"
          nb_tx          = 2
          nb_rx          = 2
-         att_tx         = 10
-         att_rx         = 5;
+         att_tx         = 12
+         att_rx         = 0;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf
index 21fc241994..a2dfde11c3 100644
--- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf
@@ -204,8 +204,8 @@ MACRLCs = (
         bler_target_upper = 20.0;
         bler_target_lower = 10.0;
         max_ul_rb_index   = 27;
-        puSch10xSnr     =  190;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  280;
+        puCch10xSnr     =  250;
         }  
 );
 
@@ -224,8 +224,8 @@ RUs = (
        local_rf       = "yes"
          nb_tx          = 2
          nb_rx          = 2
-         att_tx         = 10
-         att_rx         = 5;
+         att_tx         = 18
+         att_rx         = 0;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
index bee8c9eba5..b518f98bdb 100644
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
@@ -31,15 +31,15 @@
 111111
 100000
 010010
-030101
+031101
 010001
 000001
-050000
-050001
-070000
-070001
+051000
+051001
+071000
+071001
 010010
-030201
+031201
 
 </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
@@ -65,7 +65,7 @@
     <command>sudo cpupower idle-set -E</command>
   </testCase>
 
-  <testCase id="030101">
+  <testCase id="031101">
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
@@ -85,7 +85,7 @@
     <id>up2</id>
   </testCase>
 
-  <testCase id="050000">
+  <testCase id="051000">
     <class>Ping</class>
     <desc>Ping: 20 pings</desc>
     <id>up2</id>
@@ -94,7 +94,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
 
- <testCase id="050001">
+ <testCase id="051001">
     <class>Ping</class>
     <desc>Ping: 100 pings, size 1024</desc>
     <id>up2</id>
@@ -103,7 +103,7 @@
     <ping_rttavg_threshold>60</ping_rttavg_threshold>
    </testCase>
 
-  <testCase id="070000">
+  <testCase id="071000">
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 1M -t 60 -R</iperf_args>
@@ -113,7 +113,7 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
    </testCase>
 
-   <testCase id="070001">
+   <testCase id="071001">
      <class>Iperf</class>
      <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
      <iperf_args>-u -b 7M -t 60</iperf_args>
@@ -129,7 +129,7 @@
     <id>up2</id>
   </testCase>
 
-  <testCase id="030201">
+  <testCase id="031201">
     <class>Undeploy_Object</class>
     <desc>Undeploy gNB</desc>
     <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>