Commit 6d9c2c35 authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'integration_2025_w07' into 'develop' 

Integration: `2025.w07`

Closes #812, #901, #904, #881, and #819

See merge request oai/openairinterface5g!3258

* !3055 Dynamic PDCCH aggregation level
* !3176 Refactor and extend NAS Registration Request
* !3256 Add check on force_local in custom_command CI handling
* !3257 Bugfix in gNB modulated DCI buffer size
* !3249 Improvements in TDD configuration
* !3194 fix NTN LEO scenarios
* !3200 FHI72: remove polling, fix memory leak
* !3127 Optimizations of PDSCH Resource Mapping in nr_dlsch.c/nr_modulation.c
* !3252 \[E2 agent\] Multi RC REPORT service styles support
parents ff58b5e1 87c83f72

CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -1366,6 +1366,7 @@ target_link_libraries(NR_L2_UE PRIVATE nr_nas) 


add_library(MAC_NR_COMMON

            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c

            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c

            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c

)

target_link_libraries(MAC_NR_COMMON PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -1891,6 +1892,7 @@ add_executable(nr-uesoftmodem 
  ${OPENAIR_DIR}/radio/COMMON/common_lib.c

  ${OPENAIR_DIR}/radio/COMMON/record_player.c

  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c

  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c

  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c

  )

ci-scripts/conf_files/gnb.sa.band66.ntn.25prb.rfsim.conf→ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf

+40 −19
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ gNBs = 


    sib1_tda                                                  = 5;

    min_rxtxtime                                              = 6;

    disable_harq                                              = 1;

    num_dlharq                                                = 32;

    num_ulharq                                                = 32;



    servingCellConfigCommon = (

    {
@@ -28,11 +29,11 @@ gNBs = 


#  downlinkConfigCommon

    #frequencyInfoDL

      # this is 2150.43 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block

      absoluteFrequencySSB                                          = 430590;

      dl_frequencyBand                                              = 66;

      # this is 2150.43 MHz

      dl_absoluteFrequencyPointA                                    = 430086;

      # GSCN 6221

      absoluteFrequencySSB                                          = 497770;

      dl_frequencyBand                                              = 254;

      # this is 2486.15 MHz

      dl_absoluteFrequencyPointA                                    = 497230;

      #scs-SpecificCarrierList

        dl_offstToCarrier                                           = 0;

# subcarrierSpacing
@@ -52,9 +53,9 @@ gNBs = 


  #uplinkConfigCommon

     #frequencyInfoUL

      ul_frequencyBand                                              = 66;

      # this is 1750.43 MHz

      ul_absoluteFrequencyPointA                                    = 350086;

      ul_frequencyBand                                              = 254;

      # this is 1612.65 MHz

      ul_absoluteFrequencyPointA                                    = 322530;

      #scs-SpecificCarrierList

      ul_offstToCarrier                                             = 0;

# subcarrierSpacing
@@ -147,14 +148,15 @@ gNBs = 


  #ext2

    #ntn_Config_r17

      cellSpecificKoffset_r17                                       = 478;

      ta-Common-r17                                                 = 29314900;

      cellSpecificKoffset_r17                                       = 40;

      ta-Common-r17                                                 = 4634000; # 18.87 ms

      ta-CommonDrift-r17                                            = -230000; # -46 µs/s

      positionX-r17                                                 = 0;

      positionY-r17                                                 = 0;

      positionZ-r17                                                 = 32433846;

      positionY-r17                                                 = -2166908; # -2816980.4 m

      positionZ-r17                                                 =  4910784; #  6384019.2 m

      velocityVX-r17                                                = 0;

      velocityVY-r17                                                = 0;

      velocityVZ-r17                                                = 0;

      velocityVY-r17                                                = 115246; # 6914.76 m/s

      velocityVZ-r17                                                =  50853; # 3051.18 m/s

  }



  );
@@ -196,8 +198,11 @@ MACRLCs = ( 
  num_cc                      = 1;

  tr_s_preference             = "local_L1";

  tr_n_preference             = "local_RRC";

#  ulsch_max_frame_inactivity  = 0;

  pusch_TargetSNRx10          = 150;

  pucch_TargetSNRx10          = 200;

  dl_max_mcs                  = 9;

  ul_max_mcs                  = 9;

}

);
@@ -205,7 +210,7 @@ L1s = ( 
{

  num_cc = 1;

  tr_n_preference       = "local_mac";

  prach_dtx_threshold   = 120;

  prach_dtx_threshold   = 150;

  pucch0_dtx_threshold  = 150;

  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0

}
@@ -243,11 +248,28 @@ rfsimulator : 
{

  serveraddr = "server";

  serverport = 4043;

  options = (); #("saviq"); or/and "chanmod"

  modelname = "AWGN";

  options = ("chanmod"); #("saviq"); or/and "chanmod"

  prop_delay = 20;

  IQfile = "/tmp/rfsimulator.iqs";

};



channelmod = {

  max_chan=10;

  modellist="modellist_rfsimu_1";

  modellist_rfsimu_1 = (

    {

      model_name     = "rfsimu_channel_enB0"

      type           = "SAT_LEO_TRANS";

      noise_power_dB = -100;

    },

    {

      model_name     = "rfsimu_channel_ue0"

      type           = "SAT_LEO_TRANS";

      noise_power_dB = -100;

    }

  );

};



security = {

  # preferred ciphering algorithms

  # the first one of the list that an UE supports in chosen
@@ -277,4 +299,3 @@ log_config : 
  ngap_log_level                        ="debug";

  f1ap_log_level                        ="debug";

};

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band254.ntn.mu0.25prb.rfsim.conf→ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf

+13 −11
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ gNBs = 


#  downlinkConfigCommon

    #frequencyInfoDL

      # GSCN 6221 = 497770, (GSCN 6215 - 497290)

      # GSCN 6221

      absoluteFrequencySSB                                          = 497770;

      dl_frequencyBand                                              = 254;

      # this is 2486.9 MHz

      dl_absoluteFrequencyPointA                                    = 497380;

      # this is 2486.15 MHz

      dl_absoluteFrequencyPointA                                    = 497230;

      #scs-SpecificCarrierList

        dl_offstToCarrier                                           = 0;

# subcarrierSpacing
@@ -47,14 +47,14 @@ gNBs = 
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120

        initialDLBWPsubcarrierSpacing                               = 0;

      #pdcch-ConfigCommon

        initialDLBWPcontrolResourceSetZero                          = 0;

        initialDLBWPcontrolResourceSetZero                          = 2;

        initialDLBWPsearchSpaceZero                                 = 0;



  #uplinkConfigCommon

     #frequencyInfoUL

      ul_frequencyBand                                              = 254;

      # this is 1613.4 MHz

      ul_absoluteFrequencyPointA                                    = 322680;

      # this is 1612.65 MHz

      ul_absoluteFrequencyPointA                                    = 322530;

      #scs-SpecificCarrierList

      ul_offstToCarrier                                             = 0;

# subcarrierSpacing
@@ -147,8 +147,8 @@ gNBs = 


  #ext2

    #ntn_Config_r17

      cellSpecificKoffset_r17                                       = 478; //GEO

      ta-Common-r17                                                 = 29319745;

      cellSpecificKoffset_r17                                       = 478;

      ta-Common-r17                                                 = 58629666; # 238.74 ms

      positionX-r17                                                 = 0;

      positionY-r17                                                 = 0;

      positionZ-r17                                                 = 32433846;
@@ -196,8 +196,11 @@ MACRLCs = ( 
  num_cc                      = 1;

  tr_s_preference             = "local_L1";

  tr_n_preference             = "local_RRC";

#  ulsch_max_frame_inactivity  = 0;

  pusch_TargetSNRx10          = 150;

  pucch_TargetSNRx10          = 200;

  dl_max_mcs                  = 9;

  ul_max_mcs                  = 9;

}

);
@@ -205,7 +208,7 @@ L1s = ( 
{

  num_cc = 1;

  tr_n_preference       = "local_mac";

  prach_dtx_threshold   = 120;

  prach_dtx_threshold   = 150;

  pucch0_dtx_threshold  = 150;

  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0

}
@@ -244,7 +247,7 @@ rfsimulator : 
  serveraddr = "server";

  serverport = 4043;

  options = (); #("saviq"); or/and "chanmod"

  modelname = "AWGN";

  prop_delay = 238.74;

  IQfile = "/tmp/rfsimulator.iqs";

};
@@ -277,4 +280,3 @@ log_config : 
  ngap_log_level                        ="debug";

  f1ap_log_level                        ="debug";

};

