Commit b7d867ea authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova

Merge remote-tracking branch 'origin/2l-ul-aerial' into integration_2025_w46 (!3755)

CI: Increase tested UL throughput on Aerial pipeline using 2L UL

The goal of this MR is to activate the use of 2-layer uplink by enabling SRS
and to increase the tested UL throughput in CI.
parents 603fc231 de744ddf
...@@ -32,7 +32,7 @@ gNBs = ...@@ -32,7 +32,7 @@ gNBs =
pdsch_AntennaPorts_N1 = 2; pdsch_AntennaPorts_N1 = 2;
pusch_AntennaPorts = 2; pusch_AntennaPorts = 2;
do_CSIRS = 1; do_CSIRS = 1;
do_SRS = 0; do_SRS = 1;
min_rxtxtime = 2; min_rxtxtime = 2;
servingCellConfigCommon = ( servingCellConfigCommon = (
...@@ -155,7 +155,7 @@ gNBs = ...@@ -155,7 +155,7 @@ gNBs =
nrofUplinkSlots = 3; #1; nrofUplinkSlots = 3; #1;
nrofUplinkSymbols = 0; nrofUplinkSymbols = 0;
ssPBCH_BlockPower = -25; ssPBCH_BlockPower = -15;
} }
); );
...@@ -195,7 +195,7 @@ MACRLCs = ( ...@@ -195,7 +195,7 @@ MACRLCs = (
remote_s_portd = 50010; // pnf p7 port [!] remote_s_portd = 50010; // pnf p7 port [!]
tr_s_preference = "aerial"; tr_s_preference = "aerial";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; # 150; pusch_TargetSNRx10 = 280; # 150;
pucch_TargetSNRx10 = 200; #200; pucch_TargetSNRx10 = 200; #200;
dl_max_mcs = 28; dl_max_mcs = 28;
ul_max_mcs = 28; ul_max_mcs = 28;
......
...@@ -24,9 +24,9 @@ gNBs = ...@@ -24,9 +24,9 @@ gNBs =
pdsch_AntennaPorts_N1 = 2; pdsch_AntennaPorts_N1 = 2;
pusch_AntennaPorts = 2; pusch_AntennaPorts = 2;
do_CSIRS = 1; do_CSIRS = 1;
do_SRS = 0; do_SRS = 1;
min_rxtxtime = 2; min_rxtxtime = 2;
force_UL256qam_off = 1;
servingCellConfigCommon = ( servingCellConfigCommon = (
{ {
#spCellConfigCommon #spCellConfigCommon
...@@ -187,7 +187,7 @@ MACRLCs = ( ...@@ -187,7 +187,7 @@ MACRLCs = (
remote_s_portd = 50010; // pnf p7 port [!] remote_s_portd = 50010; // pnf p7 port [!]
tr_s_preference = "aerial"; tr_s_preference = "aerial";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 220; # 150; pusch_TargetSNRx10 = 260; # 150;
pucch_TargetSNRx10 = 200; #200; pucch_TargetSNRx10 = 200; #200;
dl_max_mcs = 28; dl_max_mcs = 28;
ul_max_mcs = 28; ul_max_mcs = 28;
......
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
<testCase id="000022"> <testCase id="000022">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/UDP/500M)(30 sec)(single-ue profile)</desc> <desc>iperf (DL/UDP/800M)(30 sec)(single-ue profile)</desc>
<iperf_args>-u -b 500M -t 30 -R</iperf_args> <iperf_args>-u -b 800M -t 30 -R</iperf_args>
<svr_id>oc-cn5g-20897-aerial</svr_id> <svr_id>oc-cn5g-20897-aerial</svr_id>
<id>up2-aerial</id> <id>up2-aerial</id>
<iperf_packetloss_threshold>25</iperf_packetloss_threshold> <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
<testCase id="000033"> <testCase id="000033">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/UDP/40M)(30 sec)(single-ue profile)</desc> <desc>iperf (UL/UDP/150M)(30 sec)(single-ue profile)</desc>
<iperf_args>-u -b 40M -t 30 -l 1428</iperf_args> <iperf_args>-u -b 150M -t 30 -l 1428</iperf_args>
<svr_id>oc-cn5g-20897-aerial</svr_id> <svr_id>oc-cn5g-20897-aerial</svr_id>
<id>up2-aerial</id> <id>up2-aerial</id>
<iperf_packetloss_threshold>25</iperf_packetloss_threshold> <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
<testCase id="300033"> <testCase id="300033">
<class>Iperf</class> <class>Iperf</class>
<desc>Optional iperf (UL/UDP/90M)(30 sec)(single-ue profile)</desc> <desc>Optional iperf (UL/UDP/200M)(30 sec)(single-ue profile)</desc>
<may_fail>true</may_fail> <may_fail>true</may_fail>
<iperf_args>-u -b 90M -t 30 -l 1428</iperf_args> <iperf_args>-u -b 200M -t 30 -l 1428</iperf_args>
<svr_id>oc-cn5g-20897-aerial</svr_id> <svr_id>oc-cn5g-20897-aerial</svr_id>
<id>up2-aerial</id> <id>up2-aerial</id>
<iperf_packetloss_threshold>25</iperf_packetloss_threshold> <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
......
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
<testCase id="000032"> <testCase id="000032">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/UDP/200M)(30 sec)(single-ue profile)</desc> <desc>iperf (UL/UDP/300M)(30 sec)(single-ue profile)</desc>
<iperf_args>-u -b 200M -t 30 -l 1428</iperf_args> <iperf_args>-u -b 300M -t 30 -l 1428</iperf_args>
<svr_id>oc-cn5g-20897-aerial</svr_id> <svr_id>oc-cn5g-20897-aerial</svr_id>
<id>up2-aerial</id> <id>up2-aerial</id>
<iperf_packetloss_threshold>10</iperf_packetloss_threshold> <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
...@@ -107,9 +107,9 @@ ...@@ -107,9 +107,9 @@
<testCase id="000033"> <testCase id="000033">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/UDP/220M)(30 sec)(single-ue profile)</desc> <desc>iperf (UL/UDP/380M)(30 sec)(single-ue profile)</desc>
<may_fail>true</may_fail> <may_fail>true</may_fail>
<iperf_args>-u -b 220M -t 30 -l 1428</iperf_args> <iperf_args>-u -b 380M -t 30 -l 1428</iperf_args>
<svr_id>oc-cn5g-20897-aerial</svr_id> <svr_id>oc-cn5g-20897-aerial</svr_id>
<id>up2-aerial</id> <id>up2-aerial</id>
<iperf_packetloss_threshold>10</iperf_packetloss_threshold> <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment