symbol based RU control function

Signed-off-by: francescomani <email@francescomani.it>

CMakeLists.txt

@@ -5,8 +5,8 @@ project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
 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.")
@@ -34,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()
 
 #########################################################
@@ -155,17 +155,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")
@@ -176,17 +173,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")
@@ -228,9 +221,9 @@ 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
@@ -849,7 +842,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
@@ -1144,20 +1136,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
@@ -1201,7 +1185,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
@@ -1237,7 +1221,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
@@ -1279,9 +1263,7 @@ 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
@@ -1383,7 +1365,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()
@@ -1391,6 +1372,7 @@ 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)
@@ -1916,7 +1898,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}
   )
 
@@ -1927,7 +1909,6 @@ target_link_libraries(nr-cuup PRIVATE
                       alg
                       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)
@@ -2108,13 +2089,13 @@ target_link_libraries(nr_srssim PRIVATE
   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()
 

README.md

@@ -8,9 +8,8 @@
     <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-Fedore44-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">

ci-scripts/Jenkinsfile

@@ -20,13 +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 INTERNAL_REPO = "asterix:/home/git/openairinterface5g.git"
-def sourceBranch = params.sourceBranch ?: env.GIT_BRANCH
-def targetBranch = params.targetBranch ?: 'develop'
-def commitID = params.sourceCommit ?: env.GIT_COMMIT
-def testRepository = params.customRepository ?: INTERNAL_REPO
-def testBranch = params.customBranch ?: "${sourceBranch}-${commitID}"
-def mergeWithTarget = params.mergeWithTarget ?: false
+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
@@ -51,7 +50,7 @@ pipeline {
           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}"
       }
     }
@@ -65,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"
@@ -85,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"
@@ -112,21 +121,28 @@ pipeline {
               }
             }
             sh """
-              python3 main.py --mode=InitiateHtml --repository=${testRepository} \
-                              --branch=${testBranch} --commitID=${commitID} \
-                              ${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}
                         """
@@ -144,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}
                       """
                     }

ci-scripts/Jenkinsfile-GitLab-Container

@@ -87,6 +87,9 @@ pipeline {
             // since a bit, in push events, gitlabUserEmail is not populated
             gitCommitAuthorEmailAddr = env.gitlabUserEmail
             echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
+            // GitLab-Jenkins plugin integration is lacking to perform the merge by itself
+            // Doing it manually --> it may have merge conflicts
+
             // Validate MR commits: checks for missing Signed-off-by and merge commits
             def mrValidationLog = "signedCommit_${env.BUILD_NUMBER}.log"
             def mrValidationExitCode = sh(
@@ -95,12 +98,11 @@ pipeline {
             )
             def mrValidationMessage = readFile(mrValidationLog).trim()
             sh "rm -f ${mrValidationLog}"
-            if (mrValidationExitCode >= 1) {
-              addGitLabMRComment comment: "${mrValidationMessage}"
-            }
+            addGitLabMRComment comment: "${mrValidationMessage}"
             if (mrValidationExitCode >= 2) {
               error("${mrValidationMessage}")
             }
+            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
           } else {
             echo "Git Branch    is ${GIT_BRANCH}"
             echo "Git Commit    is ${GIT_COMMIT}"
@@ -111,19 +113,29 @@ pipeline {
           }
         }
       }
+      post {
+        failure {
+          script {
+            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI"
+            addGitLabMRComment comment: message
+            currentBuild.result = 'FAILURE'
+          }
+        }
+      }
     }
     stage ("Local-Repo-Push") {
       steps {
         script {
-          triggerSlaveJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
+          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+            triggerSlaveJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
+          }
         }
       }
       post {
         failure {
           script {
-            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Cannot perform CI - merge validation failed (merge conflict, git operation failure, or internal CI error)."
-            addGitLabMRComment comment: message
-            currentBuild.result = 'FAILURE'
+            echo "Push to local repository KO"
+            failingStages += '\n * RAN-Local-Repo-Push'
           }
         }
       }
@@ -749,29 +761,6 @@ pipeline {
             }
           }
         }
-        stage ("SA-FHI72-MPLANE-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-FHI72-MPLANE-CN5G', 'SA-FHI72-MPLANE-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saFHI72MplaneStatus = finalizeSlaveJob('RAN-SA-FHI72-MPLANE-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saFHI72MplaneStatus
-              }
-            }
-          }
-        }
         stage ("SA-Handover-CN5G") {
           when { expression {do5Gtest} }
           steps {
@@ -880,19 +869,12 @@ def triggerSlaveJob (jobName, gitlabStatusName) {
   def localStatus = build job: jobName,
     parameters: [
       string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-      string(name: 'targetRepo', value: String.valueOf(GIT_URL)),
       string(name: 'SourceRepo', value: String.valueOf(env.gitlabSourceRepoHttpUrl)),
-      string(name: 'sourceRepo', value: String.valueOf(env.gitlabSourceRepoHttpUrl)),
       string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
-      string(name: 'sourceBranch', value: String.valueOf(env.gitlabSourceBranch)),
       string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
-      string(name: 'sourceCommit', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
       string(name: 'eNB_MR', value: String.valueOf(MR_NUMBER)),
-      string(name: 'requestNumber', value: String.valueOf(MR_NUMBER)),
       booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
-      booleanParam(name: 'mergeWithTarget', value: "MERGE".equals(env.gitlabActionType)),
-      string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch)),
-      string(name: 'targetBranch', value: String.valueOf(env.gitlabTargetBranch))
+      string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
     ], propagate: false
   def localResult = localStatus.getResult()
   echo "${jobName} Slave Job status is ${localResult}"
@@ -907,13 +889,14 @@ def triggerSlaveJob (jobName, gitlabStatusName) {
 
 def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
   if ("MERGE".equals(env.gitlabActionType)) {
-    shaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%H" ' + env.gitlabMergeRequestLastCommit
-    shaOne = shaOne.trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shaOne
+    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
+    shortenShaOne = shortenShaOne.trim()
+    branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim()
+    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
   } else {
-    shaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%H" ' + env.GIT_COMMIT
-    shaOne = shaOne.trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + shaOne
+    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT
+    shortenShaOne = shortenShaOne.trim()
+    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + shortenShaOne
   }
   // Workaround for the "cancelled" GitLab pipeline notification
   // The slave job is triggered with the propagate false so the following commands are executed

ci-scripts/Jenkinsfile-push-local-repo

@@ -27,26 +27,21 @@ pipeline {
       steps {
         script {
           def missingParams = []
-          if (!params.sourceRepo?.trim())   { missingParams << 'sourceRepo' }
-          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 (!params.SourceRepo?.trim())       { missingParams << 'SourceRepo' }
+          if (!params.eNB_Branch?.trim())       { missingParams << 'eNB_Branch' }
+          if (!params.eNB_CommitID?.trim())     { missingParams << 'eNB_CommitID' }
+          if (!params.eNB_TargetBranch?.trim()) { missingParams << 'eNB_TargetBranch' }
+          if (!params.eNB_Repository?.trim())   { missingParams << 'eNB_Repository' }
 
           if (missingParams) {
             error "Missing required parameters: ${missingParams.join(', ')}"
           }
 
-          echo "Source Repo   : ${params.sourceRepo}"
-          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}"
-          }
+          echo "Source Repo   : ${params.SourceRepo}"
+          echo "Source Branch : ${params.eNB_Branch}"
+          echo "Source Commit : ${params.eNB_CommitID}"
+          echo "Target Branch : ${params.eNB_TargetBranch}"
+          echo "Target Repo   : ${params.eNB_Repository}"
         }
       }
     }
@@ -56,7 +51,6 @@ pipeline {
           git config user.email "jenkins@openairinterface.org"
           git config user.name "OAI Jenkins"
           git remote remove source || true
-          git remote remove target || true
           git remote remove internal-repo || true
         """
       }