ci-scripts/main.py

+3 −0
Original line number Diff line number Diff line
@@ -406,6 +406,9 @@ def ExecuteActionWithParam(action): 


	elif action == 'Custom_Command':

		node = test.findtext('node')

		if force_local:

			# Change all execution targets to localhost

			node = 'localhost'

		command = test.findtext('command')

		command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']

		success = cls_oaicitest.Custom_Command(HTML, node, command, command_fail)

ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ services: 
        cap_drop:

            - ALL

        environment:

            USE_ADDITIONAL_OPTIONS: --rfsim --rfsimulator.prop_delay 238.74 --log_config.global_log_options level,nocolor,time

            USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time

            ASAN_OPTIONS: detect_leaks=0

        depends_on:

            - oai-ext-dn
@@ -94,7 +94,7 @@ services: 
            public_net:

                ipv4_address: 192.168.71.140

        volumes:

            - ../../conf_files/gnb.sa.band66.ntn.25prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf

            - ../../conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf:/opt/oai-gnb/etc/gnb.conf

        healthcheck:

            test: /bin/bash -c "pgrep nr-softmodem"

            interval: 10s
@@ -110,7 +110,7 @@ services: 
            - NET_ADMIN  # for interface bringup

            - NET_RAW    # for ping

        environment:

            USE_ADDITIONAL_OPTIONS: --band 66 -C 2152680000 --CO -400000000 -r 25 --numerology 0 --ssb 48 --rfsim --rfsimulator.prop_delay 238.74 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time

            USE_ADDITIONAL_OPTIONS: --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.prop_delay 238.74 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time

        depends_on:

            - oai-gnb

        networks: