Commit bab05384 authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'integration_2025_w22' into 'develop' 

Integration: `2025.w22`

Closes #832

See merge request !3452

* !3415 several fixes and cleanup for nrLDPC_coding_t2
* !3448 T: macpdu2wireshark: dump to file instead of sending UDP packets
* !3449 bugfix: pass correct buffer
* !3453 CI: revert modification of SSB per RACH occasion in SC-FDMA test
* !3440 Update NAS documentation
* !3451 fix the number of preambles per SSB at UE in case PRACH is configured with groupB
* !3441 Replace hashtable with epoll_event_t in rfsimulator
* !3277 Add CI test to force RRC IDLE and new connection setup with 5G-S-TMSI
* !3454 Keep old MAC stats after re-establishment
* !3450 Make number of UL/DL actors in NR UE fully configurable
* !3458 (doc): update README with build icons for dedicated arch and os
parents b2c9a1d2 714b223a

README.md

+4 −3
Original line number Diff line number Diff line
@@ -4,10 +4,9 @@ 


<p align="center">

    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>

    <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>

    <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>

    <a href="https://releases.ubuntu.com/24.04/"><img src="https://img.shields.io/badge/OS-Ubuntu24-Green" alt="Supported OS Ubuntu 24"></a>

    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>

    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RHEL9"></a>

    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore41-Green" alt="Supported OS Fedora 41"></a>

</p>
@@ -16,7 +15,9 @@ 
</p>



<p align="center">

    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Container-Parent/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Container-Parent%2F&label=build%20Images"></a>

    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Ubuntu18-Image-Builder%2F&label=build-Ubuntu-x86%20Images"></a>

    <a href="https://jenkins-oai.eurecom.fr/job/RAN-RHEL8-Cluster-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-RHEL8-Cluster-Image-Builder%2F&label=build-UBI-x86%20Images"></a>

    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu-ARM-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Ubuntu-ARM-Image-Builder%2F&label=build-Ubuntu-ARM%20Images"></a>

</p>



<p align="center">

ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ gNBs = 
        ra_ResponseWindow                                           = 4;

#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR

#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen

        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 2;

        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;

#one (0..15) 4,8,12,16,...60,64

        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;

#ra_ContentionResolutionTimer

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

+27 −6
Original line number Diff line number Diff line
@@ -34,9 +34,24 @@ 
 020002

 030001

 030002

 040002

 000004

 020001

 040002

 000004

 020001

 040002

 000004

 020001

 040002

 000004

 020001

 040002

 000004

 020001

 040001

 000004

 020002

 020001

 100001

 222222

        </TestCaseRequestedList>
@@ -82,7 +97,7 @@ 
        <testCase id="000004">

                <class>IdleSleep</class>

                <desc>Sleep</desc>

                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>

                <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>

        </testCase>



        <testCase id="020001">
@@ -92,8 +107,8 @@ 
                <nodes>cacofonix</nodes>

                <svr_id>rfsim5g_ext_dn</svr_id>

                <svr_node>cacofonix</svr_node>

                <ping_args> -c 20 -i0.2</ping_args>

                <ping_packetloss_threshold>5</ping_packetloss_threshold>

                <ping_args> -c 20 -i0.5</ping_args>

                <ping_packetloss_threshold>80</ping_packetloss_threshold>

        </testCase>



        <testCase id="020002">
@@ -139,13 +154,19 @@ 
                <command_fail>yes</command_fail>

        </testCase>



        <testCase id="040002">

                <class>Custom_Command</class>

                <desc>Force RRC_IDLE (UE ID 0)</desc>

                <node>cacofonix</node>

                <command>echo ciUE force_RRC_IDLE | nc 192.168.71.150 8091</command>

                <command_fail>yes</command_fail>

        </testCase>



        <testCase id="100001">

                <class>Undeploy_Object</class>

                <always_exec>true</always_exec>

                <desc>Undeploy all OAI 5G stack</desc>

                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_24prb</yaml_path>

                <d_retx_th>1,0,0,0</d_retx_th>

                <u_retx_th>1,0,0,0</u_retx_th>

                <eNB_instance>0</eNB_instance>

                <eNB_serverId>0</eNB_serverId>

        </testCase>

common/config/yaml/config_yaml.cpp

+15 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ extern "C" { 
#include "common/config/config_userapi.h"

void *config_allocate_new(configmodule_interface_t *cfg, int sz, bool autoFree);

void config_check_valptr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int elt_sz, int nb_elt);

#include "../config_userapi.h"

#include "../config_common.h"

}

#include <cstring>

#include <string>
@@ -98,6 +100,9 @@ void SetDefault(configmodule_interface_t *cfg, paramdef_t *param) 
        param->uptr = (uint32_t *)param->defintarrayval;

      }

      break;

    case TYPE_IPV4ADDR:

      config_setdefault_ipv4addr(cfg, param, param->defstrval);

      break;

    default:

      AssertFatal(false, "Unhandled type %d", param->type);

  }
@@ -186,6 +191,16 @@ void SetNonDefault(configmodule_interface_t *cfg, const YAML::Node &node, paramd 
      }

      break;

    }

    case TYPE_IPV4ADDR: {

      std::string ipv4addr = node[optname].as<std::string>();

      char* ipv4addr_ptr = strdup(ipv4addr.c_str());

      int rst = config_assign_ipv4addr(cfg, param, ipv4addr_ptr);

      free(ipv4addr_ptr);

      if (rst < 0) {

        fprintf(stderr,"[LIBCONFIG] %s not valid for %s \n", ipv4addr.c_str(), optname.c_str());

      }

      break;

    }

    default:

      AssertFatal(false, "Unhandled type %d", param->type);

  }

common/config/yaml/tests/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ configure_file(test_string.yaml test_string.yaml COPYONLY) 
configure_file(test_list_of_mappings.yml test_list_of_mappings.yml COPYONLY)

configure_file(test_int_array.yaml test_int_array.yaml COPYONLY)

configure_file(test_read_mapping_as_list.yaml test_read_mapping_as_list.yaml COPYONLY)

configure_file(test_ipv4.yaml test_ipv4.yaml COPYONLY)