maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ci-vvdn-update' into integration_2025_w14_p2 (!3357)

Browse Source 
CI: update VVDN configuration file

- change frequency
- use MAC address of the new VVDN RU
This commit is contained in:
Robert Schmidt
2025-04-08 10:06:06 +02:00
parent e4c9cb4125 9207c74cba
commit 42a9dde691
6 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+13 -13
View File
@@ -18,11 +18,12 @@ gNBs =
////////// Physical parameters: ////////// Physical parameters:
pdsch_AntennaPorts_XP = 2; pdsch_AntennaPorts_XP = 2;
pdsch_AntennaPorts_N1 = 1; pdsch_AntennaPorts_N1 = 2;
maxMIMO_layers = 2; maxMIMO_layers = 4;
pusch_AntennaPorts = 4; pusch_AntennaPorts = 4;
do_CSIRS = 1; do_CSIRS = 1;
do_SRS = 0; do_SRS = 0;
force_UL256qam_off = 1;
servingCellConfigCommon = ( servingCellConfigCommon = (
{ {
@@ -30,12 +31,12 @@ gNBs =
physCellId = 0; physCellId = 0;
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# center frequency = 3999.36 MHz # center frequency = 4049.76 MHz
# selected SSB frequency = 3999.36 MHz # selected SSB frequency = 4049.76 MHz
absoluteFrequencySSB = 666624; absoluteFrequencySSB = 669984;
dl_frequencyBand = 77; dl_frequencyBand = 77;
# frequency point A = 3950.22 MHz # frequency point A = 4000.62 MHz
dl_absoluteFrequencyPointA = 663348; dl_absoluteFrequencyPointA = 666708;
#scs-SpecificCarrierList #scs-SpecificCarrierList
dl_offstToCarrier = 0; dl_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
@@ -177,10 +178,8 @@ MACRLCs = (
num_cc = 1; num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 180; pusch_TargetSNRx10 = 200;
pucch_TargetSNRx10 = 230; pucch_TargetSNRx10 = 250;
ul_bler_target_upper = .35;
ul_bler_target_lower = .15;
pusch_FailureThres = 100; pusch_FailureThres = 100;
} }
); );
@@ -212,7 +211,7 @@ RUs = (
sf_extension = 0; sf_extension = 0;
eNB_instances = [0]; eNB_instances = [0];
ru_thread_core = 5; ru_thread_core = 5;
sl_ahead = 5; sl_ahead = 10;
tr_preference = "raw_if4p5"; # important: activate FHI7.2 tr_preference = "raw_if4p5"; # important: activate FHI7.2
do_precoding = 0; # needs to match O-RU configuration do_precoding = 0; # needs to match O-RU configuration
} }
@@ -250,10 +249,11 @@ log_config :
fhi_72 = { fhi_72 = {
dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1"); dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1");
dpdk_iova_mode = "VA";
system_core = 0; system_core = 0;
io_core = 1; io_core = 1;
worker_cores = (2); worker_cores = (2);
ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
mtu = 9600; mtu = 9600;
fh_config = ({ fh_config = ({
T1a_cp_dl = (285, 470); T1a_cp_dl = (285, 470);
ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
+8 -9
View File
@@ -53,11 +53,10 @@
</testCase> </testCase>
<testCase id="110000"> <testCase id="110000">
<class>Pull_Cluster_Image</class> <class>Pull_Local_Registry</class>
<desc>Pull Images from Cluster</desc> <desc>Pull Images from Local Registry</desc>
<oc_project>oaicicd-ran</oc_project> <svr_id>0</svr_id>
<images>oai-gnb-fhi72</images> <images>oai-gnb-fhi72</images>
<node>cacofonix</node>
</testCase> </testCase>
<testCase id="800813"> <testCase id="800813">
<class>Create_Workspace</class> <class>Create_Workspace</class>
@@ -91,8 +90,8 @@
<testCase id="100010"> <testCase id="100010">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/300Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (DL/600Mbps/UDP)(30 sec)(multi-ue profile)</desc>
<iperf_args>-u -b 300M -t 30 -R</iperf_args> <iperf_args>-u -b 600M -t 30 -R</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_packetloss_threshold>20</iperf_packetloss_threshold> <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
<iperf_bitrate_threshold>80</iperf_bitrate_threshold> <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -111,8 +110,8 @@
<testCase id="100020"> <testCase id="100020">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/70Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/80Mbps/UDP)(30 sec)(multi-ue profile)</desc>
<iperf_args>-u -b 70M -t 30</iperf_args> <iperf_args>-u -b 80M -t 30</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_packetloss_threshold>20</iperf_packetloss_threshold> <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
<iperf_bitrate_threshold>80</iperf_bitrate_threshold> <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -125,7 +124,7 @@
<desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
<iperf_args>-t 30</iperf_args> <iperf_args>-t 30</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_tcp_rate_target>40</iperf_tcp_rate_target> <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
<svr_id>oc-cn5g-20897</svr_id> <svr_id>oc-cn5g-20897</svr_id>
</testCase> </testCase>
ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml
+2 -3
View File
@@ -2,7 +2,6 @@ services:
oai-gnb: oai-gnb:
image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-fhi72:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-fhi72:${TAG:-develop}
cap_add: cap_add:
- SYS_ADMIN
- IPC_LOCK - IPC_LOCK
- SYS_NICE - SYS_NICE
cap_drop: cap_drop:
@@ -10,14 +9,14 @@ services:
container_name: oai-gnb container_name: oai-gnb
environment: environment:
TZ: Europe/Paris TZ: Europe/Paris
USE_ADDITIONAL_OPTIONS: --thread-pool 6,7,8,9 USE_ADDITIONAL_OPTIONS: --thread-pool 7,8,9,10,11,12
devices: devices:
- /dev/vfio:/dev/vfio/ - /dev/vfio:/dev/vfio/
volumes: volumes:
- ../../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf:/opt/oai-gnb/etc/gnb.conf - ../../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf:/opt/oai-gnb/etc/gnb.conf
- /dev/hugepages:/dev/hugepages - /dev/hugepages:/dev/hugepages
# Please change these values based on your system # Please change these values based on your system
cpuset: "0,1,2,3,4,5,6,7,8,9" cpuset: "0,1,2,3,4,5,6,7,8,9,10,11,12"
networks: networks:
oai-net: oai-net:
ipv4_address: 172.21.18.20 ipv4_address: 172.21.18.20
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf
+6 -6
View File
@@ -33,12 +33,12 @@ gNBs =
# n_TimingAdvanceOffset = 0; # n_TimingAdvanceOffset = 0;
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# center frequency = 3999.36 MHz # center frequency = 4049.76 MHz
# selected SSB frequency = 3999.36 MHz # selected SSB frequency = 4049.76 MHz
absoluteFrequencySSB = 666624; absoluteFrequencySSB = 669984;
dl_frequencyBand = 77; dl_frequencyBand = 77;
# frequency point A = 3980.28 MHz # frequency point A = 4030.68 MHz
dl_absoluteFrequencyPointA = 665352; dl_absoluteFrequencyPointA = 668712;
#scs-SpecificCarrierList #scs-SpecificCarrierList
dl_offstToCarrier = 0; dl_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
@@ -259,7 +259,7 @@ fhi_72 = {
system_core = 0; system_core = 0;
io_core = 1; io_core = 1;
worker_cores = (2); worker_cores = (2);
ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
mtu = 9600; mtu = 9600;
fh_config = ({ fh_config = ({
T1a_cp_dl = (285, 470); T1a_cp_dl = (285, 470);
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf
+6 -6
View File
@@ -31,12 +31,12 @@ gNBs =
# n_TimingAdvanceOffset = 0; # n_TimingAdvanceOffset = 0;
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# center frequency = 3999.36 MHz # center frequency = 4049.76 MHz
# selected SSB frequency = 3999.36 MHz # selected SSB frequency = 4049.76 MHz
absoluteFrequencySSB = 666624; absoluteFrequencySSB = 669984;
dl_frequencyBand = 77; dl_frequencyBand = 77;
# frequency point A = 3950.22 MHz # frequency point A = 4000.62 MHz
dl_absoluteFrequencyPointA = 663348; dl_absoluteFrequencyPointA = 666708;
#scs-SpecificCarrierList #scs-SpecificCarrierList
dl_offstToCarrier = 0; dl_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
@@ -256,7 +256,7 @@ fhi_72 = {
system_core = 0; system_core = 0;
io_core = 1; io_core = 1;
worker_cores = (2); worker_cores = (2);
ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
mtu = 9600; mtu = 9600;
fh_config = ({ fh_config = ({
T1a_cp_dl = (285, 470); T1a_cp_dl = (285, 470);
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+6 -6
View File
@@ -33,12 +33,12 @@ gNBs =
# n_TimingAdvanceOffset = 0; # n_TimingAdvanceOffset = 0;
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# center frequency = 3999.36 MHz # center frequency = 4049.76 MHz
# selected SSB frequency = 3999.36 MHz # selected SSB frequency = 4049.76 MHz
absoluteFrequencySSB = 666624; absoluteFrequencySSB = 669984;
dl_frequencyBand = 77; dl_frequencyBand = 77;
# frequency point A = 3950.22 MHz # frequency point A = 4000.62 MHz
dl_absoluteFrequencyPointA = 663348; dl_absoluteFrequencyPointA = 666708;
#scs-SpecificCarrierList #scs-SpecificCarrierList
dl_offstToCarrier = 0; dl_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
@@ -258,7 +258,7 @@ fhi_72 = {
system_core = 0; system_core = 0;
io_core = 1; io_core = 1;
worker_cores = (2); worker_cores = (2);
ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
mtu = 9600; mtu = 9600;
fh_config = ({ fh_config = ({
T1a_cp_dl = (285, 470); T1a_cp_dl = (285, 470);