From e0af1a2e75e33ee89ed3ee27327d8043a4b32119 Mon Sep 17 00:00:00 2001 From: francescomani Date: Wed, 26 Nov 2025 10:50:57 +0100 Subject: [PATCH] convert RFsim FR2 32 PRB test into 66 PRB to test MUX pattern 3 --- ...conf => gnb.sa.band257.u3.66prb.rfsim.conf} | 18 +++++++++--------- ...rb.xml => container_5g_rfsim_fr2_66prb.xml} | 8 ++++---- .../docker-compose.yaml | 4 ++-- doc/analog_beamforming.md | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) rename ci-scripts/conf_files/{gnb.sa.band261.u3.32prb.rfsim.conf => gnb.sa.band257.u3.66prb.rfsim.conf} (98%) rename ci-scripts/xml_files/{container_5g_rfsim_fr2_32prb.xml => container_5g_rfsim_fr2_66prb.xml} (92%) rename ci-scripts/yaml_files/{5g_rfsimulator_fr2_32prb => 5g_rfsimulator_fr2_66prb}/docker-compose.yaml (97%) diff --git a/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf similarity index 98% rename from ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf rename to ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf index c37acc89f5..fac77fc70e 100644 --- a/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf @@ -29,40 +29,40 @@ gNBs = # downlinkConfigCommon #frequencyInfoDL # this is pointA + 16 PRBs@120kHz SCS (same as initial BWP) - absoluteFrequencySSB = 2071387; - dl_frequencyBand = 261; + absoluteFrequencySSB = 2078299; + dl_frequencyBand = 257; # this is 27.900 GHz - dl_absoluteFrequencyPointA = 2071001; + dl_absoluteFrequencyPointA = 2077915; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 dl_subcarrierSpacing = 3; - dl_carrierBandwidth = 32; + dl_carrierBandwidth = 66; #initialDownlinkBWP #genericParameters # this is RBstart=0,L=32 (275*(L-1))+RBstart - initialDLBWPlocationAndBandwidth = 8525; + initialDLBWPlocationAndBandwidth = 13475; # subcarrierSpacing # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 initialDLBWPsubcarrierSpacing = 3; #pdcch-ConfigCommon - initialDLBWPcontrolResourceSetZero = 1; + initialDLBWPcontrolResourceSetZero = 4; initialDLBWPsearchSpaceZero = 0; #uplinkConfigCommon #frequencyInfoUL - ul_frequencyBand = 261; + ul_frequencyBand = 257; #scs-SpecificCarrierList ul_offstToCarrier = 0; # subcarrierSpacing # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 ul_subcarrierSpacing = 3; - ul_carrierBandwidth = 32; + ul_carrierBandwidth = 66; pMax = 20; #initialUplinkBWP #genericParameters - initialULBWPlocationAndBandwidth = 8525; + initialULBWPlocationAndBandwidth = 13475; # subcarrierSpacing # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 initialULBWPsubcarrierSpacing = 3; diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_66prb.xml similarity index 92% rename from ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml rename to ci-scripts/xml_files/container_5g_rfsim_fr2_66prb.xml index 5eab626ece..b64837c839 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_66prb.xml @@ -21,7 +21,7 @@ --> - rfsim-fr2-32prb-5gnr-tdd + rfsim-fr2-66prb-5gnr-tdd Monolithic FR2 gNB wrench @@ -42,7 +42,7 @@ Deploy_Object Deploy OAI gNB localhost - ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb + ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb mysql oai-amf oai-smf oai-upf oai-ext-dn @@ -50,7 +50,7 @@ Deploy_Object Deploy OAI NR-UE localhost - ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb + ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb oai-gnb oai-nr-ue @@ -88,7 +88,7 @@ true Undeploy all OAI 5G stack localhost - ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb + ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb 10,0,0,0 10,0,0,0 diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb/docker-compose.yaml similarity index 97% rename from ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml rename to ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb/docker-compose.yaml index 7ae33004f5..dfc7064c0d 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb/docker-compose.yaml @@ -102,7 +102,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.sa.band261.u3.32prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.sa.band257.u3.66prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" start_period: 10s @@ -122,7 +122,7 @@ services: environment: USE_ADDITIONAL_OPTIONS: --rfsim --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - -r 32 --numerology 3 --band 261 -C 27533160000 --ssb 73 + -C 27972480000 -r 66 --numerology 3 --ssb 72 --band 257 ASAN_OPTIONS: detect_leaks=0 devices: - /dev/net/tun:/dev/net/tun diff --git a/doc/analog_beamforming.md b/doc/analog_beamforming.md index 6a11a9f94a..02bc4a46f9 100644 --- a/doc/analog_beamforming.md +++ b/doc/analog_beamforming.md @@ -14,7 +14,7 @@ Analog beamforming implementation also allows to enable distributed antenna syst # Configuration file fields for analog beamforming -A set of parameters in configuration files controls the implementation of analog beamforming and instructs the scheduler on how to behave in such scenarios. Since most notably this technique in 5G is employed in FR2, the configuration file example currently available is a RFsim one for band 261. [Config file example](../ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf) +A set of parameters in configuration files controls the implementation of analog beamforming and instructs the scheduler on how to behave in such scenarios. Since most notably this technique in 5G is employed in FR2, the configuration file example currently available is a RFsim one for band 261. [Config file example](../ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf) In the `MACRLC` section of configuration files, there are three new parameters: `set_analog_beamforming`, `beam_duration` and `beams_per_period`. The explanation of these parameters is here provided: - `set_analog_beamforming` can be set a value equal to 1 or 2 to activate or 0 to desactivate analog beamforming (default value is 0)