@@ -64,38 +58,31 @@ pipeline {
     stage('Add source repo & fetch branches') {
       steps {
         sh """
-          git remote add source ${params.sourceRepo} || true
-          git fetch source ${params.sourceBranch}
+          git remote add source ${params.SourceRepo} || true
+          git fetch source ${params.eNB_Branch}
+          git fetch origin ${params.eNB_TargetBranch}
         """
-        script {
-          if (params.mergeWithTarget) {
-            sh """
-              git remote add target ${params.targetRepo} || true
-              git fetch target ${params.targetBranch}
-            """
-          }
-        }
       }
     }
     stage('Create temporary branch for CI') {
       steps {
         script {
-          env.NEW_BRANCH = "${params.sourceBranch}-${params.sourceCommit}"
+          def shortCommit = params.eNB_CommitID.take(8)
+          env.NEW_BRANCH = "${params.eNB_Branch}-${shortCommit}"
           echo "New branch: ${env.NEW_BRANCH}"
         }
         sh """
           # Checkout source commit
-          git checkout -B ${env.NEW_BRANCH} ${params.sourceCommit}
+          git checkout -B ${env.NEW_BRANCH} ${params.eNB_CommitID}
         """
       }
     }
     stage('Merge target into source') {
-      when { expression { return params.mergeWithTarget } }
       steps {
         sh """
-          echo "Merging target branch ${params.targetBranch} into source branch ${env.NEW_BRANCH}"
-          if ! git merge --ff target/${params.targetBranch} \
-            -m "Merge ${params.targetBranch} into ${params.sourceBranch} for CI"; then
+          echo "Merging target branch ${params.eNB_TargetBranch} into source branch ${env.NEW_BRANCH}"
+          if ! git merge --ff origin/${params.eNB_TargetBranch} \
+            -m "Merge ${params.eNB_TargetBranch} into ${params.eNB_Branch} for CI"; then
             echo "Merge conflicts detected. Aborting."
             git merge --abort || true
             exit 1

ci-scripts/Jenkinsfile-push-registry

@@ -56,7 +56,7 @@ pipeline {
               echo "Forced Tag is ${WEEK_TAG}"
             }
           }
-          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([

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
@@ -44,55 +44,74 @@ 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=(.+)$|^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-repository=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-repository=(.+)$', 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.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)
+            CiTestObj.ranRepository = matchReg.group(1)
+            RAN.ranRepository=matchReg.group(1)
+            HTML.ranRepository=matchReg.group(1)
+            CONTAINERS.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=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE)
+                CiTestObj.ranAllowMerge = True
+                RAN.ranAllowMerge=True
+                HTML.ranAllowMerge=True
+                CONTAINERS.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.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'^\-\-commitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-commitID=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-commitID=(.*)$', myArgv, re.IGNORECASE)
+            CiTestObj.ranBranch = matchReg.group(1)
+            RAN.ranBranch=matchReg.group(1)
+            HTML.ranBranch=matchReg.group(1)
+            CONTAINERS.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)
-            HTML.commitID=matchReg.group(1)
-        elif re.match(r'^\-\-targetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE)
+            CiTestObj.ranCommitID = matchReg.group(1)
+            RAN.ranCommitID=matchReg.group(1)
+            HTML.ranCommitID=matchReg.group(1)
+            CONTAINERS.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)
-            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)
-            else:
+            CiTestObj.ranTargetBranch = matchReg.group(1)
+            RAN.ranTargetBranch=matchReg.group(1)
+            HTML.ranTargetBranch=matchReg.group(1)
+            CONTAINERS.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)
+                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))

ci-scripts/ci_infra.yaml

@@ -85,14 +85,6 @@ oc-cn5g-20897:
   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%%"
-
 oc-cn5g-00103-ho:
   Host: groot
   NetworkScript: echo "inet 172.21.6.111"
@@ -191,16 +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
-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
 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}'

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

ci-scripts/cls_containerize.py

@@ -32,15 +32,35 @@ from cls_ci_helper import archiveArtifact
 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,12 +172,14 @@ 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 = ''
@@ -171,7 +193,7 @@ 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 = []
@@ -227,16 +249,16 @@ class Containerize():
 		baseTag = 'develop'
 		forceBaseImageBuild = False
 		imageTag = 'develop'
-		if (self.merge):
+		if (self.ranAllowMerge):
 			imageTag = 'ci-temp'
-			if self.targetBranch == 'develop':
+			if self.ranTargetBranch == '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')
 				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'
@@ -354,8 +376,90 @@ class Containerize():
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 		return status
 
+	def BuildProxy(self, ctx, node, HTML):
+		lSourcePath = self.eNBSourceCodePath
+		logging.debug('Building on server: ' + 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, dockerfile, runtime_opt, ctest_opt, HTML):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
 		cmd.cd(lSourcePath)
@@ -363,8 +467,8 @@ class Containerize():
 		# check that ran-base image exists as we expect it
 		baseImage = 'ran-base'
 		baseTag = 'develop'
-		if self.merge:
-			if self.targetBranch == 'develop':
+		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.ubuntu | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
@@ -407,7 +511,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
@@ -420,10 +524,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:
@@ -436,7 +540,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}')
@@ -484,7 +588,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}"
@@ -497,7 +601,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:
@@ -516,17 +620,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'
@@ -544,7 +648,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:
@@ -570,7 +674,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')
@@ -599,7 +703,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}'
@@ -637,7 +741,7 @@ class Containerize():
 	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:

ci-scripts/cls_oai_html.py

@@ -33,9 +33,11 @@ class HTMLManagement():
 		self.htmlHeaderCreated = False
 		self.htmlFooterCreated = False
 
-		self.repository = ''
-		self.branch = ''
-		self.commitID = ''
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranCommitID = ''
+		self.ranAllowMerge = False
+		self.ranTargetBranch = ''
 
 		self.nbTestXMLfiles = 0
 		self.htmlTabRefs = []
@@ -94,18 +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_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.commitID, 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-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')
+			self.htmlFile.write('     <tr>\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')

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':
@@ -282,8 +265,12 @@ def Deploy_Physim(ctx, HTML, node, workdir, script, options):
 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 = ''
@@ -470,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 = ""
@@ -483,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)
@@ -498,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)
@@ -507,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"):

ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf

@@ -70,7 +70,7 @@ gNBs =
         initialULBWPsubcarrierSpacing                                           = 3;
       #rach-ConfigCommon
         #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 52;
+          prach_ConfigurationIndex                                  = 70;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
           prach_msg1_FDM                                            = 0;
@@ -112,7 +112,7 @@ gNBs =
         hoppingId                                                   = 40;
         p0_nominal                                                  = -90;
 
-      ssb_PositionsInBurst_Bitmap                                   = 1;
+      ssb_PositionsInBurst_Bitmap                                   = 85;
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
@@ -179,7 +179,7 @@ MACRLCs = ({
   set_analog_beamforming      = "lophy";
   beam_duration               = 1;
   beams_per_period            = 1;
-  beam_weights = [0]; // single SSB -> one analog beam
+  beam_weights = [0, 1, 2, 3]; // 4 SSBs -> 4 analog beams
 });
 
 L1s = (

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);
-  });
-};

ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml

@@ -207,40 +207,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    

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);
-  });
-};

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; }
   )
 }
 

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

ci-scripts/doGitLabMerge.sh

@@ -0,0 +1,126 @@
+#!/bin/bash
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+function usage {
+    echo "OAI GitLab merge request applying script"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo ""
+    echo "    doGitLabMerge.sh [OPTIONS] [MANDATORY_OPTIONS]"
+    echo ""
+    echo "Mandatory Options:"
+    echo "------------------"
+    echo ""
+    echo "    --src-branch #### OR -sb ####"
+    echo "    Specify the source branch of the merge request."
+    echo ""
+    echo "    --src-commit #### OR -sc ####"
+    echo "    Specify the source commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "    --target-branch #### OR -tb ####"
+    echo "    Specify the target branch of the merge request (usually develop)."
+    echo ""
+    echo "    --target-commit #### OR -tc ####"
+    echo "    Specify the target commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "Options:"
+    echo "--------"
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+if [ $# -ne 8 ] && [ $# -ne 1 ]
+then
+    echo "Syntax Error: not the correct number of arguments"
+    echo ""
+    usage
+    exit 1
+fi
+
+checker=0
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    shift
+    usage
+    exit 0
+    ;;
+    -sb|--src-branch)
+    SOURCE_BRANCH="$2"
+    let "checker|=0x1"
+    shift
+    shift
+    ;;
+    -sc|--src-commit)
+    SOURCE_COMMIT_ID="$2"
+    let "checker|=0x2"
+    shift
+    shift
+    ;;
+    -tb|--target-branch)
+    TARGET_BRANCH="$2"
+    let "checker|=0x4"
+    shift
+    shift
+    ;;
+    -tc|--target-commit)
+    TARGET_COMMIT_ID="$2"
+    let "checker|=0x8"
+    shift
+    shift
+    ;;
+    *)
+    echo "Syntax Error: unknown option: $key"
+    echo ""
+    usage
+    exit 1
+esac
+
+done
+
+if [[ $TARGET_COMMIT_ID == "latest" ]]
+then
+    TARGET_COMMIT_ID=`git log -n1 --pretty=format:%H origin/$TARGET_BRANCH`
+fi
+
+echo "Source Branch is    : $SOURCE_BRANCH"
+echo "Source Commit ID is : $SOURCE_COMMIT_ID"
+echo "Target Branch is    : $TARGET_BRANCH"
+echo "Target Commit ID is : $TARGET_COMMIT_ID"
+
+if [ $checker -ne 15 ]
+then
+    echo ""
+    echo "Syntax Error: missing option"
+    echo ""
+    usage
+    exit 1
+fi
+
+git config user.email "jenkins@openairinterface.org"
+git config user.name "OAI Jenkins"
+
+git checkout -f $SOURCE_COMMIT_ID > checkout.txt 2>&1
+STATUS=`grep -E -c "fatal: reference is not a tree" checkout.txt`
+rm -f checkout.txt
+if [ $STATUS -ne 0 ]
+then
+    echo "fatal: reference is not a tree --> $SOURCE_COMMIT_ID"
+    STATUS=-1
+    exit $STATUS
+fi
+
+git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"
+
+STATUS=`git status | grep -E -c "You have unmerged paths.|fix conflicts"`
+if [ $STATUS -ne 0 ]
+then
+    echo "There are merge conflicts.. Cannot perform further build tasks"
+    STATUS=-1
+fi
+exit $STATUS

ci-scripts/docker/Dockerfile.channelsim.ubuntu

@@ -26,7 +26,7 @@ RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
         -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
         -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
         -DPHYSIM_CHECK_FILES="ThresholdsCuda.cmake" \
-        -DENABLE_CHANNEL_SIM_CUDA=ON \
+        -DCUDA_ENABLE=ON \
         -DUSE_UNIFIED_MEMORY=ON \
         -DUSE_ATS_MEMORY=OFF \
         -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \

ci-scripts/docker/Dockerfile.physim.cuda.ubuntu

@@ -26,7 +26,7 @@ RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
         -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
         -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
         -DPHYSIM_CHECK_FILES="ThresholdsCuda.cmake" \
-        -DENABLE_CHANNEL_SIM_CUDA=ON \
+        -DCUDA_ENABLE=ON \
         -DUSE_UNIFIED_MEMORY=ON \
         -DUSE_ATS_MEMORY=OFF \
         -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \

ci-scripts/docker/Dockerfile.unittest.cuda.ubuntu

@@ -22,4 +22,4 @@ WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DENABLE_CHANNEL_SIM_CUDA=ON .. && ninja tests
+RUN cmake -GNinja -DENABLE_TESTS=ON -DCUDA_ENABLE=ON .. && ninja tests

ci-scripts/docker/Dockerfile.unittest.ubuntu

@@ -21,4 +21,4 @@ WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DOAI_ZMQ=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja
+RUN cmake -GNinja -DENABLE_TESTS=ON -DOAI_ZMQ=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja tests

ci-scripts/helpreadme.py

@@ -28,15 +28,16 @@ def GenericHelp(vers):
 	print('          images are available locally, will not remove any images and will run inside the current repo directory')
 
 def GitSrvHelp(repository,branch,commit,mergeallow,targetbranch):
-	print('  --repository=[OAI RAN Repository URL]                                      -- ' + repository)
-	print('  --branch=[OAI RAN Repository Branch]                                       -- ' + branch)
-	print('  --commitID=[OAI RAN Repository Commit SHA-1]                               -- ' + commit)
+	print('  --ranRepository=[OAI RAN Repository URL]                                      -- ' + repository)
+	print('  --ranBranch=[OAI RAN Repository Branch]                                       -- ' + branch)
+	print('  --ranCommitID=[OAI RAN Repository Commit SHA-1]                               -- ' + commit)
 	print('  --ranAllowMerge=[Allow Merge Request (with target branch) (true or false)]    -- ' + mergeallow)
-	print('  --targetBranch=[Target Branch in case of a Merge Request]                  -- ' + targetbranch)
+	print('  --ranTargetBranch=[Target Branch in case of a Merge Request]                  -- ' + targetbranch)
 
-def SrvHelp(sourcepath):
-	print('  --workspace=[directory for workspaces on remote hosts]            -- ' + sourcepath)
+def eNBSrvHelp(sourcepath):
+	print('  --eNBSourceCodePath=[eNB\'s Source Code Path]            -- ' + sourcepath)
 
 def XmlHelp(filename):
 	print('  --XMLTestFile=[XML Test File to be run]                  -- ' + filename)
 	print('	Note: multiple xml files can be specified (--XMLFile=File1 ... --XMLTestFile=FileN) when HTML headers are created ("InitiateHtml" mode)')
+

ci-scripts/main.py

@@ -65,16 +65,21 @@ def ExecuteActionWithParam(action, ctx, node):
 	global HTML
 	global CONTAINERS
 	global CLUSTER
-	if action == 'Build_eNB' or action == 'Build_Image' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
+	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
+		proxy_commit = test.findtext('proxy_commit')
 		dockerfile = test.findtext('dockerfile') or ''
 		runtime_opt = test.findtext('runtime-opt') or ''
 		ctest_opt = test.findtext('ctest-opt') or ''
+		if proxy_commit is not None:
+			CONTAINERS.proxyCommit = proxy_commit
 		if action == 'Build_eNB':
-			success = cls_native.Native.Build(ctx, node, HTML, RAN.workspace, RAN.Build_eNB_args)
+			success = cls_native.Native.Build(ctx, node, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
 		elif action == 'Build_Image':
 			success = CONTAINERS.BuildImage(ctx, node, HTML)
+		elif action == 'Build_Proxy':
+			success = CONTAINERS.BuildProxy(ctx, node, HTML)
 		elif action == 'Build_Cluster_Image':
 			success = CLUSTER.BuildClusterImage(ctx, node, HTML)
 		elif action == 'Build_Run_Tests':
@@ -148,16 +153,16 @@ def ExecuteActionWithParam(action, ctx, node):
 	elif action == 'Deploy_Run_OC_PhySim':
 		oc_release = test.findtext('oc_release')
 		script = "scripts/oc-deploy-physims.sh"
-		image_tag = CLUSTER.branch
-		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.workspace}"
-		workdir = CLUSTER.workspace
+		image_tag = cls_containerize.CreateTag(CLUSTER.ranCommitID, CLUSTER.ranBranch, CLUSTER.ranAllowMerge)
+		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.eNBSourceCodePath}"
+		workdir = CLUSTER.eNBSourceCodePath
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
 	elif action == 'Build_Deploy_PhySim':
 		ctest_opt = test.findtext('ctest-opt') or ''
 		script = test.findtext('script')
-		options = f"{CONTAINERS.workspace} {ctest_opt}"
-		workdir = CONTAINERS.workspace
+		options = f"{CONTAINERS.eNBSourceCodePath} {ctest_opt}"
+		workdir = CONTAINERS.eNBSourceCodePath
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
 	elif action == 'DeployCoreNetwork' or action == 'UndeployCoreNetwork':
@@ -169,7 +174,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		CONTAINERS.yamlPath = test.findtext('yaml_path')
 		CONTAINERS.services = test.findtext('services')
 		CONTAINERS.num_attempts = int(test.findtext('num_attempts') or 1)
-		CONTAINERS.deploymentTag = CONTAINERS.branch
+		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
 		if action == 'Deploy_Object':
 			success = CONTAINERS.DeployObject(ctx, node, HTML)
 		elif action == 'Stop_Object':
@@ -190,7 +195,7 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.Create_Workspace(node, HTML)
 
 	elif action == 'LicenceAndFormattingCheck':
-		success = SCA.StaticCodeAnalysis.LicenceAndFormattingCheck(ctx, node, HTML, RAN.workspace, RAN.branch, RAN.merge, RAN.targetBranch)
+		success = SCA.StaticCodeAnalysis.LicenceAndFormattingCheck(ctx, node, HTML, RAN.eNBSourceCodePath, RAN.ranBranch, RAN.ranAllowMerge, RAN.ranTargetBranch)
 
 	elif action == 'Push_Local_Registry':
 		tag_prefix = test.findtext('tag_prefix') or ""
@@ -214,14 +219,14 @@ def ExecuteActionWithParam(action, ctx, node):
 	elif action == 'Custom_Command':
 		command = test.findtext('command')
 		# Allow referencing repository workspace path in XML via %%workspace%%
-		command = command.replace("%%workspace%%", CONTAINERS.workspace)
+		command = command.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Command(HTML, node, command)
 
 	elif action == 'Custom_Script':
 		script = test.findtext('script')
 		args = test.findtext('args')
 		# Allow referencing repository workspace path in XML via %%workspace%%
-		script = script.replace("%%workspace%%", CONTAINERS.workspace)
+		script = script.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Script(HTML, node, script, args)
 
 	elif action == 'Pull_Cluster_Image':
@@ -365,15 +370,15 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	logging.info('\u001B[1m  Starting Scenario: ' + CiTestObj.testXMLfiles[0] + '\u001B[0m')
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 	if re.match('^TesteNB$', mode, re.IGNORECASE):
-		if RAN.repository == '' or RAN.branch == '' or RAN.workspace == '':
+		if RAN.ranRepository == '' or RAN.ranBranch == '' or RAN.eNBSourceCodePath == '':
 			HELP.GenericHelp(CONST.Version)
-			if RAN.repository == '':
-				HELP.GitSrvHelp(RAN.repository, RAN.branch, RAN.merge, RAN.targetBranch)
-			if RAN.workspace == '':
-				HELP.SrvHelp(RAN.workspace)
+			if RAN.ranRepository == '':
+				HELP.GitSrvHelp(RAN.ranRepository, RAN.ranBranch, RAN.ranCommitID, RAN.ranAllowMerge, RAN.ranTargetBranch)
+			if RAN.eNBSourceCodePath == '':
+				HELP.eNBSrvHelp(RAN.eNBSourceCodePath)
 			sys.exit('Insufficient Parameter')
 	else:
-		if CiTestObj.repository == '' or CiTestObj.branch == '':
+		if CiTestObj.ranRepository == '' or CiTestObj.ranBranch == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('UE: Insufficient Parameter')
 

ci-scripts/pre-ci-check.sh

@@ -58,20 +58,18 @@ done
 # Merged commits
 # ----------------------------
 mergeCommits=$(git rev-list --merges --abbrev-commit "$TARGET_BRANCH".."$SOURCE_BRANCH")
-if [[ ! "$SOURCE_BRANCH" =~ ^(origin/)?integration_[0-9]{4}_w[0-9]{2}$ ]]; then
-    if [[ -n "$mergeCommits" ]]; then
-        message="> ERROR: Following merge commits are found in the source branch history. Please rebase your branch.\n>\n"
-        message+="> $(echo "$mergeCommits" | paste -sd ',' -)\n"
-        echo -e "$message"
-        exit 3
-    fi
+if [[ -n "$mergeCommits" ]]; then
+    message="> ERROR: Following merge commits are found in the source branch history. Please rebase your branch.\n>\n"
+    message+="> $(echo "$mergeCommits" | paste -sd ',' -)\n"
+    echo -e "$message"
+    exit 3
 fi
 
 # ----------------------------
 # Check unsigned commits
 # ----------------------------
 unsignedCommits=$(
-    for c in $(git rev-list "$TARGET_BRANCH".."$SOURCE_BRANCH" --no-merges); do
+    for c in $(git rev-list "$TARGET_BRANCH".."$SOURCE_BRANCH"); do
         if ! git log -1 --format=%B "$c" | grep -q "Signed-off-by:"; then
             git log -1 --format='%h' "$c"
         fi

ci-scripts/ran.py

@@ -32,11 +32,12 @@ class RANManagement():
 
 	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.Initialize_eNB_args = ''
 		self.imageKind = ''
 		self.eNBOptions = ['', '', '']
@@ -56,7 +57,7 @@ class RANManagement():
 			raise ValueError(f"{node=}")
 		logging.debug('Starting eNB/gNB on server: ' + node)
 
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		cmd = cls_cmd.getConnection(node)
 		
 		# Initialize_eNB_args usually start with -O and followed by the location in repository
@@ -102,7 +103,7 @@ class RANManagement():
 
 	def TerminateeNB(self, ctx, node, HTML, to_analyze):
 		logging.debug('Stopping eNB/gNB on server: ' + node)
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		cmd = cls_cmd.getConnection(node)
 		ret = cmd.run('ps -aux | grep --color=never -e softmodem | grep -v grep')
 		result = re.search('-softmodem', ret.stdout)
@@ -137,7 +138,7 @@ class RANManagement():
 
 	def AnalyzeRTStats(self, HTML, node, ctx, thresholds):
 		logging.info(f'Analyzing realtime stats from server: {node}')
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 
 		logdir = f'{lSourcePath}/cmake_targets'
 		with cls_cmd.getConnection(node) as cmd:

ci-scripts/run_locally.sh

@@ -30,13 +30,15 @@ docker tag oai-nr-ue oai-ci/oai-nr-ue:develop-${SHORT_COMMIT_SHA}
 docker tag oai-gnb oai-ci/oai-gnb:develop-${SHORT_COMMIT_SHA}
 docker tag oai-nr-cuup oai-ci/oai-nr-cuup:develop-${SHORT_COMMIT_SHA}
 
-python3 main.py --mode=InitiateHtml --repository=NONE --branch=${CURRENT_BRANCH} \
+python3 main.py --mode=InitiateHtml --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
+    --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
+    --ranTargetBranch=NONE \
     --XMLTestFile=xml_files/${TESTCASE} --local --datefmt="%H:%M:%S"
 
-python3 main.py --mode=TesteNB --repository=NONE --branch=${CURRENT_BRANCH} \
-    --ranAllowMerge=false \
-    --targetBranch=NONE \
-    --workspace=${REPO_PATH} \
+python3 main.py --mode=TesteNB --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
+    --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
+    --ranTargetBranch=NONE \
+    --eNBSourceCodePath=${REPO_PATH} \
     --XMLTestFile=${TESTCASE} --local --datefmt="%H:%M:%S"
 RET=$?
 

ci-scripts/scripts/create_workspace.sh

@@ -6,16 +6,22 @@ function die() {
   exit 1
 }
 
-[ $# -eq 3 ] || die "usage: $0 <directory> <repository> <branch>"
+[ $# -ge 3 -a $# -le 4 ] || die "usage: $0 <directory> <repository> <ref> [<merge-ref>]"
 
 set -ex
 
 dir=$1
 repo=$2
-branch=$3
+ref=$3
+merge=$4
 
 rm -rf ${dir}
-git clone --depth=1 --branch "${branch}" "${repo}" "${dir}"
+git clone --filter=blob:none -n ${repo} ${dir}
 cd ${dir}
+git config user.email "jenkins@openairinterface.org"
+git config user.name "OAI Jenkins"
+git config advice.detachedHead false
 mkdir -p cmake_targets/log
+git checkout -f ${ref}
+[ -n "${merge}" ] && git fetch origin ${merge} && git merge --ff FETCH_HEAD -m "Temporary merge for CI"
 exit 0

ci-scripts/tests/build.py

@@ -24,7 +24,7 @@ class TestBuild(unittest.TestCase):
 		self._d = tempfile.mkdtemp()
 		logging.warning(f"temporary directory: {self._d}")
 		self.node = 'localhost'
-		self.cont.workspace = self._d
+		self.cont.eNBSourceCodePath = self._d
 		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
 
 	def tearDown(self):
@@ -33,5 +33,10 @@ class TestBuild(unittest.TestCase):
 			cmd.run(f"rm -rf {self._d}")
 			cmd.run(f'rm -rf {self.ctx.logPath}')
 
+	def test_build_proxy(self):
+		self.cont.proxyCommit = "b64d9bce986b38ca59e8582864ade3fcdd05c0dc"
+		success = self.cont.BuildProxy(self.ctx, self.node, self.html)
+		self.assertTrue(success)
+
 if __name__ == '__main__':
 	unittest.main()

ci-scripts/tests/deployment.py

@@ -41,9 +41,10 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.ci = cls_oaicitest.OaiCiTest()
 		self.cont = cls_containerize.Containerize()
 		self.cont.yamlPath = ''
-		self.cont.merge = True
-		self.cont.branch = ''
-		self.cont.workspace = os.getcwd()
+		self.cont.ranAllowMerge = True
+		self.cont.ranBranch = ''
+		self.cont.ranCommitID = ''
+		self.cont.eNBSourceCodePath = os.getcwd()
 		self.cont.num_attempts = 3
 		self.node = 'localhost'
 		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
@@ -135,12 +136,13 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.assertTrue(undeploy)
 
 	def test_create_workspace(self):
-		self.cont.workspace = tempfile.mkdtemp()
-		self.cont.repository = "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-		self.cont.branch = "develop"
+		self.cont.eNBSourceCodePath = tempfile.mkdtemp()
+		self.cont.ranRepository = "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
+		self.cont.ranCommitID = "05f9c975eeecbca1bdff5940affad44465f1301f"
+		self.cont.ranBranch = "develop"
 		ws = self.cont.Create_Workspace(self.node, self.html)
 		with cls_cmd.LocalCmd() as cmd:
-			cmd.run(f"rm -rf {self.cont.workspace}")
+			cmd.run(f"rm -rf {self.cont.eNBSourceCodePath}")
 		self.assertTrue(ws)
 
 	def test_undeploy_loganalysis(self):

ci-scripts/tests/ping-iperf.py

@@ -82,17 +82,5 @@ class TestPingIperf(unittest.TestCase):
 		success = self.ci.Iperf(self.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
-	def test_iperf_new_bindport(self):
-		self.ci.iperf_args = "-u -t 5 -b 22M -O 0 -p 10000 -B 127.0.0.3"
-		self.ci.svr_id = "test"
-		self.ci.svr_node = "localhost"
-		self.ci.iperf_packetloss_threshold = "0"
-		self.ci.iperf_bitrate_threshold = "0"
-		self.ci.iperf_profile = "balanced"
-		infra_file = "tests/config/infra_ping_iperf.yaml"
-		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf(self.ctx, self.node, self.html, infra_file=infra_file)
-		self.assertTrue(success)
-
 if __name__ == '__main__':
 	unittest.main()

ci-scripts/tests/pull-clean-int-registry.py

@@ -22,7 +22,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.html = cls_oai_html.HTMLManagement()
 		self.html.testCaseId = "000000"
 		self.cont = cls_containerize.Containerize()
-		self.cont.workspace = os.getcwd()
+		self.cont.eNBSourceCodePath = os.getcwd()
 
 	def test_pull_clean_local_reg(self):
 		# the pull function has the authentication at the internal cluster hardcoded

ci-scripts/tests/test-runner/run.sh

@@ -9,17 +9,21 @@ rm -f ${file}
 cd ../../
 python3 main.py \
   --mode=InitiateHtml \
-  --repository=https://gitlab.eurecom.fr/oai/openairinterface5g.git \
-  --branch=${branch} \
+  --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g.git \
+  --ranBranch=${branch} \
+  --ranCommitID=${commit} \
+  --ranAllowMerge=true \
+  --ranTargetBranch=develop \
   --XMLTestFile=tests/test-runner/test.xml
 
 python3 main.py \
   --mode=TesteNB \
-  --repository=https://gitlab.eurecom.fr/oai/openairinterface5g.git \
-  --branch=${branch} \
+  --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g.git \
+  --ranBranch=${branch} \
+  --ranCommitID=${commit} \
   --ranAllowMerge=true \
-  --targetBranch=develop \
-  --workspace=NONE \
+  --ranTargetBranch=develop \
+  --eNBSourceCodePath=NONE \
   --XMLTestFile=tests/test-runner/test.xml
 
 python3 main.py \

ci-scripts/xml_class_list.yml

@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
+  - Build_Proxy
   - Build_Cluster_Image
   - Pull_Cluster_Image
   - Build_eNB

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -41,17 +41,6 @@
     <node>localhost</node>
   </testCase>
 
-  <testCase>
-    <class>Ping</class>
-    <desc>UL ping ext-dn from NR-UE</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i0.5</ping_args>
-    <ping_packetloss_threshold>80</ping_packetloss_threshold>
-  </testCase>
-
   <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -23,7 +23,7 @@
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
     <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-    <services>mysql oai-amf oai-smf oai-pcf oai-upf oai-ext-dn</services>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
   <testCase>
@@ -41,6 +41,28 @@
     <node>localhost</node>
   </testCase>
 
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
   <testCase>
     <class>Attach_UE</class>
     <desc>Verify 2nd PDU session is up</desc>
@@ -49,109 +71,14 @@
   </testCase>
 
   <testCase>
-    <class>Custom_Command</class>
-    <desc>Configure policy routing for PDU2 source IP</desc>
-    <may_fail>true</may_fail>
-    <node>localhost</node>
-    <command>docker exec rfsim5g-oai-nr-ue sh -c "ip rule add from 12.1.2.2/32 table 1002 prio 1002; ip route replace default dev oaitun_ue1p2 src 12.1.2.2 table 1002"</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Ping ext-dn from UE PDU session 1 interface</desc>
-    <node>localhost</node>
-    <command>docker exec rfsim5g-oai-nr-ue ping -I oaitun_ue1 -c 10 192.168.72.135</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Ping ext-dn from UE PDU session 2 interface</desc>
-    <node>localhost</node>
-    <command>docker exec rfsim5g-oai-nr-ue ping -I oaitun_ue1p2 -c 10 192.168.72.135</command>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/1Mbps/UDP)(6 sec) QFI 1 (default) flow on PDU session 1 (port 5201)</desc>
-    <iperf_args>-u -b 1M -t 6 -B 12.1.1.2 -p 5201</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/1Mbps/UDP)(6 sec) QFI 2 flow on PDU session 1 (port 52080)</desc>
-    <iperf_args>-u -b 1M -t 6 -B 12.1.1.2 -p 52080</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/1Mbps/UDP)(6 sec) QFI 3 flow on PDU session 1 (port 52081)</desc>
-    <iperf_args>-u -b 1M -t 6 -B 12.1.1.2 -p 52081</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/1Mbps/UDP)(6 sec) default flow on PDU session 2 (port 5201)</desc>
-    <iperf_args>-u -b 1M -t 6 -B 12.1.2.2 -p 5201</iperf_args>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>
     <id>rfsim5g_ue_pdu_2</id>
     <node>localhost</node>
     <svr_id>rfsim5g_ext_dn</svr_id>
     <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/1Mbps/UDP)(6 sec) QFI 1 (default) flow on PDU session 1 (port 5201)</desc>
-    <iperf_args>-u -b 1M -t 6 -R -B 12.1.1.2 -p 5201</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/1Mbps/UDP)(6 sec) QFI 2 flow on PDU session 1 (port 52080)</desc>
-    <iperf_args>-u -b 1M -t 6 -R -B 12.1.1.2 -p 52080</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/1Mbps/UDP)(6 sec) QFI 3 flow on PDU session 1 (port 52081)</desc>
-    <iperf_args>-u -b 1M -t 6 -R -B 12.1.1.2 -p 52081</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_image_build.xml

@@ -7,7 +7,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>obelix</node>
   </testCase>
 

ci-scripts/xml_files/container_image_build_arm.xml

@@ -7,7 +7,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>gracehopper3-oai</node>
   </testCase>
 

ci-scripts/xml_files/container_image_build_jetson.xml

@@ -7,7 +7,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>jetson3-oai</node>
   </testCase>
 

ci-scripts/xml_files/container_l2sim_proxy.xml

@@ -0,0 +1,15 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>l2sim-4glte-5gnr-proxy-build</htmlTabRef>
+  <htmlTabName>Build L2sim proxy image</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Build_Proxy</class>
+    <desc>Build L2sim Proxy Image</desc>
+    <node>localhost</node>
+    <proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

@@ -34,7 +34,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

@@ -34,7 +34,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml

@@ -35,7 +35,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 
@@ -54,7 +54,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 1</desc>
     <node>carabe</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml

@@ -34,7 +34,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml

@@ -28,7 +28,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -31,7 +31,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>gracehopper1-oai</node>
   </testCase>
 

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

@@ -31,7 +31,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>gracehopper1-oai</node>
   </testCase>
 

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>ofqot</node>
   </testCase>
 

ci-scripts/xml_files/container_sa_fhi72_benetel_2x2_100MHz_9b_mplane_amariue.xml

@@ -1,149 +0,0 @@
-<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
-
-<testCaseList>
-  <htmlTabRef>test-5g-fhi72-benetel-2x2-100MHz-9b-mplane</htmlTabRef>
-  <htmlTabName>100 MHz 2x2 9b TDD SA Benetel M-plane</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-
-  <testCase>
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00105</cn_id>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Script</class>
-    <desc>Configure system for low-latency RT performance</desc>
-    <node>cacofonix</node>
-    <script>yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb/setup_config.sh</script>
-  </testCase>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>cacofonix</node>
-    <images>oai-gnb-fhi72</images>
-  </testCase>
-
-  <testCase>
-    <class>Initialize_UE</class>
-    <desc>Initialize Amarisoft UE</desc>
-    <id>amarisoft_00105_100MHz</id>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>cacofonix</node>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/100MHz/Benetel) in a container</desc>
-    <node>cacofonix</node>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb</yaml_path>
-  </testCase>
-
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_1</id>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping: 100 pings in 10 sec</desc>
-    <id>amarisoft_ue_1</id>
-    <svr_id>oc-cn5g-00105</svr_id>
-    <ping_args>-c 100 -i 0.1</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/250Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 250M -t 30 -R</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/35Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 35M -t 30</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach UE</desc>
-    <id>amarisoft_ue_1</id>
-  </testCase>
-
-  <testCase>
-    <class>Terminate_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate UE</desc>
-    <id>amarisoft_00105_100MHz</id>
-  </testCase>
-
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy gNB</desc>
-    <node>cacofonix</node>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb</yaml_path>
-    <analysis>
-      <services>oai-gnb=EndsWithBye</services>
-    </analysis>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>cacofonix</node>
-    <images>oai-gnb-fhi72</images>
-  </testCase>
-
-  <testCase>
-    <class>UndeployCoreNetwork</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-00105</cn_id>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_benetel_4x4_40MHz_9b_mplane_amariue.xml

@@ -1,149 +0,0 @@
-<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
-
-<testCaseList>
-  <htmlTabRef>test-5g-fhi72-benetel-40Mhz-4x4-9b-mplane</htmlTabRef>
-  <htmlTabName>40MHz 4x4 9b TDD SA Benetel M-plane</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-
-  <testCase>
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00105</cn_id>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Script</class>
-    <desc>Configure system for low-latency RT performance</desc>
-    <node>cacofonix</node>
-    <script>yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/setup_config.sh</script>
-  </testCase>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>cacofonix</node>
-    <images>oai-gnb-fhi72</images>
-  </testCase>
-
-  <testCase>
-    <class>Initialize_UE</class>
-    <desc>Initialize Amarisoft UE</desc>
-    <id>amarisoft_00105_40MHz</id>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>cacofonix</node>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/100MHz/Benetel) in a container</desc>
-    <node>cacofonix</node>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb</yaml_path>
-  </testCase>
-
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_1</id>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping: 100 pings in 10 sec</desc>
-    <id>amarisoft_ue_1</id>
-    <svr_id>oc-cn5g-00105</svr_id>
-    <ping_args>-c 100 -i 0.1</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/130Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 130M -t 30 -R</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/15Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 15M -t 30</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach UE</desc>
-    <id>amarisoft_ue_1</id>
-  </testCase>
-
-  <testCase>
-    <class>Terminate_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate UE</desc>
-    <id>amarisoft_00105_40MHz</id>
-  </testCase>
-
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy gNB</desc>
-    <node>cacofonix</node>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb</yaml_path>
-    <analysis>
-      <services>oai-gnb=EndsWithBye</services>
-    </analysis>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>cacofonix</node>
-    <images>oai-gnb-fhi72</images>
-  </testCase>
-
-  <testCase>
-    <class>UndeployCoreNetwork</class>
-    <desc>Terminate 5G Core</desc>
-    <always_exec>true</always_exec>
-    <cn_id>oc-cn5g-00105</cn_id>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -28,7 +28,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>cacofonix</node>
   </testCase>
 

ci-scripts/yaml_files/5g_rfsimulator/mini_nonrf_config.yaml

@@ -43,12 +43,6 @@ nfs:
     n4:
       interface_name: eth0
       port: 8805
-  pcf:
-    host: oai-pcf
-    sbi:
-      port: 8080
-      api_version: v1
-      interface_name: eth0
 
   upf:
     host: oai-upf
@@ -83,10 +77,6 @@ database:
 snssais:
   - &embb_slice1
     sst: 1
-    sd: "FFFFFF"
-  - &embb_slice2
-    sst: 1
-    sd: "123456"
 
 ############## NF-specific configuration
 amf:
@@ -113,7 +103,6 @@ amf:
       tac: 0x0001
       nssai:
         - *embb_slice1
-        - *embb_slice2
   supported_integrity_algorithms:
     - "NIA0"
     - "NIA1"
@@ -127,7 +116,7 @@ smf:
   ue_mtu: 1500
   support_features:
     use_local_subscription_info: yes # Use infos from local_subscription_info or from UDM
-    use_local_pcc_rules: no # Enforce PCC rules from PCF
+    use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
   upfs:
     - host: oai-upf
       port: 8805
@@ -155,9 +144,6 @@ smf:
       - sNssai: *embb_slice1
         dnnSmfInfoList:
           - dnn: "oai"
-      - sNssai: *embb_slice2
-        dnnSmfInfoList:
-          - dnn: "openairinterface"
   local_subscription_infos:
     - single_nssai: *embb_slice1
       dnn: "oai"
@@ -165,19 +151,6 @@ smf:
         5qi: 9
         session_ambr_ul: "200Mbps"
         session_ambr_dl: "400Mbps"
-    - single_nssai: *embb_slice2
-      dnn: "openairinterface"
-      qos_profile:
-        5qi: 9
-        session_ambr_ul: "200Mbps"
-        session_ambr_dl: "400Mbps"
-
-pcf:
-  local_policy:
-    policy_decisions_path: /openair-pcf/policies/policy_decisions
-    pcc_rules_path: /openair-pcf/policies/pcc_rules
-    traffic_rules_path: /openair-pcf/policies/traffic_rules
-    qos_data_path: /openair-pcf/policies/qos_data
 
 upf:
   support_features:
@@ -189,15 +162,9 @@ upf:
       - sNssai: *embb_slice1
         dnnUpfInfoList:
           - dnn: "oai"
-      - sNssai: *embb_slice2
-        dnnUpfInfoList:
-          - dnn: "openairinterface"
 
 ## DNN configuration
 dnns:
   - dnn: "oai"
     pdu_session_type: "IPV4"
     ipv4_subnet: "12.1.1.0/24"
-  - dnn: "openairinterface"
-    pdu_session_type: "IPV4"
-    ipv4_subnet: "12.1.2.0/24"

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

@@ -99,6 +99,7 @@ services:
             - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
+                                    --rfsimulator.[0].enable_beams --rfsimulator.[0].beam_gains 0,-20,-30,-40
             ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
@@ -125,6 +126,7 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim
                                     --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
                                     -C 27975360000 -r 66 --numerology 3 --ssb 48 --band 257
+                                    --rfsimulator.[0].enable_beams --rfsimulator.[0].beam_gains 0,-20,-30,-40 --rfsimulator.[0].beam_ids 2
             ASAN_OPTIONS: detect_leaks=0
         devices:
              - /dev/net/tun:/dev/net/tun

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

@@ -45,26 +45,9 @@ services:
             - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
         depends_on:
             - oai-amf
-            - oai-pcf
         networks:
             public_net:
                 ipv4_address: 192.168.71.133
-    oai-pcf:
-        container_name: "rfsim5g-oai-pcf"
-        image: oaisoftwarealliance/oai-pcf:v2.2.1
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-pcf/etc/config.yaml
-            - ./policies/policy_decisions:/openair-pcf/policies/policy_decisions
-            - ./policies/pcc_rules:/openair-pcf/policies/pcc_rules
-            - ./policies/traffic_rules:/openair-pcf/policies/traffic_rules
-            - ./policies/qos_data:/openair-pcf/policies/qos_data
-        depends_on:
-            - oai-amf
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.142
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.2.1
@@ -95,8 +78,7 @@ services:
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
-              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0;"\
-              "ip route add 12.1.2.0/24 via 192.168.72.134 dev eth0; sleep infinity"
+              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
         depends_on:
             - oai-upf
         networks:

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/policies/pcc_rules/pcc_rules.yaml

@@ -1,29 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-gbr-rule-default-3mbps:
-  flowInfos:
-    - flowDescription: permit out ip from any to assigned
-      packetFilterUsage: true
-  precedence: 10
-  refQosData:
-    - gbr-qos-default-3mbps
-
-gbr-rule-52080:
-  flowInfos:
-    - flowDescription: permit out ip from any to assigned 52080
-      packetFilterUsage: true
-    - flowDescription: permit in ip from assigned 52080 to any
-      packetFilterUsage: true
-  precedence: 7
-  refQosData:
-    - gbr-qos-52080-20mbps
-
-gbr-rule-52081:
-  flowInfos:
-    - flowDescription: permit out ip from any to assigned 52081
-      packetFilterUsage: true
-    - flowDescription: permit in ip from assigned 52081 to any
-      packetFilterUsage: true
-  precedence: 8
-  refQosData:
-    - gbr-qos-52081-10mbps

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/policies/policy_decisions/policy_decision.yaml

@@ -1,35 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-decision_default:
-  default: true
-  pcc_rules:
-  - gbr-rule-default-3mbps
-
-decision_dnn_oai:
-  dnn: oai
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  - gbr-rule-52080
-  - gbr-rule-52081
-
-decision_dnn_openairinterface:
-  dnn: openairinterface
-  pcc_rules:
-  - gbr-rule-default-3mbps
-
-decision_supi2:
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  supi_imsi: 001010000059450
-decision_supi3:
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  supi_imsi: 001010000059451
-decision_supi4:
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  supi_imsi: 001010000059452
-decision_supi5:
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  supi_imsi: 001010000059453

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/policies/qos_data/qos_data.yaml

@@ -1,37 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-gbr-qos-default-3mbps:
-  5qi: 9
-  maxbrUl: 1000 Mbps
-  maxbrDl: 1000 Mbps
-  gbrUl: 3 Mbps
-  gbrDl: 3 Mbps
-  arp:
-    priorityLevel: 8
-    preemptCap: NOT_PREEMPT
-    preemptVuln: NOT_PREEMPTABLE
-  priorityLevel: 50
-
-gbr-qos-52080-20mbps:
-  5qi: 67
-  maxbrUl: 1000 Mbps
-  maxbrDl: 1000 Mbps
-  gbrUl: 20 Mbps
-  gbrDl: 20 Mbps
-  arp:
-    priorityLevel: 8
-    preemptCap: NOT_PREEMPT
-    preemptVuln: NOT_PREEMPTABLE
-  priorityLevel: 30
-
-gbr-qos-52081-10mbps:
-  5qi: 69
-  maxbrUl: 1000 Mbps
-  maxbrDl: 1000 Mbps
-  gbrUl: 10 Mbps
-  gbrDl: 10 Mbps
-  arp:
-    priorityLevel: 8
-    preemptCap: NOT_PREEMPT
-    preemptVuln: NOT_PREEMPTABLE
-  priorityLevel: 40

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

@@ -97,7 +97,7 @@ services:
         cap_drop:
             - ALL
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.chanmod 1 --vrtsim.num_ues 1
+            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.chanmod 1
         depends_on:
             - oai-ext-dn
         networks:
@@ -123,7 +123,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --ue-nb-ant-rx 2 --ue-nb-ant-tx 2
+            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim
         depends_on:
             - oai-gnb
         networks:

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

@@ -111,7 +111,7 @@ services:
         cap_drop:
             - ALL
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.cirdb 1 --vrtsim.num_ues 1
+            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.cirdb 1 --vrtsim.cirdb_file /cirdb/cir_db.bin --vrtsim.cirdb_yaml /cirdb/cir_db.yaml --vrtsim.cirdb_model_id 0 --vrtsim.cirdb_ds_ns 1 --vrtsim.cirdb_speed_mps 1.5
         depends_on:
             cir-generator:
                 condition: service_completed_successfully
@@ -142,7 +142,7 @@ services:
             - NET_ADMIN
             - NET_RAW
         environment:
-            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --ue-nb-ant-rx 2 --ue-nb-ant-tx 2
+            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client
         depends_on:
             - oai-gnb
         networks:

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

@@ -111,7 +111,7 @@ services:
         cap_drop:
             - ALL
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.cirdb 1 --vrtsim.num_ues 2 --gNBs.[0].min_rxtxtime 8
+            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.num_ues 2 --vrtsim.cirdb 1 --vrtsim.cirdb_file /cirdb/cir_db.bin --vrtsim.cirdb_yaml /cirdb/cir_db.yaml --vrtsim.ue_config.[0].antennas 1x2 --vrtsim.ue_config.[0].model_id 0 --vrtsim.ue_config.[0].ds_ns 10.0 --vrtsim.ue_config.[0].speed_mps 1.5 --vrtsim.ue_config.[1].antennas 2x2 --vrtsim.ue_config.[1].model_id 1 --vrtsim.ue_config.[1].ds_ns 10.0 --vrtsim.ue_config.[1].speed_mps 1.5 --gNBs.[0].min_rxtxtime 8
         depends_on:
             cir-generator:
                 condition: service_completed_successfully
@@ -142,7 +142,7 @@ services:
             - NET_ADMIN
             - NET_RAW
         environment:
-            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3319680000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --vrtsim.ue_id 0 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2
+            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3319680000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --vrtsim.ue_id 0 --ue-nb-ant-tx 1 --ue-nb-ant-rx 2
         depends_on:
             - oai-gnb
         networks:
@@ -171,7 +171,7 @@ services:
             - NET_ADMIN
             - NET_RAW
         environment:
-            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3319680000 --ssb 516 --uicc0.imsi 208990100001101 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --vrtsim.ue_id 1 --ue-nb-ant-tx 1 --ue-nb-ant-rx 2
+            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3319680000 --ssb 516 --uicc0.imsi 208990100001101 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --vrtsim.ue_id 1 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2
         depends_on:
             - oai-gnb
         networks:

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:9.6
+        image: mysql:8.0
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.2.1
+        image: oaisoftwarealliance/oai-amf:v2.1.10
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.2.1
+        image: oaisoftwarealliance/oai-smf:v2.1.10
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.2.1
+        image: oaisoftwarealliance/oai-upf:v2.1.10
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:9.6
+        image: mysql:8.0
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.2.1
+        image: oaisoftwarealliance/oai-amf:v2.1.10
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.2.1
+        image: oaisoftwarealliance/oai-smf:v2.1.10
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.2.1
+        image: oaisoftwarealliance/oai-upf:v2.1.10
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

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

@@ -3,7 +3,7 @@
 services:
     mysql:
         container_name: "rfsim5g-mysql"
-        image: mysql:9.6
+        image: mysql:8.0
         init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.2.1
+        image: oaisoftwarealliance/oai-amf:v2.1.10
         environment:
             - TZ=Europe/paris
         volumes:
@@ -38,7 +38,7 @@ services:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.2.1
+        image: oaisoftwarealliance/oai-smf:v2.1.10
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -50,7 +50,7 @@ services:
                 ipv4_address: 192.168.71.133
     oai-upf:
         container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.2.1
+        image: oaisoftwarealliance/oai-upf:v2.1.10
         init: true
         environment:
             - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb/docker-compose.yml

@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-services:
-    dpdk-init:
-        image: docker.io/library/oai-dpdk-init:latest
-        network_mode: host
-        container_name: dpdk-init
-        entrypoint: "/tmp/setup_sriov.sh"
-        privileged: true
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ./setup_sriov_benetel.sh:/tmp/setup_sriov.sh
-            - /lib/modules:/lib/modules
-            - /usr/lib/modules:/usr/lib/modules
-    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}oai-gnb-fhi72:${TAG:-develop}
-        privileged: true
-        network_mode: "host"
-        container_name: oai-gnb
-        environment:
-            TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --thread-pool 7,8,9,10,11,12 --device.name oran_fhlib_5g_mplane --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ../../conf_files/gnb.sa.band78.273prb.fhi72.2x2-benetel550-9b-mplane.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev/hugepages:/dev/hugepages
-            - /home/oaicicd/.ssh/id_rsa.pub:/opt/oai-gnb/etc/id_rsa.pub
-            - /home/oaicicd/.ssh/id_rsa:/opt/oai-gnb/etc/id_rsa
-        # Please change these values based on your system
-        cpuset: "0-12"
-        depends_on:
-           dpdk-init:
-             condition: service_completed_successfully
-        healthcheck:
-           test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-           start_period: 60s
-           start_interval: 500ms
-           interval: 5s
-           timeout: 5s
-           retries: 10

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb/setup_cleanup.sh

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-set -e
-sudo cpupower idle-set -E > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=950000
-sudo sysctl kernel.timer_migration=1
-exit 0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb/setup_config.sh

@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-set -e
-sudo cpupower idle-set -D 0 > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=-1
-sudo sysctl kernel.timer_migration=0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb/setup_sriov_benetel.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: MIT
-
-set -eu
-
-pci_addr()
-{
-        PF_IF=$1
-        VF_INDEX=$2
-        SYSFS_PATH="/sys/class/net/${PF_IF}/device/virtfn${VF_INDEX}"
-
-        if [ ! -e "$SYSFS_PATH" ]; then
-                    echo "VF $VF_INDEX not found for interface $PF_IF"
-                        exit 1
-        fi
-        PCI_ADDR=$(basename "$(readlink "$SYSFS_PATH")")
-        echo "$PCI_ADDR"
-}
-IF_NAME=ens7f1
-## O-DU C Plane MAC ADDR and VLAN
-C_U_PLANE_MAC_ADD=00:11:22:33:44:66
-C_U_PLANE_VLAN=3
-MTU=9000
-DPDK_DEVBIND_PREFIX=/usr/local/bin
-NUM_VFs=1
-ethtool -G $IF_NAME rx 8160 tx 8160
-sh -c "echo 0 > /sys/class/net/$IF_NAME/device/sriov_numvfs"
-sh -c "echo $NUM_VFs > /sys/class/net/$IF_NAME/device/sriov_numvfs"
-C_U_PLANE_PCI=$(pci_addr $IF_NAME 0)
-# this next 2 lines is for C/U planes
-ip link set $IF_NAME vf 0 mac $C_U_PLANE_MAC_ADD vlan $C_U_PLANE_VLAN spoofchk off mtu $MTU
-sleep 1
-modprobe iavf
-${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --unbind $C_U_PLANE_PCI
-modprobe vfio-pci
-${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --bind vfio-pci $C_U_PLANE_PCI
-echo "Successfully configured C-PLANE and U-PLANE:
-  - C-PLANE MAC: $C_U_PLANE_MAC_ADD, VLAN: $C_U_PLANE_VLAN, PCI: $C_U_PLANE_PCI"
-exit 0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/docker-compose.yml

@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-services:
-    dpdk-init:
-        image: docker.io/library/oai-dpdk-init:latest
-        network_mode: host
-        container_name: dpdk-init
-        entrypoint: "/tmp/setup_sriov.sh"
-        privileged: true
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ./setup_sriov_benetel.sh:/tmp/setup_sriov.sh
-            - /lib/modules:/lib/modules
-            - /usr/lib/modules:/usr/lib/modules
-    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}oai-gnb-fhi72:${TAG:-develop}
-        privileged: true
-        network_mode: "host"
-        container_name: oai-gnb
-        environment:
-            TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --thread-pool 7,8,9,10,11,12 --device.name oran_fhlib_5g_mplane --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.fhi72.4x4-benetel550-9b-mplane.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev/hugepages:/dev/hugepages
-            - /home/oaicicd/.ssh/id_rsa.pub:/opt/oai-gnb/etc/id_rsa.pub
-            - /home/oaicicd/.ssh/id_rsa:/opt/oai-gnb/etc/id_rsa
-        # Please change these values based on your system
-        cpuset: "0-12"
-        depends_on:
-           dpdk-init:
-             condition: service_completed_successfully
-        healthcheck:
-           test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-           start_period: 60s
-           start_interval: 500ms
-           interval: 5s
-           timeout: 5s
-           retries: 10

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/setup_cleanup.sh

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-set -e
-sudo cpupower idle-set -E > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=950000
-sudo sysctl kernel.timer_migration=1
-exit 0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/setup_config.sh

@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-set -e
-sudo cpupower idle-set -D 0 > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=-1
-sudo sysctl kernel.timer_migration=0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/setup_sriov_benetel.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: MIT
-
-set -eu
-
-pci_addr()
-{
-        PF_IF=$1
-        VF_INDEX=$2
-        SYSFS_PATH="/sys/class/net/${PF_IF}/device/virtfn${VF_INDEX}"
-
-        if [ ! -e "$SYSFS_PATH" ]; then
-                    echo "VF $VF_INDEX not found for interface $PF_IF"
-                        exit 1
-        fi
-        PCI_ADDR=$(basename "$(readlink "$SYSFS_PATH")")
-        echo "$PCI_ADDR"
-}
-IF_NAME=ens7f1
-## O-DU C Plane MAC ADDR and VLAN
-C_U_PLANE_MAC_ADD=00:11:22:33:44:66
-C_U_PLANE_VLAN=3
-MTU=9000
-DPDK_DEVBIND_PREFIX=/usr/local/bin
-NUM_VFs=1
-ethtool -G $IF_NAME rx 8160 tx 8160
-sh -c "echo 0 > /sys/class/net/$IF_NAME/device/sriov_numvfs"
-sh -c "echo $NUM_VFs > /sys/class/net/$IF_NAME/device/sriov_numvfs"
-C_U_PLANE_PCI=$(pci_addr $IF_NAME 0)
-# this next 2 lines is for C/U planes
-ip link set $IF_NAME vf 0 mac $C_U_PLANE_MAC_ADD vlan $C_U_PLANE_VLAN spoofchk off mtu $MTU
-sleep 1
-modprobe iavf
-${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --unbind $C_U_PLANE_PCI
-modprobe vfio-pci
-${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --bind vfio-pci $C_U_PLANE_PCI
-echo "Successfully configured C-PLANE and U-PLANE:
-  - C-PLANE MAC: $C_U_PLANE_MAC_ADD, VLAN: $C_U_PLANE_VLAN, PCI: $C_U_PLANE_PCI"
-exit 0

cmake_targets/macros.cmake

@@ -88,85 +88,3 @@ function(run_asn1c ASN1C_GRAMMAR ASN1C_PREFIX)
     COMMENT "Generating ${ASN1C_COMMENT} from ${GRAMMAR_FILE}"
   )
 endfunction()
-
-define_property(TEST PROPERTY TEST_DESCRIPTION
-                BRIEF_DOCS "A human-readable description of this test"
-                FULL_DOCS "A human-readable description of this test")
-
-define_property(TEST PROPERTY CHECK_COUNT
-                BRIEF_DOCS "helper property to enumerate checks in environment"
-                FULL_DOCS "the property counts the number of threshold checks, used to enumerate environment variables given to analyze-timing.sh")
-
-function(add_physim_test test_name test_description test_exec)
-  # catch all the arguments past the last expected arqument and store them in the options_list
-  if (NOT TARGET ${test_exec})
-    message(FATAL_ERROR "test executable ${test_exec} is not an executable")
-  endif()
-  set(test_invocation $<TARGET_FILE:${test_exec}> ${ARGN})
-  add_test(
-    NAME ${test_name}
-    COMMAND ${CMAKE_COMMAND}
-        "-DTEST_CMD=${test_invocation}"
-        "-DCHECK_SCRIPT=${CMAKE_SOURCE_DIR}/openair1/SIMULATION/tests/analyze-timing.sh"
-        -P ${CMAKE_SOURCE_DIR}/openair1/SIMULATION/tests/RunTimedTest.cmake
-  )
-  set_tests_properties(${test_name} PROPERTIES
-    LABELS "${test_exec}"
-    TEST_DESCRIPTION "${test_description}"
-    # pass test description also through environment variable: for cmake < 3.30,
-    # in JSON export, we cannot recover the description otherwise
-    # see also https://gitlab.kitware.com/cmake/cmake/-/issues/21490
-    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR};TEST_DESCRIPTION=${test_description}"
-  )
-  set_tests_properties(${test_name} PROPERTIES CHECK_COUNT 0)
-  add_dependencies(tests ${test_exec})
-endfunction()
-
-function(check_threshold testname threshold condition)
-  # check that threshold and condition don't have a colon (;), because that
-  # would interfere with cmake's list management
-  string(FIND "${threshold}" ";" pos)
-  if (pos GREATER -1)
-    message(FATAL_ERROR "colon not allowed in threshold, but have \"${threshold}\"")
-  endif()
-  string(FIND "${condition}" ";" pos)
-  if (pos GREATER -1)
-    message(FATAL_ERROR "colon not allowed in condition, but have \"${condition}\"")
-  endif()
-  set(THRCOND "${threshold}\;${condition}")
-
-  get_test_property(${testname} CHECK_COUNT count)
-  #message(STATUS "add check ${count} ${THRCOND}")
-  if (${count} GREATER 10)
-    message(FATAL_ERROR "only maximum of 10 checks per test allowed")
-  endif()
-
-  # add a new environment variable CHECK_X with this threshold+condition, then
-  # increase test property regarding check count
-  set_property(TEST ${testname} APPEND PROPERTY ENVIRONMENT "CHECK_${count}=${THRCOND}")
-  MATH(EXPR count "${count}+1")
-  set_tests_properties(${testname} PROPERTIES CHECK_COUNT ${count})
-endfunction()
-
-function(check_threshold_range testname threshold)
-  cmake_parse_arguments(RANGE "" "LOWER;UPPER" "" ${ARGN})
-  if (NOT RANGE_LOWER AND NOT RANGE_UPPER)
-    message(FATAL_ERROR "need at least one LOWER or one UPPER threshold")
-  endif()
-  if (RANGE_LOWER)
-    check_threshold(${testname} ${threshold} "> ${RANGE_LOWER}")
-  endif()
-  if (RANGE_UPPER)
-    check_threshold(${testname} ${threshold} "< ${RANGE_UPPER}")
-  endif()
-endfunction()
-
-function(check_threshold_variance testname threshold)
-  cmake_parse_arguments(VARIANCE "" "AVG;ABS_VAR" "" ${ARGN})
-  if (NOT VARIANCE_AVG AND NOT VARIANCE_ABS_VAR)
-    message(FATAL_ERROR "need both AVG and ABS_VAR")
-  endif()
-  MATH(EXPR upper "${VARIANCE_AVG}+${VARIANCE_ABS_VAR}")
-  MATH(EXPR lower "${VARIANCE_AVG}-${VARIANCE_ABS_VAR}")
-  check_threshold_range(${testname} ${threshold} LOWER ${lower} UPPER ${upper})
-endfunction()

cmake_targets/tools/build_helper

@@ -83,13 +83,11 @@ get_distribution_release() {
 check_supported_distribution() {
     local distribution=$(get_distribution_release)
     case "$distribution" in
-        "ubuntu26.04") return 0 ;;
         "ubuntu24.04") return 0 ;;
         "ubuntu22.04") return 0 ;;
         "debian11")    return 0 ;;
         "debian12")    return 0 ;;
         "fedora43")    return 0 ;;
-        "fedora44")    return 0 ;;
         "rhel9.0")     return 0 ;;
         "rhel9.1")     return 0 ;;
         "rhel9.2")     return 0 ;;
@@ -98,7 +96,6 @@ check_supported_distribution() {
         "rhel9.5")     return 0 ;;
         "rhel9.6")     return 0 ;;
         "rhel9.7")     return 0 ;;
-        "rhel9.8")     return 0 ;;
         "centos9")     return 0 ;; # CentOS stream
         "rocky9.1")    return 0 ;;
         "rocky9.2")    return 0 ;;
@@ -107,7 +104,6 @@ check_supported_distribution() {
         "rocky9.5")    return 0 ;;
         "rocky9.6")    return 0 ;;
         "rocky9.7")    return 0 ;;
-        "rocky9.8")    return 0 ;;
     esac
     return 1
 }
@@ -145,8 +141,12 @@ install_usrp_uhd_driver_from_source(){
             # - 3.15.0.0
             git apply $OPENAIR_DIR/cmake_targets/tools/uhd-3.15-tdd-patch.diff
             ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
-        elif [[ "$UHD_VERSION" == "4.10.0.0" || "$UHD_VERSION" == "4.9.0.0" || "$UHD_VERSION" == "4.8.0.0" || "$UHD_VERSION" == "4.7.0.0" || "$UHD_VERSION" == "4.6.0.0" || "$UHD_VERSION" == "4.5.0.0" ]]; then
-            # Tested patch for versions listed in elif clause
+        elif [[ "$UHD_VERSION" == "4.8.0.0" || "$UHD_VERSION" == "4.7.0.0" || "$UHD_VERSION" == "4.6.0.0" || "$UHD_VERSION" == "4.5.0.0" ]]; then
+            # Tested that patch for the following versions:
+            # - 4.7.0.0
+            cp $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
+            sed -i '9,13 s/STATE_OFF/STATE_RX1_OFF/' $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
+            sed -i '24,28 s/STATE_OFF/STATE_RX2_OFF/' $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
             git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
             ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
         else
@@ -162,8 +162,8 @@ install_usrp_uhd_driver_from_source(){
             ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
         fi
     else
-        git checkout tags/v4.8.0.0
-        git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
+        git checkout tags/v4.0.0.0
+        git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff
         ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
     fi
     # Printing out the results of the patch to make sure it was properly applied
@@ -199,14 +199,29 @@ check_install_usrp_uhd_driver(){
             install_usrp_uhd_driver_from_source
             return
         fi
+        # The new USRP repository
+        # Raphael Defosseux: Adding a loop on adding PPA because in CI the gpg key retrieve may
+        # timeout due to proxy / network latencies in Eurecom on VM
         echo_info "\nAdding PPA repository ettusresearch/uhd\n"
-        $SUDO add-apt-repository ppa:ettusresearch/uhd -y
+        x=0
+        while [ $x -le 5 ]
+        do
+            if $SUDO add-apt-repository ppa:ettusresearch/uhd -y
+            then
+                echo_info "add-apt-repository successful\n"
+                break
+            else
+                echo_info "add-apt-repository failed, retrying...\n"
+                sleep 30
+            fi
+            x=$((x + 1))
+        done
         $SUDO apt-get update
         $SUDO apt-get -y install python3-tk  $boost_libs_ubuntu libusb-1.0-0-dev
         case "$(get_distribution_release)" in
-          "ubuntu22.04") $SUDO apt-get -y install libuhd-dev libuhd4.5.0 uhd-host ;;
-          "ubuntu24.04") $SUDO apt-get -y install libuhd-dev libuhd4.8.0 uhd-host ;;
-          "ubuntu26.04") $SUDO apt-get -y install libuhd-dev libuhd4.9.0 uhd-host ;;
+          "ubuntu22.04")
+            $SUDO apt-get -y install libuhd-dev libuhd4.5.0 uhd-host
+            ;;
         esac
     elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
         boost_libs_fedora="boost-chrono boost-date-time boost-filesystem boost-program-options boost-thread boost-test boost-regex boost-devel"

cmake_targets/tools/uhd-4.5plus-tdd-patch.diff

@@ -1,34 +0,0 @@
-diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp
-index 6de161e87..432af5784 100644
---- a/host/lib/usrp/b200/b200_impl.cpp
-+++ b/host/lib/usrp/b200/b200_impl.cpp
-@@ -1410,10 +1410,10 @@ void b200_impl::update_atrs(void)
-         if (not enb_rx and enb_tx)
-             fd = txonly;
-         gpio_atr_3000::sptr atr = perif.atr;
--        atr->set_atr_reg(ATR_REG_IDLE, STATE_RX1_OFF);
--        atr->set_atr_reg(ATR_REG_RX_ONLY, rxonly);
--        atr->set_atr_reg(ATR_REG_TX_ONLY, txonly);
--        atr->set_atr_reg(ATR_REG_FULL_DUPLEX, fd);
-+        atr->set_atr_reg(ATR_REG_IDLE, STATE_RX1_OFF | (1<<7));
-+        atr->set_atr_reg(ATR_REG_RX_ONLY, rxonly | (1<<7));
-+        atr->set_atr_reg(ATR_REG_TX_ONLY, txonly | (1<<7));
-+        atr->set_atr_reg(ATR_REG_FULL_DUPLEX, fd | (1<<7));
-     }
-     if (_radio_perifs.size() > _fe2 and _radio_perifs[_fe2].atr) {
-         radio_perifs_t& perif = _radio_perifs[_fe2];
-@@ -1431,10 +1431,10 @@ void b200_impl::update_atrs(void)
-         if (not enb_rx and enb_tx)
-             fd = txonly;
-         gpio_atr_3000::sptr atr = perif.atr;
--        atr->set_atr_reg(ATR_REG_IDLE, STATE_RX2_OFF);
--        atr->set_atr_reg(ATR_REG_RX_ONLY, rxonly);
--        atr->set_atr_reg(ATR_REG_TX_ONLY, txonly);
--        atr->set_atr_reg(ATR_REG_FULL_DUPLEX, fd);
-+        atr->set_atr_reg(ATR_REG_IDLE, STATE_RX2_OFF | (1<<7));
-+        atr->set_atr_reg(ATR_REG_RX_ONLY, rxonly | (1<<7));
-+        atr->set_atr_reg(ATR_REG_TX_ONLY, txonly | (1<<7));
-+        atr->set_atr_reg(ATR_REG_FULL_DUPLEX, fd | (1<<7));
-     }
- }
-

common/5g_platform_types.h

@@ -36,23 +36,25 @@ typedef enum {
 
 typedef enum { NON_DYNAMIC, DYNAMIC } fiveQI_t;
 
-/* 5QI (5G QoS Identifier) - 3GPP TS 23.501 §5.7.2.1
- * Range: 0..255
- * - Standardized 5QI values: have one-to-one mapping to standardized 5G QoS characteristics (Table 5.7.4-1)
- * - Pre-configured 5QI values: pre-configured in the AN
- * - Dynamically assigned 5QI values: require signaling of QoS characteristics as part of QoS profile */
-#define MIN_FIVEQI 0
-#define MAX_STANDARDIZED_FIVEQI 90
-#define MAX_FIVEQI 255
-
-/* ARP Priority Level - 3GPP TS 23.501 §5.7.2.2
- * The ARP priority level defines the relative importance of a QoS Flow.
- * Range: 1 to 15, with 1 as the highest priority.
- * ARP priority levels 1-8: authorized by serving network (prioritized treatment)
- * ARP priority levels 9-15: authorized by home network (roaming scenarios) */
-typedef uint8_t qos_arp_priority_level_t;
-#define MIN_QOS_ARP_PRIORITY_LEVEL 1 // highest priority
-#define MAX_QOS_ARP_PRIORITY_LEVEL 15 // lowest priority
+/* QoS Priority Level */
+typedef enum {
+  QOS_PRIORITY_SPARE = 0,
+  QOS_PRIORITY_HIGHEST,
+  QOS_PRIORITY_2,
+  QOS_PRIORITY_3,
+  QOS_PRIORITY_4,
+  QOS_PRIORITY_5,
+  QOS_PRIORITY_6,
+  QOS_PRIORITY_7,
+  QOS_PRIORITY_8,
+  QOS_PRIORITY_9,
+  QOS_PRIORITY_10,
+  QOS_PRIORITY_11,
+  QOS_PRIORITY_12,
+  QOS_PRIORITY_13,
+  QOS_PRIORITY_LOWEST,
+  QOS_NO_PRIORITY
+} qos_priority_t;
 
 /* Pre-emption Capability */
 typedef enum {
@@ -68,101 +70,19 @@ typedef enum {
   PEV_MAX,
 } qos_pev_t;
 
-/* Allocation and Retention Priority (ARP) - 3GPP TS 23.501 §5.7.2.2
- * Contains information about priority level, pre-emption capability and vulnerability.
- * Used for admission control of GBR traffic and pre-emption decisions. */
+/* Allocation Retention Priority */
 typedef struct {
-  // ARP priority level (1-15, 1 = highest)
-  qos_arp_priority_level_t priority_level;
+  qos_priority_t priority_level;
   qos_pec_t pre_emp_capability;
   qos_pev_t pre_emp_vulnerability;
 } qos_arp_t;
 
-/* QoS Priority Level - 3GPP TS 23.501 §5.7.3.3
- * The Priority Level associated with 5G QoS characteristics indicates a priority
- * in scheduling resources among QoS Flows. The lowest Priority Level value
- * corresponds to the highest priority.
- * Range: 1 to 127, with 1 as the highest priority and 127 as the lowest priority.
- * Used for scheduling resources among QoS Flows (different from ARP priority level
- * which is used for admission control/preemption).
- * Every standardized 5QI is associated with a default Priority Level value. */
-typedef uint8_t qos_priority_level_t;
-#define MIN_QOS_PRIORITY_LEVEL 1 // highest priority
-#define MAX_QOS_PRIORITY_LEVEL 127 // lowest priority
-
-/* Packet Delay Budget (PDB) - 3GPP TS 23.501 §5.7.3.4
- * Upper bound for packet delay between UE and UPF N6 termination point (0..1023 ms).
- * Used for scheduling and link layer configuration (e.g. HARQ target operating points).
- * For Delay-critical GBR flows, packets delayed more than PDB are counted as lost. */
-#define MIN_PACKET_DELAY_BUDGET 0
-#define MAX_PACKET_DELAY_BUDGET 1023
-
-/* Packet Error Rate (PER) - 3GPP TS 23.501 §5.7.3.5
- * Upper bound for rate of non-congestion related packet losses (0..9 for scalar/exponent).
- * Used for link layer protocol configuration (e.g. RLC, HARQ).
- * PER = Scalar * 10^(-Exponent) */
-#define MIN_PACKET_ERROR_RATE_SCALAR 0
-#define MAX_PACKET_ERROR_RATE_SCALAR 9
-#define MIN_PACKET_ERROR_RATE_EXPONENT 0
-#define MAX_PACKET_ERROR_RATE_EXPONENT 9
-
-typedef struct {
-  // Packet Error Rate Scalar (0..9)
-  uint8_t scalar;
-  // Packet Error Rate Exponent (0..9)
-  uint8_t exponent;
-} qos_per_t;
-
-/** QoS Characteristics for a standardized or
- * pre-configured 5QI for downlink and uplink*/
-typedef struct {
-  uint16_t fiveQI;
-  qos_priority_level_t *qos_priority;
-} non_dynamic_5qi_t;
-
-/** QoS Characteristics for a Non-standardised or
- * not pre-configured 5QI for downlink and uplink. */
-typedef struct {
-  uint16_t *fiveQI;
-  qos_priority_level_t qos_priority;
-  // Packet Delay Budget (0..1023 ms)
-  int packet_delay_budget;
-  // Packet Error Rate (0..9 for scalar/exponent)
-  qos_per_t per;
-} dynamic_5qi_t;
-
-/* Bit Rate (kbps) - 3GPP TS 38.413 */
-typedef struct qos_bitrate_s {
-  // Guaranteed Flow Bit Rate (GFBR) (kbps)
-  uint64_t guaranteedFlowBitRate;
-  // Maximum Flow Bit Rate (MFBR) (kbps)
-  uint64_t maximumFlowBitRate;
-} qos_bitrate_t;
-
-/* GBR QoS Flow Information - 3GPP TS 23.501 §5.7.1.2, TS 38.413 §9.3.1.19
- * Present only for GBR QoS flows (5QI < 5 for NonDynamic5QI, or Dynamic5QI with GBR).
- * For GBR QoS Flow only, the QoS profile SHALL include for DL and UL:
- * - Guaranteed Flow Bit Rate (GFBR)
- * - Maximum Flow Bit Rate (MFBR) */
-typedef struct gbr_qos_flow_information_s {
-  // Downlink bit rates (kbps)
-  qos_bitrate_t dl;
-  // Uplink bit rates (kbps)
-  qos_bitrate_t ul;
-} gbr_qos_flow_information_t;
-
 typedef struct pdusession_level_qos_parameter_s {
   uint8_t qfi;
-  // QoS Characteristics
+  uint64_t fiveQI;
+  uint64_t qos_priority;
   fiveQI_t fiveQI_type;
-  union {
-    non_dynamic_5qi_t non_dynamic;
-    dynamic_5qi_t dynamic;
-  } qos_characteristics;
-  // NG-RAN Allocation and Retention Priority
   qos_arp_t arp;
-  /* GBR QoS Flow Information (optional - only for GBR flows) */
-  gbr_qos_flow_information_t *gbr_qos_flow_information;
 } pdusession_level_qos_parameter_t;
 
 #endif

common/config/config_userapi.c

@@ -126,97 +126,37 @@ int config_getlist(configmodule_interface_t *cfg, paramlist_def_t *ParamList, pa
   }
   const int ret = cfg->getlist(cfg, ParamList, params, numparams, prefix);
 
-  /* build newprefix OUTSIDE the params check so we can use it below too */
-  char *newprefix = NULL;
-  if (prefix) {
-    int rc = asprintf(&newprefix, "%s.%s", prefix, ParamList->listname);
-    if (rc < 0)
-      newprefix = NULL;
-  } else {
-    newprefix = ParamList->listname;
-  }
-
-  char cfgpath[MAX_OPTNAME_SIZE * 2 + 6]; /* prefix.listname.[listindex] */
-
   if (ret >= 0 && params) {
+    char *newprefix;
+
+    if (prefix) {
+      int rc = asprintf(&newprefix, "%s.%s", prefix, ParamList->listname);
+
+      if (rc < 0) newprefix = NULL;
+    } else {
+      newprefix = ParamList->listname;
+    }
+
+    char cfgpath[MAX_OPTNAME_SIZE*2 + 6]; /* prefix.listname.[listindex] */
+
     for (int i = 0; i < ParamList->numelt; ++i) {
+      // TODO config_process_cmdline?
       sprintf(cfgpath, "%s.[%i]", newprefix, i);
       config_process_cmdline(cfg, ParamList->paramarray[i], numparams, cfgpath);
-      if (cfg->rtflags & CONFIG_SAVERUNCFG)
+      if (cfg->rtflags & CONFIG_SAVERUNCFG) {
         cfg->set(ParamList->paramarray[i], numparams, cfgpath);
+      }
       config_execcheck(cfg, ParamList->paramarray[i], numparams, cfgpath);
     }
+
+    if (prefix)
+      free(newprefix);
   }
 
-  if (params && newprefix && (ret >= 0 || ParamList->numelt == 0)) {
-    sprintf(cfgpath, "%s", newprefix);
-    char searchstr[MAX_OPTNAME_SIZE * 2 + 10];
-    snprintf(searchstr, sizeof(searchstr), "--%s.", cfgpath);
-    char *endptr;
-    int valid_idx = ParamList->numelt;
-
-    for (int i = 1; i < cfg->argc; i++) {
-      char *res = strstr(cfg->argv[i], searchstr);
-      if (res != NULL) {
-        char *bracket = strchr(res + strlen(searchstr), '[');
-        bracket++;
-        long num = strtol(bracket, &endptr, 10);
-        if (num < valid_idx)
-          continue;
-        if (valid_idx == num) {
-          valid_idx++;
-        } else if (num > valid_idx) {
-          LOG_E(HW, "Out of Order Element Creation\n index: %s, valid_idx: %d, num: %ld\n", cfg->argv[i], valid_idx, num);
-          return -1;
-        } else {
-          LOG_E(HW, "[CONFIG] Invalid Configuration\n index: %s, valid_idx: %d, num: %ld\n", cfg->argv[i], valid_idx, num);
-          return -1;
-        }
-      }
-    }
-
-    while (ParamList->numelt < valid_idx) {
-      int new_idx = ParamList->numelt;
-      sprintf(cfgpath, "%s.[%i]", newprefix, new_idx);
-      paramdef_t **old = ParamList->paramarray;
-      ParamList->paramarray = config_allocate_new(cfg, (new_idx + 1) * sizeof(paramdef_t *), true);
-      memcpy(ParamList->paramarray, old, new_idx * sizeof(paramdef_t *));
-      ParamList->paramarray[new_idx] = config_allocate_new(cfg, numparams * sizeof(paramdef_t), true);
-      memcpy(ParamList->paramarray[new_idx], params, sizeof(paramdef_t) * numparams);
-
-      for (int p = 0; p < numparams; p++) {
-        ParamList->paramarray[new_idx][p].voidptr = NULL;
-      }
-
-      ParamList->numelt++;
-      fprintf(stderr, "[CONFIG] Created new array parameter %s.[%d]\n", newprefix, new_idx);
-      config_process_cmdline(cfg, ParamList->paramarray[new_idx], numparams, cfgpath);
-
-      for (int p = 0; p < numparams; p++) {
-        paramdef_t *pd = &ParamList->paramarray[new_idx][p];
-        if (pd->paramflags & PARAMFLAG_PARAMSET)
-          continue;
-        config_common_getdefault(cfg, pd, cfgpath);
-      }
-
-      config_execcheck(cfg, ParamList->paramarray[new_idx], numparams, cfgpath);
-
-      for (int p = 0; p < numparams; p++) {
-        if (ParamList->paramarray[new_idx][p].paramflags & PARAMFLAG_PARAMSET)
-          fprintf(stderr, "[CONFIG] New parameter set: %s\n", ParamList->paramarray[new_idx][p].optname);
-      }
-    }
-  }
-
-  if (prefix)
-    free(newprefix);
-
-  /* when added parameters via CLI, return numelt instead of original ret */
-  return (ParamList->numelt > 0) ? (int)ParamList->numelt : ret;
+  return ret;
 }
 
-int config_isparamset(paramdef_t *params, int paramidx)
-{
+int config_isparamset(paramdef_t *params,int paramidx) {
   if ((params[paramidx].paramflags & PARAMFLAG_PARAMSET) != 0) {
     return 1;
   } else {

common/openairinterface5g_limits.h

@@ -17,6 +17,7 @@
 #        define NUMBER_OF_SCH_STATS_MAX 16
 
 
+#        ifndef PHYSIM
 #            ifndef UE_EXPANSION
 #                    define NUMBER_OF_UE_MAX 40
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 1
@@ -26,5 +27,10 @@
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 1
 #                    define NUMBER_OF_CONNECTED_gNB_MAX 1
 #            endif
+#        else
+#                    define NUMBER_OF_UE_MAX 4
+#                    define NUMBER_OF_CONNECTED_eNB_MAX 1
+#                    define NUMBER_OF_CONNECTED_gNB_MAX 1
+#        endif
 
 #endif /* OPENAIRINTERFACE5G_LIMITS_H_ */

common/platform_constants.h

@@ -43,7 +43,7 @@
 #define NB_RB_MAX (11 + 3) /* LTE_maxDRB from LTE_asn_constant.h + 3 SRBs */
 #define NR_NB_RB_MAX (29 + 3) /* NR_maxDRB from NR_asn_constant.hm + 3 SRBs */
 
-#define NR_MAX_NB_PDU_SESSIONS (256)
+#define NGAP_MAX_PDU_SESSION (256) /* As defined in TS 38.413 9.2.1.1 Range Bound for PDU Sessions. */
 
 #define MAX_DRBS_PER_UE         (32)  /* Maximum number of Data Radio Bearers per UE
                                        * defined for NGAP in TS 38.413 - maxnoofDRBs */

common/platform_types.h

@@ -108,7 +108,6 @@ typedef struct {
   sdu_size_t head_sdu_remaining_size_to_send; /*!< \brief remaining size of sdu: could be the total size or the remaining size of
                                                  already segmented sdu */
   bool head_sdu_is_segmented; /*!< \brief 0 if head SDU has not been segmented, 1 if already segmented */
-  uint64_t oldest_sdu_arrival_ms; /*!< \brief Timestamp (ms, RLC time) of oldest SDU in tx/retx queue, 0 if empty */
 } mac_rlc_status_resp_t;
 
 #define SDU_CONFIRM_NO false

common/utils/T/T_messages.txt

@@ -1454,7 +1454,7 @@ ID = UE_PHY_PDCCH_ENERGY
 ID = UE_PHY_PDSCH_IQ
     DESC = UE PDSCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_DL : int,symbols_per_tti : buffer,pdsch_comp
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pdsch_comp
 ID = UE_PHY_PDSCH_ENERGY
     DESC = UE PDSCH 1 energy and threshold
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE

common/utils/T/tracer/ue.c

@@ -229,7 +229,8 @@ static void ue_main_gui(ue_gui *e, gui *g, event_handler *h, void *database,
   e->pdsch_iq_ue_xy_plot = w;
   widget_add_child(g, line, w, -1);
   xy_plot_set_range(g, w, -500, 500, -500, 500);
-  l = new_iqlog(h, database, "UE_PHY_PDSCH_IQ", "nb_rb", "N_RB_DL", "symbols_per_tti", "pdsch_comp");
+  l = new_iqlog(h, database, "UE_PHY_PDSCH_IQ", "nb_rb",
+      "N_RB_UL", "symbols_per_tti", "pusch_comp");
   v = new_view_xy(100*12*14,10,g,w,new_color(g,"#000"),XY_FORCED_MODE);
   logger_add_view(l, v);
   e->pdsch_iq_ue_logger = l;

common/utils/ds/tests/test_spsc_q_perf.cpp

@@ -40,9 +40,9 @@ static void *consumer(void *arg)
 static void run_test(int range, int q_size)
 {
   q_args_t args = {
+    .q = spsc_q_alloc(q_size, sizeof(int)),
     .range = range,
   };
-  spsc_q_alloc(&args.q, q_size, sizeof(int));
 
   pthread_t p, c;
   int ret;

common/utils/nr/nr_common.h

@@ -71,9 +71,7 @@ static inline const char *rnti_types(nr_rnti_type_t rr)
 #define MAX_GSCN_BAND 620 // n78 has the highest GSCN range of 619
 #define NR_SYMBOLS_PER_SLOT 14
 #define NR_SYMBOLS_PER_SLOT_EXTENDED_CP 12
-#define NR_MAX_NB_LAYERS 4
-#define MAX_NUM_NR_DLSCH_SEGMENTS (MAX_NUM_NR_DLSCH_SEGMENTS_PER_LAYER * NR_MAX_NB_LAYERS)
-#define MAX_NUM_NR_ULSCH_SEGMENTS (MAX_NUM_NR_ULSCH_SEGMENTS_PER_LAYER * NR_MAX_NB_LAYERS)
+#define NR_MAX_NB_LAYERS 4 // 8
 #define NR_MAX_CSI_PORTS 12
 
 // Since the IQ samples are represented by SQ15 R+I (see https://en.wikipedia.org/wiki/Q_(number_format)) we need to compensate when

common/utils/telnetsrv/telnetsrv_ci.c

@@ -301,7 +301,7 @@ static int trigger_ngap_pdu_session_release(char *buf, int debug, telnet_printfu
     ERROR_MSG_RET("Missing input. Usage: trigger_pdu_session_release [ue_id=gNB_ue_ngap_id(int,opt)],pdusession_id(int)[,pdusession_id(int)...]\n");
   }
 
-  char *tokens[NR_MAX_NB_PDU_SESSIONS + 1];
+  char *tokens[NGAP_MAX_PDU_SESSION + 1];
   int count = 0;
 
   for (char *tok = strtok(buf, ","); tok != NULL && count < (int)sizeofArray(tokens); tok = strtok(NULL, ",")) {

common/utils/utils.h

@@ -62,7 +62,7 @@ extern "C" {
 #endif
 
 #ifndef malloc16
-#define malloc16(x) memalign(64, x + 64)
+#    define malloc16(x) memalign(32,x+32)
 #endif
 #define free16(y,x) free(y)
 #define openair_free(y,x) free((y))
@@ -76,7 +76,7 @@ extern "C" {
   } while (0)
 
 static inline void *malloc16_clear( size_t size ) {
-  void *ptr = memalign(64, size + 64);
+  void *ptr = memalign(32, size+32);
   DevAssert(ptr);
   memset( ptr, 0, size );
   return ptr;
@@ -110,7 +110,7 @@ static inline void *malloc_or_fail(size_t size)
 # define msg(aRGS...) LOG_D(PHY, ##aRGS)
 #endif
 #ifndef malloc16
-#define malloc16(x) memalign(64, x)
+#    define malloc16(x) memalign(32,x)
 #endif
 
 #define free16(y,x) free(y)

doc/BUILD.md

@@ -192,7 +192,7 @@ Now, when installing the pre-requisites, especially the `UHD` driver, you can no
 
 ```bash
 export BUILD_UHD_FROM_SOURCE=True
-export UHD_VERSION=4.10.0.0
+export UHD_VERSION=3.15.0.0
 ./build_oai -I -w USRP
 ```
 
@@ -206,7 +206,6 @@ See:
 
 * `cmake_targets/tools/uhd-3.15-tdd-patch.diff`
 * `cmake_targets/tools/uhd-4.x-tdd-patch.diff`
-* `cmake_targets/tools/uhd-4.5plus-tdd-patch.diff`
 * `cmake_targets/tools/build_helper` --> function `install_usrp_uhd_driver_from_source`
 
 ### Building PHY Simulators

doc/E1AP/e1ap_procedures.md

@@ -65,3 +65,36 @@ sequenceDiagram
   u->>c: BEARER CONTEXT MODIFICATION RESPONSE
   Note over c: e1apCUCP_handle_BEARER_CONTEXT_MODIFICATION_RESPONSE
 ```
+
+## PDU Session Release
+
+```mermaid
+sequenceDiagram
+    participant AMF
+    participant CUCP
+    participant CUUP
+    participant DU
+    participant UE
+
+    AMF->>CUCP: NG PDU SESSION RESOURCE RELEASE COMMAND
+    Note over CUCP: ngap_gNB_handle_pdusession_release_command
+    CUCP->>CUCP: rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND
+    Note over CUCP: set status PDU_SESSION_STATUS_TORELEASE
+    CUCP->>CUUP: E1 Bearer Context Modification Request
+    Note over CUUP: release_gtpu_tunnel (GTP tunnel, PDCP, SDAP)
+    CUUP->>CUCP: E1 Bearer Context Modification Response
+    Note over CUCP: rrc_gNB_send_f1_drb_release_request
+    CUCP->>DU: F1 UE Context Modification Request
+    Note over DU: handle_ue_context_drbs_release (release in MAC/RLC)
+    DU->>CUCP: F1 UE Context Modification Response
+    Note over CUCP: rrc_CU_process_ue_context_modification_response
+    Note over CUCP: replace existing CellGroupConfig
+    Note over CUCP: rrc_gNB_generate_dedicatedRRCReconfiguration
+    CUCP->>UE: RRCReconfiguration (DRB release list, NAS PDU)
+    UE->>CUCP: RRCReconfigurationComplete
+    Note over CUCP: handle_rrcReconfigurationComplete
+    Note over CUCP: rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE
+    CUCP->>AMF: NG PDU SESSION RESOURCE RELEASE RESPONSE
+    Note over CUCP: rm_drbs_by_pdusession (from stored RRC list)
+    Note over CUCP: rm_pduSession (from stored RRC list)
+```

doc/MAC/mac-usage.md

@@ -10,9 +10,7 @@ out the various configuration options that influence its behavior.
 
 The 5G MAC scheduler is a proportional fair (PF) scheduler, "approximating
 wide-band CQI" (for lack of a better term, but CQI is typically used for PF)
-through the selection of an MCS to use. For a detailed description of the
-scheduler pipeline and how to replace individual policies, see
-[Scheduler Architecture](scheduler-architecture.md).
+through the selection of an MCS to use.
 
 Concretely, the scheduler loops through all UEs and calculates the PF
 coefficient using the currently selected MCS, and the historical achieved rate.
@@ -24,13 +22,9 @@ UEs with retransmissions are allocated first; similarly, UEs that have not been
 scheduled for some time in UL are scheduled automatically in UL and have
 therefore priority over data with "normal" traffic.
 
-The MCS selection is done in `nr_dl_mcs_select_default()` / `nr_ul_mcs_select_default()` in files
-[`gNB_scheduler_dlsch_default_policies.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch_default_policies.c)
-and
-[`gNB_scheduler_ulsch_default_policies.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch_default_policies.c).
-The BLER estimation itself is computed separately in `update_bler_stats()` in
-[`gNB_scheduler_primitives.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c),
-and the MCS policy reads the result. It considers two thresholds for a "BLER" that is computed from the number of
+The MCS selection is done in `get_mcs_from_bler()` in file
+[`gNB_scheduler_primitives.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c).
+It consider two thresholds for a "BLER" that is computed from the number of
 first-round retransmissions over total transmissions in the last window (50ms).
 If that ratio is higher than an "upper" threshold (see
 `dl/ul_bler_target_upper` in the configuration section below), it is
@@ -39,11 +33,11 @@ lower than a "lower" threshold (see `dl/ul_bler_target_lower`), it is
 interpreted as "good channel" and MCS is incremented by 1. This happens each
 window.
 
-The actual scheduler implementation can be found in functions `nr_dl_proportional_fair()` and
-`nr_ul_proportional_fair()` in files
-[`gNB_scheduler_dlsch_default_policies.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch_default_policies.c)
+The actual scheduler implementation can be found in functions `pf_dl()` and
+`pf_ul()` in files
+[`gNB_scheduler_dlsch.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c)
 (for DL) and
-[`gNB_scheduler_ulsch_default_policies.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch_default_policies.c)
+[`gNB_scheduler_ulsch.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c)
 (for UL), respectively.
 
 ## PDCCH aggregation level
@@ -126,8 +120,9 @@ Example:
 UE RNTI 2460 CU-UE-ID 2 in-sync PH 28 dB PCMAX 24 dBm, average RSRP -74 (8 meas), average SINR 40.0 (32 meas)
 UE 2460: CQI 15, RI 2, PMI (14,1)
 UE 2460: UL-RI 2 TPMI 0
-UE 2460: dlsch_rounds 32917/5113/1504/560, dlsch_errors 211, pucch0_DTX 1385 (SNR 19.8+0.2 dB), BLER 0.19557 MCS (1) 23 CCE fail 3, goodput 120.50 Mbps
-UE 2460: ulsch_rounds 3756/353/182/179, ulsch_errors 170, ulsch_DTX 285, BLER 0.33021 MCS (1) 27 (Qm 8 deltaMCS 0 dB) NPRB 5 SNR 31.0 (-1.0) dB CCE fail 0, goodput 12.30 Mbps
+UE 2460: dlsch_rounds 32917/5113/1504/560, dlsch_errors 211, pucch0_DTX 1385 (SNR 19.8+0.2 dB), BLER 0.19557 MCS (1) 23 CCE fail 3
+UE 2460: ulsch_rounds 3756/353/182/179, ulsch_errors 170, ulsch_DTX 285, BLER 0.33021 MCS (1) 27 (Qm 8  dB) NPRB 5 SNR 31.0 (-1.0) dB CCE fail 0
+UE 2460: MAC:    TX     1530943191 RX         194148 bytes
 UE 2460: LCID 1: TX            651 RX           3031 bytes
 UE 2460: LCID 2: TX              0 RX              0 bytes
 UE 2460: LCID 4: TX     1526169592 RX          16152 bytes
@@ -214,11 +209,11 @@ The fourth and fifth line show HARQ-related information:
 * Both ULSCH/DLSCH `CCE fail`: lists the number of failed CCE attempts. If this
   number gets high, it signifies that the scheduler tried to scheduled this UE,
   but could not allocate the DCI.
-* Both ULSCH/DLSCH `goodput`: smoothed (EWMA) goodput in Mbps, reflecting the
-  actual MAC-layer throughput achieved by the UE.
 
 In the last lines:
 
+* `MAC` shows the amount of MAC PDU bytes scheduled in transmit (`TX`,
+  `1530943191`) and receive (`RX`, `194148`) directions
 * `LCID X` shows the amount of MAC SDU/RLC PDU data for Logical Channel ID with
   ID `X` in transmit and receive directions. LCIDs 1 and 2 are mapped to SRBs 1
   and 2. LCIDs 4 and onward are mapped to DRBs 1 onward. If you have an LCID 4,

doc/MAC/scheduler-architecture.md

@@ -1,433 +0,0 @@
-# gNB MAC Scheduler Architecture
-
-## Overview
-
-The gNB MAC scheduler runs once per DL slot. It allocates PDSCH resources for the
-current slot and PUSCH resources for a future UL slot (selected via K2), sending the
-UL DCI grant in the current DL slot. The DL and UL schedulers follow the same pipeline
-design: a fixed orchestration loop calls a sequence of **pluggable function pointers**,
-each handling one stage of the scheduling decision. Any stage can be replaced
-independently without touching the rest of the pipeline.
-
-Both schedulers send their DCIs in the same DL slot and share the same physical
-CORESET/CCE resources. The UL scheduler runs first (`nr_schedule_ulsch` in
-`gNB_scheduler.c`), then the DL scheduler (`nr_schedule_ue_spec`). CCEs are claimed on
-a first-come basis via `get_cce_index` + `fill_pdcch_vrb_map`, so UL DCIs take
-priority. If CCE space is tight, DL UEs are more likely to be skipped. The two
-schedulers use separate FAPI containers (`UL_dci_req` for UL grants, `DL_req` for DL
-grants) but the underlying CCE map is shared.
-
-All scheduler code lives under `openair2/LAYER2/NR_MAC_gNB/`. The DL scheduler is in
-[`gNB_scheduler_dlsch.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c),
-the UL scheduler in
-[`gNB_scheduler_ulsch.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c),
-and shared primitives in
-[`gNB_scheduler_primitives.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c).
-Data structures and typedefs are in
-[`nr_mac_gNB.h`](../../openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h).
-Default policy implementations are in
-[`gNB_scheduler_dlsch_default_policies.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch_default_policies.c)
-and
-[`gNB_scheduler_ulsch_default_policies.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch_default_policies.c).
-Function pointers are assigned at startup in
-[`main.c`](../../openair2/LAYER2/NR_MAC_gNB/main.c).
-
-## Scheduler Pipeline
-
-Both DL and UL follow the same 7-stage pipeline, plus a DL-only 8th stage.
-
-```
-                         DL                              UL
-                    ┌────────────┐                  ┌────────────┐
-                    │  1.Collect │                  │  1.Collect │  ◄── nr_ulsch_preprocessor
-                    │ Candidates │                  │ Candidates │      (iterates over
-                    └─────┬──────┘                  └─────┬──────┘       reachable UL slots)
-                          │                               │
-                    ┌─────┴──────┐                  ┌─────┴──────┐
-                    │  2. RI/PMI │                  │  2. RI/TPMI│  ◄─┐
-                    │ Selection  │                  │ Selection  │    │
-                    └─────┬──────┘                  └─────┬──────┘    │
-                          │                               │           │
-                    ┌─────┴──────┐                  ┌─────┴──────┐    │
-                    │  3. Beam   │                  │  3. Beam   │    │
-                    │ Selection  │                  │ Selection  │    │
-                    └─────┬──────┘                  └─────┬──────┘    │
-                          │                               │           │ nr_ul_schedule
-                    ┌─────┴──────┐                  ┌─────┴──────┐    │ (per UL slot)
-                    │  4. TDA    │                  │  4. TDA    │    │
-                    │ Selection  │                  │ Selection  │    │
-                    └─────┬──────┘                  └─────┬──────┘    │
-                          │                               │           │
-                    ┌─────┴──────┐                  ┌─────┴──────┐    │
-                    │  5. MCS    │                  │  5. MCS    │    │
-                    │ Selection  │                  │ Selection  │    │
-                    └─────┬──────┘                  └─────┬──────┘    │
-                          │                               │           │
-                    ┌─────┴──────┐                  ┌─────┴──────┐    │
-                    │  6. RB     │                  │  6. RB     │    │
-                    │ Allocation │                  │ Allocation │    │
-                    │ (per beam) │                  │ (per beam) │    │
-                    └─────┬──────┘                  └─────┬──────┘    │
-                          │                               │           │
-                    ┌─────┴──────┐                  ┌─────┴──────┐    │
-                    │  7.Dispatch│                  │  7.Dispatch│  ◄─┘
-                    │  (fixed)   │                  │  (fixed)   │
-                    └─────┬──────┘                  └────────────┘
-                          │
-                    ┌─────┴──────┐
-                    │  8. LCID   │  (DL only)
-                    │ Allocation │
-                    └────────────┘
-```
-
-### UL preprocessor split
-
-The UL pipeline is split across two functions. The preprocessor
-(`nr_ulsch_preprocessor`) runs a loop over **multiple candidate UL slots**: for each DL
-slot there may be several reachable UL slots (depending on K2), and the scheduler must
-pick one. The loop iterates until the DCI budget is exhausted or no TDA can reach
-further UL slots.
-
-**Only step 1 (candidate collection) lives in the preprocessor loop.** Candidates depend
-on `sched_frame`/`sched_slot` (e.g. inactivity checks), so they are rebuilt each
-iteration. The preprocessor also runs a lightweight TDA reachability gate
-(`get_num_ul_tda == 0 → break`) to short-circuit the loop when no TDA can reach the
-target slot.
-
-**Steps 2–7 live in `nr_ul_schedule`**, called once per UL slot with the collected
-candidates. `k2` is passed as a parameter for TDA selection. This mirrors the DL
-structure where all stages run in a single function.
-
-Beam selection (step 3) runs before TDA selection (step 4) so that TDA selection can
-use the allocated beam to check the correct VRB map and pick the best TDA per beam.
-
-The preprocessor itself is a pluggable function pointer (`pre_processor_ul`), so a
-custom implementation can replace the entire outer strategy — including how many UL
-slots to target and what to do when the DCI budget is limited.
-
-### Candidate struct
-
-Each candidate is an `nr_{dl,ul}_candidate_t` struct that flows through the pipeline,
-accumulating decisions. Its fields are split into three sections:
-
-1. **Identity / scheduling state** — set by collect, read-only afterwards: `UE` pointer,
-   `rnti`, HARQ state, pending bytes, BLER estimate, current MCS, BWP geometry, QoS.
-2. **CSI observations** — set by collect: `cqi` (DL), `beam_rsrp[]`, `beam_sinr[]` (per-SSB).
-3. **gNB decisions** — written by the stage indicated below. Some live in the
-   embedded `sched_pdsch` / `sched_pusch` sub-struct, others are `alloc_`-prefixed
-   fields on the candidate itself:
-   - `sched_p{d,u}sch.nrOfLayers`, `.pm_index` (DL) / `.tpmi` (UL) — set by ri_pmi/tpmi_select
-   - `sched_p{d,u}sch.time_domain_allocation`, `.tda_info`, `alloc_slbitmap` — set by tda_select
-   - `alloc_beam_idx`, `alloc_dci_beam_idx` (UL), etc. — set by beam_select
-   - `sched_p{d,u}sch.mcs` — set by mcs_select
-   - `sched_p{d,u}sch.rbStart`, `.rbSize` — set by rb_alloc
-   - `alloc_cce_index`, `alloc_aggregation_level`, `alloc_sched_pdcch` — set by commit_alloc
-
-The policy (`rb_alloc`) writes to `sched_p{d,u}sch.rbStart/rbSize/mcs` via the
-`COMMIT_ALLOC` / `COMMIT_UL_ALLOC` macro, which also runs CCE validation and sets
-`cand->scheduled = true`. Only candidates with that flag set are dispatched.
-
----
-
-### Stage 1. Candidate Collection (fixed)
-
-**Functions:** `collect_dl_candidates()`, `collect_ul_candidates()`
-
-Iterates over connected UEs and builds an array of `nr_{dl,ul}_candidate_t` structs.
-Populates the identity/state and CSI sections. Not a function pointer — fixed scaffolding
-that feeds the pipeline.
-
-### Stage 2. RI / PMI Selection
-
-**Function pointers:** `mac->dl_ri_pmi_select` (`nr_dl_ri_pmi_select_fn`),
-`mac->ul_ri_tpmi_select` (`nr_ul_ri_tpmi_select_fn`)
-
-Sets rank and precoder index per candidate. In DL, rank and PMI come from the UE's CSI
-report (RI + PMI). In UL, the gNB has full authority and reads rank and TPMI from SRS
-feedback.
-
-**DL outputs:** `cand->sched_pdsch.nrOfLayers`, `cand->sched_pdsch.pm_index`.
-**UL outputs:** `cand->sched_pusch.nrOfLayers`, `cand->sched_pusch.tpmi`.
-
-### Stage 3. Beam Selection
-
-**Function pointers:** `mac->dl_beam_select` (`nr_dl_beam_select_fn`),
-`mac->ul_beam_select` (`nr_ul_beam_select_fn`)
-
-Assigns a beam structure index to each candidate. For UL, two beams are needed — one
-for the DCI slot, one for the PUSCH slot — since they may fall in different beam periods.
-Candidates that fail beam allocation (no beam available) are marked with `skipped=true`.
-
-Placed before TDA selection so that TDA selection can use the allocated beam to check
-the correct VRB map and pick the best TDA per beam.
-
-**Outputs:** `cand->alloc_beam_idx` (PUSCH/PDSCH beam), `cand->alloc_dci_beam_idx` (UL DCI beam).
-
-### Stage 4. TDA Selection
-
-**Function pointers:** `mac->dl_tda_select` (`nr_dl_tda_select_fn`),
-`mac->ul_tda_select` (`nr_ul_tda_select_fn`)
-
-Picks the Time Domain Allocation for each candidate. For UL retransmissions, also
-validates feasibility: if the TDA differs from the original transmission (e.g. because
-targeting a different UL slot), the TBS must be preservable with the new symbol/DMRS
-layout. Infeasible retx candidates are marked with `skipped=true`.
-
-**Outputs:** `cand->sched_p{d,u}sch.time_domain_allocation`, `.tda_info`, `cand->alloc_slbitmap`. UL retx
-candidates get `cand->retx_rbSize` set.
-**Returns:** number of surviving candidates.
-
-### Stage 5. MCS Selection
-
-**Function pointers:** `mac->dl_mcs_select` (`nr_dl_mcs_select_fn`),
-`mac->ul_mcs_select` (`nr_ul_mcs_select_fn`)
-
-Runs for **all surviving candidates** — including those that may ultimately not be
-scheduled due to CCE failure. Sets `sched_p{d,u}sch.mcs` from BLER stats or SINR, and persists
-the decision to `{ul,dl}_bler_stats.mcs` so continuity is maintained across slots even
-for unscheduled UEs.
-
-Placed after beam selection so custom implementations can use `alloc_beam_idx` and
-`beam_rsrp/sinr` for beam-aware MCS adaptation.
-
-### Stage 6. RB Allocation (per beam)
-
-**Function pointers:** `mac->dl_rb_alloc` (`nr_dl_rb_alloc_fn`),
-`mac->ul_rb_alloc` (`nr_ul_rb_alloc_fn`)
-
-The core resource allocation decision and the most likely stage to be replaced. Called
-once per beam with candidates filtered to that beam. Decides which UEs to schedule and
-how many PRBs each gets. MCS is already set on `sched_p{d,u}sch.mcs` by the previous
-stage; the policy may refine it (e.g. downward PHR adjustment).
-
-Each allocation must go through the `COMMIT_ALLOC` / `COMMIT_UL_ALLOC` macro, which
-writes `sched_p{d,u}sch.rbStart/rbSize/mcs` onto the candidate, runs CCE validation
-(and PUCCH validation on DL), and sets `cand->scheduled = true`. UEs that fail CCE are
-skipped transparently.
-
-**Outputs:** `cand->scheduled` flag on accepted candidates.
-**Returns:** number of scheduled UEs.
-
-### Stage 7. Dispatch (fixed)
-
-Not a function pointer. Iterates over candidates with `scheduled == true`, reads the `alloc_*` fields
-from each candidate, applies CCE results to `sched_ctrl`, marks the VRB map, and calls
-`apply_{dl,ul}_{new_transmission,retransmission}` to build the final
-`NR_sched_{pusch,pdsch}_t` and trigger FAPI message preparation.
-
-### Stage 8. Per-LCID Byte Allocation (DL only)
-
-**Function pointer:** `mac->dl_lcid_alloc` (`nr_dl_lcid_alloc_fn`)
-
-Called inside `generate_dl_mac_pdu` for initial DL transmissions. Decides how many bytes
-each logical channel gets within the available TBS. The candidate flows from the dispatch
-stage into `post_process_dlsch` → `generate_dl_mac_pdu`, giving this stage access to the
-full candidate context (per-LCID pending bytes, QoS, priority).
-
-The function pointer receives the MAC instance, the candidate, the TBS available after
-MAC CEs, and writes an output array `lcid_alloc[NR_MAX_NUM_LCID]` specifying the byte
-budget per LCID. The MAC PDU builder then executes the plan: it iterates over LCs in
-config order, requests up to `lcid_alloc[lcid]` bytes from RLC for each, and builds the
-MAC subheaders. RLC may return fewer bytes than budgeted; the builder handles this
-transparently.
-
-**Inputs:** `candidate->pending_bytes_per_lcid[]`, `candidate->fiveQI`, `candidate->priority`,
-`candidate->nssai`, `tbs_available`.
-**Outputs:** `lcid_alloc[NR_MAX_NUM_LCID]` — byte budget per LCID.
-
-Not invoked for retransmissions (which reuse the stored transport block) or for phy-test
-mode (which fills random data). In these cases the candidate pointer is NULL.
-
----
-
-## Default Implementations
-
-All function pointers are assigned in
-[`main.c`](../../openair2/LAYER2/NR_MAC_gNB/main.c) at startup.
-The `COMMIT_ALLOC` / `COMMIT_UL_ALLOC` macros are defined in
-[`mac_proto.h`](../../openair2/LAYER2/NR_MAC_gNB/mac_proto.h).
-
-### `nr_dl_ri_pmi_select_default`, `nr_ul_ri_tpmi_select_default`
-
-DL reads rank and PMI from the UE's CSI report (`csi_ri`, `csi_pm_index` on
-`sched_ctrl`). Retransmissions reuse rank/PMI from the original HARQ process.
-UL reads rank and TPMI from SRS feedback (`srs_feedback` on `sched_ctrl`).
-Both write `cand->sched_p{d,u}sch.nrOfLayers` and the respective precoder index.
-
-### `nr_dl_tda_select_default`, `nr_ul_tda_select_default`
-
-Assigns the same TDA to all candidates in a slot (picks the first valid one for the
-scheduled frame/slot). For UL retransmissions, calls `check_ul_retx_feasibility` to
-verify TBS preservation under the new symbol/DMRS layout.
-
-### `nr_dl_beam_select_default`, `nr_ul_beam_select_default`
-
-Uses OAI's beam management framework (`NR_beam_info_t`). For UL, allocates both a DCI
-beam and a PUSCH beam. Candidates that fail beam allocation are compacted out.
-
-### `nr_dl_mcs_select_default`, `nr_ul_mcs_select_default`
-
-BLER-based (when `harq_round_max > 1`): calls `nr_adapt_mcs_from_bler` for candidates
-with a fresh BLER estimate; holds current MCS otherwise. SINR-based (when
-`harq_round_max == 1`): maps measured PUSCH SINR to MCS via lookup table. In both
-cases, persists to `{dl,ul}_bler_stats.mcs`.
-
-### `nr_dl_proportional_fair`, `nr_ul_proportional_fair`
-
-Proportional-fair scheduler with three phases:
-
-- **Phase 1 — Retransmissions:** find the largest free block >= `retx_rbSize`.
-- **Phase 2 — Minimal-grant UEs:** in DL, targets UEs with no pending RLC data
-  (`pending_bytes == 0`) that still need a TA command or beam-switch MAC CE. In UL,
-  targets inactive UEs (`sched_inactive`) that need scheduling for TA/SR. Both get a
-  minimum grant (`min_rb`).
-- **Phase 3 — New data:** sort by PF weight (`pending_bytes / avg_throughput`), allocate
-  the largest free block to each UE in order.
-
-The UL policy also checks PHR (Power Headroom) and adjusts MCS/RBs accordingly.
-All phases use `COMMIT_ALLOC` / `COMMIT_UL_ALLOC` to validate CCE (and PUCCH on DL).
-
-### `nr_dl_lcid_alloc_default`
-
-Greedy fill: sets each LCID's budget to its full `pending_bytes_per_lcid` value. The
-execution loop in `generate_dl_mac_pdu` then fills LCIDs in LC config order until the
-TBS is exhausted, reproducing the original first-come-first-served behavior. A custom
-implementation could use the candidate's QoS fields (`fiveQI`, `priority`, `nssai`)
-to implement weighted fair queuing, strict priority with rate limiting, or slice-aware
-allocation across LCIDs.
-
-### `nr_dlsch_preprocessor`, `nr_ulsch_preprocessor`
-
-Top-level orchestrators that run the full pipeline above. In phy-test mode, replaced by
-`nr_preprocessor_phytest` / `nr_ul_preprocessor_phytest` which bypass the staged pipeline.
-
----
-
-## Function Pointer Reference
-
-### DL
-
-| Field on `gNB_MAC_INST`  | Typedef                   | Default                       | Stage |
-|--------------------------|---------------------------|-------------------------------|-------|
-| `pre_processor_dl`       | `nr_pp_impl_dl`           | `nr_dlsch_preprocessor`       | Orchestrator |
-| `dl_ri_pmi_select`       | `nr_dl_ri_pmi_select_fn`  | `nr_dl_ri_pmi_select_default` | 2. RI/PMI |
-| `dl_beam_select`         | `nr_dl_beam_select_fn`    | `nr_dl_beam_select_default`   | 3. Beam |
-| `dl_tda_select`          | `nr_dl_tda_select_fn`     | `nr_dl_tda_select_default`    | 4. TDA |
-| `dl_mcs_select`          | `nr_dl_mcs_select_fn`     | `nr_dl_mcs_select_default`    | 5. MCS |
-| `dl_rb_alloc`            | `nr_dl_rb_alloc_fn`       | `nr_dl_proportional_fair`     | 6. RB alloc |
-| `dl_lcid_alloc`          | `nr_dl_lcid_alloc_fn`     | `nr_dl_lcid_alloc_default`    | 8. LCID alloc |
-
-### UL
-
-| Field on `gNB_MAC_INST`  | Typedef                   | Default                        | Stage |
-|--------------------------|---------------------------|--------------------------------|-------|
-| `pre_processor_ul`       | `nr_pp_impl_ul`           | `nr_ulsch_preprocessor`        | Orchestrator |
-| `ul_ri_tpmi_select`      | `nr_ul_ri_tpmi_select_fn` | `nr_ul_ri_tpmi_select_default` | 2. RI/TPMI |
-| `ul_beam_select`         | `nr_ul_beam_select_fn`    | `nr_ul_beam_select_default`    | 3. Beam |
-| `ul_tda_select`          | `nr_ul_tda_select_fn`     | `nr_ul_tda_select_default`     | 4. TDA |
-| `ul_mcs_select`          | `nr_ul_mcs_select_fn`     | `nr_ul_mcs_select_default`     | 5. MCS |
-| `ul_rb_alloc`            | `nr_ul_rb_alloc_fn`       | `nr_ul_proportional_fair`      | 6. RB alloc |
-
----
-
-## Key Data Structures
-
-All defined in `nr_mac_gNB.h`.
-
-### Candidate (`nr_{dl,ul}_candidate_t`)
-
-Flows through the pipeline accumulating decisions. Three sections:
-
-**Identity / scheduling state** (set by collect, read-only after):
-`UE` pointer, `rnti`, `is_retx`, `retx_harq_pid`, `retx_rbSize`, `pending_bytes`,
-`pending_bytes_per_lcid[NR_MAX_NUM_LCID]`, `avg_throughput`, `bler`, `current_mcs`,
-`max_mcs`, `bwp_start`, `bwp_size`, `fiveQI`, `priority`, `nssai`.
-
-**CSI observations** (set by collect, read-only after):
-`cqi` (DL CQI), `beam_rsrp[]`, `beam_sinr[]` (per-SSB L1-RSRP/SINR, `INT16_MIN` = no data).
-
-**gNB decisions** (written by the named stage — some in `sched_p{d,u}sch`, some `alloc_*`):
-`sched_p{d,u}sch.nrOfLayers`, `.pm_index`/`.tpmi`, `.time_domain_allocation`, `.tda_info`,
-`.mcs`, `.rbStart`, `.rbSize`;
-`alloc_slbitmap`, `alloc_beam_idx`, `alloc_dci_beam_idx` (UL),
-`alloc_cce_index`, `alloc_aggregation_level`, `alloc_sched_pdcch`.
-
-### Sched Params (`nr_{dl,ul}_sched_params_t`)
-
-Per-beam context passed to `rb_alloc`. Contains the MAC instance, slot info, VRB map,
-available RBs, BLER thresholds, TDA info, and serving cell config.
-
----
-
-## Writing a Custom Scheduler
-
-### Replacing the RB allocation policy
-
-Write a function matching the typedef:
-
-```c
-int my_ul_rb_alloc(const nr_ul_sched_params_t *params,
-                   nr_ul_candidate_t *candidates,
-                   int n_candidates)
-{
-    int n_scheduled = 0;
-    for (int i = 0; i < n_candidates; i++) {
-        nr_ul_candidate_t *cand = &candidates[i];
-        // ... decide rbStart, rbSize, mcs ...
-        // COMMIT_UL_ALLOC writes sched_pusch fields, validates CCE, sets cand->scheduled:
-        COMMIT_UL_ALLOC(params, cand, rbStart, rbSize, mcs, n_scheduled);
-    }
-    return n_scheduled;
-}
-```
-
-Register it in `openair2/LAYER2/NR_MAC_gNB/main.c`:
-
-```c
-RC.nrmac[i]->ul_rb_alloc = my_ul_rb_alloc;
-```
-
-### Replacing the per-LCID allocation policy (DL)
-
-Write a function matching the typedef:
-
-```c
-void my_lcid_alloc(const gNB_MAC_INST *mac,
-                   const nr_dl_candidate_t *candidate,
-                   int tbs_available,
-                   int lcid_alloc[NR_MAX_NUM_LCID])
-{
-    memset(lcid_alloc, 0, NR_MAX_NUM_LCID * sizeof(int));
-    // ... use candidate->pending_bytes_per_lcid[], candidate->fiveQI,
-    //     candidate->priority, tbs_available to decide budgets ...
-    for (int lcid = 0; lcid < NR_MAX_NUM_LCID; lcid++)
-        lcid_alloc[lcid] = my_budget_for(lcid);
-}
-```
-
-Register it:
-
-```c
-RC.nrmac[i]->dl_lcid_alloc = my_lcid_alloc;
-```
-
-### Replacing other stages
-
-Any function pointer can be replaced independently:
-
-```c
-RC.nrmac[i]->ul_ri_tpmi_select = my_ri_tpmi_select;
-RC.nrmac[i]->ul_mcs_select     = my_mcs_select;
-RC.nrmac[i]->ul_beam_select    = my_beam_select;
-```
-
-### Recommendations
-
-- **Always use `COMMIT_ALLOC` / `COMMIT_UL_ALLOC`** to accept an allocation. It writes
-  `sched_p{d,u}sch` fields onto the candidate, validates CCE (and PUCCH on DL), and sets
-  `cand->scheduled`.
-- **Do not mark the VRB map** — `commit_alloc` / `commit_ul_alloc` handles that inside the macro.
-- `sched_p{d,u}sch.mcs` is already set by `mcs_select` when your policy runs. You may
-  refine it downward (e.g. PHR); pass the final value to `COMMIT_ALLOC` / `COMMIT_UL_ALLOC`.
-- Candidates are non-const: the policy is allowed to write `sched_p{d,u}sch` and `alloc_*`
-  fields. Do not modify identity/state or CSI fields.

doc/ORAN_FHI7.2_Tutorial.md

@@ -62,13 +62,10 @@ We tested the category A radio units listed below.
 |Vendor           |Software Version                             |
 |-----------------|---------------------------------------------|
 |VVDN LPRU        |03-v3.0.5                                    |
-|LiteON RU FR1    |01.00.08/02.00.03/02.00.10                   |
-|LiteON RU FR2    |02.00.07                                     |
-|Metanoia RU FR1  |2.0.6                                        |
-|Benetel 650      |RAN650-1v2.1.0-M-0820797                     |
-|Benetel 550      |RAN550-1v2.1.0-M-0820797                     |
+|LiteON RU        |01.00.08/02.00.03/02.00.10                   |
+|Benetel 650      |RAN650-1v1.0.4-dda1bf5/RAN650-1v1.2.2-2fa04bc/RAN650-1v1.4.2-NM-c48047d|
+|Benetel 550      |RAN550-1v1.0.4-605a25a/RAN550-1v1.2.2-2fa04bc/RAN550-1v1.4.1-M-25fa970/RAN550-1v2.0.5-M-92a9d2c|
 |Foxconn RPQN     |v3.1.15q.551_rc10                            |
-|Microamp RU      |0.1.174                                      |
 
 Tested libxran releases:
 
@@ -633,481 +630,82 @@ eAXC_id 0 1 # set PRACH eAxC IDs
 ...
 ```
 
-#### Microamp FR2
-
-#### Firmware starting from 0.1.174
-
-Requirements:
-- sshpass:
-  ```bash
-  #RHEL
-  sudo dnf install sshpass -y
-  #Ubuntu
-  sudo apt install sshpass -y
-  ``` 
-
-To check PTP status, you can use the following command:
-```bash
-sshpass -p microampcfg ssh remctl@<RU_IP_ADDR> "logs-ptp"
-```
-<details>
-  <summary>PTP output will be similar to:</summary>
-
-  ```
-  Apr 27 11:58:35 bbv1 ptp4l[74545]: ptp4l[357120.237]: rms    8 max   16 freq   -100 +/- 142 delay  1183 +/-   0
-  Apr 27 11:58:34 bbv1 ptp4l[74545]: ptp4l[357119.114]: rms    1 max    1 freq   +189 +/-  25 delay  1183 +/-   0
-  Apr 27 11:58:33 bbv1 ptp4l[74545]: ptp4l[357117.991]: rms    1 max    1 freq    +99 +/-  30 delay  1183 +/-   0
-  Apr 27 11:58:32 bbv1 ptp4l[74545]: ptp4l[357116.869]: rms    1 max    1 freq    +22 +/-  18 delay  1183 +/-   0
-  Apr 27 11:58:31 bbv1 ptp4l[74545]: ptp4l[357115.746]: rms    1 max    1 freq    -51 +/-  20 delay  1183 +/-   0
-  Apr 27 11:58:30 bbv1 ptp4l[74545]: ptp4l[357114.624]: rms    1 max    2 freq   -126 +/-  29 delay  1183 +/-   0
-  Apr 27 11:58:29 bbv1 ptp4l[74545]: ptp4l[357113.501]: rms    8 max   16 freq    -16 +/- 200 delay  1184 +/-   0
-  Apr 27 11:58:28 bbv1 ptp4l[74545]: ptp4l[357112.378]: rms    1 max    2 freq   +164 +/-  29 delay  1183 +/-   0
-  Apr 27 11:58:26 bbv1 ptp4l[74545]: ptp4l[357111.256]: rms    1 max    2 freq    +54 +/-  39 delay  1183 +/-   0
-  Apr 27 11:58:25 bbv1 ptp4l[74545]: ptp4l[357110.133]: rms    1 max    2 freq    -34 +/-  19 delay  1183 +/-   0
-  Apr 27 11:58:24 bbv1 ptp4l[74545]: ptp4l[357109.010]: rms    1 max    2 freq   -112 +/-  26 delay  1183 +/-   0
-  Apr 27 11:58:23 bbv1 ptp4l[74545]: ptp4l[357107.888]: rms    8 max   16 freq    -48 +/- 174 delay  1183 +/-   0
-  Apr 27 11:58:22 bbv1 ptp4l[74545]: ptp4l[357106.766]: rms    1 max    1 freq   +197 +/-  25 delay  1183 +/-   0
-  Apr 27 11:58:21 bbv1 ptp4l[74545]: ptp4l[357105.642]: rms    1 max    2 freq   +149 +/-  26 delay  1183 +/-   0
-  Apr 27 11:58:20 bbv1 ptp4l[74545]: ptp4l[357104.519]: rms    1 max    2 freq    +66 +/-  27 delay  1183 +/-   0
-  Apr 27 11:58:19 bbv1 ptp4l[74545]: ptp4l[357103.396]: rms    1 max    2 freq    -17 +/-  24 delay  1183 +/-   0
-  Apr 27 11:58:17 bbv1 ptp4l[74545]: ptp4l[357102.273]: rms    1 max    1 freq    -94 +/-  23 delay  1183 +/-   0
-  Apr 27 11:58:16 bbv1 ptp4l[74545]: ptp4l[357101.150]: rms    7 max   16 freq   +107 +/- 180 delay  1183 +/-   0
-  Apr 27 11:58:15 bbv1 ptp4l[74545]: ptp4l[357100.027]: rms    1 max    2 freq   +166 +/-  11 delay  1184 +/-   0
-  Apr 27 11:58:14 bbv1 ptp4l[74545]: ptp4l[357098.906]: rms    1 max    1 freq   +140 +/-  21 delay  1183 +/-   0
-  ```
-
-</details>
-
-###### RU configuration
-
-You can use the following command to display the current RU configuration:
-
-```bash
-sshpass -p microampcfg ssh remctl@<RU_IP_ADDR> get-cfg
-```
-
-<details>
-  <summary>
-  The OAI configuration file [`gnb.sa.band257.132prb.fhi72.2x2-microamp.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.132prb.fhi72.2x2-microamp.conf) corresponds to the following RU configuration:
-  </summary>
-
-  ```
-  PRACH0 CC ID: 0
-  PRACH0 RU port ID: 0
-  PRACH1 CC ID: 1
-  PRACH1 RU port ID: 1
-  Bandwidth: 200M [Hz]
-  Carrier frequency: 28049280000.0 [Hz]
-  Compression enable: True
-  TDD config: DDDSU
-  eCPRI VLAN support enable: True
-  eCPRI VLAN tag: 600
-    MAC address: 10:70:fd:b8:86:02
-    VLAN PTP status: ENABLED
-    VLAN MGMT enabled: ENABLED
-    State: ENABLED_WITH_VLAN
-      Dynamic beamforming with mirrored beams
-  PL MAC address:
-    RU MAC: 10-70-FD-B8-86-02
-    DU MAC: 50-7C-6F-31-00-61
-  RF Power level: -5 dB - relative to maximum
-  ```
-
-</details>
-
-Execute the following command to check how to configure the RU:
-
-```bash
-sshpass -p microampcfg ssh remctl@<RU_IP_ADDR> "help"
-```
-<details>
-  <summary>Help output will be similar to:</summary>
-
-  ```
-  Usage: remctl <subcommand> [options]
-
-  Allowed Subcommands:
-    set-cfg, get-cfg, stat, logs-ptp, reboot, set-power, help, clear-cfg
-
-  Allowed 'set-cfg' options:
-    --bandwidth
-    --tdd-cfg
-    --compression-enable
-    --compression-disable
-    --ecpri-vlan-tag
-    --ecpri-vlan-support-enable
-    --ecpri-vlan-support-disable
-    --ru-mac
-    --du-mac
-    --beamforming
-    --carrier-freq
-    --eth-ipv4
-    --prach0-cc-id
-    --prach0-ru-port-id
-    --prach1-cc-id
-    --prach1-ru-port-id
-
-  ```
-
-</details>
+#### MICROAMP FR2
 
 
-
-You can also execute the following command to show fronthaul statistics including on-time/late packet' counters:
-```bash
-sshpass -p microampcfg ssh remctl@<RU_IP_ADDR> "stat"
-```
-
-<details>
-  <summary>Statistics output will be similar to:</summary>
-
-  ```
-  ORAN RX C-plane on time:    71645874
-  ORAN RX C-plane early:      0
-  ORAN RX C-plane late:       16
-  ORAN TX U-plane:            229686268
-  ORAN RX DL C-plane on time: 53987559
-  ORAN RX DL C-plane early:   0
-  ORAN RX DL C-plane late:    12
-  ORAN RX DL U-plane on time: 701836967
-  ORAN RX DL U-plane early:   0
-  ORAN RX DL U-plane late:    52
-  ORAN RX UL C-plane on time: 17658315
-  ORAN RX UL C-plane early:   0
-  ORAN RX UL C-plane late:    4
-  CLASSIFIER LLC: overflow protection:    0
-  CLASSIFIER LLC: frame err:              28
-  CLASSIFIER LLC: packet too long:        0
-  CLASSIFIER LLC: dropped:                28
-  CLASSIFIER LLC: passed:                 804719078
-  CLASSIFIER ETH: dst MAC addr err:       0
-  CLASSIFIER ETH: VLAN LEGACY:            275571
-  CLASSIFIER ETH: VLAN Dot1Q:             804443507
-  CLASSIFIER ETH: VLAN Dot1AD:            0
-  CLASSIFIER ETH: VLAN Tag ID pass:       773482909
-  CLASSIFIER ETH: VLAN Tag ID error:      0
-  CLASSIFIER ETH: multicast:              31233828
-  CLASSIFIER ETH: PTP:                    29502626
-  CLASSIFIER ETH: eCPRI:                  773482909
-  CLASSIFIER ETH: to OS:                  31236169
-  CLASSIFIER ETH: dropped:                0
-  CLASSIFIER ETH: passed:                 804719078
-  CLASSIFIER ECPRI: prot rev unsupported: 0
-  CLASSIFIER ECPRI: concat unsupported:   0
-  CLASSIFIER ECPRI: msg type unsupported: 0
-  CLASSIFIER ECPRI: pld size err:         0
-  CLASSIFIER ECPRI: U-Plane:              701837019
-  CLASSIFIER ECPRI: C-Plane:              71645890
-  CLASSIFIER ECPRI: delay:                0
-  CLASSIFIER ECPRI: dropped:              0
-  CLASSIFIER ECPRI: passed:               773482909
-  CPLANE PARSER: ul early:                        0
-  CPLANE PARSER: ul late:                         4
-  CPLANE PARSER: ul on time:                      17658315
-  CPLANE PARSER: dl early:                        0
-  CPLANE PARSER: dl late:                         12
-  CPLANE PARSER: dl on time:                      53987559
-  CPLANE PARSER: timing dropped:                  16
-  CPLANE PARSER: timing passed:                   71645874
-  CPLANE PARSER: bad du port id:                  0
-  CPLANE PARSER: bad bandsector id:               0
-  CPLANE PARSER: bad cc id:                       663059
-  CPLANE PARSER: bad ru port id:                  2794
-  CPLANE PARSER: bad sequence id:                 0
-  CPLANE PARSER: bad e bit:                       0
-  CPLANE PARSER: bad subsequence id:              0
-  CPLANE PARSER: ecpri transport header dropped:  665623
-  CPLANE PARSER: ecpri transport header passed:   70980251
-  CPLANE PARSER: bad payloadversion:              0
-  CPLANE PARSER: bad filterindex:                 0
-  CPLANE PARSER: bad subframeid:                  0
-  CPLANE PARSER: bad slotid:                      0
-  CPLANE PARSER: bad startsymbolid:               0
-  CPLANE PARSER: bad numberofsections:            0
-  CPLANE PARSER: bad sectiontype:                 0
-  CPLANE PARSER: bad timeoffset:                  0
-  CPLANE PARSER: bad fftsize:                     0
-  CPLANE PARSER: bad subcarrierspacing:           0
-  CPLANE PARSER: bad cplength:                    0
-  CPLANE PARSER: bad udiqwidth:                   0
-  CPLANE PARSER: radio aplication header dropped: 0
-  CPLANE PARSER: radio aplication header passed:  70980251
-  CPLANE PARSER: bad rb:                          0
-  CPLANE PARSER: bad startprbc:                   0
-  CPLANE PARSER: bad numprbc:                     0
-  CPLANE PARSER: bad remask:                      0
-  CPLANE PARSER: bad numsymbol:                   0
-  CPLANE PARSER: bad ef:                          0
-  CPLANE PARSER: bad freqoffset:                  0
-  CPLANE PARSER: common section fields dropped:   0
-  CPLANE PARSER: common section fields passed:    70980251
-  CPLANE PARSER: bad section to symbol map:       0
-  CPLANE PARSER: dropped:                         0
-  CPLANE PARSER: passed:                          70980251
-  CPLANE PARSER: expected uplanes number:         701813698
-  UPLANE PARSER: sequence ID err:       0
-  UPLANE PARSER: IQ pld size err:       0
-  UPLANE PARSER: C-Plane match err:     114225
-  UPLANE PARSER: eAxC ID unsupported:   24631
-  UPLANE PARSER: any value unsupported: 24631
-  UPLANE PARSER: dropped:               138886
-  UPLANE PARSER: passed:                701698133
-  UPLANE ENCAPSULATOR 0: false drop error: 0
-  UPLANE ENCAPSULATOR 0: passed:           94598642
-  UPLANE ENCAPSULATOR 1: false drop error: 0
-  UPLANE ENCAPSULATOR 1: passed:           94598642
-  UPLANE ENCAPSULATOR 2: false drop error: 0
-  UPLANE ENCAPSULATOR 2: passed:           0
-  UPLANE ENCAPSULATOR 3: false drop error: 0
-  UPLANE ENCAPSULATOR 3: passed:           0
-  COMMON COMMON: symbol counter: 57757250505
-  DSP CHAIN 0: dl fft overflow: 0
-  DSP CHAIN 0: ul fft overflow: 0
-  DSP CHAIN 1: dl fft overflow: 0
-  DSP CHAIN 1: ul fft overflow: 0
-  ```
-
-</details>
-
-
-##### Firmware older than 0.1.174
 Interaction with RU is performed using `rucfg` utility provided by Microamp.
 
-To check PTP status, you can use `rucfg ptp`. 
+To check PTP status, you can use `rucfg ptp`. the output should be similar to:
+```bash
+[INFO] Check if RU is available
+[INFO] RU available
+[INFO] Check SSH to RU available
+[INFO] SSH to RU available
+[INFO] Getting PTP status
+[INFO] ptp4l status = 
+{
+Feb 12 16:26:02 bbv1 ptp4l[23822]: ptp4l[6280.658]: rms    0 max    1 freq     +2 +/-   7 delay  1184 +/-   0
+Feb 12 16:26:00 bbv1 ptp4l[23822]: ptp4l[6279.535]: rms    0 max    1 freq     -8 +/-  13 delay  1184 +/-   0
+Feb 12 16:25:59 bbv1 ptp4l[23822]: ptp4l[6278.413]: rms    1 max    1 freq    -35 +/-  13 delay  1184 +/-   0
+Feb 12 16:25:58 bbv1 ptp4l[23822]: ptp4l[6277.290]: rms    0 max    1 freq    -68 +/-   9 delay  1184 +/-   0
+Feb 12 16:25:57 bbv1 ptp4l[23822]: ptp4l[6276.167]: rms    1 max    1 freq    -69 +/-  10 delay  1184 +/-   0
+Feb 12 16:25:56 bbv1 ptp4l[23822]: ptp4l[6275.044]: rms    0 max    1 freq    -46 +/-   9 delay  1184 +/-   0
+Feb 12 16:25:55 bbv1 ptp4l[23822]: ptp4l[6273.921]: rms    1 max    1 freq    -65 +/-  10 delay  1184 +/-   0
+Feb 12 16:25:54 bbv1 ptp4l[23822]: ptp4l[6272.800]: rms    0 max    1 freq    -91 +/-   6 delay  1184 +/-   0
+Feb 12 16:25:53 bbv1 ptp4l[23822]: ptp4l[6271.677]: rms    4 max   17 freq   -107 +/-  48 delay  1184 +/-   0
+Feb 12 16:25:52 bbv1 ptp4l[23822]: ptp4l[6270.554]: rms    6 max   17 freq   +179 +/- 106 delay  1184 +/-   0
+Feb 12 16:25:50 bbv1 ptp4l[23822]: ptp4l[6269.431]: rms    1 max    2 freq   +191 +/-  12 delay  1184 +/-   0
+Feb 12 16:25:49 bbv1 ptp4l[23822]: ptp4l[6268.308]: rms    1 max    1 freq   +119 +/-  21 delay  1184 +/-   0
+Feb 12 16:25:48 bbv1 ptp4l[23822]: ptp4l[6267.186]: rms    1 max    1 freq   +103 +/-  13 delay  1184 +/-   0
+Feb 12 16:25:47 bbv1 ptp4l[23822]: ptp4l[6266.063]: rms    7 max   17 freq   -101 +/- 160 delay  1184 +/-   0
+Feb 12 16:25:46 bbv1 ptp4l[23822]: ptp4l[6264.940]: rms    7 max   17 freq    -65 +/- 154 delay  1184 +/-   0
+Feb 12 16:25:45 bbv1 ptp4l[23822]: ptp4l[6263.817]: rms    1 max    2 freq   +176 +/-  33 delay  1183 +/-   0
+Feb 12 16:25:44 bbv1 ptp4l[23822]: ptp4l[6262.695]: rms    0 max    1 freq   +100 +/-   7 delay  1184 +/-   0
+Feb 12 16:25:43 bbv1 ptp4l[23822]: ptp4l[6261.572]: rms    1 max    2 freq    +56 +/-  34 delay  1184 +/-   0
+Feb 12 16:25:41 bbv1 ptp4l[23822]: ptp4l[6260.449]: rms    1 max    1 freq    -37 +/-  14 delay  1184 +/-   0
+Feb 12 16:25:40 bbv1 ptp4l[23822]: ptp4l[6259.326]: rms    7 max   16 freq   +114 +/- 149 delay  1183 +/-   0
+}
 
+```
 
-<details>
-  <summary>PTP output will be similar to:</summary>
+##### RU configuration
 
-  ```
-  [INFO] Check if RU is available
-  [INFO] RU available
-  [INFO] Check SSH to RU available
-  [INFO] SSH to RU available
-  [INFO] Getting PTP status
-  [INFO] ptp4l status = 
-  {
-  Feb 12 16:26:02 bbv1 ptp4l[23822]: ptp4l[6280.658]: rms    0 max    1 freq     +2 +/-   7 delay  1184 +/-   0
-  Feb 12 16:26:00 bbv1 ptp4l[23822]: ptp4l[6279.535]: rms    0 max    1 freq     -8 +/-  13 delay  1184 +/-   0
-  Feb 12 16:25:59 bbv1 ptp4l[23822]: ptp4l[6278.413]: rms    1 max    1 freq    -35 +/-  13 delay  1184 +/-   0
-  Feb 12 16:25:58 bbv1 ptp4l[23822]: ptp4l[6277.290]: rms    0 max    1 freq    -68 +/-   9 delay  1184 +/-   0
-  Feb 12 16:25:57 bbv1 ptp4l[23822]: ptp4l[6276.167]: rms    1 max    1 freq    -69 +/-  10 delay  1184 +/-   0
-  Feb 12 16:25:56 bbv1 ptp4l[23822]: ptp4l[6275.044]: rms    0 max    1 freq    -46 +/-   9 delay  1184 +/-   0
-  Feb 12 16:25:55 bbv1 ptp4l[23822]: ptp4l[6273.921]: rms    1 max    1 freq    -65 +/-  10 delay  1184 +/-   0
-  Feb 12 16:25:54 bbv1 ptp4l[23822]: ptp4l[6272.800]: rms    0 max    1 freq    -91 +/-   6 delay  1184 +/-   0
-  Feb 12 16:25:53 bbv1 ptp4l[23822]: ptp4l[6271.677]: rms    4 max   17 freq   -107 +/-  48 delay  1184 +/-   0
-  Feb 12 16:25:52 bbv1 ptp4l[23822]: ptp4l[6270.554]: rms    6 max   17 freq   +179 +/- 106 delay  1184 +/-   0
-  Feb 12 16:25:50 bbv1 ptp4l[23822]: ptp4l[6269.431]: rms    1 max    2 freq   +191 +/-  12 delay  1184 +/-   0
-  Feb 12 16:25:49 bbv1 ptp4l[23822]: ptp4l[6268.308]: rms    1 max    1 freq   +119 +/-  21 delay  1184 +/-   0
-  Feb 12 16:25:48 bbv1 ptp4l[23822]: ptp4l[6267.186]: rms    1 max    1 freq   +103 +/-  13 delay  1184 +/-   0
-  Feb 12 16:25:47 bbv1 ptp4l[23822]: ptp4l[6266.063]: rms    7 max   17     freq   -101 +/- 160 delay  1184 +/-   0
-  Feb 12 16:25:46 bbv1 ptp4l[23822]: ptp4l[6264.940]: rms    7 max   17 freq    -65 +/- 154 delay  1184 +/-   0
-  Feb 12 16:25:45 bbv1 ptp4l[23822]: ptp4l[6263.817]: rms    1 max    2 freq   +176 +/-  33 delay  1183 +/-   0
-  Feb 12 16:25:44 bbv1 ptp4l[23822]: ptp4l[6262.695]: rms    0 max    1 freq   +100 +/-   7 delay  1184 +/-   0
-  Feb 12 16:25:43 bbv1 ptp4l[23822]: ptp4l[6261.572]: rms    1 max    2 freq    +56 +/-  34 delay  1184 +/-   0
-  Feb 12 16:25:41 bbv1 ptp4l[23822]: ptp4l[6260.449]: rms    1 max    1 freq    -37 +/-  14 delay  1184 +/-   0
-  Feb 12 16:25:40 bbv1 ptp4l[23822]: ptp4l[6259.326]: rms    7 max   16 freq   +114 +/- 149 delay  1183 +/-   0
-  } 
-  ```
+You can use `rucfg show` to display the current RU configuration. 
 
-</details>
-
-###### RU configuration
-
-You can use `rucfg show` command to display the current RU configuration. 
-
-<details>
-  <summary>
-  The OAI configuration file [`gnb.sa.band257.132prb.fhi72.2x2-microamp.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.132prb.fhi72.2x2-microamp.conf) corresponds to the following RU configuration:
-  </summary>
-
-  ```
-  [INFO] Check if RU is available
-  [INFO] RU available
-  [INFO] Check SSH to RU available
-  [INFO] SSH to RU available
-  [INFO] Downloading oran_autostart
-  [INFO] Downloading ructl_config.sh
-  [INFO] Downloading udc_pll_configurator_startup
-  [INFO] Downloaded Cellbox config = 
-  {
-    eCPRI Compression: True
-    RF Bandwidth: 200MHz
-    CC Bandwidth: 200MHz
-    CCs: 1
-    LO frequency: 7.91642667e9
-    UL compensation frequency: 28.04928e9
-    DL compensation frequency: -28.04928e9
-    RU MAC: 10:70:FD:B8:86:02
-    DU MAC: 50:7C:6F:31:00:61
-    TDD config: dddsu
-    RF Power level: -5 dB - relative to maximum
-    VLAN ORAN: Enabled, tag: 600
-    VLAN PTP: Enabled, tag: 1
-    VLAN MGMT: False
-    Beamforming: dynamic-mirrored-beam
-  }
-  ```
-
-</details>
+The OAI configuration file [`gnb.sa.band257.132prb.fhi72.2x2-microamp.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.132prb.fhi72.2x2-microamp.conf) corresponds to the following RU configuration:
 
+```bash
+[INFO] Check if RU is available
+[INFO] RU available
+[INFO] Check SSH to RU available
+[INFO] SSH to RU available
+[INFO] Downloading oran_autostart
+[INFO] Downloading ructl_config.sh
+[INFO] Downloading udc_pll_configurator_startup
+[INFO] Downloaded Cellbox config = 
+{
+	eCPRI Compression: True
+	RF Bandwidth: 200MHz
+	CC Bandwidth: 200MHz
+	CCs: 1
+	LO frequency: 7.91642667e9
+	UL compensation frequency: 28.04928e9
+	DL compensation frequency: -28.04928e9
+	RU MAC: 10:70:FD:B8:86:02
+	DU MAC: 50:7C:6F:31:00:61
+	TDD config: dddsu
+	RF Power level: -5 dB - relative to maximum
+	VLAN ORAN: Enabled, tag: 600
+	VLAN PTP: Enabled, tag: 1
+	VLAN MGMT: False
+	Beamforming: dynamic-mirrored-beam
+}
+```
 
 Execute `rucfg config -h` to check how to configure the RU.
 
-<details>
-<summary>Help output will be similar to:</summary>
-
-```
-usage: rucfg config [-h] [-f frequency] [-b bandwidth] [-t TDD pattern] [-p RU Power]
-                    [--cc carrier components] [--compression compression] [--vlan-oran vlan-oran]
-                    [--vlan-ptp vlan-ptp] [--mac DU MAC address]
-
-options:
-  -h, --help            show this help message and exit
-  -f frequency, --freq frequency
-                        Sets the 5G NR frequency. Allowed range: 24.0-29.9 GHz, default: <no conf
-                        change>
-  -b bandwidth, --bandwidth bandwidth
-                        Sets RF bandwidth 100/200 [MHz] per CC, default: <no conf change>
-  -t TDD pattern, --tdd TDD pattern
-                        Sets TDD pattern DDDSU/DDSUU/DSUUU, default: <no conf change>
-  -p RU Power, --power RU Power
-                        Sets Power in (0-100), default: <no conf change>
-  --cc carrier components
-                        Sets number of carrier components 1/2, default: <no conf change>
-  --compression compression
-                        Sets eCPRI compression True/False, default: <no conf change>
-  --vlan-oran vlan-oran
-                        Sets ORAN VLAN to None or <TAG>, default: <no conf change>
-  --vlan-ptp vlan-ptp   Sets PTP VLAN to None or <TAG>, default: <no conf change>
-  --mac DU MAC address  Sets DU MAC address (where RU sends eCPRI packets), format
-                        AA:BB:CC:DD:EE:FF, default: <no conf change>
-```
-
-</details>
-
-
-
 You can also execute `rucfg stats` to show fronthaul statistics including on-time/late packet' counters.
 
-
-<details>
-  <summary>Statistics output will be similar to:</summary>
-
-  ```
-  [INFO] Check if RU is available
-  [INFO] RU available
-  [INFO] Check SSH to RU available
-  [INFO] SSH to RU available
-  [INFO] Getting RU stats
-  [WARN] Received non-zero rc from ructl: 255
-  [INFO] ru stats = 
-  {
-  Preaccumulator overflow detected
-  ORAN RX C-plane on time:    5442384
-  ORAN RX C-plane early:      0
-  ORAN RX C-plane late:       4
-  ORAN TX U-plane:            15908424
-  ORAN RX DL C-plane on time: 3349166
-  ORAN RX DL C-plane early:   0
-  ORAN RX DL C-plane late:    0
-  ORAN RX DL U-plane on time: 43538742
-  ORAN RX DL U-plane early:   0
-  ORAN RX DL U-plane late:    93
-  ORAN RX UL C-plane on time: 2093218
-  ORAN RX UL C-plane early:   0
-  ORAN RX UL C-plane late:    4
-  CLASSIFIER LLC: overflow protection:    0
-  CLASSIFIER LLC: frame err:              0
-  CLASSIFIER LLC: packet too long:        0
-  CLASSIFIER LLC: dropped:                0
-  CLASSIFIER LLC: passed:                 49044133
-  CLASSIFIER ETH: dst MAC addr err:       0
-  CLASSIFIER ETH: VLAN LEGACY:            1524
-  CLASSIFIER ETH: VLAN Dot1Q:             49042609
-  CLASSIFIER ETH: VLAN Dot1AD:            0
-  CLASSIFIER ETH: VLAN Tag ID pass:       48981223
-  CLASSIFIER ETH: VLAN Tag ID error:      0
-  CLASSIFIER ETH: multicast:              60260
-  CLASSIFIER ETH: PTP:                    56086
-  CLASSIFIER ETH: eCPRI:                  48981223
-  CLASSIFIER ETH: to OS:                  62910
-  CLASSIFIER ETH: dropped:                0
-  CLASSIFIER ETH: passed:                 49044133
-  CLASSIFIER ECPRI: prot rev unsupported: 0
-  CLASSIFIER ECPRI: concat unsupported:   0
-  CLASSIFIER ECPRI: msg type unsupported: 0
-  CLASSIFIER ECPRI: pld size err:         0
-  CLASSIFIER ECPRI: U-Plane:              43538835
-  CLASSIFIER ECPRI: C-Plane:              5442388
-  CLASSIFIER ECPRI: delay:                0
-  CLASSIFIER ECPRI: dropped:              0
-  CLASSIFIER ECPRI: passed:               48981223
-  CPLANE PARSER: ul early:                        0
-  CPLANE PARSER: ul late:                         4
-  CPLANE PARSER: ul on time:                      2093218
-  CPLANE PARSER: dl early:                        0
-  CPLANE PARSER: dl late:                         0
-  CPLANE PARSER: dl on time:                      3349166
-  CPLANE PARSER: timing dropped:                  4
-  CPLANE PARSER: timing passed:                   5442384
-  CPLANE PARSER: bad du port id:                  0
-  CPLANE PARSER: bad bandsector id:               0
-  CPLANE PARSER: bad cc id:                       0
-  CPLANE PARSER: bad ru port id:                  0
-  CPLANE PARSER: bad sequence id:                 0
-  CPLANE PARSER: bad e bit:                       0
-  CPLANE PARSER: bad subsequence id:              0
-  CPLANE PARSER: ecpri transport header dropped:  0
-  CPLANE PARSER: ecpri transport header passed:   5442384
-  CPLANE PARSER: bad payloadversion:              0
-  CPLANE PARSER: bad filterindex:                 0
-  CPLANE PARSER: bad subframeid:                  0
-  CPLANE PARSER: bad slotid:                      0
-  CPLANE PARSER: bad startsymbolid:               0
-  CPLANE PARSER: bad numberofsections:            0
-  CPLANE PARSER: bad sectiontype:                 0
-  CPLANE PARSER: bad timeoffset:                  0
-  CPLANE PARSER: bad fftsize:                     0
-  CPLANE PARSER: bad subcarrierspacing:           0
-  CPLANE PARSER: bad cplength:                    0
-  CPLANE PARSER: bad udiqwidth:                   0
-  CPLANE PARSER: radio aplication header dropped: 0
-  CPLANE PARSER: radio aplication header passed:  5442384
-  CPLANE PARSER: bad rb:                          0
-  CPLANE PARSER: bad startprbc:                   0
-  CPLANE PARSER: bad numprbc:                     0
-  CPLANE PARSER: bad remask:                      0
-  CPLANE PARSER: bad numsymbol:                   0
-  CPLANE PARSER: bad ef:                          0
-  CPLANE PARSER: bad freqoffset:                  0
-  CPLANE PARSER: common section fields dropped:   0
-  CPLANE PARSER: common section fields passed:    5442384
-  CPLANE PARSER: bad section to symbol map:       0
-  CPLANE PARSER: dropped:                         0
-  CPLANE PARSER: passed:                          5442384
-  UPLANE PARSER: sequence ID err:       0
-  UPLANE PARSER: IQ pld size err:       0
-  UPLANE PARSER: C-Plane match err:     7138
-  UPLANE PARSER: eAxC ID unsupported:   0
-  UPLANE PARSER: any value unsupported: 0
-  UPLANE PARSER: dropped:               7231
-  UPLANE PARSER: passed:                43531604
-  UPLANE ENCAPSULATOR 0: false drop error: 0
-  UPLANE ENCAPSULATOR 0: passed:           6698292
-  UPLANE ENCAPSULATOR 1: false drop error: 0
-  UPLANE ENCAPSULATOR 1: passed:           6698292
-  UPLANE ENCAPSULATOR 2: false drop error: 0
-  UPLANE ENCAPSULATOR 2: passed:           0
-  UPLANE ENCAPSULATOR 3: false drop error: 0
-  UPLANE ENCAPSULATOR 3: passed:           0
-  COMMON COMMON: symbol counter: 111095058
-  }
-  ```
-
-</details>
-
-
 #### VVDN LPRU
 
 **Version 3.x**
@@ -1246,42 +844,6 @@ sudo ./ru_emulator -c <path-to/protoru-OAI-B210-TDD-n78-40MHz-1x1-30kHz.yml>
 
 Finally, start the OAI gNB.
 
-#### WNC R1220
-
-**Version 1.9.0**
-
-The OAI configuration file [gnb.sa.band77.273prb.fhi72.4x4-wnc.conf](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-wnc.conf) corresponds to:
-
-- TDD pattern `DDDDDDSUUU`, 5ms
-- Bandwidth 100MHz
-- 4TX4R
-
-##### RU configuration
-
-After switching on or rebooting the RU, you can check the RU PTP status with `show ptp clock` to make sure it's locked and run `show running-config` to check the current configuration.
-To enable RU transmission, use the `radio enable` command. Then verify the configuration with `show running-config`, which should reflect the enabled state:
-```
-radio 1
-  no shutdown
-```
-
-The required parameters to configure are:
-
-1. `center-frequency` →  3849990
-2. `transmit-power` →  24
-3. `lna-shutdown` →  **disabled**
-4. `transport-interface` →  configure the sub-interface (VLAN ID is defined during sub-interface creation)
-5. `transport-peer-mac` →  must match the DU MAC address
-6. `phase-compensation` →  **enabled**
-7. `bandwidth` →  100
-8. `sub-carrier` →  30
-9. `compress-oran-compliant` →  **enabled**
-
-**Note**
-  * Ensure that the VLAN configuration and MAC addressing are consistent with the DU setup.
-  * The RU must be PTP synchronized before starting the gNB.
-  * After reboot, the RU loads its `startup-config`. To save the current configuration, use `copy running-config startup-config`.
-
 ## Configure Network Interfaces and DPDK VFs
 
 The 7.2 fronthaul uses the xran library, which requires DPDK. In this step, we
@@ -1933,9 +1495,7 @@ sudo ldconfig
 If you would like to install these libraries in the custom path, please replace `/usr/local` default path to e.g. `/opt/mplane-v2`.
 
 ## Benetel O-RU
-Note: RAN550-1v2.1.0-M-0820797 has been successfully tested.
-
-We added a [CI M-plane pipeline](https://jenkins-oai.eurecom.fr/job/RAN-SA-FHI72-MPLANE-CN5G/) showcasing the M-plane integration.
+Note: RAN550/650 v1.2.2 and v1.4.1 have been successfully tested.
 
 #### One time steps
 Connect to the RU as user `root`, enable the mplane service, and reboot: