Commit 8c0641c6 authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'integration_2025_w24' into 'develop' 

Integration: `2025.w24`

Closes #965

See merge request oai/openairinterface5g!3476

* !3354 Preparation Work for N2 Handover
* !3383 Add configurable values of NR RLC and NR PDCP to the configuration file
* !3468 Resolve "SSB frequency at gnb.sa.band78.fr1.24PRB.usrpb210.conf is invalid"
* !3466 YAML related updates
* !3460 SRS configuration
* !3474 Fix AMF selection fallback by PLMN ID when no UE identity is present or matching
* !3473 Fix various bugs and inconsistencies in config read, SCTP, ITTI, GTP
* !3169 NR RU improvements for analog beamforming
* !3456 CI: update config for AW2S pipeline
* !3369 Add Security Mode Reject lib/unit test and adopt in stack
* !3457 Fix NR reestablishment
* !3412 [E2 agent] E2AP README update and OAI-FlexRIC CI pipeline improvements
parents 627e60f5 736ea530

CMakeLists.txt

+9 −8
Original line number Diff line number Diff line
@@ -300,14 +300,15 @@ add_definitions(-DHAVE_NETINET_IN_H) 
set(E2_AGENT "OFF" CACHE STRING "O-RAN-compliant E2 Agent")

set_property(CACHE E2_AGENT PROPERTY STRINGS "ON" "OFF")



if (E2_AGENT)

  set(E2AP_VERSION "E2AP_V2" CACHE STRING "E2AP version")

  set_property(CACHE E2AP_VERSION PROPERTY STRINGS "E2AP_V1" "E2AP_V2" "E2AP_V3")

message(STATUS "Selected E2AP_VERSION: ${E2AP_VERSION}")

  message(STATUS "Selected E2AP version: ${E2AP_VERSION}")



  set(KPM_VERSION "KPM_V2_03" CACHE STRING "The KPM SM version to use")

  set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")

message(STATUS "Selected KPM Version: ${KPM_VERSION}")



  message(STATUS "Selected KPM version: ${KPM_VERSION}")

endif()



add_boolean_option(ENABLE_IMSCOPE OFF "Enable phy scope based on imgui" OFF)

add_boolean_option(ENABLE_IMSCOPE_RECORD OFF "Enable recording IQ data for imscope" OFF)

ci-scripts/as_ue/aw2s-multi-00102-20.cfg

+2 −3
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 
#define DL_ARFCN 631296

#define TDD 1



log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",

log_options: "all.level=debug,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",

log_filename: "/tmp/ue.log",



/* Enable remote API and Web interface */

com_addr: "0.0.0.0:9002",



include "rf_driver_20/1chan.cfg",

include "rf_driver/config.cfg",



/* If true, allow the simulation of several UEs at the same time and

allow dynamic UE creation from remote API */
@@ -22,7 +22,6 @@ allow dynamic UE creation from remote API */ 
  cell_groups: [{

      group_type: "nr",

      multi_ue: true,

      ldpc_max_its:8,

      cells: [{

      rf_port: 0,

      bandwidth: 20,

ci-scripts/as_ue/config.cfg

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/* Parameters for SDR device version 2023-06-10

 * Copyright (C) 2015-2023 Amarisoft

 */



#if !defined(N_CELL)

  #define N_CELL 1

#endif



#if N_ANTENNA_DL <= 2

  #define N_CHAN N_CELL

#else

  #define N_CHAN 2*N_CELL

#endif



rf_driver: {

    name: "sdr",



    /* list of devices. 'dev0' is always the master. */

#if N_CHAN == 1

    args: "dev0=/dev/sdr0",

#elif N_CHAN == 2

    args: "dev0=/dev/sdr0,dev1=/dev/sdr1",

#elif N_CHAN == 3

    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2",

#elif N_CHAN == 4

    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2,dev3=/dev/sdr3",

#elif N_CHAN == 6

    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2,dev3=/dev/sdr3,dev4=/dev/sdr4,dev5=/dev/sdr5",

#else

    args: "",

#endif



    /* synchronisation source: internal, gps, external (default = internal) */

    // sync: "gps",

    //rx_antenna:"rx", // force to use the RX connector in TDD as RX antenna



    /* PCIe jitter. decrease it to reduce latency */

    fifo_tx_time: 50,

    //rx_latency: 30,

},



#if 0

  tx_pad_duration:300,

#endif



tx_gain: 75.0, /* TX gain (in dB) */

rx_gain: 55.0, /* RX gain (in dB) */

ci-scripts/ci_infra.yaml

+40 −38
Original line number Diff line number Diff line
@@ -147,125 +147,127 @@ ltebox-nepes: 


amarisoft_ue:

  Host: amariue

  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &

  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2

  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &

  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2

  NetworkScript: ip netns exec ue1 ip a show dev pdn0

amarisoft_ue_2x2:

  Host: amariue

  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &

  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2

  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &

  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2

  NetworkScript: ip netns exec ue1 ip a show dev pdn0

amarisoft_ue_fhi72:

  Host: amariue

  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-multi-20897-2x2.cfg &

  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2

  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-multi-20897-2x2.cfg &

  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2

amarisoft_ue_1:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'

  NetworkScript: ip netns exec ue1 ip a show dev pdn0

  CmdPrefix: ip netns exec ue1

  MTU: 1500

amarisoft_ue_2:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'

  NetworkScript: ip netns exec ue2 ip a show dev pdn0

  CmdPrefix: ip netns exec ue2

  MTU: 1500

amarisoft_ue_3:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'

  NetworkScript: ip netns exec ue3 ip a show dev pdn0

  CmdPrefix: ip netns exec ue3

  MTU: 1500

amarisoft_ue_4:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'

  NetworkScript: ip netns exec ue4 ip a show dev pdn0

  CmdPrefix: ip netns exec ue4

  MTU: 1500

amarisoft_ue_5:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'

  NetworkScript: ip netns exec ue5 ip a show dev pdn0

  CmdPrefix: ip netns exec ue5

  MTU: 1500

amarisoft_ue_6:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'

  NetworkScript: ip netns exec ue6 ip a show dev pdn0

  CmdPrefix: ip netns exec ue6

  MTU: 1500

amarisoft_ue_7:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'

  NetworkScript: ip netns exec ue7 ip a show dev pdn0

  CmdPrefix: ip netns exec ue7

  MTU: 1500

amarisoft_ue_8:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'

  NetworkScript: ip netns exec ue8 ip a show dev pdn0

  CmdPrefix: ip netns exec ue8

  MTU: 1500

amarisoft_ue_9:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'

  NetworkScript: ip netns exec ue9 ip a show dev pdn0

  CmdPrefix: ip netns exec ue9

  MTU: 1500

amarisoft_ue_10:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'

  NetworkScript: ip netns exec ue10 ip a show dev pdn0

  CmdPrefix: ip netns exec ue10

  MTU: 1500

amarisoft_ue_11:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'

  NetworkScript: ip netns exec ue11 ip a show dev pdn0

  CmdPrefix: ip netns exec ue11

  MTU: 1500

amarisoft_ue_12:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'

  NetworkScript: ip netns exec ue12 ip a show dev pdn0

  CmdPrefix: ip netns exec ue12

  MTU: 1500

amarisoft_ue_13:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'

  NetworkScript: ip netns exec ue13 ip a show dev pdn0

  CmdPrefix: ip netns exec ue13

  MTU: 1500

amarisoft_ue_14:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'

  NetworkScript: ip netns exec ue14 ip a show dev pdn0

  CmdPrefix: ip netns exec ue14

  MTU: 1500

amarisoft_ue_15:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'

  NetworkScript: ip netns exec ue15 ip a show dev pdn0

  CmdPrefix: ip netns exec ue15

  MTU: 1500

amarisoft_ue_16:

  Host: amariue

  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'

  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'

  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'

  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'

  NetworkScript: ip netns exec ue16 ip a show dev pdn0

  CmdPrefix: ip netns exec ue16

  MTU: 1500

ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf

+8 −0
Original line number Diff line number Diff line
@@ -58,6 +58,14 @@ gNBs = 
  }

);



pdcp = {

  drb = {

    sn_size = "len18bits"

    t_reordering  = "ms100"

    discard_timer = "infinity"

  }

}



security = {

  # preferred ciphering algorithms

  # the first one of the list that an UE supports in chosen