log

Revert "log"
This reverts commit 26b74de4bd.
2026-07-14 05:00:31 +00:00 · 2026-04-17 09:20:41 +01:00 · 2026-04-16 21:03:16 +01:00 · 2026-04-16 21:01:55 +01:00 · 2026-04-16 20:36:00 +01:00 · 2026-04-16 20:31:32 +01:00
1184 changed files with 31169 additions and 63448 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,4 +5,3 @@ common/utils/T/T_IDs.h
 common/utils/T/T_messages.txt.h
 common/utils/T/genids
 common/utils/T/genids.o
-build/
--- a/.github/workflows/jenkins-dispatch.yml
+++ b/.github/workflows/jenkins-dispatch.yml
@@ -1,190 +0,0 @@
-name: Duranta Jenkins Dispatch
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened, labeled]
-    branches: [develop]
-  push:
-    branches:
-      - develop
-
-concurrency:
-  group: ${{ github.event_name }}-${{ github.event.action }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  verify-signed-commits:
-    runs-on: ubuntu-24.04
-
-    if: github.event_name == 'pull_request_target'
-
-    steps:
-      - name: Check all commits are signed
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          UNSIGNED=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/commits \
-            --paginate --jq '[.[] | select(.commit.verification.verified == false) | .sha[:7]] | join(", ")')
-
-          if [ -n "$UNSIGNED" ]; then
-            echo -e "$UNSIGNED commits are missing signature"
-            gh pr comment ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --body "$(cat <<EOF
-          **Validation:**
-          The following commit(s) are missing signature:
-
-          $UNSIGNED
-
-          Please use 'git commit -S' to sign your commits.
-          For detailed instructions, refer to the [CONTRIBUTING.md](https://github.com/duranta-project/openairinterface5g/blob/develop/CONTRIBUTING.md) file at the root of this repository or [GitHub Docs](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)
-          EOF
-          )"
-            exit 1
-          fi
-
-  check-labels:
-    needs: verify-signed-commits
-    runs-on: ubuntu-24.04
-
-    if: github.event_name == 'pull_request_target'
-
-    steps:
-      - name: Check for mandatory CI label
-        run: |
-          PR_LABELS=$(echo '${{ toJson(github.event.pull_request.labels) }}' | jq -r '.[].name')
-
-          for label in \
-            "${{ vars.BUILD_ONLY_LABEL }}" \
-            "${{ vars.DOC_LABEL }}" \
-            "${{ vars.NR_LABEL }}" \
-            "${{ vars.NRUE_LABEL }}" \
-            "${{ vars.LTE_LABEL }}" \
-            "${{ vars.CI_LABEL }}" \
-            "${{ vars.RETRIGGER_CI_LABEL }}"; do
-            if echo "$PR_LABELS" | grep -qxF "$label"; then
-              exit 0
-            fi
-          done
-
-          exit 1
-
-  detect-changes:
-    needs: check-labels
-    runs-on: ubuntu-24.04
-
-    if: |
-      always() && (
-        github.event_name == 'push' ||
-        needs.check-labels.result == 'success'
-      ) && (
-        github.event.action != 'labeled' ||
-        github.event.label.name == vars.RETRIGGER_CI_LABEL
-      )
-
-    outputs:
-      protected_files_changed: ${{ steps.filter.outputs.protected }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Check changed files
-        uses: dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            protected:
-              - 'ci-scripts/**'
-              - '.github/workflows/**'
-              - '.github/actions/**'
-              - 'docker/**'
-              - 'charts/**'
-              - 'openshift/**'
-              - 'cmake_targets/build_oai'
-              - 'cmake_targets/tools/build_helper'
-
-  require-maintainer-approval:
-    needs: detect-changes
-
-    if: |
-      always() &&
-      needs.detect-changes.outputs.protected_files_changed == 'true'
-    runs-on: ubuntu-24.04
-
-    environment:
-      name: ci-approval
-
-    steps:
-      - run: echo "Maintainer has approved the changes"
-
-  trigger-jenkins:
-    needs:
-      - check-labels
-      - detect-changes
-      - require-maintainer-approval
-
-    if: |
-      always() &&
-      (
-        needs.detect-changes.outputs.protected_files_changed == 'false' ||
-        needs.require-maintainer-approval.result == 'success'
-      )
-
-    runs-on: ubuntu-24.04
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-
-      - name: Trigger Jenkins
-        run: |
-          # Write payload to a temp file to avoid shell escaping issues
-          cat << 'EOF' > /tmp/payload.json
-          ${{ toJson(github.event) }}
-          EOF
-
-          # Filter and send
-          jq -c 'del(.pull_request.body)' /tmp/payload.json > /tmp/filtered_payload.json
-
-          # Remap pull_request_target -> pull_request for Jenkins compatibility
-          EVENT_NAME="${{ github.event_name }}"
-          if [ "$EVENT_NAME" = "pull_request_target" ]; then
-            EVENT_NAME="pull_request"
-          fi
-
-          curl -X POST "https://${{ secrets.J_USER }}:${{ secrets.J_PASS }}@${{ secrets.J_URL }}" \
-            -H "Accept: */*" \
-            -H "Content-Type: application/json" \
-            -H "User-Agent: GitHub-Hookshot/${{ secrets.H_AGENT }}" \
-            -H "X-Github-Delivery: ${{ secrets.GITHUB_TOKEN }}" \
-            -H "X-Github-Event: $EVENT_NAME" \
-            -H "X-Github-Hook-Id: ${{ secrets.H_ID }}" \
-            -H "X-Github-Hook-Installation-Target-Id: ${{ secrets.H_TARGET }}" \
-            -H "X-Github-Hook-Installation-Target-Type: repository" \
-            --data @/tmp/filtered_payload.json
-
-  cleanup:
-    needs:
-      - verify-signed-commits
-      - check-labels
-      - detect-changes
-      - require-maintainer-approval
-      - trigger-jenkins
-
-    if: always() && github.event_name == 'pull_request_target'
-
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Remove retrigger-ci label
-        run: |
-          PR_LABELS=$(echo '${{ toJson(github.event.pull_request.labels) }}' | jq -r '.[].name')
-          if echo "$PR_LABELS" | grep -qxF "${{ vars.RETRIGGER_CI_LABEL }}"; then
-            gh pr edit ${{ github.event.pull_request.number }} --remove-label "${{ vars.RETRIGGER_CI_LABEL }}" --repo ${{ github.repository }}
-          fi
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ cmake_targets/*/build/
 cmake_targets/ran_build/
 log/
 lte_build_oai/
-build*

 # IDE files
 .vscode
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@

 # RELEASE NOTES: #

-## [v2.4.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.4.0) -> December 2025. ##
+## [v2.4.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.4.0) -> December 2025. ##

 General new features and improvements (both RAN and UE):
 - Rework LDPC BBdev/AAL interface and support both AMD T2/Intel vRAN Boost
@@ -68,7 +68,7 @@ Configuration file changes:
  should be removed
 - `MACRLCs.[0].stats_max_ue` has been added

-## [v2.3.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.3.0) -> July 2025. ##
+## [v2.3.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.3.0) -> July 2025. ##

 General new features and improvements (both RAN and UE):
 - Preliminary support for RedCap UEs
@@ -114,7 +114,7 @@ nrUE changes:
 Regression:
 - Multiple BWPs do not work reliably on gNB; use tag 2025.w17

-## [v2.2.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.2.0) -> November 2024. ##
+## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##

 General 5G improvements (both gNB and UE):
 - Make standalone mode (SA) the default (see [`RUNMODEM.md`](doc/RUNMODEM.md))
@@ -170,7 +170,7 @@ General 5G improvements (both gNB and UE):
 This release also includes many fixes and documentation updates. See
 `doc/README.md` in the repository for an overview of documentation.

-## [v2.1.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.1.0) -> February 2024. ##
+## [v2.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.1.0) -> February 2024. ##

 This release improves existing 5G support and adds various new features.

@@ -197,7 +197,7 @@ interoperability is under testing.

 This release also includes many fixes and documentation updates.

-## [v2.0.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v2.0.0) -> August 2023. ##
+## [v2.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.0.0) -> August 2023. ##

 This release adds support for 5G and maintains previous features:
 * 5G SA in gNB
@@ -226,11 +226,11 @@ This release adds support for 5G and maintains previous features:

 For more information on supported features, please refer to the [feature set](doc/FEATURE_SET.md).

-## [v1.2.1](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.2.1) -> February 2020. ##
+## [v1.2.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.2.1) -> February 2020. ##

 * Bug fix for mutex lock for wake-up signal

-## [v1.2.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.2.0) -> January 2020. ##
+## [v1.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.2.0) -> January 2020. ##

 This version adds the following implemented features:

@@ -246,11 +246,11 @@ This version also has an improved code quality:
 * Better Test Coverage in Continuous Integration:
  - Initial framework to do long-run testing at R2LAB

-## [v1.1.1](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.1.1) -> November 2019. ##
+## [v1.1.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.1.1) -> November 2019. ##

 - Bug fix in the TDD Fair Round-Robin scheduler

-## [v1.1.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.1.0) -> July 2019. ##
+## [v1.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.1.0) -> July 2019. ##

 This version adds the following implemented features:

@@ -282,19 +282,19 @@ This version has an improved code quality:
  - Multi-RRU TDD mode
  - X2 Handover in FDD mode

-## [v1.0.3](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.0.3) -> June 2019. ##
+## [v1.0.3](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.3) -> June 2019. ##

 - Bug fix for LimeSuite v19.04.0 API

-## [v1.0.2](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.0.2) -> February 2019. ##
+## [v1.0.2](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.2) -> February 2019. ##

 - Full OAI support for 3.13.1 UHD

-## [v1.0.1](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.0.1) -> February 2019. ##
+## [v1.0.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.1) -> February 2019. ##

 - Bug fix for the UE L1 simulator.

-## [v1.0.0](https://github.com/duranta-project/openairinterface5g/releases/tag/v1.0.0) -> January 2019. ##
+## [v1.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.0.0) -> January 2019. ##

 This version first implements the architectural split described in the following picture.

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,10 @@
 cmake_minimum_required (VERSION 3.19)
 project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(OAI_VERSION 2.4.0)

-option(ENABLE_CHANNEL_SIM_CUDA "Enable CUDA accelerated channel simulation" OFF)
-if(ENABLE_CHANNEL_SIM_CUDA)
+option(CUDA_ENABLE "Enable CUDA accelerated channel simulation" OFF)
+if(CUDA_ENABLE)
    find_package(CUDA REQUIRED)
    find_package(CUDAToolkit REQUIRED)
    message(STATUS "CUDA explicitly enabled, building with GPU acceleration support.")
@@ -35,7 +34,7 @@ if(ENABLE_CHANNEL_SIM_CUDA)
        message(STATUS "CUDA Explicit Copy path enabled (default ATS was overridden).")
    endif()

-    add_compile_definitions(CHANNEL_SIM_CUDA)
+    add_compile_definitions(ENABLE_CUDA)
 endif()

 #########################################################
@@ -84,40 +83,25 @@ option(PACKAGING_COMMON "Will produce a package containing common target, config
 option(PACKAGING_USRP "Will produce a package containing usrp target, configuration files and docs" OFF)
 option(PACKAGING_PHYSIM "Will produce a package containing physim target, configuration files and docs" OFF)

+
 # Check if asn1c is installed, and check if it supports all options we need
 # a user can provide ASN1C_EXEC to override an asn1c to use (e.g., parallel
 # installation)
 find_program(ASN1C_EXEC_PATH asn1c HINTS /opt/asn1c/bin)
 set(ASN1C_EXEC ${ASN1C_EXEC_PATH} CACHE FILEPATH "path to asn1c executable")
-option(AUTO_DOWNLOAD_ASN1C "Automatically download asn1c if not found" OFF)
-if (ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -gen-APER ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -no-gen-UPER ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -no-gen-JER ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -no-gen-BER ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -no-gen-OER ASN1C_EXEC)
-  add_custom_target(asn1c DEPENDS ${ASN1C_EXEC})
-else ()
-  if (NOT AUTO_DOWNLOAD_ASN1C)
-    message(FATAL_ERROR "asn1c not found. Install it globally or activate AUTO_DOWNLOAD_ASN1C")
-  endif()
-  message(STATUS "Downloading and compile asn1c local in this build tree")
-  include(ExternalProject)
-  ExternalProject_Add(
-    asn1c_gen
-    GIT_REPOSITORY https://github.com/mouse07410/asn1c
-    GIT_TAG 940dd5fa9f3917913fd487b13dfddfacd0ded06e
-    GIT_REMOTE_UPDATE_STRATEGY CHECKOUT
-    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/asn1c
-    BUILD_IN_SOURCE True
-    CONFIGURE_COMMAND autoreconf -i
-    BUILD_COMMAND ./configure --prefix ${CMAKE_BINARY_DIR}
-    COMMAND make -j8 CFLAGS=-fno-strict-aliasing -Wmisleading-indentation
-    STEP_TARGETS build
-  )
-  set(ASN1C_EXEC ${CMAKE_BINARY_DIR}/bin/asn1c)
-  add_custom_target(asn1c DEPENDS asn1c_gen)
+if(NOT ASN1C_EXEC)
+    message(FATAL_ERROR "No asn1c found!
+You might want to re-run ./build_oai -I
+Or provide a path to asn1c using
+./build_oai ... --cmake-opt -DASN1C_EXEC=/path/to/asn1c
+")
 endif()
+check_option(${ASN1C_EXEC} -gen-APER ASN1C_EXEC)
+check_option(${ASN1C_EXEC} -no-gen-UPER ASN1C_EXEC)
+check_option(${ASN1C_EXEC} -no-gen-JER ASN1C_EXEC)
+check_option(${ASN1C_EXEC} -no-gen-BER ASN1C_EXEC)
+check_option(${ASN1C_EXEC} -no-gen-OER ASN1C_EXEC)
+
 #########################################################
 # Base directories, compatible with legacy OAI building #
 #########################################################
@@ -156,17 +140,14 @@ add_boolean_option(AVX512 ${AUTODETECT_AVX512} "Whether AVX512 intrinsics is ava
 eval_boolean(AUTODETECT_AVX2 DEFINED CPUFLAGS AND CPUFLAGS MATCHES "avx2")
 add_boolean_option(AVX2 ${AUTODETECT_AVX2} "Whether AVX2 intrinsics is available on the host processor" ON)

-eval_boolean(AUTODETECT_GFNI DEFINED CPUFLAGS AND CPUFLAGS MATCHES "gfni")
-add_boolean_option(GFNI ${AUTODETECT_GFNI} "Whether GFNI intrinsics is available on the host processor" ON)
-
 message(STATUS "CPU architecture is ${CMAKE_SYSTEM_PROCESSOR}")
 if (CROSS_COMPILE)
  message(STATUS "setting as aarch64")
  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -lgcc -lrt")
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
  # The following intrinsics are assumed to be available on any x86 system
-  # (avx, f16c, fma, mmx, pclmul, sse, sse2, sse3, xop)
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_F16C_NATIVE -DSIMDE_X86_FMA_NATIVE -DSIMDE_X86_MMX_NATIVE -DSIMDE_X86_PCLMUL_NATIVE -DSIMDE_X86_SSE2_NATIVE -DSIMDE_X86_SSE3_NATIVE -DSIMDE_X86_SSE_NATIVE -DSIMDE_X86_XOP_HAVE_COM_ -DSIMDE_X86_XOP_NATIVE")
+  # (avx, f16c, fma, gnfi, mmx, pclmul, sse, sse2, sse3, xop)
+  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_F16C_NATIVE -DSIMDE_X86_FMA_NATIVE -DSIMDE_X86_GFNI_NATIVE -DSIMDE_X86_MMX_NATIVE -DSIMDE_X86_PCLMUL_NATIVE -DSIMDE_X86_SSE2_NATIVE -DSIMDE_X86_SSE3_NATIVE -DSIMDE_X86_SSE_NATIVE -DSIMDE_X86_XOP_HAVE_COM_ -DSIMDE_X86_XOP_NATIVE")
  message(STATUS "AVX512 intrinsics are ${AVX512}")
  if(${AVX512})
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX512BW_NATIVE -DSIMDE_X86_AVX512F_NATIVE -DSIMDE_X86_AVX512VL_NATIVE -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512")
@@ -177,17 +158,13 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
  if(${AVX2})
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX2_NATIVE -DSIMDE_X86_VPCLMULQDQ_NATIVE")
  endif()
-  message(STATUS "GFNI intrinsics are ${GFNI}")
-  if(${GFNI})
-    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_GFNI_NATIVE -mgfni")
-  endif()
-  if (CPUFLAGS MATCHES "sse4_1")
+  if (CPUINFO MATCHES "sse4_1")
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_1_NATIVE")
  endif()
-  if(CPUFLAGS MATCHES "sse4_2")
+  if(CPUINFO MATCHES "sse4_2")
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_2_NATIVE")
  endif()
-  if(CPUFLAGS MATCHES "ssse3")
+  if(CPUINFO MATCHES "ssse3")
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSSE3_NATIVE")
  endif()
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
@@ -229,14 +206,16 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
  set(commonOpts "${commonOpts} -Wno-packed-bitfield-compat")
 endif()
 # clang: suppress complaints about unused command line argument (-rdynamic only
-# used during linking) and "const member leaves the object uninitialized"
+# used during linking)
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  set(commonOpts "${commonOpts} -Wno-unused-command-line-argument -Wno-default-const-init-field-unsafe")
+  set(commonOpts "${commonOpts} -Wno-unused-command-line-argument")
 endif()

 set(CMAKE_C_FLAGS
  "${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops ${CMAKE_C_FLAGS}")
-set(CMAKE_CXX_FLAGS "${C_FLAGS_PROCESSOR} ${commonOpts} ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS
+  "${C_FLAGS_PROCESSOR}  ${commonOpts} -std=c++11 ${CMAKE_CXX_FLAGS}")
+

 add_boolean_option(SANITIZE_ADDRESS OFF "enable the address sanitizer (ASan)" ON)
 if (SANITIZE_ADDRESS)
@@ -383,12 +362,6 @@ 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)

-#########################
-##### E3 AGENT
-#########################
-set(E3_AGENT "OFF" CACHE STRING "O-RAN nGRG E3 Agent for dApps")
-set_property(CACHE E3_AGENT PROPERTY STRINGS "ON" "OFF")
-
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
 ##################################################
@@ -447,6 +420,7 @@ add_library(ngap
  ${NGAP_DIR}/ngap_gNB_pdu_session_management.c
  ${NGAP_DIR}/ngap_gNB_nnsf.c
  ${NGAP_DIR}/ngap_gNB_overload.c
+  ${NGAP_DIR}/ngap_gNB_trace.c
  ${NGAP_DIR}/ngap_gNB_ue_context.c
  ${NGAP_DIR}/ngap_gNB_NRPPa_transport_procedures.c
  )
@@ -629,6 +603,12 @@ include_directories("${OPENAIR2_DIR}/COMMON")
 include_directories("${OPENAIR2_DIR}/UTIL")
 include_directories("${OPENAIR3_DIR}/COMMON")
 include_directories("${OPENAIR3_DIR}/UTILS")
+include_directories("${NFAPI_DIR}/nfapi/public_inc")
+include_directories("${NFAPI_DIR}/common/public_inc")
+include_directories("${NFAPI_DIR}/pnf/public_inc")
+include_directories("${NFAPI_DIR}/nfapi/inc")
+include_directories("${NFAPI_DIR}/sim_common/inc")
+include_directories("${NFAPI_DIR}/pnf_sim/inc")
 include_directories("${OPENAIR1_DIR}")
 include_directories("${OPENAIR2_DIR}")
 include_directories("${OPENAIR3_DIR}/NAS/TOOLS")
@@ -694,8 +674,6 @@ target_link_libraries(UTIL PUBLIC instrumentation)

 set(SECURITY_SRC
  ${OPENAIR3_DIR}/SECU/secu_defs.c
-  ${OPENAIR3_DIR}/SECU/curve_25519.c
-  ${OPENAIR3_DIR}/SECU/x963_kdf.c
  ${OPENAIR3_DIR}/SECU/kdf.c
  ${OPENAIR3_DIR}/SECU/aes_128_ctr.c
  ${OPENAIR3_DIR}/SECU/aes_128_cbc_cmac.c
@@ -725,24 +703,22 @@ set(SCHED_SRC
 )
 add_library(SCHED_LIB ${SCHED_SRC})
 target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)
-target_link_libraries(SCHED_LIB PRIVATE nfapi_pnf_lib)

 set(SCHED_NR_SRC
  ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
  ${OPENAIR1_DIR}/SCHED_NR/nr_prach_procedures.c
-  ${OPENAIR1_DIR}/SCHED_NR/nr_ru_procedures.c
  ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
 )
 add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
 target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs UTIL)
-target_link_libraries(SCHED_NR_LIB PRIVATE nfapi_nr_lib nfapi_user_lib) # some FAPI messages pack "subPDUs"

 set(SCHED_SRC_RU
  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
+  ${OPENAIR1_DIR}/SCHED_NR/nr_ru_procedures.c
  ${OPENAIR1_DIR}/SCHED/prach_procedures.c
 )
 add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
-target_link_libraries(SCHED_RU_LIB PRIVATE asn1_lte_rrc_hdrs nfapi_user_lib)
+target_link_libraries(SCHED_RU_LIB PRIVATE asn1_lte_rrc_hdrs)

 set(SCHED_SRC_UE
  ${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
@@ -764,6 +740,79 @@ set(SCHED_SRC_NR_UE
 add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
 target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)

+# nFAPI
+#################################
+set(NFAPI_SRC
+  ${NFAPI_DIR}/nfapi/src/nfapi_p4.c
+  ${NFAPI_DIR}/nfapi/src/nfapi_p5.c
+  ${NFAPI_DIR}/nfapi/src/nfapi_p7.c
+)
+add_library(NFAPI_LIB ${NFAPI_SRC})
+target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
+target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7)
+
+if(OAI_WLS)
+  target_compile_definitions(NFAPI_LIB PRIVATE ENABLE_WLS)
+else()
+  target_compile_definitions(NFAPI_LIB PRIVATE ENABLE_SOCKET)
+endif()
+include_directories(${NFAPI_DIR}/nfapi/public_inc)
+include_directories(${NFAPI_DIR}/nfapi/inc)
+
+set(NFAPI_PNF_SRC
+  ${NFAPI_DIR}/pnf/src/pnf.c
+  ${NFAPI_DIR}/pnf/src/pnf_interface.c
+  ${NFAPI_DIR}/pnf/src/pnf_p7.c
+  ${NFAPI_DIR}/pnf/src/pnf_p7_interface.c
+)
+add_library(NFAPI_PNF_LIB ${NFAPI_PNF_SRC})
+target_link_libraries(NFAPI_PNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+target_link_libraries(NFAPI_PNF_LIB PUBLIC nr_fapi_p7)
+
+if(OAI_WLS)
+  target_compile_definitions(NFAPI_PNF_LIB PRIVATE ENABLE_WLS)
+endif()
+include_directories(${NFAPI_DIR}/pnf/public_inc)
+include_directories(${NFAPI_DIR}/pnf/inc)
+
+set(NFAPI_VNF_SRC
+  ${NFAPI_DIR}/vnf/src/vnf.c
+  ${NFAPI_DIR}/vnf/src/vnf_interface.c
+  ${NFAPI_DIR}/vnf/src/vnf_p7.c
+  ${NFAPI_DIR}/vnf/src/vnf_p7_interface.c
+)
+add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})
+target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5 nr_fapi_p7)
+if(OAI_AERIAL)
+  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL)
+endif()
+include_directories(${NFAPI_DIR}/vnf/public_inc)
+include_directories(${NFAPI_DIR}/vnf/inc)
+
+if(OAI_WLS)
+  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_WLS)
+endif()
+# nFAPI user defined code
+#############################
+set(NFAPI_USER_SRC
+  ${NFAPI_USER_DIR}/nfapi.c
+  ${NFAPI_USER_DIR}/nfapi_pnf.c
+  ${NFAPI_USER_DIR}/nfapi_vnf.c
+  ${NFAPI_USER_DIR}/gnb_ind_vars.c
+)
+add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
+if(OAI_WLS)
+  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_WLS)
+elseif (OAI_AERIAL)
+  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_AERIAL)
+else()
+  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_SOCKET)
+endif()
+target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(NFAPI_USER_LIB PRIVATE nr_fapi_p7)
+include_directories(${NFAPI_USER_DIR})
+
 # Layer 1
 #############################
 set(PHY_TURBOIF
@@ -775,7 +824,6 @@ set(PHY_NRLDPC_CODINGIF
 )

 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)
-target_compile_options(dfts PRIVATE -fno-semantic-interposition)

 set(PHY_SRC_COMMON
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
@@ -816,6 +864,7 @@ set(PHY_SRC_COMMON
  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
  ${OPENAIR1_DIR}/PHY/TOOLS/get_sin_cos.c
  ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
+  ${OPENAIR1_DIR}/PHY/log_tools.c
  )

 set(PHY_SRC
@@ -826,10 +875,6 @@ set(PHY_SRC
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots_mbsfn.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_coding.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_modulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c  
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci.c
@@ -846,21 +891,22 @@ set(PHY_SRC
  )

 set(PHY_SRC_RU
-  ${OPENAIR1_DIR}/PHY/if4_tools.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/drs_modulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_nr.c
  ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz.c
  ${OPENAIR1_DIR}/PHY/MODULATION/gen_75KHz.cpp
  ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
  ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
  ${OPENAIR1_DIR}/PHY/INIT/lte_init_ru.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach.c
-  )
-
-set(NR_PHY_SRC_RU
-  ${OPENAIR1_DIR}/PHY/MODULATION/nr_beamforming.c
-  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_nr.c
  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ru.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach.c
+
  )

 set(PHY_SRC_UE
@@ -929,6 +975,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
@@ -1019,7 +1066,7 @@ add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)

 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5 polar smallblock ds)
+target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5 polar smallblock)

 add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
 target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
@@ -1031,8 +1078,6 @@ target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common
 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)

-add_library(NR_PHY_RU ${NR_PHY_SRC_RU})
-
 #Layer 2 library
 #####################
 set(MAC_DIR ${OPENAIR2_DIR}/LAYER2/MAC)
@@ -1068,20 +1113,12 @@ set(NR_PDCP_SRC
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia2.c
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia1.c
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/asn1_utils.c
-  )
-
-# gNB: PDCP + CU-CP/CU-UP interface
-set(NR_PDCP_SRC_GNB
-  ${NR_PDCP_SRC}
  openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c
  openair2/LAYER2/nr_pdcp/cuup_cucp_if.c
  openair2/LAYER2/nr_pdcp/cuup_cucp_direct.c
  openair2/LAYER2/nr_pdcp/cuup_cucp_e1ap.c
  )

-# UE build: PDCP only; CU-CP/CU-UP interface is gNB-only.
-set(NR_PDCP_SRC_UE ${NR_PDCP_SRC})
-
 set(NR_SDAP_SRC
  ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap.c
  ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap_entity.c
@@ -1125,7 +1162,7 @@ set(L2_LTE_SRC
  )

 set(L2_NR_SRC
-  ${NR_PDCP_SRC_GNB}
+  ${NR_PDCP_SRC}
  ${NR_SDAP_SRC}
  ${NR_RRC_DIR}/rrc_gNB.c
  ${NR_RRC_DIR}/mac_rrc_dl_direct.c
@@ -1161,7 +1198,7 @@ set(L2_RRC_SRC_UE
  )

 set(NR_L2_SRC_UE
-  ${NR_PDCP_SRC_UE}
+  ${NR_PDCP_SRC}
  ${NR_SDAP_SRC}
  ${NR_UE_RRC_DIR}/L2_interface_ue.c
  ${NR_UE_RRC_DIR}/main_ue.c
@@ -1203,15 +1240,12 @@ set (MAC_NR_SRC
  ${NR_GNB_MAC_DIR}/gNB_scheduler.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_bch.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_dlsch.c
-  ${NR_GNB_MAC_DIR}/gNB_scheduler_dlsch_default_policies.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_ulsch.c
-  ${NR_GNB_MAC_DIR}/gNB_scheduler_ulsch_default_policies.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_primitives.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_phytest.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_uci.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_srs.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_RA.c
-  ${NR_GNB_MAC_DIR}/gNB_scheduler_pcch.c
  ${NR_GNB_MAC_DIR}/mac_rrc_dl_handler.c
  ${NR_GNB_MAC_DIR}/mac_rrc_ul_direct.c
  ${NR_GNB_MAC_DIR}/mac_rrc_ul_f1ap.c
@@ -1269,7 +1303,6 @@ set (MISC_NFAPI_LTE
 )

 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})
-target_link_libraries(MISC_NFAPI_LTE_LIB PRIVATE nfapi_vnf_lib nfapi_pnf_lib)

 add_library(L2
  ${L2_SRC}
@@ -1279,7 +1312,6 @@ add_library(L2
  )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_link_libraries(L2 PRIVATE nfapi_vnf_lib nfapi_pnf_lib)
 if(E2_AGENT)
  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()
@@ -1297,11 +1329,13 @@ add_library(L2_NR
  )
 target_link_libraries(L2_NR PRIVATE ds alg)
 target_link_libraries(L2_NR PRIVATE f1ap_lib)
-target_link_libraries(L2_NR PRIVATE nfapi_vnf_lib)
 target_include_directories(L2_NR PRIVATE ${F1AP_DIR}/lib)
 if(E2_AGENT)
  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()
+if (OAI_AERIAL_CUMAC)
+  target_compile_definitions(L2_NR PUBLIC ENABLE_CUMAC)
+endif()

 add_library(e1_if
  ${NR_RRC_DIR}/cucp_cuup_direct.c
@@ -1311,7 +1345,6 @@ add_library(e1_if
 target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} e1ap GTPV1U)

 target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc nr_common)
-target_compile_definitions(L2_NR PRIVATE PDCP_CUCP_CUUP)
 if(OAI_AERIAL)
    target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
 endif()
@@ -1319,10 +1352,10 @@ endif()
 add_library(L2_LTE_NR
  # temporary solution until 4G/5G code completely untangled (as evidenced by deletion of the following file)
  ${MAC_DIR}/dummy_functions.c
+  ${ENB_APP_SRC}
 )

 target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap nr_rrc)
-target_link_libraries(L2_LTE_NR PRIVATE nfapi_vnf_lib)

 add_library(L2_UE
  ${L2_SRC_UE}
@@ -1330,7 +1363,6 @@ add_library(L2_UE
 )
 target_link_libraries(L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(L2_UE PRIVATE GTPV1U)
-target_link_libraries(L2_UE PRIVATE nfapi_pnf_lib)

 target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)

@@ -1364,7 +1396,6 @@ set (MME_APP_SRC
 add_library(MME_APP ${MME_APP_SRC})
 target_link_libraries(MME_APP PRIVATE m2ap m3ap)
 target_link_libraries(MME_APP PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(MME_APP PRIVATE nfapi_vnf_lib nfapi_user_lib)

 find_package(sctp REQUIRED)
 set(SCTP_SRC
@@ -1668,6 +1699,7 @@ endif()

 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
+include_directories("${NFAPI_DIR}/pnf/public_inc")
 include_directories("${NFAPI_DIR}/nfapi/inc")
 include_directories("${NFAPI_DIR}/sim_common/inc")
 include_directories("${NFAPI_DIR}/pnf_sim/inc")
@@ -1709,9 +1741,9 @@ add_dependencies(lte-softmodem oai_iqplayer)
 target_link_libraries(lte-softmodem PRIVATE
  -Wl,--start-group
  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
-  PHY_COMMON PHY PHY_RU  L2 L2_LTE nfapi_vnf_lib nfapi_pnf_lib nfapi_user_lib MISC_NFAPI_LTE_LIB
+  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
  ${NAS_UE_LIB} ITTI SIMU radio_common softmodem_common
-  -Wl,--end-group dl)
+  -Wl,--end-group z dl)

 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
@@ -1726,17 +1758,13 @@ add_executable(oairu
  ${OPENAIR_DIR}/executables/lte-ru.c
  ${OPENAIR_DIR}/executables/ru_control.c
  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c
  ${OPENAIR_DIR}/executables/main_ru.c
  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
 )
 target_link_libraries(oairu PRIVATE
  -Wl,--start-group
  SCHED_RU_LIB PHY_COMMON PHY_RU UTIL radio_common softmodem_common
-  -Wl,--end-group dl)
+  -Wl,--end-group z dl)

 target_link_libraries(oairu PRIVATE pthread m CONFIG_LIB rt ${T_LIB})
 target_link_libraries(oairu PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -1763,9 +1791,9 @@ target_link_libraries(lte-uesoftmodem PRIVATE
  -Wl,--start-group
  lte_rrc nr_rrc s1ap x2ap m2ap m3ap
  SECURITY UTIL SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
-  PHY_UE PHY_RU L2_UE L2_LTE SIMU nfapi_pnf_lib nfapi_user_lib MISC_NFAPI_LTE_LIB
+  PHY_UE PHY_RU L2_UE L2_LTE SIMU NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
  ${NAS_UE_LIB} ITTI radio_common softmodem_common
-  -Wl,--end-group dl)
+  -Wl,--end-group z dl)

 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
@@ -1775,24 +1803,22 @@ target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs
 target_link_libraries(lte-uesoftmodem PRIVATE
                      asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)

-if (OAI_RU_FRONTHAUL)
-  add_executable(nr-oru
-    ${OPENAIR_DIR}/executables/nr-ru.c
-    ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-    ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
-    ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
-    ${OPENAIR_DIR}/openair1/SCHED_NR/nr_ru_procedures.c
-    ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
-    ${OPENAIR_DIR}/executables/main_nr_ru.c
-    ${OPENAIR_DIR}/executables/nr-oru.c
-  )
-  target_link_libraries(nr-oru PRIVATE
-    UTIL NR_PHY_RU PHY_NR shlib_loader dl oru_fh MAC_NR_COMMON
-    radio_common softmodem_common nfapi_pnf_lib)
-  target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
-    barrier actor nfapi_user_lib)
-  target_link_libraries(nr-oru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)
-endif()
+# nr RRU
+add_executable(nr-oru
+  ${OPENAIR_DIR}/executables/nr-ru.c
+  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
+  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
+  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
+  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
+  ${OPENAIR_DIR}/executables/main_nr_ru.c
+)
+target_link_libraries(nr-oru PRIVATE
+  UTIL SCHED_RU_LIB PHY_COMMON PHY_RU PHY_NR shlib_loader z dl
+  radio_common softmodem_common)
+target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
+  barrier actor)
+target_link_libraries(nr-oru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)
+
 # nr-softmodem
 ###################################################

@@ -1811,37 +1837,38 @@ add_executable(nr-softmodem

 target_link_libraries(nr-softmodem PRIVATE
  -Wl,--start-group
-  UTIL SCTP_CLIENT SCHED_LIB SCHED_NR_LIB PHY_NR PHY PHY_NR_COMMON NR_PHY_RU GTPV1U SECURITY
-  ITTI ${NAS_UE_LIB} nr_rrc
-  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON nfapi_vnf_lib nfapi_pnf_lib nfapi_user_lib SIMU
+  UTIL SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
+  ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
+  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
  x2ap f1ap m2ap m3ap e1ap radio_common
  time_management softmodem_common
-  -Wl,--end-group dl)
+  -Wl,--end-group z dl)

 target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_boolean_option(OAI_WLS OFF "Activate OAI's WLS driver" OFF)
-add_boolean_option(OAI_AERIAL OFF "Activate OAI's AERIAL driver" OFF)
 if (OAI_WLS)
    target_link_libraries(nr-softmodem PUBLIC wls_integration_lib)
-elseif (OAI_AERIAL)
-    target_compile_definitions(nr-softmodem PUBLIC ENABLE_AERIAL)
-    target_link_libraries(nr-softmodem PUBLIC aerial_lib)
 else()
    target_link_libraries(nr-softmodem PUBLIC nfapi_socket_lib)
 endif()
+add_boolean_option(OAI_AERIAL OFF "Activate OAI's AERIAL driver" OFF)
+if (OAI_AERIAL)
+  target_compile_definitions(nr-softmodem PUBLIC ENABLE_AERIAL)
+  target_link_libraries(nr-softmodem PUBLIC aerial_lib)
+endif()
+add_boolean_option(OAI_AERIAL_CUMAC OFF "Activate OAI's AERIAL_CUMAC driver" OFF)
+if (OAI_AERIAL_CUMAC)
+  target_link_libraries(nr-softmodem PUBLIC aerial_cumac_lib)
+  target_compile_definitions(nr-softmodem PUBLIC ENABLE_CUMAC)
+endif()
 if(E2_AGENT)
  target_link_libraries(nr-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()

-if (E3_AGENT)
-    target_link_libraries(nr-softmodem PRIVATE e3ap)
-    target_compile_definitions(nr-softmodem PRIVATE E3_AGENT)
-endif()
-

 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-softmodem PRIVATE
@@ -1851,7 +1878,7 @@ add_executable(nr-cuup
  executables/nr-cuup.c
  ${NR_RRC_DIR}/rrc_gNB_UE_context.c
  ${OPENAIR2_DIR}/E1AP/e1ap_setup.c
-  ${NR_PDCP_SRC_GNB}
+  ${NR_PDCP_SRC}
  ${NR_SDAP_SRC}
  )

@@ -1860,9 +1887,8 @@ target_link_libraries(nr-cuup PRIVATE
                      GTPV1U e1ap f1ap
                      time_management softmodem_common
                      alg
-                      dl pthread ${T_LIB})
+                      z dl pthread ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_compile_definitions(nr-cuup PRIVATE PDCP_CUCP_CUUP)
 if(E2_AGENT)
  target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
  target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
@@ -1885,15 +1911,15 @@ add_executable(nr-uesoftmodem

 target_link_libraries(nr-uesoftmodem PRIVATE
  -Wl,--start-group
-  nr_rrc SECURITY UTIL SCHED_NR_UE_LIB
-  PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON nfapi_nr_lib
+  nr_rrc SECURITY UTIL SCHED_RU_LIB SCHED_NR_UE_LIB
+  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB
  ITTI SIMU radio_common
  time_management softmodem_common
-  -Wl,--end-group dl)
+  -Wl,--end-group z dl)

 target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_meas)
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
-target_link_libraries(nr-uesoftmodem PRIVATE nr_nas lib_uicc usim_lib SECURITY)
+target_link_libraries(nr-uesoftmodem PRIVATE nr_nas lib_uicc usim_lib)
 target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 # force the generation of ASN.1 so that we don't need to wait during the build
@@ -1963,14 +1989,14 @@ target_link_libraries(physim_common PRIVATE UTIL)

 add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c)
 target_link_libraries(nr_dlschsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${T_LIB} ITTI dl physim_common
  )
 target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc_hdrs)

 add_executable(nr_pbchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c)
 target_link_libraries(nr_pbchsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${T_LIB} ITTI dl physim_common
 )
 target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -1980,14 +2006,14 @@ add_executable(nr_psbchsim
  ${NFAPI_USER_DIR}/nfapi.c
  )
 target_link_libraries(nr_psbchsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB -Wl,--end-group
  m pthread ${T_LIB} ITTI dl physim_common softmodem_common
  )
 target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_pucchsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c)
 target_link_libraries(nr_pucchsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${T_LIB} ITTI dl physim_common
 )
 target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -1999,15 +2025,15 @@ add_executable(nr_dlsim
  ${PHY_INTERFACE_DIR}/queue_t.c
  )
 target_link_libraries(nr_dlsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common NR_L2_UE
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common
  softmodem_common
  )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_prachsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c)
 target_link_libraries(nr_prachsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR NR_PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -Wl,--end-group
  m pthread ${T_LIB} ITTI dl physim_common)
 target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

@@ -2015,7 +2041,7 @@ add_executable(nr_ulschsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
  )
 target_link_libraries(nr_ulschsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${T_LIB} ITTI dl physim_common
 )
 target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2028,8 +2054,8 @@ add_executable(nr_ulsim
  )

 target_link_libraries(nr_ulsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common softmodem_common NR_L2_UE
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common softmodem_common
  )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

@@ -2039,17 +2065,17 @@ add_executable(nr_srssim
  )

 target_link_libraries(nr_srssim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON -Wl,--end-group
  m pthread ITTI dl nr_ue_phy_meas physim_common softmodem_common
  )

-if(ENABLE_CHANNEL_SIM_CUDA)
+if(CUDA_ENABLE)
  if (TARGET oai_cuda_lib)
      target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)
      target_link_libraries(nr_ulsim PRIVATE oai_cuda_lib)

-      target_compile_definitions(nr_dlsim PRIVATE CHANNEL_SIM_CUDA)
-      target_compile_definitions(nr_ulsim PRIVATE CHANNEL_SIM_CUDA)
+      target_compile_definitions(nr_dlsim PRIVATE ENABLE_CUDA)
+      target_compile_definitions(nr_ulsim PRIVATE ENABLE_CUDA)
  endif()
 endif()

@@ -2106,9 +2132,9 @@ if (${T_TRACER})
        params_libconfig
        oai_eth_transpro UTIL
        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
-        nfapi_lte_lib nfapi_nr_lib nfapi_pnf_lib nfapi_vnf_lib nfapi_user_lib
+        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
        MISC_NFAPI_LTE_LIB
-        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU NR_PHY_RU
+        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
        GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE SIMU
        dfts config_internals nr_common crc_byte)
@@ -2151,7 +2177,7 @@ if(ENABLE_TESTS)
      NAME benchmark
      GITHUB_REPOSITORY google/benchmark
      VERSION 1.9.0
-      OPTIONS "BENCHMARK_ENABLE_TESTING OFF" "BENCHMARK_ENABLE_WERROR OFF"
+      OPTIONS "BENCHMARK_ENABLE_TESTING OFF"
    )
  endif()
 endif()
@@ -2166,11 +2192,6 @@ add_subdirectory(openair3)
 add_subdirectory(radio)
 add_subdirectory(tests)

-add_boolean_option(OAI_RU_FRONTHAUL OFF "Whether to configure OAI fronthaul library" OFF)
-if(OAI_RU_FRONTHAUL)
-  add_subdirectory(fronthaul)
-endif()
-
 if(TARGET oai_cuda_lib)
    message(STATUS "CUDA library 'oai_cuda_lib' found, linking to targets...")
    target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,47 +1,33 @@
 <!-- SPDX-License-Identifier: CC-BY-4.0 -->

-# Contributing to Duranta
+# Contributing to OpenAirInterface #

 We want to make contributing to this project as easy and transparent as possible.

-1. Create an account on [GitHub](https://github.com/). Only contributions
-   against [`duranta-project/openairinterface5g/`](https://github.com/duranta-project/openairinterface5g/)
-   are accepted.
-2. Fork the repository, and open pull requests for your contributions from your
-   fork.
-3. The contributing policies are described in the [corresponding documentation
+Please refer to the steps described on our website: [How to contribute to OAI](https://www.openairinterface.org/?page_id=112).
+
+1. Sign and return a Contributor License Agreement to OAI team.
+2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up)
+   if you do not have any.
+   - We recommend that you register with a professional or student email address.
+   - If your email domain (`@domain.com`) is not whitelisted, please contact us
+     (mailto:contact@openairinterface.org).
+   - Eurecom GitLab does NOT accept public email domains.
+3. Provide the OAI team with the **username** of this account to
+   (mailto:contact@openairinterface.org) ; we will give you the developer
+   rights on this repository.
+4. The contributing policies are described in the [corresponding documentation
   page](doc/code-style-contrib.md).
-4. [Sign the CLA](https://github.com/duranta-project/governance/blob/main/docs/easy_cla_process.md)
-   either before doing making your first pull request or after submitting the
-   pull request.
-5. Mandatory signing of all the commits using the email address used for CLA.
+   - PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account.
+     It just eats up space on our servers.
+   - You can fork onto another hosting system. But we will NOT accept a merge
+     request from a forked repository.
+      * This decision was made for the license reasons.
+      * The Continuous Integration will reject your merge request.

-## Commit Guidelines
+# License #

-Every pull request must pass two CI checks before it can be merged:
-
-1. **[Developer Certificate of Origin (DCO)](https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin)**:
-   Each commit must include a `Signed-off-by:` trailer in the commit message.
-   Use `git commit -s` (or `--signoff`).
-
-2. **[Verified commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)**:
-   Each commit must be cryptographically signed using SSH or GPG keys to confirm
-   its origin.
-
-### Signing Commits
-
-GitHub supports commit signing using either SSH keys or GPG keys. For the
-step-by-step setup (key generation, Git configuration, registering the key on
-GitHub, and verifying signatures locally), see the
-[commit signing section of the Git guide](doc/git-guide.md#setting-up-commit-signing).
-
-> **NOTE:** If your commits are not signed, the CI framework will not accept the PR.
-For more information regarding contribution guidelines
-please check [this document](doc/code-style-contrib.md)
-
-## License
-
-By contributing to Duranta, you agree that your contributions will be
+By contributing to OpenAirInterface, you agree that your contributions will be
 licensed under

 1. [CSSL v1.0 license](LICENSES/preferred/CSSL-v1.0.txt): for RAN and UE
--- a/18
+++ b/18
@@ -1,10 +1,10 @@
 <!-- SPDX-License-Identifier: CC-BY-4.0 -->

-The source code is distributed under Collaborative Standards Software License
-(CSSL) v1.0. Some files, such as for orchestration, are distributed under MIT
-license. Documentation is distributed under Creative Commons Attribution 4.0
-International license. All the files without an explicit copyright header have
-an implicit "Copyright of OpenAirInterface Authors".
+The source code is distributed under [**Collaborative Standards Software
+License (CSSL) v1.0**](LICENSE).  Some files, such as for orchestration,
+are distributed under [MIT license](preferred)(MIT.txt). Documentation is
+distributed under [Creative Commons Attribution 4.0 International
+license](LICENSES/preferred/CC-BY-4.0.txt).

 For more details of the license, refer to the `LICENSES` directory for a list
 of preferred and exceptionally-applied licenses.
@@ -84,11 +84,3 @@ Nuand: https://github.com/Nuand/bladeRF/tree/master?tab=License-1-ov-file

 Credits for https://github.com/pothosware/SoapySDR
 Pothosware: BSL 1.0 License
-
-Credits for https://github.com/zeromq/libzmq
-ZeroMQ authors: Mozilla Public License Version 2.0
-
-Credits for source code:
-  - radio/zmq/zmq_imported.cpp
-  - radio/zmq/zmq_imported.h
-Software Radio Systems Limited: BSD-3-Clause-Open-MPI
--- a/README.md
+++ b/README.md
@@ -1,21 +1,24 @@
 <!-- SPDX-License-Identifier: CC-BY-4.0 -->

 <h1 align="center">
-    <a href="https://lfnetworking.org/projects/duranta/"><img src="https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png" alt="Duranta OAI" width="550"></a>
+    <a href="https://openairinterface.org/"><img src="https://openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png" alt="OAI" width="550"></a>
 </h1>

 <p align="center">
-    <a href="https://github.com/duranta-project/openairinterface5g/blob/develop/LICENSE"><img src="https://img.shields.io/badge/license-CSSL--v1.0-blue" alt="License"></a>
+    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-CSSL--v1.0-blue" alt="License"></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://releases.ubuntu.com/26.04/"><img src="https://img.shields.io/badge/OS-Ubuntu26-Green" alt="Supported OS Ubuntu 26"></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-Fedora44-Green" alt="Supported OS Fedora 44"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore41-Green" alt="Supported OS Fedora 43"></a>
 </p>

 <p align="center">
-    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Ubuntu-Image-Builder%2F&label=build-Ubuntu-x86%20Images"></a>
-    <a href="https://jenkins-oai.eurecom.fr/job/RAN-RHEL-Cluster-Image-Builder/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-RHEL-Cluster-Image-Builder%2F&label=build-RHEL-Cluster%20Images"></a>
+    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/releases"><img alt="GitLab Release (custom instance)" src="https://img.shields.io/gitlab/v/release/oai/openairinterface5g?gitlab_url=https%3A%2F%2Fgitlab.eurecom.fr&include_prereleases&sort=semver"></a>
+</p>
+
+<p align="center">
+    <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>

@@ -27,39 +30,19 @@
  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-cuup"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-cuup?label=NR-CUUP%20docker%20pulls"></a>
 </p>

-# Duranta - OpenAirInterface
-
-Duranta OpenAirInterface RAN delivers and maintains an open-source cellular
-wireless software stack for 4G, 5G and future networking technologies. It
-supports simulation, prototyping, and end-to-end deployments on
-Commercial-Off-The-Shelf (COTS) hardware. Built for research and
-experimentation, it provides standard-compliant interfaces and is released
-under the Collaborative Standards Software License (CSSL).
-
-## License
+# OpenAirInterface License #

 *  [OAI License Model](http://www.openairinterface.org/?page_id=101)
 *  [CSSL v1.0](http://www.openairinterface.org/?page_id=698)

 The source code is distributed under [**CSSL v1.0**](LICENSE).
 Some files, such as for orchestration, are distributed under
-[MIT license](./LICENSES/preferred/MIT.txt). Documentation is distributed under
+[MIT license](preferred)(MIT.txt). Documentation is distributed under
 [Creative Commons Attribution 4.0 International license](LICENSES/preferred/CC-BY-4.0.txt).

-All the files without an explicit copyright header have an implicit "Copyright
-of OpenAirInterface Authors".
+Please see [NOTICE](NOTICE.md) for other licenses which are used in the software.

-Please see [NOTICE](NOTICE) for other licenses which are used in the software.
-
-In the past OAI source code has been re-licensed sometimes, here is the
-history:
-
-1. CSSL v1.0 starting tag 2026.w14
-2. OAI Public License v1.1 starting tag v1.0 till af4b0d53
-3. OAI Public License v1.0: starting tag v.04 till v1.0
-4. GPL 3: starting tag v.0 till v.04 (only initial implementation of 4G)
-
-## Where to Start
+# Where to Start #

 *  [General overview of documentation](./doc/README.md)
 *  [The implemented features](./doc/FEATURE_SET.md)
@@ -75,7 +58,7 @@ To find all READMEs, this command might be handy:
 find . -iname "readme*"
 ```

-## RAN repository structure
+# RAN repository structure #

 The OpenAirInterface (OAI) software is composed of the following parts: 

@@ -100,9 +83,9 @@ openairinterface5g
 └── tools             : Tools for use by the developers/ci machines: code analysis and formatting
 ```

-## How to get support from the Community
+# How to get support from the OAI Community # 

-You can ask your question on the [mailing lists](https://github.com/duranta-project/openairinterface5g/wiki/MailingList).
+You can ask your question on the [mailing lists](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/MailingList).

 Your email should contain below information:

@@ -113,6 +96,6 @@ Your email should contain below information:
 - OAI gNB/DU/CU/CU-CP/CU-UP configuration file in `.conf` format only.
 - Logs of OAI gNB/DU/CU/CU-CP/CU-UP in `.log` or `.txt` format only.
 - In case your question is related to performance, include a small description of the machine (Operating System, Kernel version, CPU, RAM and networking card) and diagram of your testing environment.
- Known/open issues are present on [Github](https://github.com/duranta-project/openairinterface5g/issues), so keep checking.
+- Known/open issues are present on [GitLab](https://gitlab.eurecom.fr/oai/openairinterface5g/-/issues), so keep checking.

 Always remember a structured email will help us understand your issues quickly.
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,61 +0,0 @@
-# Duranta-OpenAirInterface Roadmap
-
-## RAN Roadmap
-
-### Q2 2026
-
- GPU LDPC Accelerator
- NR-DC Support
- CN Paging procedures
- Support for 64 UEs with E2E throughput validation
- Basic Cat-A OAI O-RU (simulated radio)
-
-### Q3 2026
-
- QoS-enforcing scheduler
- Xn Handover Support
- UL MU-MIMO
- Aperiodic UL channels (SRS/CSI reporting)
- NR user plane protocol
- Multi-cell support in L2
- Support for 128 UEs with E2E throughput validation
-
-### Q4 2026
-
- Cat-B Support for FHI 7.2 at RU/DU
- RAN Paging
- Support of 5G RAN Slicing
- Multi-cell performance evaluation (with at-least 3 cells)
-
-### Q1 2027
-
- Digital Beamforming Support
- DL MU-MIMO at L1
-
---
-
-## UE Roadmap
-
-### Q2 2026
-
- Support for Handover Procedures
- Basic Sidelink Procedures (PSSCH, PSCCH)
- PUCCH formats 1&3
-
-### Q3 2026
-
- Support for 2 UL layers
- Support for 2 DL layers
- RU sharing
-
-### Q4 2026
-
- Reduce feedback time
- AT command interface
- DL KPI Improvements
- UL KPI Improvements
-
-### Q1 2027
-
- Scan carrier
- Power control procedures for outdoor operation
--- a/charts/physims-4g/Chart.yaml
+++ b/charts/physims-4g/Chart.yaml
@@ -14,7 +14,7 @@ description: A Helm chart for physical simulators network function
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application

-icon: https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png

 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
@@ -31,8 +31,8 @@ keywords:
  - 5G

 sources:
-  - https://github.com/duranta-project/openairinterface5g
+  - https://gitlab.eurecom.fr/oai/openairinterface5g

 maintainers:
  - name:  OPENAIRINTERFACE
-    email: oaicicdteam@openairinterface.org
+    email: contact@openairinterface.org
--- a/charts/physims-4g/charts/physims.4g/Chart.yaml
+++ b/charts/physims-4g/charts/physims.4g/Chart.yaml
@@ -14,7 +14,7 @@ description: A Helm subchart for 4G physims network function
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application

-icon: https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png

 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
@@ -30,8 +30,8 @@ keywords:
  - 4G

 sources:
-  - https://github.com/duranta-project/openairinterface5g
+  - https://gitlab.eurecom.fr/oai/openairinterface5g

 maintainers:
  - name:  OPENAIRINTERFACE
-    email: oaicicdteam@openairinterface.org
+    email: contact@openairinterface.org
--- a/charts/physims-5g/Chart.yaml
+++ b/charts/physims-5g/Chart.yaml
@@ -14,7 +14,7 @@ description: A Helm chart for physical simulators network function
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application

-icon: https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png

 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
@@ -31,8 +31,8 @@ keywords:
  - 5G

 sources:
-  - https://github.com/duranta-project/openairinterface5g
+  - https://gitlab.eurecom.fr/oai/openairinterface5g

 maintainers:
  - name:  OPENAIRINTERFACE
-    email: oaicicdteam@openairinterface.org
+    email: contact@openairinterface.org
--- a/charts/physims-5g/charts/physims.5g/Chart.yaml
+++ b/charts/physims-5g/charts/physims.5g/Chart.yaml
@@ -14,7 +14,7 @@ description: A Helm subchart for 5G physims network function
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application

-icon: https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png

 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
@@ -30,8 +30,8 @@ keywords:
  - 5G

 sources:
-  - https://github.com/duranta-project/openairinterface5g
+  - https://gitlab.eurecom.fr/oai/openairinterface5g

 maintainers:
  - name:  OPENAIRINTERFACE
-    email: oaicicdteam@openairinterface.org
+    email: contact@openairinterface.org
--- a/ci-scripts/Jenkinsfile
+++ b/ci-scripts/Jenkinsfile
@@ -20,11 +20,12 @@ if (params.LockResources != null && params.LockResources.trim().length() > 0)
 // Global Parameters. Normally they should be populated when the master job
 // triggers the slave job with parameters

-def targetBranch = params.targetBranch ?: 'develop'
-def testRepository = params.repository ?: 'git@asterix:/home/git/openairinterface5g.git'
-def testBranch = params.branch ?: 'develop'
-def mergeWithTarget = params.mergeWithTarget ?: false
-def sourceBranch = params.sourceBranch ?: testBranch
+def sourceRepository = params.eNB_Repository ?: env.GIT_URL
+def sourceBranch = params.eNB_Branch ?: env.GIT_BRANCH
+def targetRepository = params.Target_Repository ?: sourceRepository
+def targetBranch = params.eNB_TargetBranch ?: 'develop'
+def commitID = params.eNB_CommitID ?: env.GIT_COMMIT
+def is_MR = params.eNB_mergeRequest ?: false

 def flexricOption = ""
 def runWithOC = false
@@ -39,23 +40,17 @@ pipeline {
    timestamps()
    ansiColor('xterm')
    lock(extra: lockResources)
-    skipDefaultCheckout()
  }

  stages {
    stage("Build Init") {
      steps {
-        checkout(
-          scmGit(branches: [[name: "${branch}"]],
-                 userRemoteConfigs: [[url: "${repository}"]],
-                 extensions: [cleanBeforeCheckout()])
-        )
        script {
          echo '\u2705 \u001B[94mBuild Init\u001B[0m'
          JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
        }
        // update the build name and description
-        buildName "${params.requestNumber}"
+        buildName "${params.eNB_MR}"
        buildDescription "Branch : ${sourceBranch}"
      }
    }
@@ -69,12 +64,12 @@ pipeline {
            echo "no LockResources given"
            allParametersPresent = false
          }
-          if (params.workspace == null) {
-            echo "no workspace given"
+          if (params.eNB_SourceCodePath == null) {
+            echo "no eNB_SourceCodePath given"
            allParametersPresent = false
          }
          if (params.OC_Credentials != null) {
-            echo "This pipeline is configured to run with Openshift Cluster."
+            echo "This pipeline is configured to run with Opensift Cluster."
            runWithOC = true
            if (params.OC_ProjectName == null) {
              echo "no OC_ProjectName given"
@@ -89,11 +84,21 @@ pipeline {
          }

          echo "CI executor node    :   ${pythonExecutor}"
-          echo "Testing Repository  :   ${testRepository}"
-          echo "Testing Branch      :   ${testBranch}"
+          echo "Source Repository   :   ${sourceRepository}"
+          echo "Source Branch       :   ${sourceBranch}"
+          echo "Target Repository   :   ${targetRepository}"
+          echo "Target Branch       :   ${targetBranch}"
+          echo "Commit ID           :   ${commitID}"

          if (allParametersPresent) {
            echo '\u2705 \u001B[94m All parameters are present\u001B[0m'
+            if (is_MR) {
+              sh "git fetch"
+              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${sourceBranch} --src-commit ${commitID} --target-branch ${targetBranch} --target-commit latest"
+            } else {
+              sh "git fetch"
+              sh "git checkout -f ${commitID}"
+            }
          } else {
            echo "\u274C Some parameters are missing"
            sh "./ci-scripts/fail.sh"
@@ -116,20 +121,28 @@ pipeline {
              }
            }
            sh """
-              python3 main.py --mode=InitiateHtml --repository=${testRepository} \
-                              --branch=${testBranch} ${mainPythonAllXmlFiles}
+              python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
+                              --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                              --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                              ${flexricOption} ${mainPythonAllXmlFiles}
            """
            if (runWithOC) {
              withCredentials([usernamePassword(credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password')]) {
+                sh """
+                  python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
+                                  --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                  --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                  ${flexricOption} ${mainPythonAllXmlFiles}
+                """
                for (xmlFile in myXmlTestSuite) {
                  if (fileExists(xmlFile)) {
                    try {
                      timeout (time: 60, unit: 'MINUTES') {
                        sh """
-                          python3 main.py --mode=TesteNB --repository=${testRepository} \
-                                          --branch=${testBranch} \
-                                          --ranAllowMerge=${mergeWithTarget} --targetBranch=${targetBranch} \
-                                          --workspace=${params.workspace} --XMLTestFile=${xmlFile} \
+                          python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
+                                          --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                          --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                          --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
                                          --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} \
                                          ${flexricOption}
                        """
@@ -147,10 +160,10 @@ pipeline {
                  try {
                    timeout (time: 60, unit: 'MINUTES') {
                      sh """
-                        python3 main.py --mode=TesteNB --repository=${testRepository} \
-                                        --branch=${testBranch} \
-                                        --ranAllowMerge=${mergeWithTarget} --targetBranch=${targetBranch} \
-                                        --workspace=${params.workspace} --XMLTestFile=${xmlFile} \
+                        python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
+                                        --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                        --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                        --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
                                        ${flexricOption}
                      """
                    }
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
--- a/ci-scripts/Jenkinsfile-push-local-repo
+++ b/ci-scripts/Jenkinsfile-push-local-repo
@@ -1,122 +0,0 @@
-#!/bin/groovy
-/*
- * SPDX-License-Identifier: LicenseRef-CSSL-1.0
- */
-
-// Location of the python executor node shall be in the same subnet as the others servers
-def nodeExecutor = params.nodeExecutor
-
-// SSH URL of the internal git repository
-def internalRepoURL = params.internalRepoURL
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-pipeline {
-  agent {
-    label nodeExecutor
-  }
-  options {
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-  stages {
-    stage("Job init") {
-      steps {
-        buildName "${params.requestNumber ?: params.targetBranch}"
-        buildDescription "Branch: ${params.sourceBranch}"
-      }
-    }
-    stage('Checkout') {
-      steps {
-        script {
-          if (params.mergeWithTarget) {
-            echo "PR triggered - checking out merge ref for PR #${params.requestNumber}"
-            try {
-              checkout([
-                $class: 'GitSCM',
-                branches: [[name: "refs/remotes/origin/pr/${params.requestNumber}/merge"]],
-                userRemoteConfigs: [[
-                  url: params.targetRepo,
-                  refspec: "+refs/pull/${params.requestNumber}/merge:refs/remotes/origin/pr/${params.requestNumber}/merge",
-                  credentialsId: 'github-jenkins-duranta'
-                ]]
-              ])
-            } catch (e) {
-              error("Checkout failed for PR #${params.requestNumber} - " +
-                    "merge ref not found. The PR likely has a conflict with ${params.targetBranch} " +
-                    "that must be resolved before CI can run. (${e.message})")
-            }
-          } else {
-            echo "Push triggered - checking out branch ${params.targetBranch}"
-            try {
-              checkout([
-                $class: 'GitSCM',
-                branches: [[name: params.targetBranch]],
-                userRemoteConfigs: [[
-                  url: params.targetRepo,
-                  credentialsId: 'github-jenkins-duranta'
-                ]]
-              ])
-            } catch (e) {
-              error("Checkout failed for branch ${params.targetBranch} from ${params.targetRepo}. (${e.message})")
-            }
-          }
-        }
-      }
-    }
-    stage('Verify parameters') {
-      steps {
-        script {
-          def missingParams = []
-          if (!params.sourceBranch?.trim())   { missingParams << 'sourceBranch' }
-          if (!params.sourceCommit?.trim()) { missingParams << 'sourceCommit' }
-          if (params.mergeWithTarget) {
-            if (!params.targetRepo?.trim())   { missingParams << 'targetRepo' }
-            if (!params.targetBranch?.trim()) { missingParams << 'targetBranch' }
-          }
-
-          if (missingParams) {
-            error "Missing required parameters: ${missingParams.join(', ')}"
-          }
-
-          echo "Source Branch : ${params.sourceBranch}"
-          echo "Source Commit : ${params.sourceCommit}"
-          echo "Merge         : ${params.mergeWithTarget}"
-          if (params.mergeWithTarget) {
-            echo "Target Branch : ${params.targetBranch}"
-            echo "Target Repo   : ${params.targetRepo}"
-          }
-        }
-      }
-    }
-    stage('Prepare workspace') {
-      steps {
-        sh """
-          git config user.email "oaicicdteam@openairinterface.org"
-          git config user.name "Duranta Jenkins"
-          git remote remove internal-repo || true
-        """
-      }
-    }
-    stage('Create testing branch for CI') {
-      steps {
-        sh """
-          # Checkout source commit
-          git checkout -B ${params.branch}
-        """
-      }
-    }
-    stage('Push merged branch to internal repository') {
-      steps {
-        sh """
-          git remote add internal-repo ${params.repository} || true
-          echo "Pushing ${params.branch} to internal repo"
-          git push --force internal-repo ${params.branch}
-        """
-      }
-    }
-  }
-}
--- a/ci-scripts/Jenkinsfile-push-registry
+++ b/ci-scripts/Jenkinsfile-push-registry
@@ -46,9 +46,9 @@ pipeline {
    stage ("Push to DockerHub") {
      steps {
        script {
-          def WEEK_REF = sh returnStdout: true, script: 'date +"%Y.w%V"'
+          WEEK_REF = sh returnStdout: true, script: 'date +"%Y.w%V"'
          WEEK_REF = WEEK_REF.trim()
-          def WEEK_TAG = sh returnStdout: true, script: 'python3 ./ci-scripts/provideUniqueImageTag.py --start_tag ' + WEEK_REF
+          WEEK_TAG = sh returnStdout: true, script: 'python3 ./ci-scripts/provideUniqueImageTag.py --start_tag ' + WEEK_REF
          WEEK_TAG = WEEK_TAG.trim()
          if ((params.forceTag != null) && (params.tagToUse != null)) {
            if (params.forceTag) {
@@ -56,7 +56,7 @@ pipeline {
              echo "Forced Tag is ${WEEK_TAG}"
            }
          }
-          def WEEK_SHA = sh returnStdout: true, script: 'git log -n1 --pretty=format:"%H" origin/develop'
+          WEEK_SHA = sh returnStdout: true, script: 'git log -n1 --pretty=format:"%h" origin/develop | cut -c 1-8'
          WEEK_SHA = WEEK_SHA.trim()

          withCredentials([
@@ -82,6 +82,12 @@ pipeline {
              }
              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:develop-${WEEK_SHA} || true"
            }
+            // Proxy is not following the same pattern.
+            sh "docker image tag proxy:develop ${DH_Account}/proxy:develop"
+            sh "docker image tag proxy:develop ${DH_Account}/proxy:${WEEK_TAG}"
+            sh "docker push --quiet ${DH_Account}/proxy:develop"
+            sh "docker push --quiet ${DH_Account}/proxy:${WEEK_TAG}"
+            sh "docker rmi ${DH_Account}/proxy:develop ${DH_Account}/proxy:${WEEK_TAG}"
            // Logging out on both registries
            sh "docker logout ${OAI_Registry} > /dev/null 2>&1"
            sh "docker logout > /dev/null 2>&1"
--- a/ci-scripts/Jenkinsfile-scheduled-run
+++ b/ci-scripts/Jenkinsfile-scheduled-run
@@ -1,210 +0,0 @@
-#!/bin/groovy
-/*
- * SPDX-License-Identifier: LicenseRef-CSSL-1.0
- */
-
-def pythonExecutor = params.pythonExecutor
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-def JOB_TIMESTAMP
-
-// Choose test stage name or fallback default
-def testStageName = params.pipelineTestStageName != null ? params.pipelineTestStageName : 'Template Test Stage'
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-
-def targetBranch = params.targetBranch ?: 'develop'
-def testRepository = params.repository ?: 'git@asterix:/home/git/openairinterface5g.git'
-def testBranch = params.branch ?: "latest"
-def mergeWithTarget = params.mergeWithTarget ?: false
-def sourceBranch = params.sourceBranch ?: testBranch
-
-def flexricOption = ""
-def runWithOC = false
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-      steps {
-        script {
-          echo '\u2705 \u001B[94mBuild Init\u001B[0m'
-          JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
-        }
-        // update the build name and description
-        buildName "${params.requestNumber}"
-        buildDescription "Branch : ${sourceBranch}"
-      }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[94mVerify Parameters\u001B[0m'
-          def allParametersPresent = true
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.workspace == null) {
-            echo "no workspace given"
-            allParametersPresent = false
-          }
-          if (params.OC_Credentials != null) {
-            echo "This pipeline is configured to run with Openshift Cluster."
-            runWithOC = true
-            if (params.OC_ProjectName == null) {
-              echo "no OC_ProjectName given"
-              allParametersPresent = false
-            }
-          }
-          if (params.Flexric_Tag != null) {
-            echo "This pipeline is configured to run with a FlexRIC deployment."
-            echo "Appending FlexRicTag option to the list of options"
-            flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
-            echo "Using new Flexric option: ${flexricOption}"
-          }
-
-	  if (testBranch == 'latest') {
-            echo "Detecting latest commit and branch from repo"
-            def latest_integration = sh(script: "git for-each-ref --format='%(refname:short) %(committerdate:unix)' refs/remotes/origin/integration_* | sort -k2 -nr | head -n1 | cut -d' ' -f1", returnStdout: true).trim()
-            def latest_develop = sh(script: "git for-each-ref --format='%(refname:short) %(committerdate:unix)' refs/remotes/origin/develop* | sort -k2 -nr | head -n1 | cut -d' ' -f1", returnStdout: true).trim()
-            def dev_date = sh(script: "git log ${latest_develop} -1 --format=%ct", returnStdout: true).trim().toInteger()
-            def int_date = sh(script: "git log ${latest_integration} -1 --format=%ct", returnStdout: true).trim().toInteger()
-            def selected_ref = (dev_date > int_date) ? "origin/develop" : latest_integration
-            sourceBranch = selected_ref.replaceFirst("^origin/", "")
-            commitID = sh(script: "git rev-parse ${selected_ref}", returnStdout: true).trim()
-            echo "Found branch ${sourceBranch}, commit ${commitID}"
-            testBranch = "${sourceBranch}-${commitID}"
-	  }
-
-          echo "CI executor node    :   ${pythonExecutor}"
-          echo "Testing Repository  :   ${testRepository}"
-          echo "Testing Branch      :   ${testBranch}"
-
-          if (allParametersPresent) {
-            echo '\u2705 \u001B[94m All parameters are present\u001B[0m'
-          } else {
-            echo "\u274C Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[94m Deploy and Test: ${testStageName}\u001B[0m"
-            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-            for (xmlFile in myXmlTestSuite) {
-              if (fileExists(xmlFile)) {
-                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                echo "Test XML file         :   ${xmlFile}"
-              } else {
-                echo "Test XML file ${xmlFile}: no such file"
-              }
-            }
-            sh """
-              python3 main.py --mode=InitiateHtml --repository=${testRepository} \
-                              --branch=${testBranch} ${mainPythonAllXmlFiles}
-            """
-            if (runWithOC) {
-              withCredentials([usernamePassword(credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password')]) {
-                for (xmlFile in myXmlTestSuite) {
-                  if (fileExists(xmlFile)) {
-                    try {
-                      timeout (time: 150, unit: 'MINUTES') {
-                        sh """
-                          python3 main.py --mode=TesteNB --repository=${testRepository} \
-                                          --branch=${testBranch} \
-                                          --ranAllowMerge=${mergeWithTarget} --targetBranch=${targetBranch} \
-                                          --workspace=${params.workspace} --XMLTestFile=${xmlFile} \
-                                          --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} \
-                                          ${flexricOption}
-                        """
-                      }
-                    } catch (Exception e) {
-                      currentBuild.result = 'FAILURE'
-                      buildStageStatus = false
-                    }
-                  }
-                }
-              }
-            } else {
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                    timeout (time: 150, unit: 'MINUTES') {
-                      sh """
-                        python3 main.py --mode=TesteNB --repository=${testRepository} \
-                                        --branch=${testBranch} \
-                                        --ranAllowMerge=${mergeWithTarget} --targetBranch=${targetBranch} \
-                                        --workspace=${params.workspace} --XMLTestFile=${xmlFile} \
-                                        ${flexricOption}
-                      """
-                    }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-            }
-          sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-          }
-        }
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-	  echo '\u2705 \u001B[94mLog Collection\u001B[0m'
-          dir ('ci-scripts') {
-            // Zipping all archived log files
-              sh "mkdir test_logs"
-              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
-              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
-              sh "rm -rf *test_log*/"
-              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
-                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
-              }
-            if (fileExists("test_results.html")) {
-              def reportName = "test_results-${env.JOB_NAME}.html"
-              sh "mv test_results.html ${reportName}"
-              sh """
-                sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' \
-                       -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' \
-		       -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' \
-                       -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' \
-                       -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' ${reportName}
-	      """
-              archiveArtifacts artifacts: "${reportName}"
-            }
-          }
-        }
-      }
-    }
-  }
-}
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0

 #---------------------------------------------------------------------
-# Python for CI testing
+# Python for CI of OAI-eNB + COTS-UE
 #
 #   Required Python Version
 #     Python 3.x
@@ -22,7 +22,7 @@ import constants as CONST
 #-----------------------------------------------------------


-def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
+def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):

    force_local = False
    date_fmt = None
@@ -44,40 +44,80 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
        elif re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
            mode = matchReg.group(1)
-        elif re.match(r'^\-\-repository=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-repository=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.repository = matchReg.group(1)
-            RAN.repository=matchReg.group(1)
-            HTML.repository=matchReg.group(1)
-            CONTAINERS.repository=matchReg.group(1)
-            CLUSTER.repository=matchReg.group(1)
-        elif re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match(r'^\-\-eNBRepository=(.+)$|^\-\-ranRepository(.+)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE)
+            else:
+                matchReg = re.match(r'^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
+            CiTestObj.ranRepository = matchReg.group(1)
+            RAN.ranRepository=matchReg.group(1)
+            HTML.ranRepository=matchReg.group(1)
+            CONTAINERS.ranRepository=matchReg.group(1)
+            SCA.ranRepository=matchReg.group(1)
+            CLUSTER.ranRepository=matchReg.group(1)
+        elif re.match(r'^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
+            else:
+                matchReg = re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
            doMerge = matchReg.group(1)
            if ((doMerge == 'true') or (doMerge == 'True')):
-                RAN.merge=True
-                CONTAINERS.merge=True
-                CLUSTER.merge=True
-        elif re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.branch = matchReg.group(1)
-            RAN.branch=matchReg.group(1)
-            HTML.branch=matchReg.group(1)
-            CONTAINERS.branch=matchReg.group(1)
-            CLUSTER.branch=matchReg.group(1)
-        elif re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE)
-            RAN.targetBranch=matchReg.group(1)
-            CONTAINERS.targetBranch=matchReg.group(1)
-            CLUSTER.targetBranch=matchReg.group(1)
-        elif re.match(r'^\-\-workspace=(.+)$|^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-workspace=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-workspace=(.+)$', myArgv, re.IGNORECASE)
+                CiTestObj.ranAllowMerge = True
+                RAN.ranAllowMerge=True
+                HTML.ranAllowMerge=True
+                CONTAINERS.ranAllowMerge=True
+                SCA.ranAllowMerge=True
+                CLUSTER.ranAllowMerge=True
+        elif re.match(r'^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
            else:
+                matchReg = re.match(r'^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
+            CiTestObj.ranBranch = matchReg.group(1)
+            RAN.ranBranch=matchReg.group(1)
+            HTML.ranBranch=matchReg.group(1)
+            CONTAINERS.ranBranch=matchReg.group(1)
+            SCA.ranBranch=matchReg.group(1)
+            CLUSTER.ranBranch=matchReg.group(1)
+        elif re.match(r'^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
+            else:
+                matchReg = re.match(r'^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
+            CiTestObj.ranCommitID = matchReg.group(1)
+            RAN.ranCommitID=matchReg.group(1)
+            HTML.ranCommitID=matchReg.group(1)
+            CONTAINERS.ranCommitID=matchReg.group(1)
+            SCA.ranCommitID=matchReg.group(1)
+            CLUSTER.ranCommitID=matchReg.group(1)
+        elif re.match(r'^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
+            else:
+                matchReg = re.match(r'^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
+            CiTestObj.ranTargetBranch = matchReg.group(1)
+            RAN.ranTargetBranch=matchReg.group(1)
+            HTML.ranTargetBranch=matchReg.group(1)
+            CONTAINERS.ranTargetBranch=matchReg.group(1)
+            SCA.ranTargetBranch=matchReg.group(1)
+            CLUSTER.ranTargetBranch=matchReg.group(1)
+        elif re.match(r'^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
+            print("parameters --eNB*IPAddress ignored")
+        elif re.match(r'^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
+            print("parameters --eNB*UserName ignored")
+        elif re.match(r'^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
+            print("parameter --eNB*Password ignored")
+        elif re.match(r'^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
-            RAN.workspace=matchReg.group(1)
-            CONTAINERS.workspace=matchReg.group(1)
-            CLUSTER.workspace=matchReg.group(1)
+                RAN.eNBSourceCodePath=matchReg.group(1)
+                CONTAINERS.eNBSourceCodePath=matchReg.group(1)
+                SCA.eNBSourceCodePath=matchReg.group(1)
+                CLUSTER.eNBSourceCodePath=matchReg.group(1)
+            elif re.match(r'^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+                print("parameter --eNB1SourceCodePath ignored")
+            elif re.match(r'^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+                print("parameter --eNB2SourceCodePath ignored")
        elif re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
            CiTestObj.testXMLfiles.append(matchReg.group(1))
--- a/ci-scripts/as_ue/multi-00105-100.cfg
+++ b/ci-scripts/as_ue/multi-00105-100.cfg
--- a/ci-scripts/as_ue/multi-00105-40.cfg
+++ b/ci-scripts/as_ue/multi-00105-40.cfg
--- a/ci-scripts/checkCodingFormattingRules.sh
+++ b/ci-scripts/checkCodingFormattingRules.sh
@@ -55,9 +55,8 @@ then
       IS_OAI_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: LicenseRef-CSSL-1.0" $FILE || true`
       IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FILE || true`
       IS_MIT_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: MIT" $FILE || true`
-       IS_APACHE_LICENSE_PRESENT=`grep -E -c "SPDX-License-Identifier: Apache-2.0" $FILE || true`
       IS_EXCEPTION=`echo $FILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`
-       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ] && [ $IS_APACHE_LICENSE_PRESENT -eq 0 ]
+       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
       then
           if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
           then
@@ -167,9 +166,8 @@ do
            IS_OAI_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: LicenseRef-CSSL-1.0" $FULLFILE || true`
            IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FULLFILE || true`
            IS_MIT_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: MIT" $FULLFILE || true`
-            IS_APACHE_LICENSE_PRESENT=`grep -E -c "SPDX-License-Identifier: Apache-2.0" $FULLFILE || true`
            IS_EXCEPTION=`echo $FULLFILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`
-            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ] && [ $IS_APACHE_LICENSE_PRESENT -eq 0 ]
+            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
            then
                if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
                then
--- a/ci-scripts/checkGitLabMergeRequestLabels.sh
+++ b/ci-scripts/checkGitLabMergeRequestLabels.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+function usage {
+    echo "OAI GitLab merge request applying script"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo ""
+    echo "    checkGitLabMergeRequestLabels.sh [OPTIONS]"
+    echo ""
+    echo "Options:"
+    echo "------------------"
+    echo ""
+    echo "    --mr-id ####"
+    echo "    Specify the ID of the merge request."
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+if [ $# -ne 2 ] && [ $# -ne 1 ]
+then
+    echo "Syntax Error: not the correct number of arguments"
+    echo ""
+    usage
+    exit 1
+fi
+
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    shift
+    usage
+    exit 0
+    ;;
+    --mr-id)
+    MERGE_REQUEST_ID="$2"
+    shift
+    shift
+    ;;
+    *)
+    echo "Syntax Error: unknown option: $key"
+    echo ""
+    usage
+    exit 1
+esac
+done
+
+LABELS=`curl --silent "https://gitlab.eurecom.fr/api/v4/projects/oai%2Fopenairinterface5g/merge_requests/$MERGE_REQUEST_ID" | jq '.labels' || true`
+
+IS_MR_DOCUMENTATION=`echo $LABELS | grep -ic documentation`
+IS_MR_BUILD_ONLY=`echo $LABELS | grep -c BUILD-ONLY`
+IS_MR_CI=`echo $LABELS | grep -c CI`
+IS_MR_4G=`echo $LABELS | grep -c 4G-LTE`
+IS_MR_5G=`echo $LABELS | grep -c 5G-NR`
+IS_MR_5G_UE=`echo $LABELS | grep -c nrUE`
+
+# none is present! No CI
+if [ $IS_MR_BUILD_ONLY -eq 0 ] && [ $IS_MR_CI -eq 0 ] && [ $IS_MR_4G -eq 0 ] && [ $IS_MR_5G -eq 0 ] && [ $IS_MR_DOCUMENTATION -eq 0 ] && [ $IS_MR_5G_UE -eq 0 ]
+then
+    echo "NONE"
+    exit 0
+fi
+
+# 4G and 5G or CI labels: run everything (4G, 5G)
+if [ $IS_MR_4G -eq 1 ] && [ $IS_MR_5G -eq 1 ] || [ $IS_MR_CI -eq 1 ]
+then
+    echo "FULL"
+    exit 0
+fi
+
+if [ $IS_MR_5G_UE -eq 1 ] && [ $IS_MR_4G -eq 1 ]
+then
+    echo "SHORTEN-4G-5G-UE"
+    exit 0
+fi
+
+# 4G is present: run only 4G
+if [ $IS_MR_4G -eq 1 ]
+then
+    echo "SHORTEN-4G"
+    exit 0
+fi
+
+# 5G is present: run only 5G
+if [ $IS_MR_5G -eq 1 ]
+then
+    echo "SHORTEN-5G"
+    exit 0
+fi
+
+if [ $IS_MR_5G_UE -eq 1 ]
+then
+    echo "SHORTEN-5G-UE"
+    exit 0
+fi
+
+# BUILD-ONLY is present: only build stages
+if [ $IS_MR_BUILD_ONLY -eq 1 ]
+then
+    echo "BUILD-ONLY"
+    exit 0
+fi
+
+# Documentation is present: don't do anything
+if [ $IS_MR_DOCUMENTATION -eq 1 ]
+then
+    echo "documentation"
+    exit 0
+fi
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -44,14 +44,6 @@ up2-aerial:
  IF: wwan0
  MTU: 1500

-up3:
-  Host: up3
-  AttachScript: /opt/mbim/start_quectel_mbim.sh
-  DetachScript: /opt/mbim/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
 adb_ue_1:
  Host: nano
  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize R3CM40LZPHT
@@ -87,19 +79,11 @@ oc-cn5g:

 oc-cn5g-20897:
  Host: cacofonix
-  NetworkScript: echo "inet 172.21.6.115"
+  NetworkScript: echo "inet 172.21.6.105"
  RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72 %%log_dir%%"
-
-oc-cn5g-00105:
-  Host: cacofonix
-  NetworkScript: echo "inet 172.21.6.118"
-  RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2026-apr-00105 oaicicd-core-for-fhi72"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2026-apr-00105 oaicicd-core-for-fhi72"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2026-apr-00105 oaicicd-core-for-fhi72 %%log_dir%%"
+  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
+  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
+  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"

 oc-cn5g-00103-ho:
  Host: groot
@@ -125,19 +109,6 @@ oc-cn5g-00104:
  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-00104 oaicicd-core-for-nvidia-aerial"
  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-00104 oaicicd-core-for-nvidia-aerial %%log_dir%%"

-oc-cn5g-20897-stonechat:
-  Host: stonechat
-  NetworkScript: echo "inet 172.21.6.105"
-  RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72  %%log_dir%%"
-
-oc-cn5g-20899-always-on:
-  Host: stonechat
-  NetworkScript: echo "inet 172.21.6.12"
-  RunIperf3Server: False
-
 matix-cn5g:
  Host: matix
  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
@@ -172,7 +143,7 @@ ltebox-nano:
    - "sudo su -c 'screen -dm -S simulated_hss /opt/hss_sim0609/starthss'"
    - "sleep 1"
    - "sudo /opt/ltebox/tools/start_mme && sudo /opt/ltebox/tools/start_xGw &"
-    - "sleep 2"
+    - "sleep 1"
  Undeploy: "sudo /opt/ltebox/tools/stop_xGw; sudo /opt/ltebox/tools/stop_mme; sudo killall screen"
  LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{mmeLog.0,s1apcLog.0,s1apsLog.0,s11cLog.0,libLog.0,xGwLog.0} %%log_dir%%"

@@ -183,7 +154,7 @@ sabox-nepes:
    - "sudo su -c 'screen -dm -S simulated_5g_hss /opt/hss_sim0609/start_5g_hss'"
    - "sleep 1"
    - "sudo /opt/ltebox/tools/start_sabox < /dev/null &> /dev/null"
-    - "sleep 2"
+    - "sleep 1"
  LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{amfLog.0,ngapcLog.0,ngapcommonLog.0,ngapsLog.0,xGwLog.0,upfLog.0} %%log_dir%%"
  Undeploy: "sudo /opt/ltebox/tools/stop_sabox; sudo killall screen"

@@ -194,7 +165,7 @@ ltebox-nepes:
    - "sudo su -c 'screen -dm -S simulated_hss /opt/hss_sim0609/starthss'"
    - "sleep 1"
    - "sudo /opt/ltebox/tools/start_mme && sudo /opt/ltebox/tools/start_xGw &"
-    - "sleep 2"
+    - "sleep 1"
  Undeploy: "sudo /opt/ltebox/tools/stop_xGw; sudo /opt/ltebox/tools/stop_mme; sudo killall screen"
  LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{mmeLog.0,s1apcLog.0,s1apsLog.0,s11cLog.0,libLog.0,xGwLog.0} %%log_dir%%"

@@ -212,24 +183,6 @@ amarisoft_ue_2x2:
  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz_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_00105_40MHz:
-  Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_mplane_40MHz/multi-00105-40.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
-  Tracing:
-    Start: '' # nothing to be done
-    Stop: '' # nothing to be done
-    Collect: 'cp /tmp/ue.log %%log_dir%%'
-amarisoft_00105_100MHz:
-  Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_mplane_100MHz/multi-00105-100.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
-  Tracing:
-    Start: '' # nothing to be done
-    Stop: '' # nothing to be done
-    Collect: 'cp /tmp/ue.log %%log_dir%%'
 amarisoft_ue_1:
  Host: amariue
  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
--- a/ci-scripts/cls_analysis.py
+++ b/ci-scripts/cls_analysis.py
@@ -95,13 +95,13 @@ class Analysis():
 		test_summary['Nbfail'] =  nb_failed
 		return nb_failed == 0, test_summary, test_result

-	def analyze_rt_stats(thresholds, stat_files):
+	def analyze_rt_stats(thresholds, L1_stats, MAC_stats):
 		with open(thresholds, 'r') as f:
 			datalog_rt_stats = yaml.load(f, Loader=yaml.FullLoader)

 		rt_keys = datalog_rt_stats['Ref']
 		real_time_stats = {}
-		for sf in stat_files:
+		for sf in [L1_stats, MAC_stats]:
 			with open(sf, 'r') as f:
 				for line in f.readlines():
 					for k in rt_keys:
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -50,16 +50,17 @@ def OC_logout(cmd):

 class Cluster:
 	def __init__(self):
-		self.workspace = ""
+		self.eNBSourceCodePath = ""
 		self.OCUserName = ""
 		self.OCPassword = ""
 		self.OCProjectName = ""
 		self.OCUrl = OCUrl
 		self.OCRegistry = OCRegistry
-		self.repository = ""
-		self.branch = ""
-		self.merge = False
-		self.targetBranch = ""
+		self.ranRepository = ""
+		self.ranBranch = ""
+		self.ranCommitID = ""
+		self.ranAllowMerge = False
+		self.ranTargetBranch = ""
 		self.cmd = None

 	def _recreate_entitlements(self):
@@ -100,7 +101,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.workspace} --exclude=""')
+		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -156,7 +157,7 @@ class Cluster:
 				OC_logout(cmd)
 				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 				return False
-			tag = self.branch
+			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			registry = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
 			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, None, None)
 			OC_logout(cmd)
@@ -173,12 +174,12 @@ class Cluster:
 		return (image, archiveArtifact(self.cmd, ctx, fn))

 	def BuildClusterImage(self, ctx, node, HTML):
-		if self.repository == '' or self.branch == '':
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError(f'Insufficient Parameter: repository {self.repository} branch {self.branch}')
-		lSourcePath = self.workspace
+			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
+		lSourcePath = self.eNBSourceCodePath
 		if node == '' or lSourcePath == '':
-			raise ValueError('Insufficient Parameter: workspace missing')
+			raise ValueError('Insufficient Parameter: eNBSourceCodePath missing')
 		ocUserName = self.OCUserName
 		ocPassword = self.OCPassword
 		ocProjectName = self.OCProjectName
@@ -199,22 +200,22 @@ class Cluster:

 		baseTag = 'develop'
 		forceBaseImageBuild = False
-		if self.merge: # merging MR branch into develop -> temporary image
-			branchName = self.branch.replace('/','-')
-			imageTag = f'{branchName}'
-			if self.targetBranch == 'develop':
+		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
+			branchName = self.ranBranch.replace('/','-')
+			imageTag = f'{branchName}-{self.ranCommitID[0:8]}'
+			if self.ranTargetBranch == 'develop':
 				ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel9 | grep --colour=never -i INDEX')
 				result = re.search('index', ret.stdout)
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
 			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.branch)
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
 			if not forceBaseImageBuild and result is not None:
 				forceBaseImageBuild = True
 				baseTag = 'ci-temp'
 		else:
-			imageTag = self.branch
+			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True

 		# logging to OC Cluster and then switch to corresponding project
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -29,18 +29,38 @@ from cls_ci_helper import archiveArtifact
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72', 'oai-gnb-fhi72-t2']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
 DEFAULT_REGISTRY = "gracehopper3-oai.sboai.cs.eurecom.fr"

-def CreateWorkspace(host, sourcePath, repository, branch):
+def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
+	if ranCommitID == '':
+		logging.error('need ranCommitID in CreateWorkspace()')
+		raise ValueError('Insufficient Parameter in CreateWorkspace(): need ranCommitID')
+
 	script = "scripts/create_workspace.sh"
-	options = f"{sourcePath} {repository} {branch}"
+	options = f"{sourcePath} {ranRepository} {ranCommitID}"
+	if ranAllowMerge:
+		if ranTargetBranch == '':
+			ranTargetBranch = 'develop'
+		options += f" {ranTargetBranch}"
 	logging.info(f'execute "{script}" with options "{options}" on node {host}')
 	with cls_cmd.getConnection(host) as c:
 		ret = c.exec_script(script, 90, options)
 	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
 	return ret.returncode == 0

+def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
+	if ranCommitID == 'develop':
+		return 'develop'
+	shortCommit = ranCommitID[0:8]
+	if ranAllowMerge:
+		# Allowing contributor to have a name/branchName format
+		branchName = ranBranch.replace('/','-')
+		tagToUse = f'{branchName}-{shortCommit}'
+	else:
+		tagToUse = f'develop-{shortCommit}'
+	return tagToUse
+
 def AnalyzeBuildLogs(image, lf):
 	committed = False
 	tagged = False
@@ -152,16 +172,23 @@ class Containerize():

 	def __init__(self):
 		
-		self.repository = ''
-		self.branch = ''
-		self.merge = False
-		self.targetBranch = ''
-		self.workspace = ''
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranAllowMerge = False
+		self.ranCommitID = ''
+		self.ranTargetBranch = ''
+		self.eNBSourceCodePath = ''
 		self.imageKind = ''
+		self.proxyCommit = None
 		self.yamlPath = ''
 		self.services = ''
 		self.deploymentTag = ''

+		self.cli = ''
+		self.cliBuildOptions = ''
+		self.dockerfileprefix = ''
+		self.host = ''
+
 		self.num_attempts = 1

 		self.flexricTag = ''
@@ -171,12 +198,23 @@ class Containerize():
 #-----------------------------------------------------------

 	def BuildImage(self, ctx, node, HTML):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
 		log_files = []
 	
-		dockerfileprefix = '.ubuntu'
+		# Checking the hostname to get adapted on cli and dockerfileprefixes
+		cmd.run('hostnamectl')
+		result = re.search('Ubuntu|Red Hat', cmd.getBefore())
+		self.host = result.group(0)
+		if self.host == 'Ubuntu':
+			self.cli = 'docker'
+			self.dockerfileprefix = '.ubuntu'
+			self.cliBuildOptions = ''
+		elif self.host == 'Red Hat':
+			self.cli = 'sudo podman'
+			self.dockerfileprefix = '.rhel9'
+			self.cliBuildOptions = '--disable-compression'

 		# we always build the ran-build image with all targets
 		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
@@ -194,20 +232,23 @@ class Containerize():
 			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
 			imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue', ''))
 			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
-			imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
-			# Building again the 5G images with Address Sanitizer
-			imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-			imageNames.append(('oai-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-			imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-			imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
-			imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
-			imageNames.append(('oai-nr-oru', 'nrORU.fhi72', 'oai-nr-oru', ''))
+			if self.host == 'Red Hat':
+				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
+			if self.host == 'Ubuntu':
+				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
+				# Building again the 5G images with Address Sanitizer
+				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('oai-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
+				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
+				imageNames.append(('oai-nr-oru', 'nrORU.fhi72', 'oai-nr-oru', ''))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
-			dockerfileprefix = '.ubuntu.cross-arm64'
+			self.dockerfileprefix = '.ubuntu.cross-arm64'
 		result = re.search('native_armv9', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
@@ -220,27 +261,27 @@ class Containerize():
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
 			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
 			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
-		result = re.search('fhi72-t2', self.imageKind)
-		if result is not None:
-			imageNames.append(('ran-build-fhi72-t2', 'build.fhi72.t2', 'ran-build-fhi72-t2', ''))
-			imageNames.append(('oai-gnb', 'gNB.fhi72.t2', 'oai-gnb-fhi72-t2', ''))
-
+		
 		cmd.cd(lSourcePath)
+		# if asterix, copy the entitlement and subscription manager configurations
+		if self.host == 'Red Hat':
+			cmd.run('mkdir -p ./etc-pki-entitlement')
+			cmd.run('cp /etc/pki/entitlement/*.pem ./etc-pki-entitlement/')

 		baseImage = 'ran-base'
 		baseTag = 'develop'
 		forceBaseImageBuild = False
 		imageTag = 'develop'
-		if (self.merge):
+		if (self.ranAllowMerge):
 			imageTag = 'ci-temp'
-			if self.targetBranch == 'develop':
-				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{dockerfileprefix} | grep --colour=never -i INDEX')
+			if self.ranTargetBranch == 'develop':
+				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
 			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.branch)
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
 			if not forceBaseImageBuild and result is not None:
 				forceBaseImageBuild = True
 				baseTag = 'ci-temp'
@@ -248,30 +289,31 @@ class Containerize():
 			forceBaseImageBuild = True

 		# Let's remove any previous run artifacts if still there
-		cmd.run(f"docker image prune --force")
+		cmd.run(f"{self.cli} image prune --force")
 		for image,pattern,name,option in imageNames:
-			cmd.run(f"docker image rm {name}:{imageTag}", reportNonZero=False)
+			cmd.run(f"{self.cli} image rm {name}:{imageTag}", reportNonZero=False)

 		cmd.run(f'docker login -u oaicicd -p oaicicd {DEFAULT_REGISTRY}')
 		ubuntuImage = "ubuntu:noble"
 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
-			cmd.run(f"docker image rm {baseImage}:{baseTag}")
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 			logfile = f'{lSourcePath}/cmake_targets/log/ran-base.docker.log'
-			option = f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
-			cmd.run(f"docker build --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{dockerfileprefix} {option} . &> {logfile}", timeout=1600)
+			if self.host == 'Ubuntu':
+				option = f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
+			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} {option} . &> {logfile}", timeout=1600)
 			t = ("ran-base", archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)

 		# First verify if the base image was properly created.
-		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
+		ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
 		allImagesSize = {}
 		if ret.returncode != 0:
 			logging.error('\u001B[1m Could not build properly ran-base\u001B[0m')
 			# Recover the name of the failed container?
-			cmd.run(f"docker ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty docker rm -f")
-			cmd.run(f"docker image prune --force")
+			cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
+			cmd.run(f"{self.cli} image prune --force")
 			cmd.close()
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
@@ -291,37 +333,32 @@ class Containerize():
 		for image,pattern,name,option in imageNames:
 			# the archived Dockerfiles have "ran-base:latest" as base image
 			# we need to update them with proper tag
-			cmd.run(f'git checkout -- docker/Dockerfile.{pattern}{dockerfileprefix}')
-			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
+			cmd.run(f'git checkout -- docker/Dockerfile.{pattern}{self.dockerfileprefix}')
+			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			# target images should use the proper ran-build image
 			if image != 'ran-build' and "-asan" in name:
-				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
+				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			elif "fhi72" in name or name == "oai-nr-oru":
-				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
+				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			elif image != 'ran-build':
-				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
+				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
 				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2026.01.07.tar.gz .')
-			if image == 'ran-build-fhi72-t2':
-				cmd.run('cp -f /opt/t2-patch/AMD-T2-SDFEC_25-03-1.patch .')
-			if name == 'oai-gnb-fhi72-t2':
-				cmd.run(f'sed -i -e "s#ran-build-fhi72-t2:latest#ran-build-fhi72-t2:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
-			option = option + f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
-			ret = cmd.run(f'docker build --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
+			if self.host == 'Ubuntu':
+				option = option + f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
+			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
 			t = (name, archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 			if image == 'oai-gnb-aerial':
 				cmd.run('rm -f nvipc_src.2026.01.07.tar.gz')
-			if image == 'ran-build-fhi72-t2':
-				cmd.run('rm -f AMD-T2-SDFEC_25-03-1.patch')
 			# check the status of the build
-			ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
+			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
 				logging.error('\u001B[1m Could not build properly ' + name + '\u001B[0m')
 				status = False
 				# Here we should check if the last container corresponds to a failed command and destroy it
-				cmd.run(f"docker ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty docker rm -f")
+				cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
 				allImagesSize[name] = 'N/A -- Build Failed'
 				break
 			else:
@@ -335,16 +372,16 @@ class Containerize():
 					logging.debug(f'{name} size is unknown')
 					allImagesSize[name] = 'unknown'
 			# Now pruning dangling images in between target builds
-			cmd.run(f"docker image prune --force")
+			cmd.run(f"{self.cli} image prune --force")
 		cmd.run(f'docker logout {DEFAULT_REGISTRY}')
 		# Remove all intermediate build images and clean up
-		cmd.run(f"docker image rm ran-build:{imageTag} ran-build-asan:{imageTag} ran-build-fhi72:{imageTag} || true")
-		cmd.run(f"docker volume prune --force")
+		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag} ran-build-fhi72:{imageTag} || true")
+		cmd.run(f"{self.cli} volume prune --force")

 		# Remove some cached artifacts to prevent out of diskspace problem
 		logging.debug(cmd.run("df -h").stdout)
 		logging.debug(cmd.run("docker system df").stdout)
-		cmd.run(f"docker buildx prune --filter until=1h --force")
+		cmd.run(f"{self.cli} buildx prune --filter until=1h --force")
 		logging.debug(cmd.run("df -h").stdout)
 		logging.debug(cmd.run("docker system df").stdout)

@@ -364,18 +401,108 @@ class Containerize():
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 		return status

-	def BuildRunTests(self, ctx, node, dockerfile, runtime_opt, ctest_opt, HTML):
-		lSourcePath = self.workspace
+	def BuildProxy(self, ctx, node, HTML):
+		lSourcePath = self.eNBSourceCodePath
 		logging.debug('Building on server: ' + node)
-		cmd = cls_cmd.getConnection(node)
+		ssh = cls_cmd.getConnection(node)
+
+		oldRanCommidID = self.ranCommitID
+		oldRanRepository = self.ranRepository
+		oldRanAllowMerge = self.ranAllowMerge
+		oldRanTargetBranch = self.ranTargetBranch
+		self.ranCommitID = self.proxyCommit
+		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
+		self.ranAllowMerge = False
+		self.ranTargetBranch = 'master'
+
+		# Let's remove any previous run artifacts if still there
+		ssh.run('docker image prune --force')
+		# Remove any previous proxy image
+		ssh.run('docker image rm oai-lte-multi-ue-proxy:latest')
+
+		tag = self.proxyCommit
+		logging.debug('building L2sim proxy image for tag ' + tag)
+		# check if the corresponding proxy image with tag exists. If not, build it
+		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
+		buildProxy = ret.returncode != 0 # if no image, build new proxy
+		if buildProxy:
+			ssh.run(f'rm -Rf {lSourcePath}')
+			success = CreateWorkspace(node, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+			if not success:
+				raise Exception("could not clone proxy repository")
+
+			fullpath = f'{lSourcePath}/proxy_build.log'
+
+			ssh.run(f'docker build --target oai-lte-multi-ue-proxy --tag proxy:{tag} --file {lSourcePath}/docker/Dockerfile.ubuntu18.04 {lSourcePath} > {fullpath} 2>&1')
+			archiveArtifact(ssh, ctx, fullpath)
+
+			ssh.run('docker image prune --force')
+			ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
+			if ret.returncode != 0:
+				logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
+				ssh.close()
+				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+		else:
+			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')
+
+		# retag the build images to that we pick it up later
+		ssh.run(f'docker image tag proxy:{tag} oai-lte-multi-ue-proxy:latest')
+
+		# we assume that the host on which this is built will also run the proxy. The proxy
+		# currently requires the following command, and the docker-compose up mechanism of
+		# the CI does not allow to run arbitrary commands. Note that the following actually
+		# belongs to the deployment, not the build of the proxy...
+		logging.warning('the following command belongs to deployment, but no mechanism exists to exec it there!')
+		ssh.run('sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up')
+
+		# to prevent accidentally overwriting data that might be used later
+		self.ranCommitID = oldRanCommidID
+		self.ranRepository = oldRanRepository
+		self.ranAllowMerge = oldRanAllowMerge
+		self.ranTargetBranch = oldRanTargetBranch
+
+		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
+		result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
+		# Cleaning any created tmp volume
+		ssh.run('docker volume prune --force')
+		ssh.close()
+
+		allImagesSize = {}
+		if result is not None:
+			imageSize = float(result.group('size')) / 1000000
+			logging.debug('\u001B[1m   proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
+			allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes'
+			logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
+			HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
+			return True
+		else:
+			logging.error('proxy size is unknown')
+			allImagesSize['proxy'] = 'unknown'
+			logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
+			HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
+			return False
+
+	def BuildRunTests(self, ctx, node, HTML):
+		lSourcePath = self.eNBSourceCodePath
+		logging.debug('Building on server: ' + node)
+		cmd = cls_cmd.RemoteCmd(node)
 		cmd.cd(lSourcePath)

+		ret = cmd.run('hostnamectl')
+		result = re.search('Ubuntu', ret.stdout)
+		host = result.group(0)
+		if host != 'Ubuntu':
+			cmd.close()
+			raise Exception("Can build unit tests only on Ubuntu server")
+		logging.debug('running on Ubuntu as expected')
+
 		# check that ran-base image exists as we expect it
 		baseImage = 'ran-base'
 		baseTag = 'develop'
-		if self.merge:
-			if self.targetBranch == 'develop':
-				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.ubuntu | grep --colour=never -i INDEX')
+		if self.ranAllowMerge:
+			if self.ranTargetBranch == 'develop':
+				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
 					baseTag = 'ci-temp'
@@ -386,9 +513,9 @@ class Containerize():
 			return False

 		# build ran-unittests image
+		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu"
 		logfile = f'{lSourcePath}/cmake_targets/log/unittest-build.log'
-		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file ci-scripts/{dockerfile} . &> {logfile}')
-
+		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {logfile}')
 		archiveArtifact(cmd, ctx, logfile)
 		if ret.returncode != 0:
 			logging.error(f'Cannot build unit tests')
@@ -401,7 +528,7 @@ class Containerize():
 		# I would like to run it with --rm and mount the ctest result directory to avoid 'docker cp'
 		# below, but then permissions are messed up and we can't remove the directory without sudo
 		# making the next pipeline fail
-		ret = cmd.run(f'docker run -a STDOUT {runtime_opt} --shm-size=2g --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ran-unittests ran-unittests:{baseTag} ctest --no-label-summary -j$(nproc) {ctest_opt}')
+		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ran-unittests ran-unittests:{baseTag} ctest --no-label-summary -j$(nproc)')
 		cmd.run('docker cp ran-unittests:/oai-ran/build/Testing/Temporary/LastTest.log .')
 		archiveArtifact(cmd, ctx, f'{lSourcePath}/LastTest.log')
 		cmd.run('docker cp ran-unittests:/oai-ran/build/Testing/Temporary/LastTestsFailed.log .')
@@ -417,7 +544,7 @@ class Containerize():
 			return False

 	def Push_Image_to_Local_Registry(self, node, HTML, tag_prefix=""):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		logging.debug('Pushing images to server: ' + node)
 		ssh = cls_cmd.getConnection(node)
 		imagePrefix = DEFAULT_REGISTRY
@@ -430,10 +557,10 @@ class Containerize():
 			return False

 		orgTag = 'develop'
-		if self.merge:
+		if self.ranAllowMerge:
 			orgTag = 'ci-temp'
 		for image in IMAGES:
-			tagToUse = tag_prefix + self.branch
+			tagToUse = tag_prefix + CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			imageTag = f"{image}:{tagToUse}"
 			ret = ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}')
 			if ret.returncode != 0:
@@ -446,7 +573,7 @@ class Containerize():
 				HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 				return False
 			# Creating a develop tag on the local private registry
-			if not self.merge:
+			if not self.ranAllowMerge:
 				devTag = f"{tag_prefix}develop"
 				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:{devTag}')
 				ssh.run(f'docker push {imagePrefix}/{image}:{devTag}')
@@ -494,7 +621,7 @@ class Containerize():
 	def Pull_Image_from_Registry(self, HTML, node, images, tag=None, tag_prefix="", registry=DEFAULT_REGISTRY, username="oaicicd", password="oaicicd"):
 		logging.debug(f'\u001B[1m Pulling image(s) on server: {node}\u001B[0m')
 		if not tag:
-			tag = self.branch
+			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 		with cls_cmd.getConnection(node) as cmd:
 			success, msg = Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, username, password)
 		param = f"on node {node}"
@@ -507,7 +634,7 @@ class Containerize():
 	def Clean_Test_Server_Images(self, HTML, node, images, tag=None):
 		logging.debug(f'\u001B[1m Cleaning image(s) from server: {node}\u001B[0m')
 		if not tag:
-			tag = self.branch
+			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)

 		status = True
 		with cls_cmd.getConnection(node) as myCmd:
@@ -526,17 +653,17 @@ class Containerize():
 		return status

 	def Create_Workspace(self, node, HTML):
-		sourcePath = self.workspace
-		success = CreateWorkspace(node, sourcePath, self.repository, self.branch)
+		lSourcePath = self.eNBSourceCodePath
+		success = CreateWorkspace(node, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 		if success:
-			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [f"created workspace {sourcePath} on node {node}"])
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [f"created workspace {lSourcePath}"])
 		else:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["cannot create workspace"])
 		return success

 	def DeployObject(self, ctx, node, HTML):
 		num_attempts = self.num_attempts
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'
@@ -554,7 +681,7 @@ class Containerize():
 				raise ValueError(f'Invalid value for num_attempts: {num_attempts}, must be greater than 0')
 			for attempt in range(num_attempts):
 				logging.info(f'will start services {services}')
-				status = ssh.run(f'docker compose -f {wd_yaml} up -d --wait --wait-timeout 120 -- {services}')
+				status = ssh.run(f'docker compose -f {wd_yaml} up -d --wait --wait-timeout 60 -- {services}')
 				info = ssh.run(f"docker compose -f {wd_yaml} ps --all --format=\'table {{{{.Service}}}} [{{{{.Image}}}}] {{{{.Status}}}}\' -- {services} | column -t")
 				deployed = status.returncode == 0
 				if not deployed:
@@ -580,7 +707,7 @@ class Containerize():
 		return deployed

 	def StopObject(self, ctx, node, HTML):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		if not self.services:
 			raise ValueError(f'no services provided')
 		logging.info(f'\u001B[1m Stopping objects "{self.services}" from server: {node}\u001B[0m')
@@ -609,7 +736,7 @@ class Containerize():
 		return success

 	def UndeployObject(self, ctx, node, HTML, to_analyze):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		logging.info(f'\u001B[1m Undeploying all objects from server {node}\u001B[0m')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
@@ -644,10 +771,10 @@ class Containerize():
 			logging.error('\u001B[1m Undeploying objects Failed\u001B[0m')
 		return success

-	def AnalyzeRTStatsObject(self, HTML, node, ctx, thresholds, service=None, stats_files=None):
+	def AnalyzeRTStatsObject(self, HTML, node, ctx, thresholds, service=None):
 		logging.info(f'Analyzing realtime stats from server: {node}')
 		yaml = self.yamlPath.strip('/')
-		wd = f'{self.workspace}/{yaml}'
+		wd = f'{self.eNBSourceCodePath}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'

 		with cls_cmd.getConnection(node) as cmd:
@@ -660,20 +787,12 @@ class Containerize():
 				raise RuntimeError(f"Requested service {s} not found among services: {deployed_services}")
 			logging.info(f"Analyzing deployed service '{s}'")
 			# similar to BuildRunTests(), use docker cp to avoid problems with permissions
-			local_files = []
-			for sf in stats_files:
-				basename = os.path.basename(sf)
-				ret = cmd.run(f'docker compose -f {wd_yaml} cp {s}:{sf} {wd}/')
-				if ret.returncode != 0:
-					logging.error(f"Cannot retrieve {s}:{sf}")
-					return False
-				file = archiveArtifact(cmd, ctx, f"{wd}/{basename}")
-				if not file:
-					logging.error(f"Cannot retrieve file {basename}")
-					return False
-				local_files.append(file)
+			cmd.run(f'docker compose -f {wd_yaml} cp {s}:/opt/oai-gnb/nrL1_stats.log {wd}/')
+			l1_file = archiveArtifact(cmd, ctx, f"{wd}/nrL1_stats.log")
+			cmd.run(f'docker compose -f {wd_yaml} cp {s}:/opt/oai-gnb/nrMAC_stats.log {wd}/')
+			mac_file = archiveArtifact(cmd, ctx, f"{wd}/nrMAC_stats.log")

 		logging.info(f"check against thresholds from {thresholds}")
-		success, datalog_rt_stats = cls_analysis.Analysis.analyze_rt_stats(thresholds, local_files)
+		success, datalog_rt_stats = cls_analysis.Analysis.analyze_rt_stats(thresholds, l1_file, mac_file)
 		HTML.CreateHtmlDataLogTable(datalog_rt_stats)
 		return success
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -33,8 +33,11 @@ class HTMLManagement():
 		self.htmlHeaderCreated = False
 		self.htmlFooterCreated = False

-		self.repository = ''
-		self.branch = ''
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranCommitID = ''
+		self.ranAllowMerge = False
+		self.ranTargetBranch = ''

 		self.nbTestXMLfiles = 0
 		self.htmlTabRefs = []
@@ -75,12 +78,12 @@ class HTMLManagement():
 			self.htmlFile.write('    <tr style="border-collapse: collapse; border: none;">\n')
 			self.htmlFile.write('      <td style="border-collapse: collapse; border: none;">\n')
 			self.htmlFile.write('        <a href="http://www.openairinterface.org/">\n')
-			self.htmlFile.write('           <img src="https://raw.githubusercontent.com/duranta-project/governance/main/logos/Duranta-Logo-Color.png" alt="" border="none" style="margin-right: 2rem;" width=150>\n')
+			self.htmlFile.write('           <img src="http://www.openairinterface.org/wp-content/uploads/2016/03/cropped-oai_final_logo2.png" alt="" border="none" height=50 width=150>\n')
 			self.htmlFile.write('           </img>\n')
 			self.htmlFile.write('        </a>\n')
 			self.htmlFile.write('      </td>\n')
 			self.htmlFile.write('      <td style="border-collapse: collapse; border: none; vertical-align: center;">\n')
-			self.htmlFile.write('        <b><font size = "6">TEMPLATE_JOB_NAME -- Build-ID: TEMPLATE_BUILD_ID</font></b>\n')
+			self.htmlFile.write('        <b><font size = "6">Job Summary -- Job: TEMPLATE_JOB_NAME -- Build-ID: TEMPLATE_BUILD_ID</font></b>\n')
 			self.htmlFile.write('      </td>\n')
 			self.htmlFile.write('    </tr>\n')
 			self.htmlFile.write('  </table>\n')
@@ -93,24 +96,47 @@ class HTMLManagement():
 			self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('     <tr>\n')
 			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-cloud-upload"></span> GIT Repository </td>\n')
-			self.htmlFile.write('       <td><a href="' + self.repository + '">' + self.repository + '</a></td>\n')
+			self.htmlFile.write('       <td><a href="' + self.ranRepository + '">' + self.ranRepository + '</a></td>\n')
 			self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('     <tr>\n')
-			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Test Branch </td>\n')
-			self.htmlFile.write('       <td>' + self.branch + '</td>\n')
+			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-wrench"></span> Job Trigger </td>\n')
+			if (self.ranAllowMerge):
+				self.htmlFile.write('       <td>Merge-Request</td>\n')
+			else:
+				self.htmlFile.write('       <td>Push to Branch</td>\n')
 			self.htmlFile.write('     </tr>\n')
-			commit_id = subprocess.check_output("git log -n1 --pretty=format:\"%H\" ", shell=True, universal_newlines=True)
-			commit_id = commit_id.strip()
 			self.htmlFile.write('     <tr>\n')
-			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
-			self.htmlFile.write('       <td>' + commit_id + '</td>\n')
+			if (self.ranAllowMerge):
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Source Branch </td>\n')
+			else:
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tree-deciduous"></span> Branch</td>\n')
+			self.htmlFile.write('       <td>' + self.ranBranch + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
-			commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" ", shell=True, universal_newlines=True)
-			commit_message = commit_message.strip()
 			self.htmlFile.write('     <tr>\n')
-			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
-			self.htmlFile.write('       <td>' + commit_message + '</td>\n')
+			if (self.ranAllowMerge):
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Source Commit ID </td>\n')
+			else:
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
+			self.htmlFile.write('       <td>' + self.ranCommitID + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
+			if self.ranAllowMerge != '' and self.ranCommitID != 'develop':
+				commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.ranCommitID, shell=True, universal_newlines=True)
+				commit_message = commit_message.strip()
+				self.htmlFile.write('     <tr>\n')
+				if (self.ranAllowMerge):
+					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Source Commit Message </td>\n')
+				else:
+					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
+				self.htmlFile.write('       <td>' + commit_message + '</td>\n')
+				self.htmlFile.write('     </tr>\n')
+			if (self.ranAllowMerge):
+				self.htmlFile.write('     <tr>\n')
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-in"></span> Target Branch </td>\n')
+				if (self.ranTargetBranch == ''):
+					self.htmlFile.write('       <td>develop</td>\n')
+				else:
+					self.htmlFile.write('       <td>' + self.ranTargetBranch + '</td>\n')
+				self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('  </table>\n')

 			self.htmlFile.write('  <br>\n')
@@ -353,6 +379,90 @@ class HTMLManagement():
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.close()

+	def CreateHtmlTestRowCppCheckResults(self, CCR):
+		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
+			return
+		self.htmlFile = open('test_results.html', 'a')
+		vId = 0
+		for version in CCR.versions:
+			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
+			self.htmlFile.write('        <td colspan="6"><b> Results for cppcheck v ' + version + ' </b></td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB ERRORS</b></td>\n')
+			if CCR.nbErrors[vId] == 0:
+				myColor = 'lightgreen'
+			elif CCR.nbErrors[vId] < 20:
+				myColor = 'orange'
+			else:
+				myColor = 'lightcoral'
+			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbErrors[vId]) + '</b></td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> NB WARNINGS</b></td>\n')
+			if CCR.nbWarnings[vId] == 0:
+				myColor = 'lightgreen'
+			elif CCR.nbWarnings[vId] < 20:
+				myColor = 'orange'
+			else:
+				myColor = 'lightcoral'
+			self.htmlFile.write('        <td colspan="3" bgcolor = "' + myColor + '"><b>' + str(CCR.nbWarnings[vId]) + '</b></td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
+			self.htmlFile.write('        <td colspan="6"> ----------------- </td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Memory leak</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbMemLeaks[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Possible null pointer deference</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbNullPtrs[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Uninitialized variable</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbUninitVars[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Undefined behaviour shifting</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbTooManyBitsShift[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Signed integer overflow</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbIntegerOverflow[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr bgcolor = "#F0F0F0" >\n')
+			self.htmlFile.write('        <td colspan="6"> </td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Printf formatting issues</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbInvalidPrintf[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Modulo result is predetermined</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbModuloAlways[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Opposite Condition -> dead code</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbOppoInnerCondition[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			self.htmlFile.write('      <tr>\n')
+			self.htmlFile.write('        <td></td>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" ><b> Wrong Scanf Nb Args</b></td>\n')
+			self.htmlFile.write('        <td colspan="3">' + str(CCR.nbWrongScanfArg[vId]) + '</td>\n')
+			self.htmlFile.write('      </tr>\n')
+			vId += 1
+
 	def CreateHtmlTestRowPhySimTestResult(self, testSummary, testResult):
 		if (self.htmlFooterCreated or (not self.htmlHeaderCreated)):
 			return
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -65,23 +65,6 @@ def Iperf_ComputeTime(args):
 		raise Exception('Iperf time not found!')
 	return int(result.group('iperf_time'))

-def Iperf_UpdateBindPort(opts, ueIP, idx):
-	# search if bind address present. Extract if yes, add if no.
-	bind_m = re.search(r'(-B|--bind)\s+(?P<ip>\d+\.\d+\.\d+\.\d+)', opts)
-	if bind_m:
-		bindIP = bind_m.group('ip')
-	else:
-		bindIP = ueIP
-		opts += f" -B {ueIP}"
-	# search if port present. Extract if yes, add if no.
-	port_m = re.search(r'(-p|--port)\s+(?P<port>\d+)', opts)
-	if port_m:
-		port = port_m.group('port')
-	else:
-		port = 5002 + idx
-		opts += f" -p {port}"
-	return bindIP, port, opts
-
 def convert_to_mbps(value, magnitude):
 	value = float(value)
 	if magnitude == 'K' or magnitude == 'k':
@@ -276,46 +259,18 @@ def Deploy_Physim(ctx, HTML, node, workdir, script, options):
 		logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
 	return test_status

-def DeployWithScript(HTML, node, script, options, tag):
-	logging.debug(f'Deploy with script {script} on node: {node}')
-	opt = options.replace('%%image_tag%%', tag)
-	with cls_cmd.getConnection(node) as c:
-		ret = c.exec_script(script, 600, opt)
-	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
-	HTML.CreateHtmlTestRowQueue(f'on node {node}', 'OK' if ret.returncode == 0 else 'KO', [f'{ret.stdout}'])
-	return ret.returncode == 0
-
-def UndeployWithScript(HTML, ctx, node, script, options):
-	logging.debug(f'Undeploy with script {script} on node: {node}')
-	remote_dir = '/tmp/undeploy'
-	opt = options.replace('%%log_dir%%', remote_dir)
-	with cls_cmd.getConnection(node) as c:
-		# create a directory for log collection
-		c.run(f'rm -rf {remote_dir}')
-		ret = c.run(f'mkdir {remote_dir}')
-		if ret.returncode != 0:
-			logging.error("cannot create directory for log collection")
-			return False
-		ret = c.exec_script(script, 600, opt)
-		logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
-		ret_ls = c.run(f'ls -1 {remote_dir}')
-		files = ret_ls.stdout.strip().splitlines()
-		log_files = []
-		for lf in files:
-			name = archiveArtifact(c, ctx, f'{remote_dir}/{lf}')
-			log_files.append(name)
-	msg = "Log files:\n" + "\n".join([os.path.basename(lf) for lf in log_files])
-	HTML.CreateHtmlTestRowQueue(f'on node {node}', 'OK' if ret.returncode == 0 else 'KO', [f'{ret.stdout}\n\n{msg}'])
-	return ret.returncode == 0
-
 #-----------------------------------------------------------
 # OaiCiTest Class Definition
 #-----------------------------------------------------------
 class OaiCiTest():
 	
 	def __init__(self):
-		self.repository = ''
-		self.branch = ''
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranCommitID = ''
+		self.ranAllowMerge = False
+		self.ranTargetBranch = ''
+
 		self.testXMLfiles = []
 		self.ping_args = ''
 		self.ping_packetloss_threshold = ''
@@ -502,6 +457,7 @@ class OaiCiTest():
 		svrIP = cn.getIP()
 		if not svrIP:
 			return (False, f"Iperf server {cn.getName()} has no IP address")
+
 		iperf_opt = self.iperf_args
 		jsonReport = "--json"
 		serverReport = ""
@@ -515,11 +471,11 @@ class OaiCiTest():
 			# note: enable server report collection on the UE side, no need to store and collect server report separately on the server side
 			serverReport = "--get-server-output"
 		iperf_time = Iperf_ComputeTime(self.iperf_args)
-		bindIP, port, iperf_opt = Iperf_UpdateBindPort(iperf_opt, ueIP, idx)
 		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
 		iperf_ue = '/data/local/tmp/iperf3' if re.search('adb', ue.getName()) else 'iperf3'
-		ue_header = f'UE {ue.getName()} ({bindIP})'
+		ue_header = f'UE {ue.getName()} ({ueIP})'
 		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(cn.getHost()) as cmd_svr:
+			port = 5002 + idx
 			# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
 			t = iperf_time * 2.5
 			cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
@@ -530,7 +486,7 @@ class OaiCiTest():
 				if ret.returncode == 0:
 					logging.warning(f'Iperf3 server on port {port} detected and terminated')
 				cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
-			client_ret = cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -c {svrIP} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t, reportNonZero=False)
+			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t)
 			dest_filename = archiveArtifact(cmd_ue, ctx, client_filename)
 		if udpIperf:
 			status, msg = Iperf_analyzeV3UDP(dest_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
@@ -539,10 +495,6 @@ class OaiCiTest():
 		else:
 			status, msg = Iperf_analyzeV3TCPJson(dest_filename, self.iperf_tcp_rate_target)

-		# add some diagnostic messages if the actual iperf command returned non-zero
-		if client_ret.returncode != 0:
-			msg = f'{msg}\nIperf client command failed on {bindIP} -> {svrIP}:{port} (return code: {client_ret.returncode})'
-
 		return (status, f'{ue_header}\n{msg}')

 	def Iperf(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -27,30 +27,160 @@ import constants as CONST
 import cls_cmd
 from cls_ci_helper import archiveArtifact

+#-----------------------------------------------------------
+# Class Declaration
+#-----------------------------------------------------------
+class CppCheckResults():
+
+	def __init__(self):
+
+		self.variants = ['bionic', 'focal']
+		self.versions = ['','']
+		self.nbErrors = [0,0]
+		self.nbWarnings = [0,0]
+		self.nbNullPtrs = [0,0]
+		self.nbMemLeaks = [0,0]
+		self.nbUninitVars = [0,0]
+		self.nbInvalidPrintf = [0,0]
+		self.nbModuloAlways = [0,0]
+		self.nbTooManyBitsShift = [0,0]
+		self.nbIntegerOverflow = [0,0]
+		self.nbWrongScanfArg = [0,0]
+		self.nbPtrAddNotNull = [0,0]
+		self.nbOppoInnerCondition = [0,0]
+
 class StaticCodeAnalysis():

-	def LicenceAndFormattingCheck(ctx, node, HTML, d, branch, allowMerge, targetBranch):
+	def __init__(self):
+
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranAllowMerge = False
+		self.ranCommitID = ''
+		self.ranTargetBranch = ''
+		self.eNBSourceCodePath = ''
+
+	def CppCheckAnalysis(self, ctx, node, HTML):
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		lSourcePath = self.eNBSourceCodePath
+
+		if not lSourcePath or not node:
+			raise ValueError(f"{lSourcePath=} {node=}")
+		logging.debug('Building on server: ' + node)
+		cmd = cls_cmd.getConnection(node)
+		# on RedHat/CentOS .git extension is mandatory
+		result = re.search(r'([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
+		if result is not None:
+			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
+		else:
+			full_ran_repo_name = self.ranRepository + '.git'
+
+		cmd.cd(lSourcePath)
+		logDir = f'{lSourcePath}/cmake_targets/log'
+		cmd.run(f'mkdir -p {logDir}')
+		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
+		cmd.run(f'sed -e "s@xenial@bionic@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic')
+		cmd.run(f'docker build --tag oai-cppcheck:bionic --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic . > {logDir}/cppcheck-bionic.txt 2>&1')
+		cmd.run(f'sed -e "s@xenial@focal@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal')
+		cmd.run(f'docker build --tag oai-cppcheck:focal --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal . > {logDir}/cppcheck-focal.txt 2>&1')
+		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
+
+		bionic = archiveArtifact(cmd, ctx, f'{logDir}/cppcheck-bionic.txt')
+		focal = archiveArtifact(cmd, ctx, f'{logDir}/cppcheck-focal.txt')
+		cmd.close()
+
+		CCR = CppCheckResults()
+		CCR_ref = CppCheckResults()
+		vId = 0
+		for variant in CCR.variants:
+			filename = ctx.baseFilename() + '-cppcheck-'+ variant + '.txt'
+			logging.info(f"will check file '{filename}'")
+			if not os.path.isfile(filename):
+				raise FileNotFoundError(f"{filename} is not a file")
+			else:
+				xmlStart = False
+				with open(filename, 'r') as logfile:
+					for line in logfile:
+						ret = re.search(r'cppcheck version="(?P<version>[0-9\.]+)"', str(line))
+						if ret is not None:
+						   CCR.versions[vId] = ret.group('version')
+						if re.search('RUN cat cmake_targets/log/cppcheck.xml', str(line)) is not None:
+							xmlStart = True
+						if xmlStart:
+							if re.search('severity="error"', str(line)) is not None:
+								CCR.nbErrors[vId] += 1
+							if re.search('severity="warning"', str(line)) is not None:
+								CCR.nbWarnings[vId] += 1
+							if re.search('id="memleak"', str(line)) is not None:
+								CCR.nbMemLeaks[vId] += 1
+							if re.search('id="nullPointer"', str(line)) is not None:
+								CCR.nbNullPtrs[vId] += 1
+							if re.search('id="uninitvar"', str(line)) is not None:
+								CCR.nbUninitVars[vId] += 1
+							if re.search('id="invalidPrintfArgType_sint"|id="invalidPrintfArgType_uint"', str(line)) is not None:
+								CCR.nbInvalidPrintf[vId] += 1
+							if re.search('id="moduloAlwaysTrueFalse"', str(line)) is not None:
+								CCR.nbModuloAlways[vId] += 1
+							if re.search('id="shiftTooManyBitsSigned"', str(line)) is not None:
+								CCR.nbTooManyBitsShift[vId] += 1
+							if re.search('id="integerOverflow"', str(line)) is not None:
+								CCR.nbIntegerOverflow[vId] += 1
+							if re.search('id="wrongPrintfScanfArgNum"|id="invalidScanfArgType_int"', str(line)) is not None:
+								CCR.nbWrongScanfArg[vId] += 1
+							if re.search('id="pointerAdditionResultNotNull"', str(line)) is not None:
+								CCR.nbPtrAddNotNull[vId] += 1
+							if re.search('id="oppositeInnerCondition"', str(line)) is not None:
+								CCR.nbOppoInnerCondition[vId] += 1
+			vMsg  = ''
+			vMsg += '========  Variant ' + variant + ' - ' + CCR.versions[vId] + ' ========\n'
+			vMsg += '   ' + str(CCR.nbErrors[vId]) + ' errors\n'
+			vMsg += '   ' + str(CCR.nbWarnings[vId]) + ' warnings\n'
+			vMsg += '  -- Details --\n'
+			vMsg += '   Memory leak:                     ' + str(CCR.nbMemLeaks[vId]) + '\n'
+			vMsg += '   Possible null pointer deference: ' + str(CCR.nbNullPtrs[vId]) + '\n'
+			vMsg += '   Uninitialized variable:          ' + str(CCR.nbUninitVars[vId]) + '\n'
+			vMsg += '   Undefined behaviour shifting:    ' + str(CCR.nbTooManyBitsShift[vId]) + '\n'
+			vMsg += '   Signed integer overflow:         ' + str(CCR.nbIntegerOverflow[vId]) + '\n'
+			vMsg += '\n'
+			vMsg += '   Printf formatting issue:         ' + str(CCR.nbInvalidPrintf[vId]) + '\n'
+			vMsg += '   Modulo result is predetermined:  ' + str(CCR.nbModuloAlways[vId]) + '\n'
+			vMsg += '   Opposite Condition -> dead code: ' + str(CCR.nbOppoInnerCondition[vId]) + '\n'
+			vMsg += '   Wrong Scanf Nb Args:             ' + str(CCR.nbWrongScanfArg[vId]) + '\n'
+			for vLine in vMsg.split('\n'):
+				logging.debug(vLine)
+			vId += 1
+
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		HTML.CreateHtmlTestRowCppCheckResults(CCR)
+		logging.info('\u001B[1m Static Code Analysis Pass\u001B[0m')
+
+		return True
+
+	def LicenceAndFormattingCheck(self, ctx, node, HTML):
 		# Workspace is no longer recreated from scratch.
 		# It implies that this method shall be called last within a build pipeline
 		# where workspace is already created
+		lSourcePath = self.eNBSourceCodePath

-		if not node or not d:
-			raise ValueError(f"{d=} {node=}")
+		if not node or not lSourcePath:
+			raise ValueError(f"{lSourcePath=} {node=}")
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
 		check_options = ''
-		if allowMerge:
-			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={branch}'
-			if targetBranch == '':
-				if branch != 'develop' and branch != 'origin/develop':
+		if self.ranAllowMerge:
+			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={self.ranBranch}'
+			if self.ranTargetBranch == '':
+				if self.ranBranch != 'develop' and self.ranBranch != 'origin/develop':
 					check_options += ' --build-arg TARGET_BRANCH=develop'
 			else:
-				check_options += f' --build-arg TARGET_BRANCH={targetBranch}'
+				check_options += f' --build-arg TARGET_BRANCH={self.ranTargetBranch}'

-		logDir = f'{d}/cmake_targets/log/'
+		logDir = f'{lSourcePath}/cmake_targets/log/'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {d}/ci-scripts/docker/Dockerfile.formatting.ubuntu {d} > {logDir}/oai-formatting-check.txt 2>&1')
+		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.ubuntu {lSourcePath} > {logDir}/oai-formatting-check.txt 2>&1')

 		cmd.run('docker image rm oai-formatting-check:latest')
 		cmd.run('docker image prune --force')
--- a/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf
+++ b/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf
@@ -184,8 +184,7 @@ L1s = (
    	{
 	num_cc = 1;
 	tr_n_preference = "local_mac";
-	prach_dtx_threshold = 200;
-	}
+        }  
 );

 RUs = (
--- a/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf
+++ b/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf
@@ -184,8 +184,7 @@ L1s = (
    	{
 	num_cc = 1;
 	tr_n_preference = "local_mac";
-	prach_dtx_threshold = 200;
-	}
+        }  
 );

 RUs = (
--- a/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
@@ -216,7 +216,6 @@ L1s =
  {
    num_cc = 1;
    tr_n_preference = "local_mac";
-    prach_dtx_threshold = 200;
  }
 );

--- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf
@@ -216,7 +216,6 @@ L1s =
  {
    num_cc = 1;
    tr_n_preference = "local_mac";
-    prach_dtx_threshold = 200;
  }
 );

--- a/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf
@@ -216,7 +216,6 @@ L1s =
  {
    num_cc = 1;
    tr_n_preference = "local_mac";
-    prach_dtx_threshold = 200;
  }
 );

--- a/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
@@ -216,7 +216,6 @@ L1s =
  {
    num_cc = 1;
    tr_n_preference = "local_mac";
-    prach_dtx_threshold = 200;
  }
 );

--- a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf
+++ b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf
@@ -215,7 +215,6 @@ L1s =
 (
  {
    num_cc = 1;
-    prach_dtx_threshold = 200;
    tr_n_preference = "local_mac";
  }
 );
--- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
@@ -17,7 +17,6 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-    cu_sibs = ( 2, 3, 4 );
    @include "neighbour-config.conf"

    nr_cellid = 12345678L;
--- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
@@ -157,6 +157,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_address = "127.0.0.5";
@@ -170,6 +171,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb-du.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
@@ -1,240 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI-DU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_DU_ID =  0xe00;
-    gNB_name  =  "gNB-OAI-DU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-    do_SRS                = "periodic";
-    force_UL256qam_off    = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 4049.76 MHz
-      # selected SSB frequency = 4049.76 MHz
-      absoluteFrequencySSB                                          = 669984;
-      dl_frequencyBand                                              = 77;
-      # frequency point A = 4000.62 MHz
-      dl_absoluteFrequencyPointA                                    = 666708;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 7;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 2;
-#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                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -100;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 8;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 2;
-
-  ssPBCH_BlockPower                                                 = -11;
-  }
-
-  );
-
-  # ------- SCTP definitions
-  SCTP :
-  {
-    # Number of streams to use in input/output
-    SCTP_INSTREAMS  = 2;
-    SCTP_OUTSTREAMS = 2;
-  };
-}
-);
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "f1";
-  local_n_address             = "172.21.10.20";
-  remote_n_address            = "172.21.6.112";
-  local_n_portd               = 2153;
-  remote_n_portd              = 2153;
-  pusch_TargetSNRx10          = 230;
-  pucch_TargetSNRx10          = 250;
-  pusch_FailureThres          = 100;
-  dl_min_mcs                  = 20;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 130
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = -100;
-  tx_amp_backoff_dB = 3;
-  L1_rx_thread_core = 11;
-  L1_tx_thread_core = 12;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 10;
-  sl_ahead       = 8;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-log_config :
-{
-  global_log_level = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:41:11.0", "0000:41:11.1");
-  dpdk_iova_mode = "VA";
-  system_core = 7;
-  io_core = 8;
-  worker_cores = (9);
-  ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
-  mtu = 9600;
-  fh_config = ({
-    T1a_cp_dl = (285, 470);
-    T1a_cp_ul = (285, 429);
-    T1a_up = (125, 350);
-    Ta4 = (110, 180);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-  });
-};
-
-nrLDPC_coding_aal : {
-  dpdk_dev : "0000:01:00.0";
-  dpdk_core_list : "18-19";
-  is_t2 : 1;
-};
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
@@ -162,6 +162,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_address = "192.168.71.171";
@@ -175,6 +176,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -25,7 +25,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime = 2;
-    do_SRS       = "periodic";
+    do_SRS       = 1;

    servingCellConfigCommon = (
    {
@@ -191,6 +191,7 @@ rlc = {

 MACRLCs = (
  {
+    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_address = "127.0.0.5";
@@ -204,6 +205,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
  pucch0_dtx_threshold = 30;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-benetel550.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-benetel550.conf
@@ -1,247 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI-DU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_DU_ID =  0xe00;
-    gNB_name  =  "gNB-OAI-DU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2; 
-    pdsch_AntennaPorts_N1 = 2;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 1;
-     # n_TimingAdvanceOffset                                         = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      absoluteFrequencySSB = 663360;
-      dl_frequencyBand     = 77;
-      dl_absoluteFrequencyPointA = 660084;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 10;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 8;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 3;
-#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                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                                 = -11;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-  }
-);
-
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "f1";
-  local_n_address             = "172.21.10.20";
-  remote_n_address            = "172.21.6.112";
-  local_n_portd               = 2153;
-  remote_n_portd              = 2153;
-  pusch_TargetSNRx10          = 250;
-  pucch_TargetSNRx10          = 220;
-  pusch_FailureThres          = 100;
-  dl_min_mcs                  = 20;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 100;
-  pucch0_dtx_threshold = 10;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 15;
-  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
-  L1_rx_thread_core = 10;
-  L1_tx_thread_core = 11; # relevant after merge of l1_tx_thread
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 12;
-  sl_ahead       = 5;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding = 0; # needs to match O-RU configuration
-  
-}
-);
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="info";
-  f1ap_log_level                        ="info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:41:11.0", "0000:41:11.1");
-  system_core = 7;
-  io_core = 8;
-  worker_cores = (9);
-  dpdk_iova_mode = "VA";
-  ru_addr = ("8c:1f:64:d1:11:c0","8c:1f:64:d1:11:c0");
-  mtu = 9216; # check if xran uses this properly
-  file_prefix = "fhi_72";
-  fh_config = ({
-    T1a_cp_dl = (419, 470);
-    T1a_cp_ul = (285, 336);
-    T1a_up = (294, 345);
-    Ta4 = (0, 200);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-  });
-};
-
-nrLDPC_coding_aal : {
-  dpdk_dev : "0000:01:00.0";
-  dpdk_core_list : "18-19";
-  is_t2 : 1;
-};
--- a/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-liteon.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-liteon.conf
@@ -1,228 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI-DU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_DU_ID =  0xe00;
-    gNB_name  =  "gNB-OAI-DU";
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-    nr_cellid = 1;
-    ////////// Physical parameters:
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4; #2;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-      physCellId                                                    = 0;
-     # n_TimingAdvanceOffset                                         = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 623328;
-      dl_frequencyBand                                              = 78;
-      # frequency point A = 3300.87 MHz
-      dl_absoluteFrequencyPointA                                    = 620058;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 22;
-          zeroCorrelationZoneConfig                                 = 15;
-          preambleReceivedTargetPower                               = -104;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 7;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 2;
-#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                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -96;
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 8;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 2;
-  ssPBCH_BlockPower                                                 = -11;
-  }
-  );
-
-  # ------- SCTP definitions
-  SCTP :
-  {
-    # Number of streams to use in input/output
-    SCTP_INSTREAMS  = 2;
-    SCTP_OUTSTREAMS = 2;
-  };
-
-}
-);
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "f1";
-  local_n_address             = "172.21.10.20";
-  remote_n_address            = "172.21.6.112";
-  local_n_portd               = 2153;
-  remote_n_portd              = 2153;
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 250;
-  pusch_FailureThres          = 100;
-  dl_min_mcs                  = 20;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 15;
-  tx_amp_backoff_dB = 20; # needs to match O-RU configuration
-  L1_rx_thread_core = 11;
-  L1_tx_thread_core = 12;
-  phase_compensation = 1; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 10;
-  sl_ahead       = 8;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-log_config :
-{
-  global_log_level = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:41:11.0", "0000:41:11.1"); # one VF can be used as well
-  dpdk_iova_mode = "VA";
-  system_core = 7;
-  io_core = 8;
-  worker_cores = (9);
-  ru_addr = ("e8:c7:4f:25:81:b3", "e8:c7:4f:25:81:b3");
-  mtu = 9600;
-  fh_config = ({
-    T1a_cp_dl = (285, 429);
-    T1a_cp_ul = (285, 429);
-    T1a_up = (96, 196);
-    Ta4 = (110, 180);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-    prach_config = {
-      kbar = 0;
-    };
-  });
-};
-
-nrLDPC_coding_aal : {
-  dpdk_dev : "0000:01:00.0";
-  dpdk_core_list : "18-19";
-  is_t2 : 1;
-};
--- a/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-metanoia.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-metanoia.conf
@@ -1,231 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI-DU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_DU_ID =  0xe00;
-    gNB_name  =  "gNB-OAI-DU";
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts    = 4;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
-    do_CSIRS              = 1;
-    do_SRS                = "periodic";
-
-    servingCellConfigCommon = (
-    {
-#spCellConfigCommon
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741)
-      absoluteFrequencySSB                                          = 649920;
-      dl_frequencyBand                                              = 78;
-      # this is 3300.24 MHz
-      dl_absoluteFrequencyPointA                                    = 646724;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 12;
-        initialDLBWPsearchSpaceZero                                 = 0;
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 148;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 12;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
-#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                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         = -90;
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 8;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 2;
-  ssPBCH_BlockPower                                                 = -11;
-  }
-  );
-
-  # ------- SCTP definitions
-  SCTP :
-  {
-    # Number of streams to use in input/output
-    SCTP_INSTREAMS  = 2;
-    SCTP_OUTSTREAMS = 2;
-  };
-
-}
-);
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "f1";
-  local_n_address             = "172.21.10.20";
-  remote_n_address            = "172.21.6.112";
-  local_n_portd               = 2153;
-  remote_n_portd              = 2153;
-  pusch_TargetSNRx10          = 220;
-  pucch_TargetSNRx10          = 220;
-  pusch_FailureThres          = 100;
-  dl_min_mcs                  = 20;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 130;
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 10;
-  tx_amp_backoff_dB = 10; #9; needs to match O-RU configuration # JF important to check
-  L1_rx_thread_core = 11;
-  L1_tx_thread_core = 12; # relevant after merge of l1_tx_thread
-  phase_compensation = 0; # needs to match O-RU configuration # JF to be tested
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 10;
-  sl_ahead       = 8;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding = 0; # needs to match O-RU configuration
-}
-);
-
-log_config :
-{
-  global_log_level                      ="info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:41:11.0", "0000:41:11.1");
-  dpdk_iova_mode = "VA";
-  system_core = 7;
-  io_core = 8;
-  worker_cores = (9);
-  ru_addr = ("00:E0:0C:00:AE:06", "00:E0:0C:00:AE:06");
-  mtu = 9000;
-  fh_config = ({
-    T1a_cp_dl = (285, 470);
-    T1a_cp_ul = (285, 429);
-    T1a_up = (125, 350);
-    Ta4 = (110, 180);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-  });
-};
-
-nrLDPC_coding_aal : {
-  dpdk_dev : "0000:01:00.0";
-  dpdk_core_list : "18-19";
-  is_t2 : 1;
-};
--- a/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.8x8-benetel650_650.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.8x8-benetel650_650.conf
@@ -1,266 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI-DU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_DU_ID =  0xe00;
-    gNB_name  =  "gNB-OAI-DU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 4;
-    pusch_AntennaPorts    = 8;
-    do_CSIRS              = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-     # n_TimingAdvanceOffset                                         = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 3950.4 MHz
-      # selected SSB frequency = 3950.4 MHz
-      absoluteFrequencySSB                                          = 663360;
-      dl_frequencyBand                                              = 77;
-      # frequency point A = 3901.26 MHz
-      dl_absoluteFrequencyPointA                                    = 660084;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 152;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 8;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 3;
-#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                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 4;
-
-    ssPBCH_BlockPower                                               = 0;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-  }
-);
-
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "f1";
-  local_n_address             = "172.21.10.20";
-  remote_n_address            = "172.21.6.92";
-  local_n_portd               = 2153;
-  remote_n_portd              = 2153;
-  pusch_TargetSNRx10          = 220;
-  pucch_TargetSNRx10          = 200;
-  dl_bler_target_upper        = .35;
-  dl_bler_target_lower        = .15;
-  ul_bler_target_upper        = .35;
-  ul_bler_target_lower        = .15;
-  pusch_FailureThres          = 100;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 100;
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 10;
-  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
-  L1_rx_thread_core = 11;
-  L1_tx_thread_core = 12; # relevant after merge of l1_tx_thread
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 8;
-  nb_rx          = 8;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 10;
-  sl_ahead       = 10;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-log_config :
-{
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:41:11.0", "0000:41:11.1", "0000:41:11.2", "0000:41:11.3"); # two VFs can be used as well
-  dpdk_iova_mode = "VA";
-  system_core = 7;
-  io_core = 8;
-  worker_cores = (9);
-  ru_addr = ("8c:1f:64:d1:10:46","8c:1f:64:d1:10:46","8c:1f:64:d1:10:43","8c:1f:64:d1:10:43"); # if two VFs, set two RU MAC addresses (one per RU)
-  mtu = 9216;
-  fh_config = (
-# RAN650 #1
-  {
-    T1a_cp_dl = (419, 470);
-    T1a_cp_ul = (285, 336);
-    T1a_up = (294, 345);
-    Ta4 = (0, 200);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-  },
-# RAN650 #2
-  {
-    T1a_cp_dl = (419, 470);
-    T1a_cp_ul = (285, 336);
-    T1a_up = (294, 345);
-    Ta4 = (0, 200);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-  });
-};
-
-nrLDPC_coding_aal : {
-  dpdk_dev : "0000:01:00.0";
-  dpdk_core_list : "18-19";
-  is_t2 : 1;
-};
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
@@ -156,6 +156,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                = 1;
  tr_s_preference       = "local_L1";
  tr_n_preference       = "f1";
  local_n_address       = "172.21.19.98";
@@ -170,6 +171,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 100;
  pucch0_dtx_threshold  = 10;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
@@ -156,6 +156,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                = 1;
  tr_s_preference       = "local_L1";
  tr_n_preference       = "f1";
  local_n_address       = "172.21.19.99";
@@ -170,6 +171,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 100;
  pucch0_dtx_threshold  = 10;
--- a/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf
@@ -2,6 +2,7 @@

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "nfapi";
  remote_n_address = "192.168.71.140"; // vnf addr
  local_n_address  = "192.168.71.141"; // pnf addr
--- a/ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf
+++ b/ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf
@@ -4,6 +4,7 @@ usrp-tx-thread-config = 1;
 tune-offset = 30720000;

 L1s = ({
+  num_cc = 1;
  tr_n_preference = "nfapi";
  remote_n_address = "127.0.0.1"; // vnf addr
  local_n_address  = "127.0.0.1"; // pnf addr
--- a/ci-scripts/conf_files/gnb-pnf.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
+++ b/ci-scripts/conf_files/gnb-pnf.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
@@ -1,70 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-L1s = (
-{
-  tr_n_preference = "nfapi";
-  remote_n_address = "127.0.0.1"; // vnf addr
-  local_n_address  = "127.0.0.1"; // pnf addr
-  local_n_portc    = 50000; // pnf p5 port [!]
-  remote_n_portc   = 50001; // vnf p5 port
-  local_n_portd    = 50010; // pnf p7 port
-  remote_n_portd   = 50011; // vnf p7 port
-  prach_dtx_threshold = 130
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = -100;
-  tx_amp_backoff_dB = 3;
-  L1_rx_thread_core = 11;
-  L1_tx_thread_core = 12;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 10;
-  sl_ahead       = 6;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-log_config :
-{
-  global_log_level = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:41:11.0", "0000:41:11.1");
-  dpdk_iova_mode = "VA";
-  system_core = 7;
-  io_core = 8;
-  worker_cores = (9);
-  ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
-  mtu = 9600;
-  fh_config = ({
-    T1a_cp_dl = (285, 470);
-    T1a_cp_ul = (285, 429);
-    T1a_up = (125, 350);
-    Ta4 = (110, 180);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-  });
-};
-
-nrLDPC_coding_aal : {
-  dpdk_dev : "0000:01:00.0";
-  dpdk_core_list : "18-19";
-  is_t2 : 1;
-};
--- a/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf
@@ -173,11 +173,14 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "nfapi";
  remote_s_address            = "192.168.71.141"; // pnf addr [!]
  local_s_address             = "192.168.71.140"; // vnf addr
  local_s_portc               = 50001; // vnf p5 port
+  remote_s_portc              = 50000; // pnf p5 port [!]
  local_s_portd               = 50011; // vnf p7 port [!]
+  remote_s_portd              = 50010; // pnf p7 port [!]
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
  pucch_TargetSNRx10          = 200;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf
@@ -24,7 +24,7 @@ gNBs =
    pdsch_AntennaPorts_N1 = 2;
    maxMIMO_layers        = 4;
    do_CSIRS              = 1;
-    do_SRS                = "periodic";
+    do_SRS                = 1;

    servingCellConfigCommon = (
    {
@@ -175,11 +175,14 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference = "nfapi";
  remote_s_address = "127.0.0.1"; // pnf addr [!]
  local_s_address  = "127.0.0.1"; // vnf addr
  local_s_portc    = 50001; // vnf p5 port
+  remote_s_portc   = 50000; // pnf p5 port [!]
  local_s_portd    = 50011; // vnf p7 port [!]
+  remote_s_portd   = 50010; // pnf p7 port [!]

  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 300;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf
@@ -1,190 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI-DU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_DU_ID =  0xe00;
-    gNB_name  =  "gNB-OAI-DU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-    do_SRS                = "periodic";
-    force_UL256qam_off    = 0;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 4049.76 MHz
-      # selected SSB frequency = 4049.76 MHz
-      absoluteFrequencySSB                                          = 669984;
-      dl_frequencyBand                                              = 77;
-      # frequency point A = 4000.62 MHz
-      dl_absoluteFrequencyPointA                                    = 666708;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 7;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 2;
-#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                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -100;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 10;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 2;
-
-  ssPBCH_BlockPower                                                 = -11;
-  }
-
-  );
-
-  # ------- SCTP definitions
-  SCTP :
-  {
-    # Number of streams to use in input/output
-    SCTP_INSTREAMS  = 2;
-    SCTP_OUTSTREAMS = 2;
-  };
-}
-);
-
-MACRLCs = (
-{
-  tr_s_preference             = "nfapi";
-  remote_s_address            = "127.0.0.1"; // pnf addr [!]
-  local_s_address             = "127.0.0.1"; // vnf addr
-  local_s_portc               = 50001; // vnf p5 port
-  remote_s_portc              = 50000; // pnf p5 port [!]
-  local_s_portd               = 50011; // vnf p7 port [!]
-  remote_s_portd              = 50010; // pnf p7 port [!]
-  tr_n_preference             = "f1";
-  local_n_address             = "172.21.8.200";
-  remote_n_address            = "172.21.6.112";
-  local_n_portd               = 2153;
-  remote_n_portd              = 2153;
-  pusch_TargetSNRx10          = 220;
-  pucch_TargetSNRx10          = 250;
-  ul_bler_target_upper        = .35;
-  ul_bler_target_lower        = .15;
-  pusch_FailureThres          = 100;
-  dl_min_mcs                  = 20;
-}
-);
-
-log_config :
-{
-  global_log_level = "info";
-};
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -25,7 +25,7 @@ gNBs =
    pdsch_AntennaPorts_N1 = 2;
    pusch_AntennaPorts    = 2;
    do_CSIRS              = 1;
-    do_SRS                = "periodic";
+    do_SRS                = 1;
    min_rxtxtime          = 2;
    uess_agg_levels       = [0, 4, 2, 1, 0];

@@ -180,10 +180,13 @@ gNBs =

 MACRLCs = (
 {
+  num_cc             = 1;
  remote_s_address   = "127.0.0.1"; // pnf addr [!]
  local_s_address    = "127.0.0.2"; // vnf addr
  local_s_portc      = 50001; // vnf p5 port
+  remote_s_portc     = 50000; // pnf p5 port [!]
  local_s_portd      = 50011; // vnf p7 port [!]
+  remote_s_portd     = 50010; // pnf p7 port [!]
  tr_s_preference    = "aerial";
  tr_n_preference    = "local_RRC";
  pucch_RSSI_Threshold = -270;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
@@ -26,7 +26,7 @@ gNBs =
    pdsch_AntennaPorts_N1 = 2;
    pusch_AntennaPorts    = 2;
    do_CSIRS              = 1;
-    do_SRS                = "periodic";
+    do_SRS                = 1;
    min_rxtxtime          = 2;
    force_UL256qam_off    = 1;
    servingCellConfigCommon = (
@@ -180,16 +180,19 @@ gNBs =

 MACRLCs = (
 {
+  num_cc           = 1;
  remote_s_address = "127.0.0.1"; // pnf addr [!]
  local_s_address  = "127.0.0.2"; // vnf addr
  local_s_portc    = 50001; // vnf p5 port
+  remote_s_portc   = 50000; // pnf p5 port [!]
  local_s_portd    = 50011; // vnf p7 port [!]
+  remote_s_portd   = 50010; // pnf p7 port [!]
  tr_s_preference             = "aerial";
  tr_n_preference             = "local_RRC";
-  pucch_RSSI_Threshold        = -270;
-  pusch_RSSI_Threshold        = -260;
-  pusch_TargetSNRx10          = 290;
-  pucch_TargetSNRx10          = 200;
+  pucch_RSSI_Threshold = -270;
+  pusch_RSSI_Threshold = -260;
+  pusch_TargetSNRx10          = 260; # 150;
+  pucch_TargetSNRx10          = 200; #200;
  dl_max_mcs = 28;
  ul_max_mcs = 28;
  ul_min_mcs = 9;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf
@@ -24,6 +24,8 @@ gNBs =
    pdsch_AntennaPorts_XP = 2;
    pdsch_AntennaPorts_N1 = 2;
    pusch_AntennaPorts    = 2;
+    do_CSIRS              = 0;
+    do_SRS                = 0;
    min_rxtxtime          = 6;

    servingCellConfigCommon = (
@@ -177,10 +179,13 @@ gNBs =

 MACRLCs = (
 {
+  num_cc           = 1;
  remote_s_address = "127.0.0.1"; // pnf addr [!]
  local_s_address  = "127.0.0.2"; // vnf addr
  local_s_portc    = 50001; // vnf p5 port
+  remote_s_portc   = 50000; // pnf p5 port [!]
  local_s_portd    = 50011; // vnf p7 port [!]
+  remote_s_portd   = 50010; // pnf p7 port [!]
  tr_s_preference             = "aerial";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 180; # 150;
--- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
@@ -161,6 +161,7 @@ gNBs =

 MACRLCs = (
  {
+  num_cc = 1;
  tr_s_preference = "local_L1";
  tr_n_preference = "local_RRC";
  }
@@ -168,6 +169,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
--- a/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf
+++ b/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf
@@ -23,6 +23,8 @@ gNBs =
    pdsch_AntennaPorts_N1 = 2;
    maxMIMO_layers        = 4;
    pusch_AntennaPorts    = 4;
+    do_CSIRS              = 0;
+    do_SRS                = 0;

    servingCellConfigCommon = (
    {
@@ -171,6 +173,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 220;
@@ -181,6 +184,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120
  pucch0_dtx_threshold = 80;
--- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
@@ -173,6 +173,7 @@ gNBs =

 MACRLCs = (
 	{
+	num_cc = 1;
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	}
@@ -180,6 +181,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
 }
 );
--- a/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf
@@ -173,6 +173,7 @@ gNBs =

 MACRLCs = (
 	{
+	num_cc = 1;
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	}
@@ -180,6 +181,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
 }
 );
--- a/ci-scripts/conf_files/gnb.band79.106prb.vrtsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.106prb.vrtsim.phytest-dora.conf
@@ -1,222 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    min_rxtxtime = 6;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 4412.64 MHz
-      absoluteFrequencySSB                                             = 694176;
-      dl_frequencyBand                                                 = 79;
-      # this is 4400.94 MHz
-      dl_absoluteFrequencyPointA                                       = 693396;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 79;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -118;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#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                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  tr_s_preference = "local_L1";
-  tr_n_preference = "local_RRC";
-});
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-});
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [7];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 50;
-  eNB_instances  = [0];
-});
-
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-};
-
--- a/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf
@@ -170,11 +170,13 @@ gNBs =
 );

 MACRLCs = ({
+  num_cc = 1;
  tr_s_preference = "local_L1";
  tr_n_preference = "local_RRC";
 });

 L1s = ({
+  num_cc = 1;
  tr_n_preference = "local_mac";
 });

--- a/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf
@@ -172,11 +172,13 @@ gNBs =
 );

 MACRLCs = ({
+  num_cc = 1;
  tr_s_preference = "local_L1";
  tr_n_preference = "local_RRC";
 });

 L1s = ({
+  num_cc = 1;
  tr_n_preference = "local_mac";
 });

--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -180,6 +180,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc              = 1;
    tr_s_preference     = "local_L1";
    tr_n_preference     = "local_RRC";
    pusch_TargetSNRx10  = 200;
@@ -189,6 +190,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
@@ -197,6 +197,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -208,6 +209,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 150;
  pucch0_dtx_threshold  = 150;
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
@@ -205,6 +205,7 @@ rlc = {

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -216,6 +217,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 150;
  pucch0_dtx_threshold  = 150;
--- a/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf
@@ -44,7 +44,7 @@ gNBs =
     #initialDownlinkBWP
      #genericParameters
        # this is RBstart=0,L=32 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 17875;
+        initialDLBWPlocationAndBandwidth                                        = 6349;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 3;
@@ -64,7 +64,7 @@ gNBs =
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 17875;
+        initialULBWPlocationAndBandwidth                                        = 6349;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 3;
@@ -145,6 +145,11 @@ gNBs =

  );

+    first_active_bwp = 1;
+    bwp_list = (
+      { scs = 3; bwpStart = 0; bwpSize = 66;}
+    );
+
    # ------- SCTP definitions
    SCTP :
    {
@@ -167,6 +172,7 @@ gNBs =
 );

 MACRLCs = ({
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -179,6 +185,7 @@ MACRLCs = ({

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold   = 120;
  #pucch0_dtx_threshold = 120;
--- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
@@ -172,6 +172,7 @@ gNBs =

 MACRLCs = (
    {
+        num_cc                      = 1;
        tr_s_preference             = "local_L1";
        tr_n_preference             = "local_RRC";
        ulsch_max_slots_inactivity  = 100;
@@ -182,6 +183,7 @@ MACRLCs = (

 L1s = (
    {
+        num_cc = 1;
        tr_n_preference = "local_mac";
        pusch_proc_threads = 8;
        prach_dtx_threshold = 200;
--- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
@@ -25,7 +25,7 @@ gNBs =
    pdsch_AntennaPorts_XP = 2;
    pusch_AntennaPorts    = 2;
    do_CSIRS              = 1;
-    do_SRS                = "periodic";
+    do_SRS                = 1;
    uess_agg_levels = [4,2,0,0,0];

    servingCellConfigCommon = (
@@ -178,6 +178,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 320;
@@ -191,6 +192,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  pusch_dtx_threshold = 20;
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-4layers-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-4layers-vvdn.conf
@@ -1,268 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-    do_SRS                = "periodic";
-    force_UL256qam_off    = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 4049.76 MHz
-      # selected SSB frequency = 4049.76 MHz
-      absoluteFrequencySSB                                          = 669984;
-      dl_frequencyBand                                              = 77;
-      # frequency point A = 4000.62 MHz
-      dl_absoluteFrequencyPointA                                    = 666708;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 7;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 2;
-#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                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -100;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 8;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 2;
-
-  ssPBCH_BlockPower                                                 = -10;
-  }
-  );
-
-  # ------- SCTP definitions
-  SCTP :
-  {
-    # Number of streams to use in input/output
-    SCTP_INSTREAMS  = 2;
-    SCTP_OUTSTREAMS = 2;
-  };
-
-  ////////// AMF parameters:
-  amf_ip_address = ({ ipv4 = "172.21.6.103"; });
-
-  NETWORK_INTERFACES :
-  {
-    GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.10.20";
-    GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.10.20";
-    GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-  };
-}
-);
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 250;
-  pusch_FailureThres          = 100;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 130
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = -100;
-  tx_amp_backoff_dB = 3;
-  L1_rx_thread_core = 11;
-  L1_tx_thread_core = 12;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 10;
-  sl_ahead       = 8;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:41:11.0", "0000:41:11.1");
-  dpdk_iova_mode = "VA";
-  system_core = 7;
-  io_core = 8;
-  worker_cores = (9);
-  ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
-  mtu = 9600;
-  fh_config = ({
-    T1a_cp_dl = (285, 470);
-    T1a_cp_ul = (285, 429);
-    T1a_up = (125, 350);
-    Ta4 = (110, 180);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-  });
-};
-
-nrLDPC_coding_aal : {
-  dpdk_dev : "0000:01:00.0";
-  dpdk_core_list : "18-19";
-  is_t2 : 1;
-};
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
@@ -24,6 +24,7 @@ gNBs =
    maxMIMO_layers        = 2;
    pusch_AntennaPorts    = 4;
    do_CSIRS              = 1;
+    do_SRS                = 0;
    force_UL256qam_off    = 1;

    servingCellConfigCommon = (
@@ -160,7 +161,7 @@ gNBs =


    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.113"; });
+    amf_ip_address = ({ ipv4 = "172.21.6.103"; });

    NETWORK_INTERFACES :
    {
@@ -173,6 +174,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -183,6 +185,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 130
  pucch0_dtx_threshold = 80;
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
@@ -23,7 +23,7 @@ gNBs = (
  pdsch_AntennaPorts_XP = 2;
  pusch_AntennaPorts    = 2;
  do_CSIRS              = 1;
-  do_SRS                = "periodic";
+  do_SRS                = 1;

  servingCellConfigCommon = (
  {
@@ -171,6 +171,7 @@ gNBs = (

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 320;
@@ -184,6 +185,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  max_ldpc_iterations = 15;
@@ -197,7 +199,7 @@ RUs = (
  nb_tx          = 2;
  nb_rx          = 2;
  att_tx         = 0;
-  att_rx         = 6;
+  att_rx         = 0;
  bands          = [77];
  max_pdschReferenceSignalPower = -27;
  max_rxgain                    = 71;
--- a/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
@@ -171,6 +171,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -181,6 +182,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.fhi72.4x4-benetel550-9b-mplane.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.fhi72.4x4-benetel550-9b-mplane.conf
@@ -1,262 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 05; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 623328;
-      dl_frequencyBand                                              = 78;
-      # frequency point A = 3330.93 MHz
-      dl_absoluteFrequencyPointA                                    = 622062;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 106;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 28875; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 106;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 152;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 8;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 3;
-#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                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                                 = -10;
-  }
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.116"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.150";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.150";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 250;
-  pucch_TargetSNRx10          = 200;
-  pusch_FailureThres          = 1000;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 100;
-  pucch0_dtx_threshold = 10;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 15;
-  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
-  L1_rx_thread_core = 3;
-  L1_tx_thread_core = 4;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 24;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 5;
-  sl_ahead       = 10;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:c3:11.0"); # one VF can be used as well
-  system_core = 0;
-  io_core = 1;
-  worker_cores = (2);
-  du_key_pair = ("/opt/oai-gnb/etc/id_rsa.pub", "/opt/oai-gnb/etc/id_rsa");
-  du_addr = ("00:11:22:33:44:66");
-  vlan_tag = (3); # only one needed if one VF configured
-  ru_username = ("oranbenetel");
-  ru_ip_addr = ("192.168.81.4");
-  fh_config = ({
-    T1a_cp_dl = (419, 470);
-    T1a_cp_ul = (285, 336);
-    T1a_up = (294, 345);
-    Ta4 = (0, 200);
-  });
-};
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -22,6 +22,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime                                              = 5;
+    do_SRS                                                    = 0;
    force_256qam_off                                          = 1;
    pdsch_AntennaPorts_N1                                     = 1;
    pdsch_AntennaPorts_XP                                     = 1;
@@ -173,6 +174,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc           = 1;
  tr_s_preference  = "local_L1";
  tr_n_preference  = "local_RRC";
  pusch_TargetSNRx10 = 150;
@@ -182,6 +184,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 150;
  #pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
@@ -176,6 +176,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -185,6 +186,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
 #  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
@@ -166,6 +166,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc             = 1;
    tr_s_preference    = "local_L1";
    tr_n_preference    = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -175,6 +176,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc                = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 200;
 #  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
@@ -174,6 +174,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 250;
@@ -183,6 +184,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
@@ -167,6 +167,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc           = 1;
  tr_s_preference  = "local_L1";
  tr_n_preference  = "local_RRC";
  pusch_TargetSNRx10 = 200;
@@ -196,6 +197,7 @@ prs_config = (

 L1s = (
 {
+  num_cc              = 1;
  tr_n_preference     = "local_mac";
  prach_dtx_threshold = 120;
 }
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
@@ -143,14 +143,16 @@ gNBs:


 MACRLCs:
-  - tr_s_preference: local_L1
+  - num_cc: 1
+    tr_s_preference: local_L1
    tr_n_preference: local_RRC
    pusch_TargetSNRx10: 200
    pucch_TargetSNRx10: 200
    stats_max_ue: 17

 L1s:
-  - tr_n_preference:  local_mac
+  - num_cc: 1
+    tr_n_preference:  local_mac
    prach_dtx_threshold: 200
    # pucch0_dtx_threshold = 150;

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf
@@ -18,7 +18,7 @@ gNBs =
    nr_cellid = 12345678L;

    ////////// Physical parameters:
-    use_deltaMCS = 1;
+

    servingCellConfigCommon = (
    {
@@ -178,9 +178,10 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 100;
+  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
  ul_prbblack_SNR_threshold   = 10;
 }
@@ -188,6 +189,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 150;
  pucch0_dtx_threshold  = 30;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml
@@ -146,13 +146,15 @@ gNBs:


 MACRLCs:
-  - tr_s_preference: local_L1
+  - num_cc: 1
+    tr_s_preference: local_L1
    tr_n_preference: local_RRC
    pusch_TargetSNRx10: 200
    pucch_TargetSNRx10: 200

 L1s:
-  - tr_n_preference:  local_mac
+  - num_cc: 1
+    tr_n_preference:  local_mac
    prach_dtx_threshold: 200
    # pucch0_dtx_threshold = 150;

@@ -207,40 +209,3 @@ channelmod:
     forgetfact: 0
     offset: 0
     ds_tdl: 0
-vrtsim:
-  role: server
-  # Channel mode: exactly one of the three modes below should be active.
-  #
-  # No channel - plain passthrough, no impairments:
-  # cirdb: 0
-  # chanmod: 0
-  #
-  # Built-in channel model defined in the channelmod: section above:
-  # chanmod: 1
-  # cirdb: 0
-  #
-  # External taps emitter publishing over a nanomsg socket.
-  # Requires a running emit_from_db.py and build with -DOAI_VRTSIM_TAPS_CLIENT=ON:
-  # cirdb: 0
-  # chanmod: 0
-  # taps-socket: "tcp://127.0.0.1:5555"
-  #
-  # In-process CIR database: reads precomputed 3GPP TDL taps directly from
-  # cir_db.bin. No external emitter required. Generate the database offline
-  # with cir_generator.py. Use cirdb-path to point to the directory containing
-  # cir_db.bin and cir_db.yaml.
-  cirdb_file: /cirdb/cir_db.bin
-  cirdb_yaml: /cirdb/cir_db.yaml  
-  #
-  # Per-UE channel configuration for multi-UE operation
-  ue_config:
-    - antennas: "2x2"   # NxM where N=UE-TX, M=gNB-TX; M must equal RU nb_tx
-      model_id: 0       # 0=TDL-A 1=TDL-B 2=TDL-C 3=TDL-D 4=TDL-E
-      ds_ns: 1.0        # RMS delay spread in ns
-      speed_mps: 1.5    # UE speed in m/s
-      # aoa_deg: 0.0    # angle of arrival in degrees; TDL-D/E only
-    - antennas: "1x2"   
-      model_id: 0
-      ds_ns: 1.0
-      speed_mps: 1.5
-      # aoa_deg: 0.0    
--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -169,6 +169,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -178,6 +179,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "local_mac";
  pusch_proc_threads    = 8;
  prach_dtx_threshold   = 120;
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.2x2-benetel550-9b-mplane.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.2x2-benetel550-9b-mplane.conf
@@ -1,260 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 05; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts    = 2;
-    do_CSIRS              = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 623328;
-      dl_frequencyBand                                              = 78;
-      # frequency point A = 3300.87 MHz
-      dl_absoluteFrequencyPointA                                    = 620058;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 152;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 8;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 3;
-#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                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                                 = -11;
-  }
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.116"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.150";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.150";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-  pusch_FailureThres          = 1000;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 100;
-  pucch0_dtx_threshold = 10;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 15;
-  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
-  L1_rx_thread_core = 3;
-  L1_tx_thread_core = 4;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 2;
-  nb_rx          = 2;
-  att_tx         = 24;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 5;
-  sl_ahead       = 10;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:c3:11.0"); # one VF can be used as well
-  system_core = 0;
-  io_core = 1;
-  worker_cores = (2);
-  du_key_pair = ("/opt/oai-gnb/etc/id_rsa.pub", "/opt/oai-gnb/etc/id_rsa");
-  du_addr = ("00:11:22:33:44:66");
-  vlan_tag = (3); # only one needed if one VF configured
-  ru_username = ("oranbenetel");
-  ru_ip_addr = ("192.168.81.4");
-  fh_config = ({
-    T1a_cp_dl = (419, 470);
-    T1a_cp_ul = (285, 336);
-    T1a_up = (294, 345);
-    Ta4 = (0, 200);
-  });
-};
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
@@ -22,7 +22,7 @@ gNBs =
    pdsch_AntennaPorts_XP                                     = 2;
    pusch_AntennaPorts                                        = 2;
    do_CSIRS                                                  = 1;
-    do_SRS                                                    = "periodic";
+    do_SRS                                                    = 1;
    min_rxtxtime = 5;

    servingCellConfigCommon = (
@@ -173,6 +173,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
 }
@@ -180,6 +181,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc                = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  tx_amp_backoff_dB = 30;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
@@ -26,7 +26,7 @@ gNBs =
    pdsch_AntennaPorts_XP                                     = 2;
    pusch_AntennaPorts                                        = 2;
    do_CSIRS                                                  = 1;
-    do_SRS                                                    = "periodic";
+    do_SRS                                                    = 1;

    servingCellConfigCommon = (
    {
@@ -177,6 +177,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -186,6 +187,7 @@ MACRLCs = (

 L1s = (
        {
+        num_cc = 1;
        tr_n_preference = "local_mac";
        prach_dtx_threshold = 120;
        pucch0_dtx_threshold = 50;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -179,6 +179,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -189,6 +190,7 @@ MACRLCs = (

 L1s = (
        {
+        num_cc = 1;
        tr_n_preference = "local_mac";
        prach_dtx_threshold = 120;
        pucch0_dtx_threshold = 50;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -168,6 +168,7 @@ gNBs =

 MACRLCs = (
 {
+  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -178,6 +179,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/ci-scripts/conf_files/neighbour-config.conf
+++ b/ci-scripts/conf_files/neighbour-config.conf
@@ -5,57 +5,6 @@
 #  for the 2-cell rfsim setup (gNB_ID 0xe00 & 0xb00)       #
 ############################################################

-############################################################
-#                           SIB2                           #
-############################################################
-
-sib2_config : {
-  q_Hyst                   = 0;
-  cellReselectionPriority  = 0;
-  threshServingLowP        = 0;
-  threshServingLowQ        = 0;
-  s_NonIntraSearchP        = -1;
-  s_NonIntraSearchQ        = -1;
-  q_RxLevMin               = -56;
-  q_QualMin                = -1;
-  s_IntraSearchP           = 22;
-  s_IntraSearchQ           = -1;
-  t_ReselectionNR          = 1;
-  deriveSSB_IndexFromCell  = 1;
-
-  speed_t_Evaluation       = 0;
-  speed_t_HystNormal       = 0;
-  speed_n_CellChangeMedium = 1;
-  speed_n_CellChangeHigh   = 2;
-  speed_sf_Medium          = 1;
-  speed_sf_High            = 0;
-};
-
-############################################################
-#      Per-frequency SIB4 inter-frequency configuration    #
-############################################################
-
-frequency_list = (
-  {
-    absoluteFrequencySSB = 621312;
-    subcarrierSpacing    = 1; # 30 kHz
-    band                 = 78;
-
-    frequency_config = (
-      {
-        cellReselectionPriority = 5;
-        threshX_HighP           = 10;
-        threshX_LowP            = 6;
-        threshX_HighQ           = -1;
-        threshX_LowQ            = -1;
-        q_OffsetFreq            = 0;
-        q_RxLevMin              = -56;
-        t_ReselectionNR         = 1;
-      }
-    );
-  }
-);
-
 neighbour_list = (
  ##########################################################
  #      Entry USED BY gNB_ID = 0xe00  (nr_cellid = 1)     #
@@ -72,9 +21,6 @@ neighbour_list = (
        band                = 78;
        plmn                = { mcc = 208; mnc = 99; mnc_length = 2 };
        tracking_area_code  = 1;
-        q_OffsetCell        = 2;
-        q_RxLevMinOffsetCell= 2;
-        q_QualMinOffsetCell = 1;
      }
    );
  },
@@ -94,9 +40,6 @@ neighbour_list = (
        band                = 78;
        plmn                = { mcc = 208; mnc = 99; mnc_length = 2 };
        tracking_area_code  = 1;
-        q_OffsetCell        = 2;
-        q_RxLevMinOffsetCell= 2;
-        q_QualMinOffsetCell = 1;
      }
    );
  }
--- a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
+++ b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
@@ -19,6 +19,7 @@ pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });

 MACRLCs = (
        {
+        num_cc = 1;
        tr_n_preference = "nfapi";
        remote_n_address = "127.0.0.1"; //Proxy IP
        local_n_address  = "127.0.0.1";
--- a/ci-scripts/conf_files/nrue.uicc.2pdu.conf
+++ b/ci-scripts/conf_files/nrue.uicc.2pdu.conf
@@ -5,8 +5,8 @@ uicc0 = {
  key = "fec86ba6eb707ed08905757b1bb44b8f";
  opc= "C42449363BBAD02B66D16BC975D77CC1";
  pdu_sessions = (
-    { id = 1; dnn = "oai"; nssai_sst = 1; nssai_sd = 0xFFFFFF; },
-    { id = 2; dnn = "openairinterface"; nssai_sst = 1; nssai_sd = 0x123456; }
+    { id = 1; dnn = "oai"; nssai_sst = 1; },
+    { id = 2; dnn = "oai"; nssai_sst = 1; }
  )
 }

--- a/ci-scripts/conf_files/nrue.uicc.yaml
+++ b/ci-scripts/conf_files/nrue.uicc.yaml
@@ -30,7 +30,7 @@ channelmod:
    - model_name: rfsimu_channel_ue0
      type: AWGN
      ploss_dB: 20
-      noise_power_dB: -2
+      nose_power_dB: -2
      forgetfact: 0
      offset: 0
      ds_tdl: 0
--- a/ci-scripts/conf_files/nrue.vrtsim.chanmod.yaml
+++ b/ci-scripts/conf_files/nrue.vrtsim.chanmod.yaml
@@ -11,7 +11,7 @@ uicc0:
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

 channelmod:
-  max_chan: 10
+  max_chan: 10;
  modellist: DefaultChannelList
  DefaultChannelList:
   - model_name: client_tx_channel_model
--- a/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf
@@ -203,7 +203,9 @@ MACRLCs = (
 	remote_s_address = "127.0.0.1";
 	local_s_address  = "127.0.0.1";
 	local_s_portc    = 50001;
+	remote_s_portc   = 50000;
 	local_s_portd    = 50011;
+	remote_s_portd   = 50010;
 	tr_s_preference = "nfapi";
 	tr_n_preference = "local_RRC";
 	scheduler_mode = "fairRR";
--- a/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
+++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
@@ -189,7 +189,9 @@ MACRLCs = (
        remote_s_address = "127.0.0.1"; // pnf addr [!]
        local_s_address  = "127.0.0.2"; // vnf addr
        local_s_portc    = 50601; // vnf p5 port
+        remote_s_portc   = 50600; // pnf p5 port [!]
        local_s_portd    = 50611; // vnf p7 port [!]
+        remote_s_portd   = 50610; // pnf p7 port [!]
        tr_s_preference = "nfapi";
        tr_n_preference = "local_RRC";
        }
--- a/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
+++ b/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf
@@ -177,7 +177,9 @@ MACRLCs = (
        remote_s_address = "127.0.0.1"; // pnf addr [!]
        local_s_address  = "127.0.0.2"; // vnf addr
        local_s_portc    = 50601; // vnf p5 port
+        remote_s_portc   = 50600; // pnf p5 port [!]
        local_s_portd    = 50611; // vnf p7 port [!]
+        remote_s_portd   = 50610; // pnf p7 port [!]
        tr_s_preference = "nfapi";
        tr_n_preference = "local_RRC";
        }
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
@@ -188,6 +188,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -197,6 +198,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
@@ -184,6 +184,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -193,6 +194,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
 }
--- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -29,7 +29,7 @@ gNBs =
    #pucch_TargetSNRx10                                        = 200;
    ul_prbblacklist                                           = "51,52,53,54"
    min_rxtxtime = 6;
-    do_SRS                                                    = "periodic";
+    do_SRS                                                    = 1;

    servingCellConfigCommon = (
    {
@@ -192,6 +192,7 @@ gNBs =

 MACRLCs = (
  {
+    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -201,6 +202,7 @@ MACRLCs = (

 L1s = (
 {
+  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
 #  pucch0_dtx_threshold = 150;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rúben Soares Silva	08d280f357	log	2026-04-17 09:20:41 +01:00
Rúben Soares Silva	a3f6109d7c	Revert "log" This reverts commit `26b74de4bd`.	2026-04-16 21:03:16 +01:00
Rúben Soares Silva	bc751da474	test prgMask	2026-04-16 21:01:55 +01:00
Rúben Soares Silva	26b74de4bd	log	2026-04-16 20:36:00 +01:00
Rúben Soares Silva	7247d7daa8	Test changing antenna count	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	7c0c318df7	test limit available prbs for cumac	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	7e2b55cc67	Pad number of connected UEs with dummy data for cuMAC UE selection	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	845d735dae	Change log level of timing print from sch_tti.request to response	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	c38962f530	Get SINR from MCS and use that to fill wbSinr and postEqSinr arrays in gNB_scheduler_dlsch.c	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	516cb2902a	Change printf to LOG_D to not flood the terminal with logs	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	0b54e9ab81	test MCS and Layer allocation	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	79f423052b	Add cuMAC last solution buffers to UE and populate after each scheduling	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	61390d8a9c	Add cuMAC last solution buffers to SCH_TTI.request	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	876fc5b205	Revert "test Logs" This reverts commit d22fa90df7edabd382d2ea6888689aac325805d6.	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	284105da7c	test PRB allocation	2026-04-16 20:31:32 +01:00
Rúben Soares Silva	64b2a513b7	test Logs	2026-04-16 17:25:37 +01:00
Rúben Soares Silva	3a8c182e37	Initial implementation for reading SCH_TTI.response data	2026-04-16 17:25:37 +01:00
Rúben Soares Silva	3860b51fde	CuMAC initial test	2026-04-16 13:38:43 +01:00