Attempt to fix the ORU hanging issue

In an attempt to make the ORU interrupt more robust, move the timing thread
stop at the very end of vrtism_end function. This will give an extra second to
applications threads to finalize read operations and stop correctly.

.clang-format

@@ -62,7 +62,6 @@ ForEachMacros:
   - BOOST_FOREACH
   - RB_FOREACH
   - UE_iterator
-  - FOR_EACH_SEQ_ARR
 IncludeBlocks:   Preserve
 IncludeCategories:
   - Regex:           '^<ext/.*\.h>'

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "openair2/E2AP/flexric"]
 	path = openair2/E2AP/flexric
-	url = https://gitlab.eurecom.fr/mosaic5g/flexric
+	url = https://gitlab.eurecom.fr/mosaic5g/flexric.git
+	branch = remotes/origin/service-models-integration

CHANGELOG.md

@@ -1,71 +1,5 @@
 # RELEASE NOTES: #
 
-## [v2.4.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.4.0) -> December 2025. ##
-
-General new features and improvements (both RAN and UE):
-- Rework LDPC BBdev/AAL interface and support both AMD T2/Intel vRAN Boost
-  (VRB) 1 accelerators
-- Add a taps client for vrtsim real-time simulator (check: vrtsim release?)
-- Add new RFemulator virtual radio driver to emulate radio (including noise
-  generation) for gNB/UE standalone operation
-- RLC AM reception improvements for high-throughput scenarios (!3512)
-- Small NTN fixes (!3659, !3666, !3581, !3652)
-- Improvements to imScope
-
-Stability and bug fixes:
-- RFsimulator: fix concurrency problems during multi-client connection
-- USRP driver: support synchronization of USRP B200
-- MAC scheduler improvements
-- General L1 improvements for efficiency and stability
-- Correct PRS bug and test in CI
-- Upgrade Ubuntu container images to Ubuntu 24.04
-- All build system targets compile (`make/ninja all`)
-- Minor cleanup, harmonization, and performance improvements all over the stack
-- Simplify CI code
-
-RAN changes (gNB/CU/CU-CP/CU-UP/DU/DU-high/DU-low):
-- Support of N2 handover
-- Support of "UL-heavy" TDD patterns, e.g., DSUUU
-- Open Fronthaul M-plane: CM improvements, PM implementation, and additional
-  v16.01 support
-- Improve interoperability with Nvidia Aerial L1 to support 2 layer UL
-- Add O-RAN OSC WLS library as FAPI transport and enable L1/L2 shared memory
-  split
-- Implement FAPI Stop exchange
-- Improve interoperability with srsRAN_Project DU
-- Add new synchronized real-time data recording application (!3462)
-- Support for measurement gaps and general handover fixes
-- Support of RRC PDU session release procedure
-- Add CU-UP load tester
-- Correct BWP scheduling and support multiple BWPs per UE
-
-nrUE changes:
-- Support one additional PDU session (see !3486)
-- L3 measurements for A2 measurement reports
-- Support for type0 PDSCH frequency allocation
-- UE symbol based PDCCH receiver
-
-Regression or removals:
-- No known regressions
-- Unused L2 simulator code has been removed
-- Unused Benetel radio driver code (not FHI 7.2!) has been removed
-
-Configuration file changes:
-- `gNBs.[0].servingCellConfigCommon.[0].ra_ResponseWindow` is automatically
-  computed and can be removed
-- `gNBs.[0].bwp_list` has been added (moved from entries in
-  `gNBs.[0].servingCellConfigDedicated`)
-- `gNBs.[0].phaseTrackingRS` has been added (moved from entries in
-  `gNBs.[0].servingCellConfigDedicated`)
-- `gNBs.[0].local_s_portc` and `gNBs.[0].remote_s_portc` have no effect and
-  should be removed
-- `gNBs.[0].CSI_report_type` has been added
-- `MACRLCs.[0].ulsch_max_frame_inactivity` is automatically computed and can be
-  removed
-- `MACRLCs.[0].local_n_portc` and `MACRLCs.[0].remote_n_portc` have no effect and
-  should be removed
-- `MACRLCs.[0].stats_max_ue` has been added
-
 ## [v2.3.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.3.0) -> July 2025. ##
 
 General new features and improvements (both RAN and UE):

CMakeLists.txt

@@ -183,10 +183,6 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang
   set(commonOpts "${commonOpts} -Wno-unused-command-line-argument")
 endif()
 
-if (ENABLE_CUDA)
-  set(commonOpts "${commonOpts} -DENABLE_CUDA")
-endif()
-
 set(CMAKE_C_FLAGS
   "${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops ${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_FLAGS
@@ -286,7 +282,7 @@ add_boolean_option(TRACY_ENABLE OFF "Enable tracy instrumentation" ON)
 if (TRACY_ENABLE)
   # the tracy version here should match the tracy server version
   # below is latest release as of this commit
-  CPMAddPackage("gh:wolfpld/tracy#0.12.2")
+  CPMAddPackage("gh:wolfpld/tracy#v0.12.2")
 endif()
 
 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
@@ -468,9 +464,6 @@ target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
-if(E2_AGENT)
-  target_compile_definitions(f1ap PRIVATE E2_AGENT)
-endif()
 
 # LPP
 ##############
@@ -659,6 +652,7 @@ add_library(SCHED_LIB ${SCHED_SRC})
 target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)
 
 set(SCHED_NR_SRC
+  ${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
   ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
   ${OPENAIR1_DIR}/SCHED_NR/nr_prach_procedures.c
   ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
@@ -945,6 +939,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
@@ -1051,17 +1046,7 @@ target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
 
-if (ENABLE_CUDA)
-  find_package(CUDA REQUIRED)
-  if (NOT CUDA_FOUND)
-    message(FATAL_ERROR "no CUDA found")
-  endif()
-  set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-arch=sm_87;")
-  set(CUDA_VERBOS_BUILD_ON)
-  cuda_add_library(PHY_NR ${PHY_NR_SRC} ${PHY_NR_SRC_CU})
-else()
-  add_library(PHY_NR ${PHY_NR_SRC})
-endif()
+add_library(PHY_NR ${PHY_NR_SRC})
 target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5)
 
 add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
@@ -1230,6 +1215,7 @@ set (MAC_SRC
 
 set (MAC_NR_SRC
   ${NR_PHY_INTERFACE_DIR}/NR_IF_Module.c
+  ${NR_PHY_INTERFACE_DIR}/nr_sched_response.c
   ${NR_GNB_MAC_DIR}/main.c
   ${NR_GNB_MAC_DIR}/config.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler.c
@@ -1297,6 +1283,12 @@ set (MISC_NFAPI_LTE
 
 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})
 
+set (MISC_NFAPI_NR
+ ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
+ )
+
+add_library(MISC_NFAPI_NR_LIB ${MISC_NFAPI_NR})
+
 add_library(L2
   ${L2_SRC}
   ${MAC_SRC}
@@ -1305,9 +1297,6 @@ add_library(L2
   )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-if(E2_AGENT)
-  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
-endif()
 
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
 target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)
@@ -1323,9 +1312,6 @@ add_library(L2_NR
 target_link_libraries(L2_NR PRIVATE ds alg)
 target_link_libraries(L2_NR PRIVATE f1ap_lib)
 target_include_directories(L2_NR PRIVATE ${F1AP_DIR}/lib)
-if(E2_AGENT)
-  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
-endif()
 
 add_library(e1_if
   ${NR_RRC_DIR}/cucp_cuup_direct.c
@@ -1802,6 +1788,30 @@ target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIE
 target_link_libraries(lte-uesoftmodem PRIVATE
                       asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)
 
+# nr RRU
+add_executable(oainr_ru
+  ${OPENAIR_DIR}/executables/nr-ru.c
+  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
+  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
+  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
+  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
+  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR_DIR}/executables/main_nr_ru.c
+  ${OPENAIR_DIR}/executables/nr-oru.c
+)
+target_link_libraries(oainr_ru PRIVATE
+  -Wl,--start-group
+  UTIL SCHED_RU_LIB PHY_COMMON PHY_RU shlib_loader
+  -Wl,--end-group z dl)
+target_link_libraries(oainr_ru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
+  barrier actor)
+target_link_libraries(oainr_ru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management PHY_NR MAC_NR_COMMON PHY_NR_COMMON)
+
 # nr-softmodem
 ###################################################
 
@@ -1963,7 +1973,7 @@ add_executable(ldpctest
 )
 target_link_libraries(ldpctest PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
-  m pthread dl shlib_loader ${T_LIB} ${CUDA_LIBRARIES}
+  m pthread dl shlib_loader ${T_LIB}
   # link 'check_crc' to make it resolved in the LDPC coding libraries
   # 'check_crc' is not used in ldpctest so it is not linked in the executable by default
   # --whole-archive links 'check_crc' in the executable even though it is note used, see 'man ld'
@@ -2105,7 +2115,7 @@ if (${T_TRACER})
         oai_eth_transpro HASHTABLE UTIL
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
         NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
-        MISC_NFAPI_LTE_LIB
+        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
         GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE SIMU

ci-scripts/Jenkinsfile

@@ -1,233 +0,0 @@
-#!/bin/groovy
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-def pythonExecutor = params.pythonExecutor
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-def JOB_TIMESTAMP
-
-// Choose test stage name or fallback default
-def testStageName = params.pipelineTestStageName != null ? params.pipelineTestStageName : 'Template Test Stage'
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-
-def 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
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-      steps {
-        script {
-          echo '\u2705 \u001B[94mBuild Init\u001B[0m'
-          JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
-        }
-        // update the build name and description
-        buildName "${params.eNB_MR}"
-        buildDescription "Branch : ${sourceBranch}"
-      }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[94mVerify Parameters\u001B[0m'
-          def allParametersPresent = true
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            echo "no eNB_SourceCodePath given"
-            allParametersPresent = false
-          }
-          if (params.OC_Credentials != null) {
-            echo "This pipeline is configured to run with Opensift Cluster."
-            runWithOC = true
-            if (params.OC_ProjectName == null) {
-              echo "no OC_ProjectName given"
-              allParametersPresent = false
-            }
-          }
-          if (params.Flexric_Tag != null) {
-            echo "This pipeline is configured to run with a FlexRIC deployment."
-            echo "Appending FlexRicTag option to the list of options"
-            flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
-            echo "Using new Flexric option: ${flexricOption}"
-          }
-
-          echo "CI executor node    :   ${pythonExecutor}"
-          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"
-          }
-        }
-      }
-    }
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[94m Deploy and Test: ${testStageName}\u001B[0m"
-            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-            for (xmlFile in myXmlTestSuite) {
-              if (fileExists(xmlFile)) {
-                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                echo "Test XML file         :   ${xmlFile}"
-              } else {
-                echo "Test XML file ${xmlFile}: no such file"
-              }
-            }
-            sh """
-              python3 main.py --mode=InitiateHtml --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 --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}
-                        """
-                      }
-                    } catch (Exception e) {
-                      currentBuild.result = 'FAILURE'
-                      buildStageStatus = false
-                    }
-                  }
-                }
-              }
-            } else {
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                    timeout (time: 60, unit: 'MINUTES') {
-                      sh """
-                        python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
-                                        --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
-                                        --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
-                                        --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
-                                        ${flexricOption}
-                      """
-                    }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-            }
-          sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-          }
-        }
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-	  echo '\u2705 \u001B[94mLog Collection\u001B[0m'
-          dir ('ci-scripts') {
-            // Zipping all archived log files
-              sh "mkdir test_logs"
-              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
-              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
-              sh "rm -rf *test_log*/"
-              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
-                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
-              }
-            if (fileExists("test_results.html")) {
-              def reportName = "test_results-${env.JOB_NAME}.html"
-              sh "mv test_results.html ${reportName}"
-              sh """
-                sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' \
-                       -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' \
-		       -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' \
-                       -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' \
-                       -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' ${reportName}
-	      """
-              archiveArtifacts artifacts: "${reportName}"
-            }
-          }
-        }
-      }
-    }
-  }
-}

ci-scripts/args_parse.py

@@ -43,6 +43,10 @@ import constants as CONST
 
 def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
 
+
+    py_param_file_present = False
+    py_params={}
+
     force_local = False
     while len(argvs) > 1:
         myArgv = argvs.pop(1)	# 0th is this file's name
@@ -168,4 +172,4 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
             HELP.GenericHelp(CONST.Version)
             sys.exit('Invalid Parameter: ' + myArgv)
 
-    return mode, force_local
+    return py_param_file_present, py_params, mode, force_local

ci-scripts/cls_cluster.py

@@ -397,9 +397,9 @@ class Cluster:
 		# Analyze the logs
 		collectInfo = {}
 		for image, lf in log_files:
-			imgStatus, errors = cls_containerize.AnalyzeBuildLogs(image, lf)
-			info = f"Analysis of {os.path.basename(lf)}: {imgStatus=}, size {imageSize[image]}, {len(errors)} errors"
-			msg = "\n".join([info] + errors)
+			ret = cls_containerize.AnalyzeBuildLogs(image, lf)
+			imgStatus = ret['status']
+			msg = f"size {imageSize[image]}, analysis of {os.path.basename(lf)}: {ret['errors']} errors, {ret['warnings']} warnings"
 			HTML.CreateHtmlTestRowQueue(image, 'OK' if imgStatus else 'KO', [msg])
 			status = status and imgStatus
 

ci-scripts/cls_containerize.py

@@ -47,7 +47,6 @@ import helpreadme as HELP
 import constants as CONST
 import cls_oaicitest
 from cls_ci_helper import archiveArtifact
-from collections import deque
 
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
@@ -86,9 +85,9 @@ def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
 	return tagToUse
 
 def AnalyzeBuildLogs(image, lf):
+	errorandwarnings = {}
 	committed = False
 	tagged = False
-	errors = []
 	with open(lf, mode='r') as inputfile:
 		for line in inputfile:
 			lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
@@ -97,13 +96,11 @@ def AnalyzeBuildLogs(image, lf):
 			# the OpenShift Cluster builder prepends image registry URL
 			lineHasCommit = re.search(r'COMMIT [a-zA-Z0-9\.:/\-]*' + image, str(line)) is not None
 			committed = committed or lineHasCommit
-			if re.search(r'error:|Errors|ERROR', line):
-				errors.append(f"=> {line.strip()}")
-	status = (committed or tagged) and len(errors) == 0
-	logging.info(f"Analyzing {image}, file {lf}: {status=}, {len(errors)} errors")
-	for e in errors:
-		logging.info(e)
-	return status, errors
+	errorandwarnings['errors'] = 0 if committed or tagged else 1
+	errorandwarnings['warnings'] = 0
+	errorandwarnings['status'] = committed or tagged
+	logging.info(f"Analyzing {image}, file {lf}: {errorandwarnings}")
+	return errorandwarnings
 
 def GetImageName(ssh, svcName, file):
 	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".image'", silent=True)
@@ -168,26 +165,25 @@ def CopyinServiceLog(ssh, lSourcePath, svcName, wd_yaml, ctx):
 	ssh.run(f'docker compose -f {wd_yaml} logs {svcName} --no-log-prefix &> {remote_filename}')
 	return archiveArtifact(ssh, ctx, remote_filename)
 
-def GetDeployedServices(ssh, file):
+def GetRunningServices(ssh, file):
 	ret = ssh.run(f'docker compose -f {file} config --services')
 	if ret.returncode != 0:
-		logging.error("could not get services")
 		return None
 	allServices = ret.stdout.splitlines()
-	deployed_services = []
+	running_services = []
 	for s in allServices:
-		# outputs the hash if the container has been deployed (but might be stopped)
-		ret = ssh.run(f'docker compose -f {file} ps --all --quiet -- {s}', silent=True)
+		# outputs the hash if the container is running
+		ret = ssh.run(f'docker compose -f {file} ps --all --quiet -- {s}')
 		if ret.returncode != 0:
-			# error: should not happen as we iterate over docker-provided service list
-			logging.error(f"service {s}: {ret.stdout}")
+			logging.info(f"service {s}: {ret.stdout}")
 		elif ret.stdout == "":
-			logging.info(f"service {s} not deployed")
+			logging.warning(f"could not retrieve information for service {s}")
 		else:
 			c = ret.stdout
-			logging.info(f'service {s} with container id {c}')
-			deployed_services.append(s)
-	return deployed_services
+			logging.debug(f'running service {s} with container id {c}')
+			running_services.append((s, c))
+	logging.info(f'stopping services: {running_services}')
+	return running_services
 
 def CheckLogs(self, filename, HTML, RAN):
 	success = True
@@ -219,24 +215,6 @@ def CheckLogs(self, filename, HTML, RAN):
 		else:
 			HTML.CreateHtmlTestRowQueue(opt, 'OK', [HTML.htmleNBFailureMsg])
 		HTML.htmleNBFailureMsg = ""
-	elif 'xapp' in name:
-		opt = f"Undeploy {name}"
-		with open(f'{filename}', "r") as f:
-			last_line = deque(f, maxlen=1).pop()
-		if ('Test xApp run SUCCESSFULLY' in last_line):
-			HTML.CreateHtmlTestRowQueue(opt, 'OK', ["xApp run successfully"])
-		else:
-			HTML.CreateHtmlTestRowQueue(opt, 'KO', ["xApp didn't run successfully"])
-			success = False
-	elif 'RIC' in name:
-		opt = f"Undeploy {name}"
-		with open(f'{filename}', 'r') as f:
-			last_line = deque(f, maxlen=1).pop()
-		if ('Removing E2 Node' in last_line):
-			HTML.CreateHtmlTestRowQueue(opt, 'OK', ["nearRT-RIC run successfully"])
-		else:
-			HTML.CreateHtmlTestRowQueue(opt, 'KO', ["nearRT-RIC didn't run successfully"])
-			success = False
 	else:
 		logging.info(f"Skipping analysis of log '{filename}': no submatch for xNB/UE")
 	logging.debug(f"log check: file {filename} passed analysis {success}")
@@ -462,9 +440,9 @@ class Containerize():
 
 		# Analyze the logs
 		for name, lf in log_files:
-			imgStatus, errors = AnalyzeBuildLogs(name, lf)
-			info = f"Analysis of {os.path.basename(lf)}: {imgStatus=}, size {allImagesSize[name]}, {len(errors)} errors"
-			msg = "\n".join([info] + errors)
+			ret = AnalyzeBuildLogs(name, lf)
+			imgStatus = ret['status']
+			msg = f"size {allImagesSize[name]}, analysis of {os.path.basename(lf)}: {ret['errors']} errors, {ret['warnings']} warnings"
 			HTML.CreateHtmlTestRowQueue(name, 'OK' if imgStatus else 'KO', [msg])
 			status = status and imgStatus
 		
@@ -737,6 +715,7 @@ class Containerize():
 	def DeployObject(self, ctx, node, HTML):
 		num_attempts = self.num_attempts
 		lSourcePath = self.eNBSourceCodePath
+		logging.debug(f'Deploying OAI Object on server: {node}')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'
@@ -747,7 +726,6 @@ class Containerize():
 				logging.error(msg)
 				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
 				return False
-			logging.info(f'\u001B[1mDeploying object(s) "{services}" on server {node}\u001B[0m')
 			ExistEnvFilePrint(ssh, wd)
 			WriteEnvFile(ssh, services, wd, self.deploymentTag, self.flexricTag)
 			if num_attempts <= 0:
@@ -772,68 +750,36 @@ class Containerize():
 		imagesInfo = info.stdout.splitlines()[1:]
 		logging.debug(f'{info.stdout.splitlines()[1:]}')
 		if deployed:
-			HTML.CreateHtmlTestRowQueue(self.services, 'OK', ['\n'.join(imagesInfo)])
-			logging.info('\u001B[1m Deploying objects Pass\u001B[0m')
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', ['\n'.join(imagesInfo)])
 		else:
-			HTML.CreateHtmlTestRowQueue(self.services, 'KO', ['\n'.join(imagesInfo)])
-			logging.error('\u001B[1m Deploying objects Failed\u001B[0m')
+			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['\n'.join(imagesInfo)])
 		return deployed
 
-	def StopObject(self, ctx, node, HTML):
-		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')
-		reqServices = self.services.split()
-		yaml = self.yamlPath.strip('/')
-		wd = f'{lSourcePath}/{yaml}'
-		wd_yaml = f'{wd}/docker-compose.y*ml'
-		with cls_cmd.getConnection(node) as ssh:
-			ExistEnvFilePrint(ssh, wd)
-			services = GetDeployedServices(ssh, wd_yaml)
-			success = []
-			fail = []
-			for s in reqServices:
-				if s in services:
-					ssh.run(f'docker compose -f {wd_yaml} stop -- {s}')
-					success.append(s)
-				else:
-					logging.error(f"no such service {s}")
-					fail.append(s)
-		if success == reqServices:
-			logging.info('\u001B[1m Stopping object Pass\u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.services, 'OK', [f'Stopped {self.services}'])
-		else:
-			logging.error('\u001B[1m Stopping object Failed\u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.services, 'KO', [f'Failed stopping {" ".join(fail)}, succeeded {" ".join(success)}'])
-		return success
-
 	def UndeployObject(self, ctx, node, HTML, RAN):
 		lSourcePath = self.eNBSourceCodePath
-		logging.info(f'\u001B[1m Undeploying all objects from server {node}\u001B[0m')
+		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {node}\u001B[0m')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
-		wd_yaml = f'{wd}/docker-compose.y*ml'
 		with cls_cmd.getConnection(node) as ssh:
 			ExistEnvFilePrint(ssh, wd)
-			services = GetDeployedServices(ssh, wd_yaml)
+			services = GetRunningServices(ssh, f"{wd}/docker-compose.y*ml")
 			copyin_res = None
-			ssh.run(f'docker compose -f {wd_yaml} stop')
 			if services is not None:
-				copyin_res = [CopyinServiceLog(ssh, lSourcePath, s, wd_yaml, ctx) for s in services]
+				all_serv = " ".join([s for s, _ in services])
+				ssh.run(f'docker compose -f {wd}/docker-compose.y*ml stop -- {all_serv}')
+				copyin_res = [CopyinServiceLog(ssh, lSourcePath, s, f"{wd}/docker-compose.y*ml", ctx) for s, _ in services]
 			else:
 				logging.warning('could not identify services to stop => no log file')
-			ssh.run(f'docker compose -f {wd_yaml} down -v')
+			ssh.run(f'docker compose -f {wd}/docker-compose.y*ml down -v')
 			ssh.run(f'rm {wd}/.env')
 		if not copyin_res:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['Could not copy logfile(s)'])
-			logging.error(f"could not copy all files: {copyin_res=} {services=}")
-			success = False
+			return False
 		else:
 			log_results = [CheckLogs(self, f, HTML, RAN) for f in copyin_res]
 			success = all(log_results)
 		if success:
-			logging.info('\u001B[1m Undeploying objects Pass\u001B[0m')
+			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
 		else:
-			logging.error('\u001B[1m Undeploying objects Failed\u001B[0m')
+			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
 		return success

ci-scripts/cls_module.py

@@ -111,11 +111,10 @@ class Module_UE:
 			return self._collectTrace(ctx)
 		return None
 
-	def attach(self, attach_tries = 3, attach_timeout = 0):
+	def attach(self, attach_tries = 4, attach_timeout = 60):
 		ip = None
 		while attach_tries > 0:
 			self._command(self.cmd_dict["attach"])
-			attach_timeout += 20
 			timeout = attach_timeout
 			logging.debug("Waiting for IP address to be assigned")
 			ip = self.getIP(silent=False, reportNonZero=True)

ci-scripts/cls_oaicitest.py

@@ -233,10 +233,10 @@ def Custom_Command(HTML, node, command):
     HTML.CreateHtmlTestRowQueue(command, status, message)
     return status == 'OK' or status == 'Warning'
 
-def Custom_Script(HTML, node, script, args):
+def Custom_Script(HTML, node, script):
 	logging.info(f"Executing custom script on {node}")
 	with cls_cmd.getConnection(node) as c:
-		ret = c.exec_script(script, 90, args)
+		ret = c.exec_script(script, 90)
 	logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
 	status = 'OK'
 	message = [ret.stdout]
@@ -299,16 +299,18 @@ class OaiCiTest():
 		self.iperf_packetloss_threshold = ''
 		self.iperf_bitrate_threshold = ''
 		self.iperf_profile = ''
+		self.iperf_options = ''
 		self.iperf_tcp_rate_target = ''
 		self.finalStatus = False
 		self.air_interface=''
 		self.ue_ids = []
+		self.nodes = []
 		self.svr_node = None
 		self.svr_id = None
 		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
 
-	def InitializeUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def InitializeUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.initialize) for ue in ues]
@@ -319,8 +321,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages)
 		return True
 
-	def AttachUE(self, node, HTML):
-		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
+	def AttachUE(self, HTML):
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.attach) for ue in ues]
 			attached = [f.result() for f in futures]
@@ -335,8 +337,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not retrieve UE IP address(es) or MTU(s) wrong!"])
 		return success
 
-	def DetachUE(self, node, HTML):
-		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
+	def DetachUE(self, HTML):
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.detach) for ue in ues]
 			[f.result() for f in futures]
@@ -344,8 +346,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		return True
 
-	def DataDisableUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def DataDisableUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataDisable) for ue in ues]
 			status = [f.result() for f in futures]
@@ -358,8 +360,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not disable UE data!"])
 		return success
 
-	def DataEnableUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def DataEnableUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'disabling data for UEs {ues}')
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataEnable) for ue in ues]
@@ -373,8 +375,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not enable UE data!"])
 		return success
 
-	def CheckStatusUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def CheckStatusUE(self,HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'checking status of UEs {ues}')
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
@@ -444,10 +446,10 @@ class OaiCiTest():
 
 		return (True, message)
 
-	def Ping(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
+	def Ping(self, ctx, HTML, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(self.Ping_common, ctx, cn, ue) for ue in ues]
@@ -518,12 +520,12 @@ class OaiCiTest():
 
 		return (status, f'{ue_header}\n{msg}')
 
-	def Iperf(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
-		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}"')
+	def Iperf(self, ctx, HTML, infra_file="ci_infra.yaml"):
+		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
 
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(self.Iperf_Module, ctx, cn, ue, i, len(ues)) for i, ue in enumerate(ues)]
@@ -547,10 +549,10 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
 		return success
 
-	def Iperf2_Unidir(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
+	def Iperf2_Unidir(self, ctx, HTML, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported")
-		ue = cls_module.Module_UE(self.ue_ids[0].strip(), node, infra_file)
+		ue = cls_module.Module_UE(self.ue_ids[0].strip(),self.nodes[0].strip(), infra_file)
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		ueIP = ue.getIP()
 		if not ueIP:
@@ -850,8 +852,8 @@ class OaiCiTest():
 				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
 		return global_status
 
-	def TerminateUE(self, ctx, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def TerminateUE(self, ctx, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.terminate, ctx) for ue in ues]
 			archives = [f.result() for f in futures]

ci-scripts/conf_files/gnb-cu.sa.f1.ho.conf

@@ -53,7 +53,7 @@ security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
   # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea2", "nea0" );
+  ciphering_algorithms = ( "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -63,7 +63,7 @@ security = {
   # 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 = "yes";
+  drb_integrity = "no";
 };
 
 log_config :

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

@@ -146,11 +146,7 @@ gNBs =
   );
 
     first_active_bwp = 1;
-    bwp_list = (
-      { scs = 1; bwpStart = 0; bwpSize = 106;},
-      { scs = 1; bwpStart = 0; bwpSize = 36;},
-      { scs = 1; bwpStart = 36; bwpSize = 70;}
-    );
+    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;});
 
     # ------- SCTP definitions
     SCTP :

ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf

@@ -32,7 +32,7 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = 1;
+    do_SRS                = 0;
     min_rxtxtime          = 2;
 
     servingCellConfigCommon = (
@@ -155,7 +155,7 @@ gNBs =
       nrofUplinkSlots                                               = 3;  #1;
       nrofUplinkSymbols                                             = 0;
 
-      ssPBCH_BlockPower                                             = -15;
+      ssPBCH_BlockPower                                             = -25;
   }
 
   );
@@ -176,8 +176,8 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.53";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.53";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.202";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.202";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
@@ -195,7 +195,7 @@ MACRLCs = (
   remote_s_portd   = 50010; // pnf p7 port [!]
   tr_s_preference             = "aerial";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 280; # 150;
+  pusch_TargetSNRx10          = 200; # 150;
   pucch_TargetSNRx10          = 200; #200;
   dl_max_mcs = 28;
   ul_max_mcs = 28;

ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf

@@ -24,9 +24,9 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = 1;
+    do_SRS                = 0;
     min_rxtxtime          = 2;
-    force_UL256qam_off    = 1;
+
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
@@ -168,8 +168,8 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.53";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.53";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.202";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.202";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
@@ -187,7 +187,7 @@ MACRLCs = (
   remote_s_portd   = 50010; // pnf p7 port [!]
   tr_s_preference             = "aerial";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 260; # 150;
+  pusch_TargetSNRx10          = 220; # 150;
   pucch_TargetSNRx10          = 200; #200;
   dl_max_mcs = 28;
   ul_max_mcs = 28;

ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf

@@ -195,7 +195,6 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 50;
          eNB_instances  = [0];
-         sl_ahead = 3;
          sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
     }
 );  

ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf

@@ -209,7 +209,7 @@ security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
   # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea2", "nea0" );
+  ciphering_algorithms = ( "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -219,7 +219,7 @@ security = {
   # 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 = "yes";
+  drb_integrity = "no";
 };
 
 log_config :

ci-scripts/conf_files/nrue.band78.106prb.prs.conf

@@ -1,89 +0,0 @@
-PRSs =
-(
-  {
-    Active_gNBs = 1;
-    prs_config0 = (
-    {
-      gNB_id = 0;
-      NumPRSResources       = 1;
-      PRSResourceSetPeriod  = [20, 2];
-      SymbolStart           = [7];
-      NumPRSSymbols         = [6];
-      NumRB                 = 106;
-      RBOffset              = 0;
-      CombSize              = 4;
-      REOffset              = [0];
-      PRSResourceOffset     = [0];
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap    = 1;
-      NPRS_ID               = [0];
-      MutingPattern1        = [];
-      MutingPattern2        = [];
-      MutingBitRepetition   = 1;
-    }
-    );
-
-    prs_config1 = (
-    {
-      gNB_id = 1;
-      NumPRSResources       = 1;
-      PRSResourceSetPeriod  = [20, 2];
-      SymbolStart           = [7];
-      NumPRSSymbols         = [6];
-      NumRB                 = 106;
-      RBOffset              = 0;
-      CombSize              = 4;
-      REOffset              = [0];
-      PRSResourceOffset     = [1];
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap    = 1;
-      NPRS_ID               = [1];
-      MutingPattern1        = [];
-      MutingPattern2        = [];
-      MutingBitRepetition   = 1;
-    }
-    );
-
-    prs_config2 = (
-    {
-      gNB_id = 2;
-      NumPRSResources       = 1;
-      PRSResourceSetPeriod  = [20, 2];
-      SymbolStart           = [7];
-      NumPRSSymbols         = [6];
-      NumRB                 = 106;
-      RBOffset              = 0;
-      CombSize              = 4;
-      REOffset              = [0];
-      PRSResourceOffset     = [2];
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap    = 1;
-      NPRS_ID               = [2];
-      MutingPattern1        = [];
-      MutingPattern2        = [];
-      MutingBitRepetition   = 1;
-    }
-    );
-
-    prs_config3 = (
-    {
-      gNB_id = 3;
-      NumPRSResources       = 1;
-      PRSResourceSetPeriod  = [20, 2];
-      SymbolStart           = [7];
-      NumPRSSymbols         = [6];
-      NumRB                 = 106;
-      RBOffset              = 0;
-      CombSize              = 4;
-      REOffset              = [0];
-      PRSResourceOffset     = [3];
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap    = 1;
-      NPRS_ID               = [3];
-      MutingPattern1        = [];
-      MutingPattern2        = [];
-      MutingBitRepetition   = 1;
-    }
-    );
-  }
-);

ci-scripts/datalog_rt_stats.100.2x2.yaml

@@ -15,6 +15,7 @@ Ref :
   DLSCH encoding : 200.0
   L1 Rx processing : 530.0
   PUSCH inner-receiver : 360.0
+  Schedule Response : 1.0
   DL & UL scheduling timing : 17.0
   UL Indication : 1.0
   Slot Indication : 13.0
@@ -30,6 +31,7 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
   DL & UL scheduling timing : 0.25
   UL Indication : 1.00
   Slot Indication : 0.50

ci-scripts/datalog_rt_stats.1x1.60.yaml

@@ -15,6 +15,7 @@ Ref :
   DLSCH encoding : 110.0
   L1 Rx processing : 345.0
   PUSCH inner-receiver : 150.0
+  Schedule Response : 1.0
   DL & UL scheduling timing : 5.0
   UL Indication : 1.0
   Slot Indication : 6.0
@@ -30,6 +31,7 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.50

ci-scripts/datalog_rt_stats.2x2.yaml

@@ -15,6 +15,7 @@ Ref :
   DLSCH encoding : 230.0
   L1 Rx processing : 175.0
   PUSCH inner-receiver : 100.0
+  Schedule Response : 3.0
   DL & UL scheduling timing : 11.0
   UL Indication : 3.0
   Slot Indication : 14.0
@@ -27,6 +28,7 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.25

ci-scripts/datalog_rt_stats.60.2x2.yaml

@@ -15,6 +15,7 @@ Ref :
   DLSCH encoding : 140.0
   L1 Rx processing : 345.0
   PUSCH inner-receiver : 155.0
+  Schedule Response : 1.0
   DL & UL scheduling timing : 8.0
   UL Indication : 3.0
   Slot Indication : 9.0
@@ -30,6 +31,7 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
   DL & UL scheduling timing : 0.35
   UL Indication : 1.00
   Slot Indication : 0.35

ci-scripts/datalog_rt_stats.default.yaml

@@ -15,6 +15,7 @@ Ref :
   DLSCH encoding : 90.0
   L1 Rx processing : 290.0
   PUSCH inner-receiver : 115.0
+  Schedule Response : 1.0
   DL & UL scheduling timing : 4.0
   UL Indication : 2.0
   Slot Indication : 5.0
@@ -30,6 +31,7 @@ DeviationThreshold :
   DLSCH encoding : 0.25
   L1 Rx processing : 0.25
   PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.50

ci-scripts/main.py

@@ -85,7 +85,15 @@ def CheckClassValidity(xml_class_list,action,id):
 		resp=True
 	return resp
 
-def ExecuteActionWithParam(action, ctx, node):
+#assigning parameters to object instance attributes (even if the attributes do not exist !!)
+def AssignParams(params_dict):
+
+	for key,value in params_dict.items():
+		setattr(CiTestObj, key, value)
+		setattr(RAN, key, value)
+		setattr(HTML, key, value)
+
+def ExecuteActionWithParam(action, ctx):
 	global RAN
 	global HTML
 	global CONTAINERS
@@ -94,6 +102,7 @@ def ExecuteActionWithParam(action, ctx, node):
 	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')
+		node = test.findtext('node')
 		proxy_commit = test.findtext('proxy_commit')
 		if proxy_commit is not None:
 			CONTAINERS.proxyCommit = proxy_commit
@@ -109,6 +118,7 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.BuildRunTests(ctx, node, HTML)
 
 	elif action == 'Initialize_eNB':
+		node = test.findtext('node')
 		datalog_rt_stats_file=test.findtext('rt_stats_cfg')
 		if datalog_rt_stats_file is None:
 			RAN.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
@@ -129,6 +139,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		success = RAN.InitializeeNB(ctx, node, HTML)
 
 	elif action == 'Terminate_eNB':
+		node = test.findtext('node')
 		#retx checkers
 		string_field = test.findtext('d_retx_th')
 		if (string_field is not None):
@@ -147,35 +158,68 @@ def ExecuteActionWithParam(action, ctx, node):
 
 	elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
+		if force_local:
+			# Change all execution targets to localhost
+			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
+		else:
+			if test.findtext('nodes'):
+				CiTestObj.nodes = test.findtext('nodes').split(' ')
+				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+					logging.error('Number of Nodes are not equal to the total number of UEs')
+					sys.exit("Mismatch in number of Nodes and UIs")
+			else:
+				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		if action == 'Initialize_UE':
-			success = CiTestObj.InitializeUE(node, HTML)
+			success = CiTestObj.InitializeUE(HTML)
 		elif action == 'Attach_UE':
-			success = CiTestObj.AttachUE(node, HTML)
+			success = CiTestObj.AttachUE(HTML)
 		elif action == 'Detach_UE':
-			success = CiTestObj.DetachUE(node, HTML)
+			success = CiTestObj.DetachUE(HTML)
 		elif action == 'Terminate_UE':
-			success = CiTestObj.TerminateUE(ctx, node, HTML)
+			success = CiTestObj.TerminateUE(ctx, HTML)
 		elif action == 'CheckStatusUE':
-			success = CiTestObj.CheckStatusUE(node, HTML)
+			success = CiTestObj.CheckStatusUE(HTML)
 		elif action == 'DataEnable_UE':
-			success = CiTestObj.DataEnableUE(node, HTML)
+			success = CiTestObj.DataEnableUE(HTML)
 		elif action == 'DataDisable_UE':
-			success = CiTestObj.DataDisableUE(node, HTML)
+			success = CiTestObj.DataDisableUE(HTML)
 
 	elif action == 'Ping':
 		CiTestObj.ping_args = test.findtext('ping_args')
 		CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id')
+		CiTestObj.svr_id = test.findtext('svr_id') or None
 		if test.findtext('svr_node'):
 			CiTestObj.svr_node = test.findtext('svr_node') if not force_local else 'localhost'
+		if force_local:
+			# Change all execution targets to localhost
+			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
+		else:
+			if test.findtext('nodes'):
+				CiTestObj.nodes = test.findtext('nodes').split(' ')
+				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+					logging.error('Number of Nodes are not equal to the total number of UEs')
+					sys.exit("Mismatch in number of Nodes and UIs")
+			else:
+				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
-		success = CiTestObj.Ping(ctx, node, HTML)
+		success = CiTestObj.Ping(ctx, HTML)
 
 	elif action == 'Iperf' or action == 'Iperf2_Unidir':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id')
+		CiTestObj.svr_id = test.findtext('svr_id') or None
+		if force_local:
+			# Change all execution targets to localhost
+			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
+		else:
+			if test.findtext('nodes'):
+				CiTestObj.nodes = test.findtext('nodes').split(' ')
+				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+					logging.error('Number of Nodes are not equal to the total number of UEs')
+					sys.exit("Mismatch in number of Nodes and UIs")
+			else:
+				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		if test.findtext('svr_node'):
 			CiTestObj.svr_node = test.findtext('svr_node') if not force_local else 'localhost'
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
@@ -185,10 +229,14 @@ def ExecuteActionWithParam(action, ctx, node):
 		if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
 			logging.error(f'test-case has wrong profile {CiTestObj.iperf_profile}, forcing balanced')
 			CiTestObj.iperf_profile = 'balanced'
+		CiTestObj.iperf_options = test.findtext('iperf_options') or 'check'
+		if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
+			logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
+			CiTestObj.iperf_options = 'check'
 		if action == 'Iperf':
-			success = CiTestObj.Iperf(ctx, node, HTML)
+			success = CiTestObj.Iperf(ctx, HTML)
 		elif action == 'Iperf2_Unidir':
-			success = CiTestObj.Iperf2_Unidir(ctx, node, HTML)
+			success = CiTestObj.Iperf2_Unidir(ctx, HTML)
 
 	elif action == 'IdleSleep':
 		st = test.findtext('idle_sleep_time_in_sec') or "5"
@@ -196,6 +244,7 @@ def ExecuteActionWithParam(action, ctx, node):
 
 	elif action == 'Deploy_Run_OC_PhySim':
 		oc_release = test.findtext('oc_release')
+		node = test.findtext('node') or None
 		script = "scripts/oc-deploy-physims.sh"
 		image_tag = cls_containerize.CreateTag(CLUSTER.ranCommitID, CLUSTER.ranBranch, CLUSTER.ranAllowMerge)
 		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.eNBSourceCodePath}"
@@ -203,6 +252,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
 	elif action == 'Build_Deploy_Docker_PhySim' or action == 'Build_Deploy_Source_PhySim':
+		node = test.findtext('node') or None
 		ctest_opt = test.findtext('ctest-opt') or ''
 		script = "scripts/docker-build-and-deploy-physims.sh" if action == 'Build_Deploy_Docker_PhySim' else 'scripts/source-deploy-physims.sh'
 		options = f"{CONTAINERS.eNBSourceCodePath} {ctest_opt}"
@@ -214,7 +264,8 @@ def ExecuteActionWithParam(action, ctx, node):
 		core_op = getattr(cls_oaicitest.OaiCiTest, action)
 		success = core_op(cn_id, ctx, HTML)
 
-	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace" or action == "Stop_Object":
+	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace":
+		node = test.findtext('node')
 		CONTAINERS.yamlPath = test.findtext('yaml_path')
 		string_field=test.findtext('d_retx_th')
 		if (string_field is not None):
@@ -227,8 +278,6 @@ def ExecuteActionWithParam(action, ctx, node):
 		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':
-			success = CONTAINERS.StopObject(ctx, node, HTML)
 		elif action == 'Undeploy_Object':
 			success = CONTAINERS.UndeployObject(ctx, node, HTML, RAN)
 		elif action == 'Create_Workspace':
@@ -238,12 +287,15 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.Create_Workspace(node, HTML)
 
 	elif action == 'LicenceAndFormattingCheck':
+		node = test.findtext('node')
 		success = SCA.LicenceAndFormattingCheck(ctx, node, HTML)
 
 	elif action == 'Cppcheck_Analysis':
+		node = test.findtext('node')
 		success = SCA.CppCheckAnalysis(ctx, node, HTML)
 
 	elif action == 'Push_Local_Registry':
+		node = test.findtext('node')
 		tag_prefix = test.findtext('tag_prefix') or ""
 		success = CONTAINERS.Push_Image_to_Local_Registry(node, HTML, tag_prefix)
 
@@ -251,6 +303,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		if force_local:
 			# Do not pull or remove images when running locally. User is supposed to handle image creation & cleanup
 			return True
+		node = test.findtext('node')
 		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
 		# hack: for FlexRIC, we need to overwrite the tag to use
@@ -263,21 +316,26 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.Clean_Test_Server_Images(HTML, node, images, tag=tag)
 
 	elif action == 'Custom_Command':
+		node = test.findtext('node')
+		if force_local:
+			# Change all execution targets to localhost
+			node = 'localhost'
 		command = test.findtext('command')
 		# Allow referencing repository workspace path in XML via %%workspace%%
 		command = command.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Command(HTML, node, command)
 
 	elif action == 'Custom_Script':
+		node = test.findtext('node')
 		script = test.findtext('script')
-		args = test.findtext('args')
 		# Allow referencing repository workspace path in XML via %%workspace%%
 		script = script.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
-		success = cls_oaicitest.Custom_Script(HTML, node, script, args)
+		success = cls_oaicitest.Custom_Script(HTML, node, script)
 
 	elif action == 'Pull_Cluster_Image':
 		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
+		node = test.findtext('node')
 		success = CLUSTER.PullClusterImage(HTML, node, images, tag_prefix=tag_prefix)
 
 	else:
@@ -295,16 +353,8 @@ def test_in_list(test, list):
 			return True
 	return False
 
-test_runner_abort = False
 def receive_signal(signum, frame):
-    global test_runner_abort
-    if not test_runner_abort:
-        logging.warning("received signal, canceling steps")
-        logging.info("send signal again to exit immediately")
-        test_runner_abort = True
-    else:
-        logging.warning("received signal again, exiting")
-        sys.exit(1)
+	sys.exit(1)
 
 def ShowTestID(ctx, desc):
     logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
@@ -349,7 +399,16 @@ CLUSTER = cls_cluster.Cluster()
 import args_parse
 # Force local execution, move all execution targets to localhost
 force_local = False
-mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)
+py_param_file_present, py_params, mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)
+
+
+
+#-----------------------------------------------------------
+# TEMPORARY params management (UNUSED)
+#-----------------------------------------------------------
+#temporary solution for testing:
+if py_param_file_present == True:
+	AssignParams(py_params)
 
 #-----------------------------------------------------------
 # mode amd XML class (action) analysis
@@ -495,7 +554,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			#logging.info('test will be run: ' + test)
 			todo_tests.append(test)
 
-	signal.signal(signal.SIGINT, receive_signal)
+	signal.signal(signal.SIGUSR1, receive_signal)
 
 	HTML.CreateHtmlTabHeader()
 
@@ -505,8 +564,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	i = 0
 	for test_case_id in todo_tests:
 		for test in all_tests:
-			if test_runner_abort:
-				task_set_succeeded = False
 			id = test.get('id')
 			if test_case_id != id:
 				continue
@@ -515,7 +572,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			ctx = TestCaseCtx(i, int(id), logPath)
 			HTML.testCase_id=CiTestObj.testCase_id
 			desc = test.findtext('desc')
-			node = test.findtext('node') if not force_local else 'localhost'
 			always_exec = test.findtext('always_exec') in ['True', 'true', 'Yes', 'yes']
 			may_fail = test.findtext('may_fail') in ['True', 'true', 'Yes', 'yes']
 			HTML.desc = desc
@@ -530,7 +586,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				HTML.CreateHtmlTestRowQueue(msg, "SKIP", [])
 				break
 			try:
-				test_succeeded = ExecuteActionWithParam(action, ctx, node)
+				test_succeeded = ExecuteActionWithParam(action, ctx)
 				if not test_succeeded and may_fail:
 					logging.warning(f"test ID {test_case_id} action {action} may or may not fail, proceeding despite error")
 				elif not test_succeeded:

ci-scripts/scripts/set-and-verify-distance-prs.sh

@@ -1,89 +0,0 @@
-#!/bin/bash
-
-[[ $# -lt 1 ]] && { echo "Usage: $0 <distance_in_meters...>"; exit 1; }
-DISTANCES=("$@")
-
-IP=192.168.71.150
-PORT=8091
-NCAT_TIMEOUT=1 #s
-SLEEP_WAIT=4 #s
-MAX_RETRIES=3
-
-set_and_verify_distance() {
-  local distance=$1
-  echo "Testing PRS ToA estimation for distance: $distance m"
-
-  # it seems that grep returns immediately with this syntax, but not echo | ncat | grep
-  # so prefer this to receive new distance immediately. We use --idle to keep
-  # ncat open for some additional time
-  local setdist_resp="$(grep --max-count 1 new_offset <(echo rfsimu setdistance rfsimu_channel_enB0 $distance | ncat --idle ${NCAT_TIMEOUT} ${IP} ${PORT}))"
-  echo "> response: ${setdist_resp}"
-
-  local gettoa_resp="$(echo "ciUE get_max_dl_toa" | ncat ${IP} ${PORT} | grep "UE max PRS DL ToA")"
-  echo "> response: ${gettoa_resp}"
-
-  [[ -z "$setdist_resp" || -z "$gettoa_resp" ]] && return 1
-
-  # Extract ToA values 
-  [[ "$setdist_resp" =~ new_offset\ ([0-9]+) ]] && local set_toa="${BASH_REMATCH[1]}" || { echo "> Set ToA extraction failed for distance: $distance m"; return 1; }
-
-  [[ "$gettoa_resp" =~ UE\ max\ PRS\ DL\ ToA\ ([0-9]+) ]] && local est_toa="${BASH_REMATCH[1]}" || { echo "> Estimated ToA extraction failed for distance: $distance m"; return 1; }
-
-  # Compare extracted ToA values
-  [[ $set_toa == $est_toa ]] && echo "PRS SUCCESS for distance: $distance m" || { echo "PRS FAILURE for distance: $distance m (Actual ToA=$set_toa, Estimated ToA=$est_toa)" ; return 1; }
-
-}
-
-test_distance() {
-  local distance=$1 retries=0
-
-  # retry loop incase we didn't receive the response
-  while (( retries < MAX_RETRIES )); do
-    echo "  Attempt $((retries + 1))/$MAX_RETRIES"
-
-    # Always reset to 0 m before testing target distance
-    if ! set_and_verify_distance 0; then
-      echo " Set distance 0 m failed during attempt $((retries + 1))"
-    else
-      sleep "$SLEEP_WAIT"
-      # Now test the actual target distance
-      if set_and_verify_distance "$distance"; then
-        return 0
-      fi
-    fi
-
-    ((retries++))
-    if (( retries < MAX_RETRIES )); then
-      sleep "$SLEEP_WAIT"
-    else
-      echo " ERROR: No valid response after $MAX_RETRIES retries for distance: $distance m"
-      return 1
-    fi
-  done
-}
-
-num_success=0
-num_fail=0
-
-for d in "${DISTANCES[@]}"; do
-  if test_distance "$d"; then
-    ((num_success++))
-  else
-    ((num_fail++))
-  fi
-  sleep "$SLEEP_WAIT"
-done
-
-# ---- Summary ----
-echo
-echo "==================== SUMMARY ===================="
-echo "Total tests run : ${#DISTANCES[@]}"
-echo "Successful tests: ${num_success}"
-echo "Failed tests    : ${num_fail}"
-echo "================================================="
-
-if [ $num_success -gt 0 ]; then
-  exit 0
-else
-  exit 1
-fi

ci-scripts/tests/deployment.py

@@ -60,33 +60,6 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.assertTrue(deploy)
 		self.assertTrue(undeploy)
 
-	def test_stop_services(self):
-		self.cont.yamlPath = 'tests/simple-undep/'
-		self.cont.deploymentTag = "noble"
-		# should deploy both testA and testB
-		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-		# should fail (no such service)
-		self.cont.services = "testC"
-		stopC = self.cont.StopObject(self.ctx, self.node, self.html)
-		# should stop testA
-		self.cont.services = "testA"
-		stopA = self.cont.StopObject(self.ctx, self.node, self.html)
-		# should (re-)stop testA (no-op)
-		self.cont.services = "testA"
-		stopA2 = self.cont.StopObject(self.ctx, self.node, self.html)
-		# should deploy testB
-		self.cont.services = "testB"
-		stopB = self.cont.StopObject(self.ctx, self.node, self.html)
-		# should not undeploy anything (everything already stopped)
-		self.cont.services = None
-		undeployAll = self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
-		self.assertTrue(deploy)
-		self.assertFalse(stopC)
-		self.assertTrue(stopA)
-		self.assertTrue(stopA2)
-		self.assertTrue(stopB)
-		self.assertTrue(undeployAll)
-
 	def test_deployfails(self):
 		# fails reliably
 		old = self.cont.yamlPath

ci-scripts/tests/ping-iperf.py

@@ -23,7 +23,7 @@ class TestPingIperf(unittest.TestCase):
 		self.html.testCaseId = "000000"
 		self.ci = cls_oaicitest.OaiCiTest()
 		self.ci.ue_ids = ["test"]
-		self.node = "localhost"
+		self.ci.nodes = ["localhost"]
 		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
 	def tearDown(self):
 		with cls_cmd.LocalCmd() as c:
@@ -35,7 +35,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.svr_id = "test"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Ping(self.ctx, self.node, self.html, infra_file=infra_file)
+		success = self.ci.Ping(self.ctx, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf(self):
@@ -50,7 +50,7 @@ class TestPingIperf(unittest.TestCase):
 		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)
+		success = self.ci.Iperf(self.ctx, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf2_unidir(self):
@@ -62,7 +62,7 @@ class TestPingIperf(unittest.TestCase):
 		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.Iperf2_Unidir(self.ctx, self.node, self.html, infra_file=infra_file)
+		success = self.ci.Iperf2_Unidir(self.ctx, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 	def test_iperf_highrate(self):
@@ -77,7 +77,7 @@ class TestPingIperf(unittest.TestCase):
 		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)
+		success = self.ci.Iperf(self.ctx, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
 if __name__ == '__main__':

ci-scripts/tests/simple-undep/docker-compose.yml

@@ -1,23 +0,0 @@
-services:
-  testA:
-    image: ubuntu:${TAG:-jammy}
-    container_name: test_container_A
-    cap_drop:
-      - ALL
-    entrypoint: /bin/bash -c "sleep infinity"
-    healthcheck:
-      test: /bin/bash -c "true"
-      interval: 1s
-      timeout: 1s
-      retries: 1
-  testB:
-    image: ubuntu:${TAG:-jammy}
-    container_name: test_container_B
-    cap_drop:
-      - ALL
-    entrypoint: /bin/bash -c "sleep infinity"
-    healthcheck:
-      test: /bin/bash -c "true"
-      interval: 1s
-      timeout: 1s
-      retries: 1

ci-scripts/xml_class_list.yml

@@ -20,7 +20,6 @@
   - Build_Image
   - Build_Run_Tests
   - Deploy_Object
-  - Stop_Object
   - Undeploy_Object
   - Cppcheck_Analysis
   - Deploy_Run_OC_PhySim

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -88,14 +88,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE</desc>
                 <id>l2sim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping trf-gen from LTE-UE 1</desc>
                 <id>l2sim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>l2sim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -106,7 +106,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE 1 from trf-gen</desc>
                 <id>l2sim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>l2sim4g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -117,7 +117,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP Downlink</desc>
                 <id>l2sim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>l2sim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M -R</iperf_args>
@@ -129,7 +129,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP Uplink</desc>
                 <id>l2sim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>l2sim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 3M</iperf_args>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -103,14 +103,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -121,7 +121,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -136,7 +136,7 @@
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_node>localhost</svr_node>
         </testCase>
 
@@ -148,7 +148,7 @@
                 <iperf_args>-u -t 30 -b 1M</iperf_args>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_node>localhost</svr_node>
         </testCase>
 

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -83,7 +83,7 @@
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -94,7 +94,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from eNB</desc>
                 <id>rfsim4g_enb_nos1</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -105,7 +105,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
@@ -117,7 +117,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -103,14 +103,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -121,7 +121,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -132,7 +132,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
@@ -144,7 +144,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -103,14 +103,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -121,7 +121,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -132,7 +132,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
@@ -144,7 +144,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -80,7 +80,7 @@
                 <class>Iperf2_Unidir</class>
                 <desc>Iperf2 UDP DL</desc>
                 <id>rfsim4g_ue_fembms</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_enb_fembms</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M</iperf_args>

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

@@ -80,7 +80,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_enb_nos1</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -103,7 +103,7 @@
                 <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -114,7 +114,7 @@
                 <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
                 <id>rfsim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -125,7 +125,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 2M -R</iperf_args>
@@ -137,7 +137,7 @@
                 <class>Iperf</class>
                 <desc>Iperf UDP UL</desc>
                 <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim4g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_args>-u -t 30 -b 1M</iperf_args>

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -76,14 +76,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <node>localhost</node>
+                <nodes>localhost localhost localhost</nodes>
         </testCase>
 
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <node>localhost</node>
+                <nodes>localhost localhost localhost</nodes>
                 <svr_id>rfsim5g_5gc_fixed_ip</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.25</ping_args>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -107,7 +107,7 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="000024">
@@ -122,7 +122,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.25</ping_args>
@@ -141,7 +141,7 @@
                 <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -153,7 +153,7 @@
                 <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -171,7 +171,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.5 -w25</ping_args>

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -70,14 +70,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -88,7 +88,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -100,7 +100,7 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -112,7 +112,7 @@
                 <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

@@ -42,13 +42,6 @@
  002006
  444444
  100002
- 100003
- 100004
- 100005
- 100006
- 100007
- 100008
- 100009
  100001
  222221
  222222
@@ -102,10 +95,10 @@
 
         <testCase id="000002">
                 <class>Deploy_Object</class>
-                <desc>Deploy OAI nearRT-RIC</desc>
+                <desc>Deploy OAI FlexRIC</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>nearRT-RIC</services>
+                <services>oai-flexric</services>
         </testCase>
 
         <testCase id="000003">
@@ -128,7 +121,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>carabe</node>
+                <nodes>carabe carabe</nodes>
                 <svr_id>oai_ext_dn</svr_id>
                 <svr_node>carabe</svr_node>
                 <ping_args>-c 20</ping_args>
@@ -139,14 +132,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>carabe</node>
+                <nodes>carabe carabe</nodes>
         </testCase>
 
         <testCase id="444444">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>carabe</node>
+                <nodes>carabe carabe</nodes>
         </testCase>
 
         <testCase id="100001">
@@ -158,72 +151,16 @@
         </testCase>
 
         <testCase id="100002">
-                <class>Stop_Object</class>
-                <desc>Stop RC monitoring xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-rc-moni</services>
-        </testCase>
-
-        <testCase id="100003">
-                <class>Stop_Object</class>
-                <desc>Stop KPM monitoring xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-moni</services>
-        </testCase>
-
-        <testCase id="100004">
-                <class>Stop_Object</class>
-                <desc>Stop KPM monitoring and RC control xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-rc</services>
-        </testCase>
-
-        <testCase id="100005">
-                <class>Stop_Object</class>
-                <desc>Stop custom SMs monitoring xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-gtp-mac-rlc-pdcp-moni</services>
-        </testCase>
-
-        <testCase id="100006">
-                <class>Stop_Object</class>
-                <desc>Stop OAI UEs</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>oai-nr-ue oai-nr-ue2</services>
-        </testCase>
-
-        <testCase id="100007">
-                <class>Stop_Object</class>
-                <desc>Stop OAI gNB</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>oai-gnb</services>
-        </testCase>
-
-        <testCase id="100008">
-                <class>Stop_Object</class>
-                <desc>Stop nearRT-RIC</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>nearRT-RIC</services>
-        </testCase>
-
-        <testCase id="100009">
                 <class>Undeploy_Object</class>
-                <desc>Undeploy RAN and FlexRIC</desc>
+                <desc>Undeploy RAN and Flexric</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <always_exec>true</always_exec>
-	</testCase>
+        </testCase>
 
         <testCase id="010000">
                 <class>Deploy_Object</class>
-                <desc>Deploy RC monitoring</desc>
+                <desc>RC monitoring</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <services>xapp-rc-moni</services>
@@ -231,7 +168,7 @@
 
         <testCase id="010001">
                 <class>Deploy_Object</class>
-                <desc>Deploy KPM monitoring</desc>
+                <desc>KPM monitoring</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <services>xapp-kpm-moni</services>
@@ -239,7 +176,7 @@
 
         <testCase id="010002">
                 <class>Deploy_Object</class>
-                <desc>Deploy KPM monitoring and RC control</desc>
+                <desc>KPM monitoring and RC control</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <services>xapp-kpm-rc</services>
@@ -247,7 +184,7 @@
 
         <testCase id="010003">
                 <class>Deploy_Object</class>
-                <desc>Deploy custom SMs monitoring</desc>
+                <desc>Custom SMs monitoring</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <services>xapp-gtp-mac-rlc-pdcp-moni</services>

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -125,14 +125,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <node>localhost</node>
+                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -143,7 +143,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -154,7 +154,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from Second NR-UE</desc>
                 <id>rfsim5g_ue2</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -165,7 +165,7 @@
                 <class>Ping</class>
                 <desc>Ping Second NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue2</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -176,7 +176,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>localhost</node>
+                <nodes>localhost localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -187,7 +187,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <node>localhost</node>
+                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
@@ -199,7 +199,7 @@
                 <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -211,7 +211,7 @@
                 <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -222,21 +222,21 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>localhost</node>
+                <nodes>localhost localhost</nodes>
         </testCase>
 
         <testCase id="444444">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>localhost</node>
+                <nodes>localhost localhost</nodes>
         </testCase>
 
         <testCase id="444445">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 3 to 10</desc>
                 <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <node>localhost</node>
+                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -88,7 +88,7 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="000004">
@@ -101,7 +101,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args> -c 20 -i0.5</ping_args>
@@ -112,7 +112,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
@@ -124,7 +124,7 @@
                 <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -136,7 +136,7 @@
                 <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -70,14 +70,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -88,7 +88,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -100,7 +100,7 @@
                 <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 10M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -112,7 +112,7 @@
                 <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -77,7 +77,7 @@
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
@@ -88,7 +88,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
@@ -100,7 +100,7 @@
                 <desc>Iperf (DL/30kbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -112,7 +112,7 @@
                 <desc>Iperf (UL/30kbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -70,14 +70,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
@@ -88,7 +88,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>

ci-scripts/xml_files/container_5g_rfsim_multiue.xml

@@ -84,14 +84,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <node>localhost</node>
+                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_multiue1</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -102,7 +102,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_multiue1</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -113,7 +113,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from Second NR-UE</desc>
                 <id>rfsim5g_multiue2</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -124,7 +124,7 @@
                 <class>Ping</class>
                 <desc>Ping Second NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_multiue2</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -135,7 +135,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_multiue1 rfsim5g_multiue2</id>
-                <node>localhost</node>
+                <nodes>localhost localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -146,7 +146,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all UEs</desc>
                 <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <node>localhost</node>
+                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
@@ -158,7 +158,7 @@
                 <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_multiue1</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -170,7 +170,7 @@
                 <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_multiue1</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -181,7 +181,7 @@
                 <class>Detach_UE</class>
                 <desc>Detach OAI UEs</desc>
                 <id>rfsim5g_multiue1</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -85,7 +85,7 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="000004">
@@ -100,7 +100,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 50 -i 0.25</ping_args>
@@ -111,7 +111,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 50 -i 0.25</ping_args>
@@ -123,7 +123,7 @@
                 <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -135,7 +135,7 @@
                 <desc>Iperf (UL/4Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -74,14 +74,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -92,7 +92,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -111,7 +111,7 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.5 -w25</ping_args>

ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml

@@ -69,14 +69,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -87,7 +87,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>

ci-scripts/xml_files/container_5g_rfsim_prs.xml

@@ -1,100 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-prs</htmlTabRef>
-        <htmlTabName>Monolithic gNB with PRS</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000012
- 000013
- 040001
- 040023
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-	</testCase>
-
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-	</testCase>
-
-        <testCase id="000012">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_prs</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
-
-        <testCase id="000013">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <node>localhost</node>
-	</testCase>
-
-        <testCase id="040001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
-        </testCase>
-
-	<testCase id="040023">
-		<class>Custom_Script</class>
-		<always_exec>true</always_exec>
-		<desc>Set and verify distance at 50, 100, 150 m</desc>
-		<node>localhost</node>
-		<script>scripts/set-and-verify-distance-prs.sh</script>
-		<args>50 100 150</args>
-	</testCase>
-
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_prs</yaml_path>
-                <d_retx_th>30,100,100,100</d_retx_th>
-                <u_retx_th>30,100,100,100</u_retx_th>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_5g_rfsim_simple.xml

@@ -63,14 +63,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -81,7 +81,7 @@
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 1</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -83,7 +83,7 @@
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
@@ -94,7 +94,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -36,11 +36,6 @@
  020003
  030001
  030002
- 050001
- 050002
- 050003
- 020001
- 020002
  100001
  222222
         </TestCaseRequestedList>
@@ -77,14 +72,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -95,7 +90,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -106,14 +101,14 @@
                 <class>Attach_UE</class>
                 <desc>Verify 2nd PDU session is up</desc>
                 <id>rfsim5g_ue_pdu_2</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
         </testCase>
 
         <testCase id="020003">
                 <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>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
@@ -125,7 +120,7 @@
                 <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -137,39 +132,19 @@
                 <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
-        <testCase id="050001">
-                <class>Custom_Command</class>
-                <desc>Trigger PDU Session Release via gNB telnet</desc>
-                <node>acamas</node>
-                <command>echo ci pdu_session_release 2 | ncat 192.168.71.140 9090</command>
-        </testCase>
-
-        <testCase id="050002">
-                <class>Custom_Command</class>
-                <desc>Add PDU Session via UE telnet</desc>
-                <node>acamas</node>
-                <command>echo ci add_pdu_session 6,7 | ncat 192.168.71.150 8091</command>
-        </testCase>
-
-        <testCase id="050003">
-                <class>Custom_Command</class>
-                <desc>Trigger PDU Session Release via gNB telnet</desc>
-                <node>acamas</node>
-                <command>echo ci pdu_session_release 6 | ncat 192.168.71.140 9090</command>
-        </testCase>
-
         <testCase id="100001">
                 <class>Undeploy_Object</class>
                 <always_exec>true</always_exec>
                 <desc>Undeploy all OAI 5G stack</desc>
                 <node>localhost</node>
+                <services>oai-vnf oai-pnf</services>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -247,7 +247,6 @@
     <testCase id="060000">
       <class>UndeployCoreNetwork</class>
       <desc>Terminate EPC</desc>
-      <always_exec>true</always_exec>
       <cn_id>ltebox-nepes</cn_id>
     </testCase>
 

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -88,8 +88,8 @@
 
         <testCase id="000022">
                 <class>Iperf</class>
-                <desc>iperf (DL/UDP/800M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 800M -t 30 -R</iperf_args>
+                <desc>iperf (DL/UDP/500M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 500M -t 30 -R</iperf_args>
                 <svr_id>oc-cn5g-20897-aerial</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -98,8 +98,8 @@
 
         <testCase id="000033">
                 <class>Iperf</class>
-                <desc>iperf (UL/UDP/150M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 150M -t 30 -l 1428</iperf_args>
+                <desc>iperf (UL/UDP/40M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 40M -t 30 -l 1428</iperf_args>
                 <svr_id>oc-cn5g-20897-aerial</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -119,9 +119,9 @@
 
         <testCase id="300033">
                 <class>Iperf</class>
-                <desc>Optional iperf (UL/UDP/200M)(30 sec)(single-ue profile)</desc>
+                <desc>Optional iperf (UL/UDP/90M)(30 sec)(single-ue profile)</desc>
                 <may_fail>true</may_fail>
-                <iperf_args>-u -b 200M -t 30 -l 1428</iperf_args>
+                <iperf_args>-u -b 90M -t 30 -l 1428</iperf_args>
                 <svr_id>oc-cn5g-20897-aerial</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

@@ -97,8 +97,8 @@
 
         <testCase id="000032">
                 <class>Iperf</class>
-                <desc>iperf (UL/UDP/300M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 300M -t 30 -l 1428</iperf_args>
+                <desc>iperf (UL/UDP/200M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 200M -t 30 -l 1428</iperf_args>
                 <svr_id>oc-cn5g-20897-aerial</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
@@ -107,9 +107,9 @@
 
         <testCase id="000033">
                 <class>Iperf</class>
-                <desc>iperf (UL/UDP/380M)(30 sec)(single-ue profile)</desc>
+                <desc>iperf (UL/UDP/220M)(30 sec)(single-ue profile)</desc>
                 <may_fail>true</may_fail>
-                <iperf_args>-u -b 380M -t 30 -l 1428</iperf_args>
+                <iperf_args>-u -b 220M -t 30 -l 1428</iperf_args>
                 <svr_id>oc-cn5g-20897-aerial</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>10</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -30,28 +30,20 @@
     310000
     800813
     330101
+    330102
+    330103
     310001
     400001
     350000
+    370001
+    370000
+    370002
     370003
     370004
-    370002
     360001
     100002
     360002
     350000
-    410002
-    370012
-    400002
-    410003
-    370013
-    400003
-    410000
-    350000
-    400000
-    410001
-    350000
-    400001
     310011
     310002
     330201
@@ -96,10 +88,24 @@
   </testCase>
   <testCase id="330101">
     <class>Deploy_Object</class>
-    <desc>Deploy gNB-CU-CP/gNB-CU-UP/gNB-DU (TDD/n76/40MHz/B200)</desc>
+    <desc>Deploy gNB-CU-CP in a container</desc>
     <node>ofqot</node>
     <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
-    <services>gnb_cucp gnb_cuup gnb_du_tdd</services>
+    <services>gnb_cucp</services>
+  </testCase>
+  <testCase id="330102">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB-CU-UP in a container</desc>
+    <node>ofqot</node>
+    <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
+    <services>gnb_cuup</services>
+  </testCase>
+  <testCase id="330103">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB-DU (TDD/Band78/40MHz/B200) in a container</desc>
+    <node>ofqot</node>
+    <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
+    <services>gnb_du_tdd</services>
   </testCase>
 
   <testCase id="300000">
@@ -126,6 +132,16 @@
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
 
+  <testCase id="370000">
+    <class>Iperf</class>
+    <desc>iperf (DL/80Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 80M -t 30 -R</iperf_args>
+    <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
+    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+  </testCase>
+
   <testCase id="400001">
     <class>Custom_Command</class>
     <desc>Check UE is on dedicated BWP ID 1</desc>
@@ -133,76 +149,19 @@
     <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 1 (dedicated) UL BWP ID 1 (dedicated)'</command>
   </testCase>
 
-  <testCase id="410001">
-    <class>Custom_Command</class>
-    <desc>Switch to dedicated BWP ID 1</desc>
-    <node>ofqot</node>
-    <command>echo ci trigger_bwp_switch 1 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 1 for UE'</command>
-  </testCase>
-
-  <testCase id="400000">
-    <class>Custom_Command</class>
-    <desc>Check UE is on initial BWP ID 0</desc>
-    <node>ofqot</node>
-    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 0 (initial) UL BWP ID 0 (initial)'</command>
-  </testCase>
-
-  <testCase id="410002">
-    <class>Custom_Command</class>
-    <desc>Switch to dedicated BWP ID 2</desc>
-    <node>ofqot</node>
-    <command>echo ci trigger_bwp_switch 2 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 2 for UE'</command>
-  </testCase>
-
-  <testCase id="370012">
+  <testCase id="370001">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(10 sec)(single-ue profile)</desc>
-    <iperf_args>-t 10 -R</iperf_args>
+    <desc>iperf (UL/8Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 8M -t 30</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>35</iperf_tcp_rate_target>
-  </testCase>
-
-  <testCase id="400002">
-    <class>Custom_Command</class>
-    <desc>Check UE is on dedicated BWP ID 2</desc>
-    <node>ofqot</node>
-    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 2 (dedicated) UL BWP ID 2 (dedicated)'</command>
-  </testCase>
-
-  <testCase id="410003">
-    <class>Custom_Command</class>
-    <desc>Switch to dedicated BWP ID 3</desc>
-    <node>ofqot</node>
-    <command>echo ci trigger_bwp_switch 3 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 3 for UE'</command>
-  </testCase>
-
-  <testCase id="370013">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(10 sec)(single-ue profile)</desc>
-    <iperf_args>-t 10 -R</iperf_args>
-    <id>idefix</id>
-    <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>85</iperf_tcp_rate_target>
-  </testCase>
-
-  <testCase id="400003">
-    <class>Custom_Command</class>
-    <desc>Check UE is on dedicated BWP ID 3</desc>
-    <node>ofqot</node>
-    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 3 (dedicated) UL BWP ID 3 (dedicated)'</command>
-  </testCase>
-
-  <testCase id="410000">
-    <class>Custom_Command</class>
-    <desc>Switch to initial BWP ID 0</desc>
-    <node>ofqot</node>
-    <command>echo ci trigger_bwp_switch 0 | nc -N 127.0.0.1 9091 | grep 'triggered BWP switch to BWP ID 0 for UE'</command>
+    <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
   <testCase id="370002">
     <class>Iperf</class>
-    <desc>iperf (BIDIR TCP)(20 sec)(single-ue profile)</desc>
+    <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
     <iperf_args>-t 20 --bidir</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>
@@ -210,17 +169,17 @@
 
   <testCase id="370003">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(20 sec)(single-ue profile)</desc>
-    <iperf_args>-t 20 -R</iperf_args>
+    <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>
-    <iperf_tcp_rate_target>140</iperf_tcp_rate_target>
+    <iperf_tcp_rate_target>30</iperf_tcp_rate_target>
   </testCase>
 
   <testCase id="370004">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(20 sec)(single-ue profile)</desc>
-    <iperf_args>-t 20</iperf_args>
+    <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-t 30</iperf_args>
     <id>idefix</id>
     <svr_id>sabox-nepes</svr_id>
     <iperf_tcp_rate_target>15</iperf_tcp_rate_target>

ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml

@@ -146,6 +146,7 @@
     <desc>Undeploy gNB</desc>
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz</yaml_path>
+    <services>oai-gnb</services>
     <d_retx_th>10,100,100,100</d_retx_th>
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

@@ -146,6 +146,7 @@
     <desc>Undeploy gNB</desc>
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
+    <services>oai-gnb</services>
     <d_retx_th>15,100,100,100</d_retx_th>
     <u_retx_th>20,100,100,100</u_retx_th>
   </testCase>

ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml

@@ -146,6 +146,7 @@
     <desc>Undeploy VNF-PNF</desc>
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz</yaml_path>
+    <services>oai-vnf oai-pnf</services>
     <d_retx_th>10,100,100,100</d_retx_th>
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>

ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
-    nearRT-RIC:
+    oai-flexric:
         image: ${REGISTRY-oaisoftwarealliance/}oai-flexric:${FLEXRIC_TAG:-develop}
-        container_name: nearRT-RIC
+        container_name: oai-flexric
         networks:
             public_net:
                 ipv4_address: 192.168.70.150
@@ -17,7 +17,7 @@ services:
         command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_rc_moni"
         container_name: xapp-rc-moni
         depends_on:
-            - nearRT-RIC
+            - oai-flexric
             - oai-gnb
         networks:
             public_net:
@@ -34,7 +34,7 @@ services:
         command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_kpm_moni"
         container_name: xapp-kpm-moni
         depends_on:
-            - nearRT-RIC
+            - oai-flexric
             - oai-gnb
         networks:
             public_net:
@@ -51,7 +51,7 @@ services:
         command: "stdbuf -o0 /usr/local/flexric/xApp/c/kpm_rc/xapp_kpm_rc"
         container_name: xapp-kpm-rc
         depends_on:
-            - nearRT-RIC
+            - oai-flexric
             - oai-gnb
         networks:
             public_net:
@@ -68,7 +68,7 @@ services:
         command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni"
         container_name: xapp-gtp-mac-rlc-pdcp-moni
         depends_on:
-            - nearRT-RIC
+            - oai-flexric
             - oai-gnb
         networks:
             public_net:
@@ -88,7 +88,7 @@ services:
             USE_ADDITIONAL_OPTIONS: -E --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
-            - nearRT-RIC
+            - oai-flexric
         networks:
             public_net:
                 ipv4_address: 192.168.70.151

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

@@ -1,71 +0,0 @@
-services:
-    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
-        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
-        environment:
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim -E
-                                    --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.140
-        devices:
-            - /dev/net/tun:/dev/net/tun
-        volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.rfsim.prs.conf:/opt/oai-gnb/etc/gnb.conf
-            - rrc.config:/opt/oai-gnb/
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
-        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
-        environment:
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim -E
-                                    --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw
-                                    --rfsimulator.serveraddr 192.168.71.140
-                                    --log_config.global_log_options level,nocolor,time
-                                    --telnetsrv --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
-                                    --telnetsrv.shrmod ciUE
-            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
-        devices:
-            - /dev/net/tun:/dev/net/tun
-        volumes:
-            - ../../conf_files/nrue.band78.106prb.prs.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-            - rrc.config:/opt/oai-nr-ue/etc/rrc/
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.150
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-volumes:
-    rrc.config:
-
-networks:
-    public_net:
-        driver: bridge
-        name: rfsim5g-oai-public-net
-        ipam:
-            config:
-                - subnet: 192.168.71.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-public"

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

@@ -97,9 +97,8 @@ services:
             - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --nfapi VNF --log_config.global_log_options level,nocolor,time
-                                    --telnetsrv --telnetsrv.listenaddr 192.168.71.140 --telnetsrv.shrmod ci
             NFAPI_TRACE_LEVEL: info
-            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -123,7 +122,7 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --nfapi PNF --rfsim --log_config.global_log_options level,nocolor,time
             NFAPI_TRACE_LEVEL: info
-            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-vnf
         networks:
@@ -148,10 +147,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48
-                                    --rfsimulator.serveraddr 192.168.71.141 --extra-pdu-id 2 --log_config.global_log_options level,nocolor,time
-                                    --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
-            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+            USE_ADDITIONAL_OPTIONS: --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48 --rfsimulator.serveraddr 192.168.71.141 --extra-pdu-id 2 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-pnf
         networks:

ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml

@@ -33,7 +33,7 @@ services:
       timeout: 5s
       retries: 5
   oai-gnb-aerial:
-    cpuset: "13-16"
+    cpuset: "13-14"
     image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb-aerial}:${TAG:-develop}
     depends_on:
       nv-cubb:

cmake_targets/build_oai

@@ -82,6 +82,8 @@ Options:
   Makes the NR softmodem
 --RU
   Makes the OAI RRU
+--nrRU
+  Makes the OAI nrRRU
 --UE
    Makes the UE specific parts (usim, nvram) from the given configuration file
 --nrUE
@@ -135,8 +137,6 @@ Options:
   CC=/usr/bin/clang CXX=/usr/bin/clang++ ./build_oai ... --sanitize-memory
 --sanitize-thread | -fsanitize=thread
   Enable the thread sanitizer on all targets
---use-cuda
-  Tell build to use NVCC for appropriate .cu files and cuda_runtime functions  
 -h | --help
    Print this help"
 }
@@ -229,6 +229,11 @@ function main() {
             TARGET_LIST="$TARGET_LIST oairu"
             echo_info "Will compile RRU"
             shift;;
+       --nrRU)
+            nrRU=1
+            TARGET_LIST="$TARGET_LIST oainr_ru"
+            echo_info "Will compile nrRRU"
+            shift;;
        --UE)
             UE=1
             TARGET_LIST="$TARGET_LIST lte-uesoftmodem conf2uedata usim nvram"
@@ -384,9 +389,6 @@ function main() {
         --sanitize-thread | -fsanitize=thread)
             CMAKE_CMD="$CMAKE_CMD -DSANITIZE_THREAD=True"
             shift;;
-	--use-cuda)
-	    CMAKE_CMD="$CMAKE_CMD -DENABLE_CUDA=True"
-	    shift;;
        --trace-asn1c-enc-dec)
             CMAKE_CMD="$CMAKE_CMD -DTRACE_ASN1C_ENC_DEC=ON"
             echo_info "Enabling asn1c internal traces via OAI logging system"
@@ -457,7 +459,7 @@ function main() {
   if [[ $TARGET_LIST != "" ]] && [[ -f $OPENAIR_DIR/CMakeLists.txt ]]; then
     # add some default libraries that should always be built
     # for eNB, gNB, UEs, simulators
-    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ]]; then
+    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ||  $nrRU == 1 ]]; then
       TARGET_LIST="$TARGET_LIST params_libconfig coding rfsimulator dfts params_yaml vrtsim rf_emulator"
     fi
 

cmake_targets/tools/install_wls_lib.patch

@@ -1,5 +1,5 @@
 diff --git a/wls_lib/Makefile b/wls_lib/Makefile
-index 2f8e4b2..7b99a26 100644
+index 2f8e4b2..e657488 100644
 --- a/wls_lib/Makefile
 +++ b/wls_lib/Makefile
 @@ -1,20 +1,6 @@
@@ -23,7 +23,7 @@ index 2f8e4b2..7b99a26 100644
 +################################################################
 +# <COPYRIGHT_TAG>
 +################################################################
-
+ 
  MYCUSTOMTAB='     '
  MYCUSTOMSPACE='============================================================================================'
 @@ -24,11 +10,17 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
@@ -48,12 +48,9 @@ index 2f8e4b2..7b99a26 100644
  else ifeq ($(WIRELESS_SDK_TOOLCHAIN),icx)
      CC  := icx
      CPP := icx
-@@ -42,11 +34,11 @@ endif
- ifeq ($(WIRELESS_SDK_TARGET_ISA),sse)
-     TARGET_PROCESSOR := -xSSE4.2
+@@ -44,9 +36,9 @@ ifeq ($(WIRELESS_SDK_TARGET_ISA),sse)
  else ifeq ($(WIRELESS_SDK_TARGET_ISA),avx2)
--    TARGET_PROCESSOR := -xCORE-AVX2
-+    TARGET_PROCESSOR := -march=core-avx2
+     TARGET_PROCESSOR := -xCORE-AVX2
  else ifeq ($(WIRELESS_SDK_TARGET_ISA),avx512)
 -    TARGET_PROCESSOR := -xCORE-AVX512
 +    TARGET_PROCESSOR := -march=skylake-avx512
@@ -66,7 +63,7 @@ index 2f8e4b2..7b99a26 100644
 @@ -66,15 +58,38 @@ PROJECT_DIR  := ./
  BUILDDIR := make
  PROJECT_BINARY := $(PROJECT_NAME).so
-
+ 
 +PKGCONF ?= pkg-config
 +LIBDPDK_VERSION=20.11.3
 +
@@ -82,7 +79,7 @@ index 2f8e4b2..7b99a26 100644
 +$(error "Please define RTE_SDK environment variable OR install DPDK version $(LIBDPDK_VERSION)")
 +endif
  endif
-
+ 
 -RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
 +# At least one of the options is defined
 +
@@ -91,10 +88,10 @@ index 2f8e4b2..7b99a26 100644
 +else ifeq ($(DPDK_INSTALLED),1)
 +    RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig  $(PKGCONF) --cflags-only-I libdpdk)
 +endif
-
+ 
  CC_SRC = wls_lib_dpdk.c \
  	syslib.c
-
+ 
 +CC_HDR = syslib.h \
 +	ttypes.h \
 +	wls.h \
@@ -107,74 +104,74 @@ index 2f8e4b2..7b99a26 100644
 @@ -84,18 +99,19 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
  	-Wimplicit-function-declaration \
  	-g -O3 -mcmodel=large $(TARGET_PROCESSOR)
-
+ 
 -INC := -I$(RTE_INC)
 +INC := -I$(RTE_INC) -I../intel_fapi/
  DEF :=
-
+ 
  AS_FLAGS :=
  AR_FLAGS := rc
-
+ 
  PROJECT_OBJ_DIR := $(BUILDDIR)/obj
 +PROJECT_DEP_DIR := $(PROJECT_OBJ_DIR)/$(PROJECT_NAME).dep.d
-
+ 
  CC_OBJS := $(patsubst %.c,%.o,$(CC_SRC))
  AS_OBJS := $(patsubst %.s,%.o,$(AS_SRC))
  OBJS    := $(CC_OBJS) $(AS_OBJS) $(LIBS)
 -DIRLIST := $(addprefix $(PROJECT_OBJ_DIR)/,$(sort $(dir $(OBJS))))
 +DIRLIST := $(addprefix $(PROJECT_OBJ_DIR)/,$(sort $(dir $(OBJS)))) $(PROJECT_DEP_DIR)
-
+ 
  CC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CC_OBJS))
-
+ 
 @@ -104,9 +120,7 @@ CC_FLAGS_FULL  := $(CC_FLAGS) $(INC) $(DEF)
-
+ 
  AS_FLAGS := $(AS_FLAGS) $(INC)
-
+ 
 -PROJECT_DEP_FILE := $(PROJECT_OBJ_DIR)/$(PROJECT_NAME).dep
 -
 -ifeq ($(wildcard $(PROJECT_DEP_FILE)),$(PROJECT_DEP_FILE))
 +ifeq ($(wildcard $(PROJECT_DEP_DIR)),$(PROJECT_DEP_DIR))
  GENERATE_DEPS :=
  else
-
+ 
 @@ -119,11 +133,11 @@ all : welcome_line 	$(PROJECT_BINARY)
-
+ 
  .PHONY : clear_dep
  clear_dep:
 -	@$(RM) $(PROJECT_DEP_FILE)
 -	@echo [DEP]   $(subst $(PROJECT_OBJ_DIR)/,,$(PROJECT_DEP_FILE))
 +	@echo [DEP] rm $(PROJECT_DEP_DIR)/$(@F).dep
 +	@$(RM) $(PROJECT_DEP_DIR)/$(@F).dep
-
+ 
 -$(CC_DEPS) :
 -	@$(CC) -MM $(subst __up__,../,$(subst __dep__,,$@)) -MT $(PROJECT_OBJ_DIR)/$(patsubst %.c,%.o,$(subst __up__,../,$(subst __dep__,,$@))) $(CC_FLAGS_FULL) >> $(PROJECT_DEP_FILE)
 +$(CC_DEPS) : $(PROJECT_DEP_DIR)
 +	@$(CC) $(CC_FLAGS_FULL) -MM $(subst __up__,../,$(subst __dep__,,$@)) -MT $(PROJECT_OBJ_DIR)/$(patsubst %.c,%.o,$(subst __up__,../,$(subst __dep__,,$@))) >> $(PROJECT_DEP_DIR)/$(@F).dep
-
+ 
  .PHONY : generate_deps
  generate_deps : clear_dep $(CC_DEPS)
 @@ -136,17 +150,17 @@ echo_start_build :
  $(DIRLIST) :
  	-@$(MD) $@
-
+ 
 -$(CC_OBJTARGETS) :
 +$(CC_OBJTARGETS) : $(GENERATE_DEPS)
  	@echo [CC]    $(subst $(PROJECT_OBJ_DIR)/,,$@)
  	@$(CC) -c $(CC_FLAGS_FULL) -o"$@" $(patsubst %.o,%.c,$(subst $(PROJECT_OBJ_DIR)/,,$@))
-
+ 
 -$(AS_OBJTARGETS) :
 +$(AS_OBJTARGETS) : $(CC_OBJTARGETS) $(CPP_OBJTARGETS)
  	@echo [AS]    $(subst $(PROJECT_OBJ_DIR)/,,$@)
  	@$(AS) $(AS_FLAGS) -o"$@" $(patsubst %.o,%.s,$(subst $(PROJECT_OBJ_DIR)/,,$@))
-
+ 
 -ifeq ($(wildcard $(PROJECT_DEP_FILE)),$(PROJECT_DEP_FILE))
 +ifeq ($(wildcard $(PROJECT_DEP_DIR)),$(PROJECT_DEP_DIR))
-
+ 
 -include $(PROJECT_DEP_FILE)
 +include $(PROJECT_DEP_DIR)/*
-
+ 
  endif
-
+ 
 @@ -156,7 +170,7 @@ clean:
  	@$(RM) $(CC_OBJTARGETS) $(AS_OBJTARGETS)
  ifneq ($(wildcard $(PROJECT_DIR)/$(PROJECT_MAKE)),)
@@ -182,17 +179,17 @@ index 2f8e4b2..7b99a26 100644
 -	@$(RM) $(PROJECT_BINARY) $(PROJECT_BINARY_LIB) $(PROJECT_DEP_FILE)
 +	@$(RM) -rf $(PROJECT_BINARY) $(PROJECT_BINARY_LIB) $(PROJECT_DEP_DIR)
  endif
-
+ 
  xclean: clean
 @@ -172,7 +186,24 @@ welcome_line :
  debug :  all
  release :  all
-
+ 
 -$(PROJECT_BINARY) : $(DIRLIST) echo_start_build $(GENERATE_DEPS) $(PRE_BUILD) $(CC_OBJTARGETS) $(AS_OBJTARGETS)
 +$(PROJECT_BINARY) : $(DIRLIST) echo_start_build $(GENERATE_DEPS) $(CC_OBJTARGETS) $(AS_OBJTARGETS)
  	@echo [AR]    $(subst $(BUILDDIR)/,,$@)
  	@$(CC) $(CC_OBJTARGETS) $(AS_OBJTARGETS) -shared -fPIC -o $@
-
+ 
 +##############################################################
 +#  Install configuration
 +##############################################################

cmake_targets/tools/oran_fhi_integration_patches/F/oran_callback_patch.patch

@@ -0,0 +1,52 @@
+diff --git a/fhi_lib/lib/src/xran_cb_proc.c b/fhi_lib/lib/src/xran_cb_proc.c
+index 2bb5187..8c5b848 100644
+--- a/fhi_lib/lib/src/xran_cb_proc.c
++++ b/fhi_lib/lib/src/xran_cb_proc.c
+@@ -460,7 +460,7 @@ xran_reg_sym_cb_rx_win_end(struct xran_device_ctx * p_dev_ctx, xran_callback_sym
+     int32_t ret = XRAN_STATUS_SUCCESS;
+     struct cb_user_per_sym_ctx *p_loc_sym_cb_ctx = &p_dev_ctx->symCbCtx[symb][XRAN_CB_SYM_RX_WIN_END];
+     uint32_t time_diff_us      = 0;
+-    uint32_t time_diff_nSymb   = 0;
++    int32_t time_diff_nSymb   = 0;
+     uint32_t absolute_ota_sym  = 0;
+     uint32_t interval_us_local = p_dev_ctx->interval_us_local;
+ 
+@@ -470,17 +470,29 @@ xran_reg_sym_cb_rx_win_end(struct xran_device_ctx * p_dev_ctx, xran_callback_sym
+         return ret;
+     }
+ 
+-    time_diff_us = p_dev_ctx->fh_cfg.Ta4_max;
+-    printf("RX WIN end Ta4_max is %d [us] where TTI is %d [us] \n", time_diff_us, interval_us_local);
+-    time_diff_nSymb = time_diff_us*1000/(interval_us_local*1000/N_SYM_PER_SLOT);
+-    if ((time_diff_nSymb/1000/(interval_us_local*1000/N_SYM_PER_SLOT)) < time_diff_us) {
+-        time_diff_nSymb+=1;
+-        printf("time duration %d rounded up to duration of %d symbols\n", time_diff_us, time_diff_nSymb);
++    if (p_dev_ctx->fh_init.io_cfg.id == O_DU) {
++        time_diff_us = p_dev_ctx->fh_cfg.Ta4_max;
++        printf("RX WIN end Ta4_max is %d [us] where TTI is %d [us] \n", time_diff_us, interval_us_local);
++        time_diff_nSymb = time_diff_us*1000/(interval_us_local*1000/N_SYM_PER_SLOT);
++        if ((time_diff_nSymb/1000/(interval_us_local*1000/N_SYM_PER_SLOT)) < time_diff_us) {
++            time_diff_nSymb+=1;
++            printf("time duration %d rounded up to duration of %d symbols\n", time_diff_us, time_diff_nSymb);
++        }
++        printf("U-plane UL delay %d [us] measured against OTA time [offset in symbols is %d]\n", time_diff_us, time_diff_nSymb);
++    } else {
++        time_diff_us = p_dev_ctx->fh_cfg.T2a_min_up;
++        printf("RX WIN end T2a_min_up is %d [us] where TTI is %d [us] \n", time_diff_us, interval_us_local);
++        time_diff_nSymb = time_diff_us*1000/(interval_us_local*1000/N_SYM_PER_SLOT);
++        time_diff_nSymb *= -1;
++        printf("U-plane DL advance %d [us] measured against OTA time [offset in symbols is %d]\n", time_diff_us, time_diff_nSymb);
++        if (time_diff_nSymb == 0) {
++            print_err("T2a_min_up of %d results in 0 symbol offset leaving no time for O-RU processing. Increase T2a_min_up at least above 1 symbol\n", time_diff_us);
++            return -1;
++        }
+     }
+-    printf("U-plane UL delay %d [us] measured against OTA time [offset in symbols is %d]\n", time_diff_us, time_diff_nSymb);
+-    absolute_ota_sym =  (symb + time_diff_nSymb) % XRAN_NUM_OF_SYMBOL_PER_SLOT;
++    absolute_ota_sym =  (symb + time_diff_nSymb + XRAN_NUM_OF_SYMBOL_PER_SLOT) % XRAN_NUM_OF_SYMBOL_PER_SLOT;
+     printf("requested symb %d pkt arrival time [deadline] coresponds to symb %d OTA time\n", symb, absolute_ota_sym);
+-
++    fflush(stdout);
+     p_loc_sym_cb_ctx->symb_num_req  = symb;
+     p_loc_sym_cb_ctx->sym_diff      = -time_diff_nSymb;
+     p_loc_sym_cb_ctx->symb_num_ota  = absolute_ota_sym;

cmake_targets/tools/oran_fhi_integration_patches/F/oran_ru_prach_patch.patch

@@ -0,0 +1,89 @@
+diff --git a/fhi_lib/lib/src/xran_common.c b/fhi_lib/lib/src/xran_common.c
+index 5968d01..eb9bb9f 100644
+--- a/fhi_lib/lib/src/xran_common.c
++++ b/fhi_lib/lib/src/xran_common.c
+@@ -908,7 +908,8 @@ inline int32_t prepare_symbol_ex(enum xran_pkt_dir direction,
+                 uint32_t do_copy,
+                 enum xran_comp_hdr_type staticEn,
+                 uint16_t num_sections,
+-                uint16_t iq_offset)
++                uint16_t iq_offset,
++                bool is_prach)
+ {
+     int32_t n_bytes , iq_len_aggr = 0;
+     int32_t prep_bytes;
+@@ -968,7 +969,7 @@ inline int32_t prepare_symbol_ex(enum xran_pkt_dir direction,
+         xp[idx].app_params.data_feature.value = 0x10;
+         xp[idx].app_params.data_feature.data_direction = direction;
+         // xp[idx].app_params.payl_ver       = 1;
+-        // xp[idx].app_params.filter_id      = 0;
++        xp[idx].app_params.data_feature.filter_id = is_prach ? 1 : 0;
+         xp[idx].app_params.frame_id       = frame_id;
+         xp[idx].app_params.sf_slot_sym.subframe_id    = subframe_id;
+         xp[idx].app_params.sf_slot_sym.slot_id        = xran_slotid_convert(slot_id, 0);
+@@ -1158,7 +1159,8 @@ int send_symbol_mult_section_ex(void *handle,
+                              do_copy,
+                              staticEn,
+                              1,
+-                             0); /*Send a single section */
++                             0,
++                             true); /*Send a single section */
+         prb_offset += prb_num_sec;
+         data_offset += n_bytes;
+         if(sent) {
+@@ -1266,7 +1268,8 @@ int send_symbol_ex(void *handle,
+                          do_copy,
+                          staticEn,
+                          1,
+-                         0); /*Send a single section */
++                         0,
++                         true); /*Send a single section */
+ 
+     if(sent){
+         pCnt->tx_counter++;
+diff --git a/fhi_lib/lib/src/xran_common.h b/fhi_lib/lib/src/xran_common.h
+index 04076fd..245b1c0 100644
+--- a/fhi_lib/lib/src/xran_common.h
++++ b/fhi_lib/lib/src/xran_common.h
+@@ -201,7 +201,8 @@ int32_t prepare_symbol_ex(enum xran_pkt_dir direction,
+                 uint32_t do_copy,
+                 enum xran_comp_hdr_type staticEn,
+                 uint16_t num_sections,
+-                uint16_t iq_buffer_offset);
++                uint16_t iq_buffer_offset,
++                bool is_prach);
+ int32_t prepare_sf_slot_sym (enum xran_pkt_dir direction,
+                 uint8_t frame_id,
+                 uint8_t subframe_id,
+diff --git a/fhi_lib/lib/src/xran_tx_proc.c b/fhi_lib/lib/src/xran_tx_proc.c
+index 85ce6fa..b7db317 100644
+--- a/fhi_lib/lib/src/xran_tx_proc.c
++++ b/fhi_lib/lib/src/xran_tx_proc.c
+@@ -23,6 +23,7 @@
+  * @author Intel Corporation
+  **/
+ 
++#include <stdbool.h>
+ #define _GNU_SOURCE
+ #include <sched.h>
+ #include <assert.h>
+@@ -421,7 +422,8 @@ int32_t xran_process_tx_sym_cp_off(void *pHandle, uint8_t ctx_id, uint32_t tti,
+                                       0,
+                                       staticEn,
+                                       num_sections,
+-                                      p_sec_desc->iq_buffer_offset);
++                                      p_sec_desc->iq_buffer_offset,
++                                      false);
+ 
+                     curr_sect_id += num_sections;
+ 
+@@ -683,7 +685,8 @@ xran_process_tx_srs_cp_off(void *pHandle, uint8_t ctx_id, uint32_t tti, int32_t
+                               0,
+                               staticEn,
+                               num_sections,
+-                              0);
++                              0,
++                              false);
+ 
+             section_id += num_sections;
+ 

common/utils/LOG/DOC/rtusage.md

@@ -21,7 +21,7 @@ The following options can be specified to trigger the information added in the h
 - `line_num`: adds the (source code) line number
 - `time`: add the time since the system started in format `ss.ssssss` (seconds and microseconds sourced from `CLOCK_MONOTONIC`)
 - `wall_clock`: add the system-wide clock time that measures real (i.e., wall-clock) time in format `ss.ssssss` (seconds and microseconds since 1970-01-01 00:00:00 Coordinated Universal Time (UTC))
-- `utc_time`: add the UTC (Coordinated Universal Time) time in format `[hh:mm:ss.ssssss]`. Note that this time is independent of the current time zone (it shows GMT). Also, printing this time has additional overhead compared to other time methods (due to time conversion and formatting).
+- `utc_time`: add the UTC (Coordinated Universal Time) time in format `YYYY-MM-DD hh:mm:ss.ssssss UTC`. Note that this time is independent of the current time zone (it shows GMT). Also, printing this time has additional overhead compared to other time methods (due to time conversion and formatting).
 
 Note: `time`, `utc_time` and `wall_clock` are mutually exclusive and cannot be used together.
 

common/utils/LOG/log.c

@@ -461,15 +461,9 @@ int register_log_component(const char *name, const char *fext, int compidx)
   }
 
   if (computed_compidx >= 0 && computed_compidx <MAX_LOG_COMPONENTS) {
-    log_component_t *c = &g_log->log_component[computed_compidx];
-    c->name = strdup(name);
-    int n = snprintf(c->headerName, sizeof(c->headerName), "[%s", c->name);
-    if (n >= sizeof(c->headerName) - 1) // snprintf() truncated
-      n = sizeof(c->headerName) - 2;
-    c->headerName[n] = ']';
-    c->headerName[n + 1] = 0;
-    c->stream = stdout;
-    c->filelog = 0;
+    g_log->log_component[computed_compidx].name = strdup(name);
+    g_log->log_component[computed_compidx].stream = stdout;
+    g_log->log_component[computed_compidx].filelog = 0;
     g_log->log_rarely_used[computed_compidx].filelog_name = calloc(1, strlen(name) + 16); /* /tmp/<name>.%s  */
     sprintf(g_log->log_rarely_used[computed_compidx].filelog_name, "/tmp/%s.", name);
     strncat(g_log->log_rarely_used[computed_compidx].filelog_name, fext, 3);
@@ -515,15 +509,12 @@ int logInit (void)
   for (int i = 0; i < MAX_LOG_PREDEF_COMPONENTS; i++)
     register_log_component(comp_name[i], comp_extension[i], i);
 
+  for (int i=0 ; log_level_names[i].name != NULL ; i++)
+    g_log->level2string[i] = toupper(log_level_names[i].name[0]); // uppercased first letter of level name
+  
   g_log->filelog_name = "/tmp/openair.log";
   log_getconfig(g_log);
 
-  for (int i = 0; log_level_names[i].name != NULL; i++)
-    if (g_log->flag & FLAG_LEVEL)
-      snprintf(g_log->level2string[i], sizeof g_log->level2string[i], " %c ", toupper(log_level_names[i].name[0]));
-    else
-      snprintf(g_log->level2string[i], sizeof g_log->level2string[i], " ");
-
   // set all unused component items to 0, they are for non predefined components
   for (int i=MAX_LOG_PREDEF_COMPONENTS; i < MAX_LOG_COMPONENTS; i++) {
     memset(&(g_log->log_component[i]),0,sizeof(log_component_t));
@@ -584,7 +575,8 @@ static inline int log_header(log_component_t *c,
       struct tm utc_time;
       if (gmtime_r(&t.tv_sec, &utc_time) == NULL)
         abort();
-      snprintf(timeString, sizeof(timeString), "[%02d:%02d:%02d.%06lu] ",
+      snprintf(timeString, sizeof(timeString), "%04d-%02d-%02d %02d:%02d:%02d.%06lu UTC ",
+               utc_time.tm_year + 1900, utc_time.tm_mon + 1, utc_time.tm_mday,
                utc_time.tm_hour, utc_time.tm_min, utc_time.tm_sec, t.tv_nsec / 1000);
     } else {
       snprintf(timeString, sizeof(timeString), "%lu.%06lu ",
@@ -601,18 +593,15 @@ static inline int log_header(log_component_t *c,
   } else {
     threadIdString[0] = 0;
   }
-
-  return snprintf(log_buffer,
-                  buffsize,
-                  "%s%s%s%-8s%s%-*s%s",
-                  flag & FLAG_NOCOLOR ? "" : log_level_highlight_start[level],
-                  timeString,
-                  threadIdString,
-                  c->headerName,
-                  g_log->level2string[level], // will print space if no level selected
-                  l[0] == 0 ? 0 : 32,
-                  l,
-                  threadname);
+  return snprintf(log_buffer, buffsize, "%s%s%s[%s] %c %s%s",
+		   flag & FLAG_NOCOLOR ? "" : log_level_highlight_start[level],
+		   timeString,
+		   threadIdString,
+		   c->name,
+		   flag & FLAG_LEVEL ? g_log->level2string[level] : ' ',
+		   l,
+		   threadname
+		   );
 }
 
 void logRecord_mt(const char *file,

common/utils/LOG/log.h

@@ -206,7 +206,6 @@ typedef struct {
 
 typedef struct  {
   const char        *name;
-  char headerName[19];
   int level;
   int filelog;
   FILE              *stream;
@@ -218,7 +217,7 @@ typedef struct  {
 typedef struct {
   log_component_t         log_component[MAX_LOG_COMPONENTS];
   log_component_back_t log_rarely_used[MAX_LOG_COMPONENTS];
-  char level2string[NUM_LOG_LEVEL][4];
+  char                    level2string[NUM_LOG_LEVEL];
   int                     flag;
   char                   *filelog_name;
   debug_flags_t debug_mask;

common/utils/nr/nr_common.c

@@ -459,50 +459,12 @@ bool compare_relative_ul_channel_bw(int nr_band, int scs, int channel_bandwidth,
   return rel_bw > limit;
 }
 
-static bool check_delta_duplex(int index, uint64_t dlfreq_khz, uint64_t ulfreq_khz, int64_t dlbw, int64_t ulbw)
-{
-  int uldl_min_offset = nr_bandtable[index].dl_min - nr_bandtable[index].ul_min;
-  int txrx_offset = dlfreq_khz - ulfreq_khz;
-  LOG_I(NR_PHY, "dlfreq:%ld ulfreq:%ld deltaduplex:%d khz, uldl_min_offset:%d khz\n",
-                              dlfreq_khz, ulfreq_khz, txrx_offset, uldl_min_offset);
-  if (txrx_offset == uldl_min_offset)
-    return true;
-
-  int band = nr_bandtable[index].band;
-
-  // Refer to section 5.4.4 in spec 38.101-5
-  if (band == 256 && txrx_offset >= 165000 && txrx_offset <= 215000)
-    return true;
-  if (band == 255 && txrx_offset >= -130500 && txrx_offset <= -72500)
-    return true;
-  if (band == 254 && txrx_offset >= 862000 && txrx_offset <= 885000)
-    return true;
-
-  // Refer to section 5.4.4 in spec 38.101-1 for these bands 24, 91-94, 109
-  if (band == 24 && (txrx_offset == -101500 || txrx_offset == -120500))
-    return true;
-  //Delta duplex is also a range for these bands n91-n94, n109.
-  if ((band >= 91 && band <= 94) || band == 109) {
-    dlbw = ((dlbw / 1000) + 1)  * 1000;
-    ulbw = ((ulbw / 1000) + 1) * 1000;
-    int lower_limit = nr_bandtable[index].dl_min - nr_bandtable[index].ul_max + ((dlbw + ulbw) >> 1);
-    int upper_limit = nr_bandtable[index].dl_max - nr_bandtable[index].ul_min - ((dlbw + ulbw) >> 1);
-    LOG_I(NR_PHY, "Band %d dlbw:%ld Khz, ulbw: %ld Khz RXTX lower limit:%d khz, upper limit:%d khz\n",
-                                            band, dlbw, ulbw, lower_limit, upper_limit);
-
-    if (txrx_offset >= lower_limit && txrx_offset <= upper_limit)
-      return true;
-  }
-
-  return false;
-}
-
-uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex, int64_t dlbw, int64_t ulbw)
+uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex)
 {
   const int64_t dl_freq_khz = downlink_frequency / 1000;
   const int32_t  delta_duplex_khz = delta_duplex / 1000;
-  const int64_t ul_freq_khz = dl_freq_khz + delta_duplex_khz;
 
+  uint64_t center_freq_diff_khz = UINT64_MAX; // 2^64
   uint16_t current_band = 0;
 
   for (int ind = 0; ind < sizeofArray(nr_bandtable); ind++) {
@@ -510,13 +472,17 @@ uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex, int64_t dlb
     if (dl_freq_khz < nr_bandtable[ind].dl_min || dl_freq_khz > nr_bandtable[ind].dl_max)
       continue;
 
-    if (ul_freq_khz < nr_bandtable[ind].ul_min || ul_freq_khz > nr_bandtable[ind].ul_max)
+    int32_t current_offset_khz = nr_bandtable[ind].ul_min - nr_bandtable[ind].dl_min;
+
+    if (current_offset_khz != delta_duplex_khz)
       continue;
 
-    if (!check_delta_duplex(ind, dl_freq_khz, ul_freq_khz, dlbw, ulbw))
-      continue;
+    int64_t center_frequency_khz = (nr_bandtable[ind].dl_max + nr_bandtable[ind].dl_min) / 2;
 
-    current_band = nr_bandtable[ind].band;
+    if (labs(dl_freq_khz - center_frequency_khz) < center_freq_diff_khz){
+      current_band = nr_bandtable[ind].band;
+      center_freq_diff_khz = labs(dl_freq_khz - center_frequency_khz);
+    }
   }
 
   printf("DL frequency %"PRIu64": band %d, UL frequency %"PRIu64"\n",
@@ -575,8 +541,8 @@ int cce_to_reg_interleaving(const int R, int k, int n_shift, const int C, int L,
   return f;
 }
 
-void get_coreset_rballoc(const uint8_t *FreqDomainResource, int *n_rb, int *rb_offset)
-{
+void get_coreset_rballoc(uint8_t *FreqDomainResource,int *n_rb,int *rb_offset) {
+
   uint8_t count=0, start=0, start_set=0;
 
   uint64_t bitmap = (((uint64_t)FreqDomainResource[0])<<37)|
@@ -599,7 +565,7 @@ void get_coreset_rballoc(const uint8_t *FreqDomainResource, int *n_rb, int *rb_o
 }
 
 // According to 38.211 7.3.2.2
-int get_coreset_num_cces(const uint8_t *FreqDomainResource, int duration)
+int get_coreset_num_cces(uint8_t *FreqDomainResource, int duration)
 {
   int num_rbs;
   int rb_offset;

common/utils/nr/nr_common.h

@@ -280,12 +280,12 @@ uint32_t to_nrarfcn(int nr_bandP, uint64_t dl_CarrierFreq, uint8_t scs_index, ui
 
 int cce_to_reg_interleaving(const int R, int k, int n_shift, const int C, int L, const int N_regs);
 int get_SLIV(uint8_t S, uint8_t L);
-void get_coreset_rballoc(const uint8_t *FreqDomainResource, int *n_rb, int *rb_offset);
-int get_coreset_num_cces(const uint8_t *FreqDomainResource, int duration);
+void get_coreset_rballoc(uint8_t *FreqDomainResource,int *n_rb,int *rb_offset);
+int get_coreset_num_cces(uint8_t *FreqDomainResource, int duration);
 int get_nr_table_idx(int nr_bandP, uint8_t scs_index);
 int32_t get_delta_duplex(int nr_bandP, uint8_t scs_index);
 frame_type_t get_frame_type(uint16_t nr_bandP, uint8_t scs_index);
-uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex, int64_t dlbw, int64_t ulbw);
+uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex);
 int NRRIV2BW(int locationAndBandwidth,int N_RB);
 int NRRIV2PRBOFFSET(int locationAndBandwidth,int N_RB);
 int PRBalloc_to_locationandbandwidth0(int NPRB,int RBstart,int BWPsize);

common/utils/shm_iq_channel/shm_td_iq_channel.c

@@ -208,8 +208,11 @@ IQChannelErrorType shm_td_iq_channel_rx(ShmTDIQChannel *channel,
     size_t num_samples_first_copy = CIRCULAR_BUFFER_SIZE - first_sample;
     memcpy(tx_iq_data, base_ptr + first_sample, num_samples_first_copy * sizeof(sample_t));
     memcpy(tx_iq_data + num_samples_first_copy, base_ptr, (num_samples - num_samples_first_copy) * sizeof(sample_t));
+    memset(base_ptr + first_sample, 0, num_samples_first_copy * sizeof(sample_t));
+    memset(base_ptr, 0, (num_samples - num_samples_first_copy) * sizeof(sample_t));
   } else {
     memcpy(tx_iq_data, base_ptr + first_sample, num_samples * sizeof(sample_t));
+    memset(base_ptr + first_sample, 0, num_samples * sizeof(sample_t));
   }
   return CHANNEL_NO_ERROR;
 }

common/utils/system.c

@@ -282,14 +282,25 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
 
   ret=pthread_create(t, &attr, func, param);
   AssertFatal(ret == 0, "Error in pthread_create(): ret: %d, errno: %d\n", ret, errno);
-  
-  pthread_setname_np(*t, name);
-  if (affinity != -1 ) {
+
+  char short_name[16];
+  strncpy(short_name, name, sizeof(short_name) - 1);
+  short_name[sizeof(short_name) - 1] = '\0';
+  ret = pthread_setname_np(*t, short_name);
+  AssertFatal(ret == 0, "Error in pthread_setname_np(): ret: %d, errno: %d\n", ret, errno);
+
+  if (affinity != -1) {
     cpu_set_t cpuset;
     CPU_ZERO(&cpuset);
     CPU_SET(affinity, &cpuset);
     ret = pthread_setaffinity_np(*t, sizeof(cpu_set_t), &cpuset);
     AssertFatal(ret == 0, "Error in pthread_getaffinity_np(): ret: %d, errno: %d", ret, errno);
+  } else {
+    cpu_set_t cpuset;
+    ret = sched_getaffinity(0, sizeof(cpu_set_t), &cpuset);
+    AssertFatal(ret == 0, "Error in sched_getaffinity(): ret: %d, errno: %d", ret, errno);
+    ret = pthread_setaffinity_np(*t, sizeof(cpu_set_t), &cpuset);
+    AssertFatal(ret == 0, "Error in pthread_setaffinity_np(): ret: %d, errno: %d", ret, errno);
   }
   pthread_attr_destroy(&attr);
 }

common/utils/telnetsrv/CMakeLists.txt

@@ -62,7 +62,7 @@ add_dependencies(telnetsrv telnetsrv_ci)
 
 message(STATUS "Add CI specific telnet functions for nrUE in telnetsrv_ciUE.so")
 add_library(telnetsrv_ciUE MODULE telnetsrv_ciUE.c)
-target_link_libraries(telnetsrv_ciUE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs UTIL NR_L2_UE nr_nas)
+target_link_libraries(telnetsrv_ciUE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs UTIL)
 add_dependencies(telnetsrv telnetsrv_ciUE)
 
 message(STATUS "Add bearer specific telnet functions in libtelnetsrv_bearer.so")

common/utils/telnetsrv/telnetsrv_ci.c

@@ -38,9 +38,7 @@
 #include "openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h"
 #include "openair2/LAYER2/nr_rlc/nr_rlc_entity_am.h"
 #include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
-#include "openair2/LAYER2/NR_MAC_gNB/mac_config.h"
 #include "openair2/RRC/NR/rrc_gNB_mobility.h"
-#include "openair3/NGAP/ngap_gNB_ue_context.h"
 
 #define TELNETSERVERCODE
 #include "telnetsrv.h"
@@ -277,8 +275,6 @@ static int get_current_bwp(char *buf, int debug, telnet_printfunc_t prnt)
   if (rnti < 0)
     ERROR_MSG_RET("could not identify UE (no UE, no such RNTI, or multiple UEs)\n");
   NR_UE_info_t *UE = find_nr_UE(&RC.nrmac[0]->UE_info, rnti);
-  if (!UE)
-    ERROR_MSG_RET("could not find UE with RNTI %04x\n", rnti);
   int dl_bwp = UE->current_DL_BWP.bwp_id;
   const char *dl_bwp_text = dl_bwp > 0 ? "dedicated" : "initial";
   int ul_bwp = UE->current_UL_BWP.bwp_id;
@@ -288,104 +284,6 @@ static int get_current_bwp(char *buf, int debug, telnet_printfunc_t prnt)
   return 0;
 }
 
-/** @brief Trigger NGAP PDU Session Release for one or more PDU sessions associated with a UE ID/
- *  Syntax: trigger_pdu_session_release [ue_id=gNB_ue_ngap_id(int,opt)],pdusession_id(int)[,pdusession_id(int)...]
- *  - If the gNB_ue_ngap_id is omitted, it is fetched from the only UE present in the RRC layer
- *  - At least one valid PDU session ID must be provided
- * @param[in] buf   Comma-separated input string: [ue_id=gNB_ue_ngap_id(int,opt)],PDU1[,PDU2,...]
- * @param[in] debug Not used.
- * @param[in] prnt  Callback for telnet output printing.
- * @return 0 on success; negative value on error. */
-static int trigger_ngap_pdu_session_release(char *buf, int debug, telnet_printfunc_t prnt)
-{
-  if (buf == NULL) {
-    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[NGAP_MAX_PDU_SESSION + 1];
-  int count = 0;
-
-  for (char *tok = strtok(buf, ","); tok != NULL && count < (int)sizeofArray(tokens); tok = strtok(NULL, ",")) {
-    tokens[count++] = tok;
-  }
-
-  if (count < 1) {
-    ERROR_MSG_RET("Invalid input. Usage: trigger_pdu_session_release [ue_id=gNB_ue_ngap_id(int,opt)],pdusession_id(int)[,pdusession_id(int)...]\n");
-  }
-
-  int gNB_ue_ngap_id = -1;
-  int pdu_start_index = 0;
-
-  if (strncmp(tokens[0], "ue_id=", 6) == 0) {
-    gNB_ue_ngap_id = atoi(tokens[0] + 6);
-    pdu_start_index = 1;
-  } else {
-    // No UE ID: infer it
-    if (!RC.nrrrc)
-      ERROR_MSG_RET("No RRC present\n");
-    rrc_gNB_ue_context_t *ue = get_single_rrc_ue();
-    if (!ue)
-      ERROR_MSG_RET("No single UE in RRC present\n");
-    gNB_ue_ngap_id = ue->ue_context.rrc_ue_id;
-  }
-
-  if (pdu_start_index >= count) {
-    ERROR_MSG_RET("No pdusession_id(int) provided\n");
-  }
-
-  ngap_gNB_ue_context_t *ngap = ngap_get_ue_context(gNB_ue_ngap_id);
-  if (!ngap) {
-    ERROR_MSG_RET("No NGAP UE context for gNB_ue_ngap_id %d\n", gNB_ue_ngap_id);
-  }
-
-  MessageDef *message_p = itti_alloc_new_message(TASK_NGAP, 0, NGAP_PDUSESSION_RELEASE_COMMAND);
-  ngap_pdusession_release_command_t *msg = &NGAP_PDUSESSION_RELEASE_COMMAND(message_p);
-  memset(msg, 0, sizeof(*msg));
-
-  msg->amf_ue_ngap_id = ngap->amf_ue_ngap_id;
-  msg->gNB_ue_ngap_id = ngap->gNB_ue_ngap_id;
-
-  int nb_sessions = 0;
-  for (int i = pdu_start_index; i < count; ++i) {
-    int sid = atoi(tokens[i]);
-    if (sid < 1 || sid > 255) {
-      ERROR_MSG_RET("Invalid pdusession_id(int): %s (must be between 1 and 255)\n", tokens[i]);
-    }
-    msg->pdusession_ids[nb_sessions++] = sid;
-  }
-
-  msg->nb_pdusessions_torelease = nb_sessions;
-
-  if (prnt) {
-    prnt("Triggering NGAP PDU Session Release for gNB_ue_ngap_id=%d: releasing pdusession_id=%d", gNB_ue_ngap_id);
-    for (int i = 0; i < nb_sessions; ++i) {
-      prnt(" %d,", msg->pdusession_ids[i]);
-    }
-    prnt("\n");
-  }
-
-  itti_send_msg_to_task(TASK_RRC_GNB, 0, message_p);
-  return 0;
-}
-
-static int trigger_bwp_switch(char *buf, int debug, telnet_printfunc_t prnt)
-{
-  char *sbwpId = strtok(buf, " ");
-  int bwpId = atoi(sbwpId);
-  char *srnti = strtok(NULL, " ");
-  prnt("bwpId %d rnti %s\n", bwpId, srnti);
-  int rnti = fetch_rnti(srnti, prnt);
-  if (rnti < 0)
-    ERROR_MSG_RET("could not identify UE (no UE, no such RNTI, or multiple UEs)\n");
-  if (!nr_trigger_bwp_switch(rnti, bwpId)) {
-    prnt("failed trigger BWP switch for UE %04x BWP ID %d\n", rnti, bwpId);
-    return -1;
-  } else {
-    prnt("triggered BWP switch to BWP ID %d for UE %04x\n", bwpId, rnti);
-    return 0;
-  }
-}
-
 static telnetshell_cmddef_t cicmds[] = {
     {"get_single_rnti", "", get_single_rnti},
     {"force_reestab", "[rnti(hex,opt)]", trigger_reestab},
@@ -395,9 +293,7 @@ static telnetshell_cmddef_t cicmds[] = {
     {"trigger_f1_ho", "[rrc_ue_id(int,opt)]", rrc_gNB_trigger_f1_ho},
     {"fetch_du_by_ue_id", "[rrc_ue_id(int,opt)]", fetch_du_by_ue_id},
     {"get_current_bwp", "[rnti(hex,opt)]", get_current_bwp},
-    {"trigger_bwp_switch", "newBWPId [rnti(hex,opt)]", trigger_bwp_switch},
     {"trigger_n2_ho", "[neighbour_pci(uint32_t),ueId(uint32_t)]", rrc_gNB_trigger_n2_ho},
-    {"pdu_session_release", "[gNB_ue_ngap_id(int,opt)]", trigger_ngap_pdu_session_release},
     {"", "", NULL},
 };
 

common/utils/telnetsrv/telnetsrv_ciUE.c

@@ -37,9 +37,6 @@
 #include "openair2/LAYER2/NR_MAC_UE/mac_defs.h"
 #include "openair2/LAYER2/NR_MAC_UE/mac_proto.h"
 #include "openair2/RRC/NR_UE/rrc_proto.h"
-#include "openair1/PHY/phy_extern_nr_ue.h"
-#include "openair1/PHY/defs_nr_common.h"
-#include "openair3/NAS/NR_UE/nr_nas_msg.h"
 
 #define TELNETSERVERCODE
 #include "telnetsrv.h"
@@ -53,14 +50,6 @@ const char* NR_UE_L2_STATE_STR[] = {
 #undef UE_STATE
 };
 
-static int get_default_ue_id(void)
-{
-  NR_UE_RRC_INST_t *rrc = get_NR_UE_rrc_inst(0);
-  if (!rrc)
-    return -1;
-  return rrc->ue_id;
-}
-
 /**
  * Get the synchronization state of a UE.
  *
@@ -121,60 +110,6 @@ static int force_deregistration(char *buf, int debug, telnet_printfunc_t prnt)
   return 0;
 }
 
-extern float get_prs_max_dl_toa(prs_meas_t *prs_meas);
-static int get_dl_toa(char *buf, int debug, telnet_printfunc_t prnt)
-{
-  // TODO multiple antennas, resources, gNBs?
-  int gNB_id = 0;
-  int rsc_id = 0;
-  int ant = 0;
-
-  PHY_VARS_NR_UE *UE = PHY_vars_UE_g[0][0];
-  if (!UE || !UE->prs_vars[gNB_id])
-    ERROR_MSG_RET("no UE/prs_vars found!\n");
-  NR_PRS_RESOURCE_t *prs_res = &UE->prs_vars[gNB_id]->prs_resource[rsc_id];
-  if (!prs_res->prs_meas || !prs_res->prs_meas[ant])
-    ERROR_MSG_RET("prs_meas not initialized!\n");
-
-  float max = get_prs_max_dl_toa(prs_res->prs_meas[ant]);
-  prnt("UE max PRS DL ToA %.3f\n", max);
-  return 0;
-}
-
-static int add_pdu_session(char *buf, int debug, telnet_printfunc_t prnt)
-{
-  int ue_id = -1;
-  int pdusession_id = -1;
-
-  if (!buf) {
-    ERROR_MSG_RET("Missing argument: expected PDUSessionID[,UE_ID]\n");
-  }
-
-  // Try parsing values in the form: "PDUSessionID[,UE_ID]"
-  int n = sscanf(buf, "%d,%d", &pdusession_id, &ue_id);
-  if (n == 1) {
-    // Only PDUSessionID provided: use default UE ID
-    ue_id = get_default_ue_id();
-    if (ue_id < 0)
-      ERROR_MSG_RET("No default UE context found\n");
-  } else if (n != 2) {
-    ERROR_MSG_RET("Invalid format: expected PDUSessionID[,UE_ID]\n");
-  }
-
-  if (pdusession_id < 0 || pdusession_id > 255)
-    ERROR_MSG_RET("PDUSessionID must be in range [0,255]\n");
-  if (ue_id < 0)
-    ERROR_MSG_RET("UE_ID must be >= 0\n");
-
-  nr_ue_nas_t *nas = get_ue_nas_info(ue_id);
-  if (!nas)
-    ERROR_MSG_RET("No NAS context found for UE_ID %d\n", ue_id);
-
-  request_pdusession(nas, pdusession_id);
-  prnt("Triggered PDU session request for UE %d with ID %d\n", ue_id, pdusession_id);
-  return 0;
-}
-
 /* Telnet shell command definitions */
 static telnetshell_cmddef_t cicmds[] = {
   {"sync_state", "[UE_ID(int,opt)]", get_sync_state},
@@ -182,8 +117,6 @@ static telnetshell_cmddef_t cicmds[] = {
   {"force_RRC_IDLE", "", force_RRC_IDLE},
   {"force_crnti_ra", "", force_crnti_ra},
   {"deregistration", "", force_deregistration},
-  {"get_max_dl_toa", "[ant]", get_dl_toa},
-  {"add_pdu_session", "[PDUSessionID(int)],[UE_ID(int,opt)]", add_pdu_session},
   {"", "", NULL},
 };
 

common/utils/telnetsrv/telnetsrv_o1.c

@@ -105,10 +105,10 @@ static int get_stats(char *buf, int debug, telnet_printfunc_t prnt)
   int bw_index = get_supported_band_index(scs, fr, nrb);
   int bw_mhz = get_supported_bw_mhz(fr, bw_index);
 
-  const dlul_mac_stats_t *stat = &mac->mac_stats;
-  static dlul_mac_stats_t last = {0};
-  int diff_used = stat->dl.used_prb_aggregate - last.dl.used_prb_aggregate;
-  int diff_total = stat->dl.total_prb_aggregate - last.dl.total_prb_aggregate;
+  const mac_stats_t *stat = &mac->mac_stats;
+  static mac_stats_t last = {0};
+  int diff_used = stat->used_prb_aggregate - last.used_prb_aggregate;
+  int diff_total = stat->total_prb_aggregate - last.total_prb_aggregate;
   int load = diff_total > 0 ? 100 * diff_used / diff_total : 0;
   last = *stat;
 

doc/Aerial_FAPI_Split_Tutorial.md

@@ -82,7 +82,7 @@ of the FAPI 10.04 version of the SRS PDU, and RX_Beamforming PDU.
 | Applicative Threads    | Allocated CPUs |
 |------------------------|----------------|
 | PTP & PHC2SYS Services | 41             |
-| OAI `nr-softmodem`     | 13-16          |
+| OAI `nr-softmodem`     | 13-14          |
 
 ## PTP configuration
 

doc/Doxyfile

@@ -1916,6 +1916,8 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_api.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_setup.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/E1AP/e1ap_asnc.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/nr_sched_response.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/nr_sched_response.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/NR_IF_Module.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/NR_PHY_INTERFACE/NR_IF_Module.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap.h \
@@ -2010,6 +2012,7 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_sss.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_uci_tools_common.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch_tools.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_prach.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_TRANSPORT/nr_scrambling.c \
@@ -2291,8 +2294,10 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/phy_frame_config_nr.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/phy_frame_config_nr.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/nr_prach_procedures.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/fapi_nr_l1.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/phy_procedures_nr_gNB.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/sched_nr.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/fapi_nr_l1.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SCHED_NR/nr_ru_procedures.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../radio/ETHERNET/if_defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../radio/ETHERNET/ethernet_lib.h \

doc/E1AP/e1ap_procedures.md

@@ -72,36 +72,3 @@ 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/FEATURE_SET.md

@@ -0,0 +1,693 @@
+**Table of Contents**
+
+[[_TOC_]]
+
+# Functional Split Architecture #
+
+-  RCC: Radio-Cloud Center
+-  RAU: Radio-Access Unit
+-  RRU: Remote Radio-Unit
+-  IF4.5 / IF5 : similar to IEEE P1914.1
+-  FAPI (IF2)  : specified by Small Cell Forum (open-nFAPI implementation)
+-  IF1         : F1 in 3GPP Release 15
+
+![Functional Split Architecture](./images/oai_enb_func_split_arch.png)
+
+
+# OpenAirInterface Block Diagram #
+
+![Block Diagram](./images/oai_enb_block_diagram.png)
+
+# OpenAirInterface 5G-NR Feature Set #
+
+## General Parameters
+
+The following features are valid for the gNB and the 5G-NR UE.
+
+*  Static TDD
+   - Multi TDD pattern supported refer [TDD Configuration](MAC/mac-usage.md)
+*  Static FDD
+*  Normal CP
+*  Subcarrier spacings: 15 and 30kHz (FR1), 120kHz (FR2)
+*  Bandwidths: 5-100MHz (FR1), 100 and 200MHz (FR2)
+*  Intermediate downlink and uplink frequencies to interface with IF equipment
+*  Procedures for 4-layer DL and 2-layer UL SU-MIMO
+*  Slot format: 14 OFDM symbols in UL or DL
+*  Highly efficient 3GPP compliant LDPC encoder and decoder (BG1 and BG2 supported)
+*  Highly efficient 3GPP compliant polar encoder and decoder
+*  Encoder and decoder for short blocks
+*  Support for UL transform precoding (SC-FDMA)
+
+These modes of operation are supported:
+
+* "phy-test" mode (gNB, nrUE):
+  - gNB and nrUE have hardcoded RNTI and radio configuration
+  - gNB schedules the nrUE all the time, even if no UE connected
+  - can be used for performance evaluation
+* "noS1" mode (DL and UL, gNB, nrUE):
+  - Connection setup stops after RA; RRC configuration is exchanged through
+    files
+  - Creates TUN interface to SDAP to inject and receive user-place traffic
+  - No connection to the core network
+* Standalone (SA) mode (gNB, nrUE):
+  - UE can register with the 5G Core Network through the gNB, establish a PDU
+    Session and exchange user-plane traffic
+  - Reestablishment supported
+* Non-standalone (NSA) mode (gNB):
+  - UE can use the gNB for user plane traffic while connected to the 4G eNB
+  - is unstable (only one UE connection)
+
+
+## gNB PHY
+
+*  15kHz and 30kHz SCS for FR1 and 120kHz SCS for FR2
+*  Generation of NR-PSS/NR-SSS
+*  NR-PBCH supports multiple SSBs and flexible periodicity
+*  Generation of NR-PDCCH (including generation of DCI, polar encoding, scrambling, modulation, RB mapping, etc)
+   - common search space
+   - user-specific search space
+   - DCI formats: 00, 10, 01 and 11
+*  Generation of NR-PDSCH (including Segmentation, LDPC encoding, rate matching, scrambling, modulation, RB mapping, etc).
+   - PDSCH mapping type A and B
+   - DMRS configuration type 1 and 2
+   - Single and multiple DMRS symbols
+   - PTRS support
+   - Support for up to 4 TX antennas
+   - Support for up to 4 layers
+   - Support for 256 QAM
+*  NR-CSIRS Generation of sequence at PHY
+*  NR-PUSCH (including Segmentation, LDPC encoding, rate matching, scrambling, modulation, RB mapping, etc).
+   - PUSCH mapping type A and B
+   - DMRS configuration type 1 and 2
+   - Single and multiple DMRS symbols
+   - PTRS support
+   - Support for up to 4 RX antennas
+   - Support for up to 2 layers
+   - Support for 256 QAM
+*  NR-PUCCH
+   - Format 0 (2 bits, for ACK/NACK and SR)
+   - Format 2 (mainly for CSI feedback)
+*  NR-SRS
+    - SRS signal reception
+    - Channel estimation (with T tracer real time monitoring)
+    - Power noise estimation
+*  NR-PRS
+    - Rel16 Positioning reference signal(PRS) generation and modulation
+    - Multiple PRS resources, one per beam is supported in FR2 TDD mode
+    - FR1 and FR2 support with config file
+*  NR-PRACH
+   - Formats 0,1,2,3, A1-A3, B1-B3
+*  Highly efficient 3GPP compliant LDPC encoder and decoder (BG1 and BG2 are supported)
+*  Highly efficient 3GPP compliant polar encoder and decoder
+*  Encoder and decoder for short block
+
+## gNB MAC
+
+- MAC -> PHY configuration using NR FAPI P5 interface
+- MAC <-> PHY data interface using FAPI P7 interface for DL_TTI.request,
+  UL_TTI.request, UL_DCI.request, TX_data.request, RX_Data.indication,
+  CRC.indication, UCI.indication, SRS.indication
+- Generation of and scheduler procedures for MIB/SIB1
+- Scheduler procedures for RA
+    - 4-Step RA
+        - Contention Free RA procedure
+        - Contention Based RA procedure
+            - Msg3 can transfer uplink CCCH, DTCH or DCCH messages
+            - CBRA can be performed using MAC CE for C-RNTI
+            - Is not possible to use 2-Step RA and 4-Step RA at the same time
+    - 2-Step RA
+        - Contention Based RA procedure
+            - MsgA can transfer uplink CCCH, DTCH or DCCH messages
+            - CBRA can be performed using MAC CE for C-RNTI
+            - Is not possible to use 2-Step RA and 4-Step RA at the same time
+            - Fallback not supported
+- Scheduler procedures for CSI-RS
+- MAC downlink scheduler
+  - phy-test scheduler (fixed allocation and usable also without UE)
+  - regular scheduler with dynamic proportionally-fair allocation
+  - MCS adaptation from HARQ BLER or SSB-SINR report
+- MAC header generation (including timing advance)
+- ACK/NACK handling and HARQ procedures for downlink
+- MAC uplink scheduler
+  - phy-test scheduler (fixed allocation)
+  - regular scheduler with dynamic proportionally-fair allocation
+  - HARQ procedures for uplink
+  - MCS adaption from HARQ BLER or PUSCH SINR
+- Scheduler procedures for SRS reception
+  - Periodic SRS reception
+  - Channel rank computation up to 2x2 scenario
+  - TPMI computation based on SRS up 4 antenna ports and 2 layers
+- MAC procedures to handle CSI measurement report
+  - evalution of RSRP report
+  - evaluation of CQI report
+- MAC scheduling of SR reception
+- Intra-frequency handover
+- Inter-frequency handover
+    - Measurement gaps are automatically computed at the DU if the CU has neighbor information and the configured
+      neighbors include cells operating on different frequencies
+    - DUs must be synchronized with each other for the measurements to be properly performed
+- Initial support for RedCap
+  - RedCap SIB1 v17 IEs supported
+  - Coexistence of RedCap and Normal UEs
+  - Handling of RedCap capability for small PDCP/RLC SN size
+- Scheduling of other SIBs (2, 19)
+- NTN
+  - Support downlinkHARQ-FeedbackDisabled-r17
+  - Support for 32 PDSCH and PUSCH HARQ processes per UE
+  - Consider ntn-Config-r17.cellSpecificKoffset-r17 in scheduling
+  - Function-based interface for ntn-Config-r17 updates (used by NTN-LEO RFsimulator)
+
+## gNB RLC
+
+- Send/Receive operations according to 38.322 Rel.16
+  - Segmentation and reassembly procedures
+  - RLC Acknowledged mode supporting PDU retransmissions
+  - RLC Unacknowledged mode
+  - DRBs and SRBs establishment/handling and association with RLC entities
+  - Timers implementation
+  - Interfaces with PDCP, MAC
+  - Interfaces with gtp-u (data Tx/Rx over F1-U at the DU)
+
+## gNB PDCP
+
+- Send/Receive operations according to 38.323 Rel.16
+  - Integrity protection and ciphering procedures
+  - Sequence number management, SDU dicard and in-order delivery
+  - Radio bearer establishment/handling and association with PDCP entities
+  - Interfaces with RRC, RLC
+  - Interfaces with gtp-u (data Tx/Rx over N3 and F1-U interfaces)
+
+## gNB SDAP
+
+- Send/Receive operations according to 37.324 Rel.15
+  - Establishment/Handling of SDAP entities.
+  - Transfer of User Plane Data
+  - Mapping between a QoS flow and a DRB for both DL and UL
+  - Marking QoS flow ID in both DL and UL packets
+  - Reflective QoS flow to DRB mapping for UL SDAP data PDUs
+
+## gNB RRC
+
+- NR RRC (38.331) Rel 17 messages using new [asn1c](https://github.com/mouse07410/asn1c)
+- LTE RRC (36.331) also updated to Rel 15
+- Generation of system information (SIB2)
+- RRC can configure PDCP and SDAP (through E1), and RLC and MAC (through F1)
+- Interface with GTP-U (tunnel creation/handling for S1-U (NSA), N3 (SA), F1 interfaces)
+- Integration of RRC messages and procedures supporting UE 5G SA connection
+  - RRCSetupRequest/RRCSetup/RRCSetupComplete
+  - RRC Uplink/Downlink Information transfer carrying NAS messages transparently
+  - RRC Reconfiguration/Reconfiguration complete
+  - RRC Reestablishment/Reestablishment complete
+  - Support for MasterCellGroup configuration (from DU)
+  - Interface with NGAP for the interactions with the AMF
+  - Interface with F1AP for CU/DU split deployment option
+  - Interface with E1AP for CU-CP/CU-CP split deployment option
+  - Periodic RRC measurements of serving/neighbour cells and A2/A3 event
+    handling
+- RRC Mobility Management Procedures:
+  - Inter-DU Handover (F1-based handover within same CU)
+  - Inter-gNB Handover (N2-based handover between different gNBs)
+  - Handover Preparation Information generation and processing
+  - Handover Command generation and processing
+  - PDCP Status transfer procedures
+  - Support for handover decision triggers (A3 events, manual triggers)
+- Initial support for RedCap (see MAC)
+
+## gNB X2AP
+
+- Integration of X2AP messages and procedures for the exchanges with the eNB over X2 interface supporting the NSA setup according to 36.423 Rel. 15
+  - X2 setup with eNB
+  - Handling of SgNB Addition Request/Addition Request Acknowledge/Reconfiguration Complete
+
+## gNB NGAP
+
+- Integration of NGAP messages and procedures for the exchanges with the AMF over N2 interface according to 38.413 Rel. 15
+  - NGAP Setup request/response
+  - NGAP Initial UE message
+  - NGAP Initial context setup request/response
+  - NGAP Downlink/Uplink NAS transfer
+  - NGAP UE context release request/complete
+  - NGAP UE radio capability info indication
+  - NGAP PDU session resource setup request/response
+  - NGAP Mobility Management Procedures:
+    * NGAP Handover Required
+    * NGAP Handover Request
+    * NGAP Handover Request Acknowledge
+    * NGAP Handover Command
+    * NGAP Handover Notify
+    * NGAP Handover Cancel
+    * NGAP Handover Cancel Acknowledge
+    * NGAP Uplink RAN Status Transfer
+    * NGAP Downlink RAN Status Transfer
+- Interface with RRC
+
+## gNB F1AP
+
+- Integration of F1AP messages and procedures for the control plane exchanges between the CU and DU entities according to 38.473 Rel. 16
+  - F1 Interface Management:
+    * F1 Setup request/response/failure
+  - F1 RRC Message Transfer:
+    * F1 Initial UL RRC Message Transfer
+    * F1 DL RRC Message Transfer
+    * F1 UL RRC Message Transfer
+  - F1 UE Context Management:
+    * F1 UE Context setup request/response
+    * F1 UE Context modification request/response
+    * F1 UE Context modification required
+    * F1 UE Context release req/cmd/complete
+  - F1 gNB CU configuration update
+  - F1 gNB DU configuration update
+  - F1 Reset (handled at DU only, full reset only)
+  - F1 Mobility Management Procedures:
+    * F1 Intra-CU Handover (Inter-DU mobility)
+- Interface with RRC
+- Interface with GTP-u (tunnel creation/handling for F1-U interface)
+- One CU(-CP) can handle multiple DUs
+- Support for intra-CU mobility (across DUs)
+
+## gNB E1AP
+
+- Integration of E1AP messages and procedures for exchange between CU-CP and CU-UP according to TS 38.463 Rel. 16
+  - E1 Setup (gNB-CU-UP initiated)
+      - E1 Setup Request
+      - E1 Setup Response
+      - E1 Setup Failure
+  - E1 Bearer Context Setup (gNB-CU-CP initiated)
+      - E1 Bearer Context Setup Request
+      - E1 Bearer Context Setup Response
+  - Bearer Context Modification (gNB-CU-CP initiated)
+      - E1 Bearer Context Modification Request
+      - E1 Bearer Context Modification Response
+  - E1 Reset
+- Interface with RRC and PDCP/SDAP
+- One CU-CP can handle multiple CU-UPs
+
+## gNB GTP-U
+
+- New GTP-U implementation supporting both N3 and F1-U interfaces according to 29.281 Rel.15
+  - Interfaces with RRC, F1AP for tunnel creation
+  - Interfaces with PDCP and RLC for data send/receive at the CU and DU respectively (F1-U interface)
+  - Interface with SDAP for data send/receive, capture of GTP-U Optional Header, GTP-U Extension Header and PDU Session Container.
+
+## Number of supported UEs
+
+* 16 by default (as defined in `MAX_MOBILES_PER_GNB`)
+* up to 64 if the configured bandwidth is sufficient (at leat 40 MHz)
+
+# OpenAirInterface 5G-NR UE Feature Set #
+
+##  NR UE PHY Layer ##
+
+*  Initial synchronization
+   - non-blind synchronization (information required: carrier frequency, bandwidth, numerology)
+   - option to search SSB inside the bandwidth available
+*  Time tracking based on PBCH DMRS
+*  Initial Frequency offset estimation based on PSS and SSS
+*  Continuous Frequency offset estimation and compensation based on PBCH DMRS
+*  15kHz and 30kHz SCS for FR1 and 120 kHz SCS for FR2
+*  Reception of NR-PSS/NR-SSS
+*  NR-PBCH supports multiple SSBs and flexible periodicity
+   - RSRP measurement for the strongest SSB
+*  Reception of NR-PDCCH (including reception of DCI, polar decoding, de-scrambling, de-modulation, RB de-mapping, etc)
+   - common search space configured by MIB
+   - user-specific search space configured by RRC
+   - DCI formats: 00, 10, 01 and 11
+*  Reception of NR-PDSCH (including Segmentation, LDPC decoding, rate de-matching, de-scrambling, de-modulation, RB de-mapping, etc).
+   - PDSCH mapping type A and B
+   - Downlink resource allocation type 0 and 1
+   - DMRS configuration type 1 and 2
+   - Single and multiple DMRS symbols
+   - PTRS support
+   - Support for 256 QAM
+   - Support for 1, 2 and 4 RX antennas
+   - Support for up to 2 layers (currently limited to DMRS configuration type 2)
+* Measurements based on NR-CSIRS
+   - RSRP measurements
+   - RI, PMI and CQI computation
+   - Support for up to 4 RX antennas
+   - Support for up to 2 layers
+*  NR-PUSCH (including Segmentation, LDPC encoding, rate matching, scrambling, modulation, RB mapping, etc).
+   - PUSCH mapping type A and B
+   - DMRS configuration type 1 and 2
+   - Single and multiple DMRS symbols
+   - PTRS support
+   - Support for 256 QAM
+   - Support for up to 2 TX antenna
+   - Support for up to 2 layers
+   - Support for UCI on PUSCH
+*  NR-PUCCH
+   - Format 0 (2 bits for ACK/NACK and SR)
+   - Format 2 (mainly for CSI feedback)
+   - Format 1 (limited testing)
+   - Format 3 and 4 present but old code never tested (need restructuring before verification)
+* NR-SRS
+   - Generation of sequence at PHY
+   - SRS signal transmission
+* NR-PRS
+   - PRS based Channel estimation with T tracer dumps
+   - Time of arrival(ToA) estimation based on channel impulse response(CIR)
+   - Finer ToA estimation by 16x oversampled IDFT for CIR
+   - Support for multiple gNB reception with gNBs synced via GPSDO
+* NR-PRACH
+   - Formats 0,1,2,3, A1-A3, B1-B3
+* NTN
+   - TA adjustemt based on ntn-Config-r17 information
+   - Autonomous TA adjustemt between SIB19 receptions based on DL time tracking
+   - UL Doppler pre-compensation based on continuous DL FO estimation
+*  Highly efficient 3GPP compliant LDPC encoder and decoder (BG1 and BG2 are supported)
+*  Highly efficient 3GPP compliant polar encoder and decoder
+*  Encoder and decoder for short block
+
+## NR UE FAPI ##
+
+*  MAC -> PHY configuration via UE FAPI P5 interface
+*  Basic MAC to control PHY via UE FAPI P7 interface
+*  PHY -> MAC indication
+
+## NR UE Higher Layers ##
+
+## UE MAC
+
+* Minimum system information (MSI)
+   - MIB processing
+   - Scheduling of system information block 1 (SIB1) reception
+* Other system information
+   - Scheduling of other system information blocks reception
+* Random access procedure (needs improvement, there is still not a clear separation between MAC and PHY)
+   - Mapping SSBs to multiple ROs
+   - Scheduling of PRACH
+  - 4-Step RA
+      - Processing of RAR
+      - Transmission and re-transmission of Msg3
+      - Msg4 and contention resolution
+  - 2-Step RA
+      - Transmission of MsgA-PUSCH
+      - Reception of MsgB
+      - Processing of SuccessRAR
+      - Fallback not supported
+* DCI processing
+   - format 10 (RA-RNTI, C-RNTI, SI-RNTI, TC-RNTI)
+   - format 00 (C-RNTI, TC-RNTI)
+   - format 11 (C-RNTI)
+   - format 01 (C-RNTI)
+* UCI processing
+   - ACK/NACK processing
+   - Scheduling request procedures
+   - CSI measurement reporting (periodic and aperiodic)
+* DLSCH scheduler
+   - Configuration of fapi PDU according to DCI
+   - HARQ procedures
+* ULSCH scheduler
+   - Configuration of fapi PDU according to DCI
+   - Buffer status reporting procedures
+   - Logical channel prioritization of 'data from any logical channel'
+   - UCI on PUSCH
+* NR-CSIRS scheduler
+  - Scheduling of NR-CSIRS reception
+  - Fill UCI for CSI measurement reporting
+* Scheduler procedures for SRS transmission
+   - Periodic and aperiodic SRS transmission
+* Bandwidth part (BWP) operation
+   - Operation in configured dedicated BWP through RRCSetup or RRCReconfiguration
+* NTN
+   - Support downlinkHARQ-FeedbackDisabled-r17
+   - Support for 32 PDSCH and PUSCH HARQ processes
+   - Consider ntn-Config-r17.cellSpecificKoffset-r17 in scheduling
+
+
+## UE RLC
+
+* Tx/Rx operations according to 38.322 Rel.16
+   - Segmentation and reassembly procedures
+   - RLC Acknowledged mode supporting PDU retransmissions
+   - RLC Unacknowledged mode
+   - DRBs and SRBs establishment and handling
+   - Timers implementation
+   - Interfaces with PDCP, MAC
+
+## UE PDCP
+
+* Tx/Rx operations according to 38.323 Rel.16
+   - Integrity protection and ciphering procedures
+   - Sequence number management, SDU dicard and in-order delivery
+   - Radio bearer establishment/handling and association with PDCP entities
+   - Interfaces with RRC, RLC
+
+## UE SDAP
+
+*  Tx/Rx operations operations according to 37.324 Rel.15
+  - Establishment/Handling of SDAP entities.
+  - Transfer of User Plane Data
+  - Reflective Mapping
+  - RRC Signaling Mapping
+
+## UE RRC
+
+* Integration of RRC messages and procedures supporting UE 5G SA connection according to 38.331 Rel.16
+   - RRCSetupRequest/RRCSetup/RRCSetupComplete
+   - RRCReject
+   - RRCRelease/ RRC going to IDLE
+   - RRC Uplink/Downlink Information transfer carrying NAS messages transparently
+   - RRC Reconfiguration/Reconfiguration complete
+   - RRCSetup fallback (after reestablishment)
+   - RRCReestablishmentRequest/RRC Reestablishment/Reestablishment complete
+   - Support for master cell group configuration
+   - Reception of UECapabilityEnquiry, encoding and transmission of UECapability
+* NTN according to 38.331 Rel.17
+   - Reception of ntn-Config-r17 from SIB19 or reconfigurationWithSync
+   - Handling of ntn-UlSyncValidityDuration-r17 in SIB19
+* Interface with PDCP: configuration, DCCH and CCCH message handling
+* Interface with RLC and MAC for configuration
+
+## UE 5G NAS
+
+* Transfer of NAS messages between the AMF and the UE supporting the UE registration with the core network and the PDU session establishment according to 24.501 Rel.16
+* 5GMM (5G Mobility Management) messages:
+  - Service Request/Accept/Reject (enc/dec library only)
+  - Identity Request/Response
+  - Authentication Request/Response
+  - Security Mode Command/Complete
+  - Registration Request/Accept/Complete
+  - Deregistration Request (UE originating)
+  - Uplink NAS Transport
+* 5GSM (5G Session Management) messages:
+  - PDU Session Establishment Request/Accept
+* Security Features:
+  - NAS message integrity protection and ciphering
+  - Security context establishment and management
+* Integration:
+  - NAS configuration and interfacing with RRC
+  - Integration with SDAP for user plane data transfer
+
+For detailed implementation status, encoding/decoding support, and unit test coverage, see [5G NAS Implementation Documentation](5Gnas.md).
+
+# OpenAirInterface 4G LTE eNB Feature Set #
+
+## eNB PHY Layer ##
+
+The Physical layer implements **3GPP 36.211**, **36.212**, **36.213** and provides the following features:
+
+- LTE release 8.6 compliant, and implements a subset of release 10
+- FDD and TDD configurations: 1 (experimental) and 3
+- Bandwidth: 5, 10, and 20 MHz
+- Transmission modes: 1, 2 (stable), 3, 4, 5, 6, 7 (experimental)
+- Max number of antennas: 2
+- CQI/PMI reporting: aperiodic, feedback mode 3 - 0 and 3 - 1
+- PRACH preamble format 0
+- Downlink (DL) channels are supported: PSS, SSS, PBCH, PCFICH, PHICH, PDCCH, PDSCH, PMCH, MPDCCH
+- Uplink (UL) channels are supported: PRACH, PUSCH, PUCCH (format 1/1a/1b), SRS, DRS
+- HARQ support (UL and DL)
+- Highly optimized base band processing (including turbo decoder)
+- Multi-RRU support: over the air synchro b/ multi RRU in TDD mode
+- Support for CE-modeA for LTE-M. Limited support for repeatition, single-LTE-M connection, legacy-LTE UE attach is disabled.
+
+### Performances ###
+
+**Transmission Mode, Bandwidth** | **Expected Throughput** | **Measured Throughput** | **Measurement Conditions**
+-------------------------------- | ----------------------- | ------------------------| ----------------:
+FDD DL: 5 MHz, 25 PRBS/ MCS 28   | 16 - 17 Mbit/s          | TM1: 17.0 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+FDD DL: 10 MHz, 50 PRBS/ MCS 28  | 34 - 35 Mbit/s          | TM1: 34.0 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+FDD DL: 20 MHz, 100 PRBS/ MCS 28 | 70 Mbit/s               | TM1: 69.9 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+ |  |  |
+FDD UL: 5 MHz, 25 PRBS/ MCS 20   | 9 Mbit/s                | TM1: 8.28 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+FDD UL: 10 MHz, 50 PRBS/ MCS 20  | 17 Mbit/s               | TM1: 18.3 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+FDD UL: 20 MHz, 100 PRBS/ MCS 20 | 35 Mbit/s               | TM1: 18.6 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+ |  |
+TDD DL: 5 MHz, 25 PRBS/ MCS **XX**   | 6.5 Mbit/s          | TM1: 6.71 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+TDD DL: 10 MHz, 50 PRBS/ MCS **XX**  | 13.5 Mbit/s         | TM1: 13.6 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+TDD DL: 20 MHz, 100 PRBS/ MCS **XX** | 28.0 Mbit/s         | TM1: 27.2 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+ |  | |
+TDD UL: 5 MHz, 25 PRBS/ MCS **XX**   | 2.0 Mbit/s          | TM1: 3.31 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+TDD UL: 10 MHz, 50 PRBS/ MCS **XX**  | 2.0 Mbit/s          | TM1: 7.25 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+TDD UL: 20 MHz, 100 PRBS/ MCS **XX** | 3.0 Mbit/s          | TM1: 4.21 Mbits/s       | COTS-UE Cat 4 (150/50 Mbps)
+
+### Number of supported UEs ###
+
+* 16 by default
+* up to 256 when compiling with dedicated compile flag
+* was tested with 40 COTS-UE
+
+## eNB MAC Layer ##
+
+The MAC layer implements a subset of the **3GPP 36.321** release v8.6 in support of BCH, DLSCH, RACH, and ULSCH channels.
+
+- RRC interface for CCCH, DCCH, and DTCH
+- Proportional fair scheduler (round robin scheduler soon), with the following improvements:
+	- Up to 30 users tested in the L2 simulator, CCE allocation in the preprocessor ; the scheduler was also simplified and made more modular
+	- Adaptative UL-HARQ
+	- Remove out-of-sync UEs
+	- No use of the `first_rb` in the UL scheduler ; respects `vrb_map_UL` and `vrb_map` in the DL
+- DCI generation
+- HARQ Support
+- RA procedures and RNTI management
+- RLC interface (AM, UM)
+- UL power control
+- Link adaptation
+- Connected DRX (CDRX) support for FDD LTE UE. Compatible with R13 from 3GPP. Support for Cat-M1 UE comming soon.
+
+## eNB RLC Layer ##
+
+The RLC layer implements a full specification of the 3GPP 36.322 release v9.3.
+
+- RLC TM (mainly used for BCCH and CCCH)
+  * Neither segment nor concatenate RLC SDUs
+  * Do not include a RLC header in the RLC PDU
+  * Delivery of received RLC PDUs to upper layers
+- RLC UM (mainly used for DTCH)
+  * Segment or concatenate RLC SDUs according to the TB size selected by MAC
+  * Include a RLC header in the RLC PDU
+  * Duplication detection
+  * PDU reordering and reassembly
+- RLC AM, compatible with 9.3
+  * Segmentation, re-segmentation, concatenation, and reassembly
+  * Padding
+  * Data transfer to the user
+  * RLC PDU retransmission in support of error control and correction
+  * Generation of data/control PDUs
+
+## eNB PDCP Layer ##
+
+The current PDCP layer is header compliant with **3GPP 36.323** Rel 10.1.0 and implements the following functions:
+
+- User and control data transfer
+- Sequence number management
+- RB association with PDCP entity
+- PDCP entity association with one or two RLC entities
+- Integrity check and encryption using the AES and Snow3G algorithms
+
+## eNB RRC Layer ##
+
+The RRC layer is based on **3GPP 36.331** v15.6 and implements the following functions:
+
+- System Information broadcast (SIB 1, 2, 3, and 13)
+  * SIB1: Up to 6 PLMN IDs broadcast
+- RRC connection establishment
+- RRC connection reconfiguration (addition and removal of radio bearers, connection release)
+- RRC connection release
+- RRC connection re-establishment
+- Inter-frequency measurement collection and reporting (experimental)
+- eMBMS for multicast and broadcast (experimental)
+- Handover (experimental)
+- Paging (soon)
+- RRC inactivity timer (release of UE after a period of data inactivity)
+
+## eNB X2AP ##
+
+The X2AP layer is based on **3GPP 36.423** v14.6.0 and implements the following functions:
+
+ - X2 Setup Request
+ - X2 Setup Response
+ - X2 Setup Failure
+ - Handover Request
+ - Handover Request Acknowledge
+ - UE Context Release
+ - X2 timers (t_reloc_prep, tx2_reloc_overall)
+ - Handover Cancel
+ - X2-U interface implemented
+ - EN-DC is implemented
+ - X2AP : Handling of SgNB Addition Request / Addition Request Acknowledge / Reconfiguration Complete
+ - RRC  : Handling of RRC Connection Reconfiguration with 5G cell info, configuration of 5G-NR measurements
+ - S1AP : Handling of E-RAB Modification Indication / Confirmation
+
+## eNB/MCE M2AP ##
+
+The M2AP layer is based on **3GPP 36.443** v14.0.1:
+ - M2 Setup Request
+ - M2 Setup Response
+ - M2 Setup Failure
+ - M2 Scheduling Information
+ - M2 Scheduling Information Response
+ - M2 Session Start Request
+ - M2 Session Start Response
+
+## MCE/MME M3AP ##
+
+The M3AP layer is based on **3GPP 36.444** v14.0.1:
+ - M3 Setup Request
+ - M3 Setup Response
+ - M3 Setup Failure
+ - M3 Session Start Request
+ - M3 Session Start Response
+
+
+# OpenAirInterface 4G LTE UE Feature Set #
+
+## LTE UE PHY Layer ##
+
+The Physical layer implements **3GPP 36.211**, **36.212**, **36.213** and provides the following features:
+
+- LTE release 8.6 compliant, and implements a subset of release 10
+- FDD and TDD configurations: 1 (experimental) and 3
+- Bandwidth: 5, 10, and 20 MHz
+- Transmission modes: 1, 2 (stable)
+- Max number of antennas: 2
+- CQI/PMI reporting: aperiodic, feedback mode 3 - 0 and 3 - 1
+- PRACH preamble format 0
+- All downlink (DL) channels are supported: PSS, SSS, PBCH, PCFICH, PHICH, PDCCH, PDSCH, PMCH
+- All uplink (UL) channels are supported: PRACH, PUSCH, PUCCH (format 1/1a/1b), SRS, DRS
+- LTE MBMS-dedicated cell (feMBMS) procedures subset for LTE release 14 (experimental)
+- LTE non-MBSFN subframe (feMBMS) Carrier Adquistion Subframe-CAS procedures (PSS/SSS/PBCH/PDSH) (experimental)
+- LTE MBSFN MBSFN subframe channel (feMBMS): PMCH (CS@1.25KHz) (channel estimation for 25MHz bandwidth) (experimental)
+
+## LTE UE MAC Layer ##
+
+The MAC layer implements a subset of the **3GPP 36.321** release v8.6 in support of BCH, DLSCH, RACH, and ULSCH channels.
+
+- RRC interface for CCCH, DCCH, and DTCH
+- HARQ Support
+- RA procedures and RNTI management
+- RLC interface (AM, UM)
+- UL power control
+- Link adaptation
+- MBMS-dedicated cell (feMBMS) RRC interface for BCCH
+- eMBMS and MBMS-dedicated cell (feMBMS) RRC interface for MCCH, MTCH
+
+## LTE UE RLC Layer ##
+
+The RLC layer implements a full specification of the 3GPP 36.322 release v9.3.
+
+## LTE UE PDCP Layer ##
+
+The current PDCP layer is header compliant with **3GPP 36.323** Rel 10.1.0.
+
+## LTE UE RRC Layer ##
+
+The RRC layer is based on **3GPP 36.331** v14.3.0 and implements the following functions:
+
+- System Information decoding
+- RRC connection establishment
+- MBMS-dedicated cell (feMBMS) SI-MBMS/SIB1-MBMS management
+
+## LTE UE NAS Layer ##
+
+The NAS layer is based on **3GPP 24.301** and implements the following functions:
+
+- EMM attach/detach, authentication, tracking area update, and more
+- ESM default/dedicated bearer, PDN connectivity, and more
+
+
+[OAI wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[OAI softmodem build procedure](BUILD.md)
+
+[Running the OAI softmodem ](RUNMODEM.md)

doc/MAC/mac-usage.md

@@ -420,29 +420,3 @@ Note that you should increase the aggregation level candidates as described in
 [the corresponding section above](#pdcch-aggregation-level). This is because the
 scheduler has to schedule multiple DCIs in a single DL slots for multiple UL
 slots. As a suggestion, you could try `uess_agg_levels = [4, 2, 2, 0, 0]`.
-
-## Multiple Dedicated BWPs
-
-A maximum of 4 dedicated BWPs can be configured for a UE per standard, but only
-1 BWP can be active in UL and DL direction at a given time.  In the code we
-only configure a single BWP for the UE at a given time and we would switch by
-reconfiguring this BWP. All this procedure is transparent for users and LOGs
-mark BWP switching according to the configuration file enumeration.  It is
-possible to configure multiple dedicated BWPs and 1st active BWP via
-configuration file.
-
-### Setup of the Configuration files ##
-
-In the configuration file you have the option to select the 1st active BWP, the
-BWP location and SCS of each BWP in the following way (example with 2
-additional BWPs):
-
-```
-    first_active_bwp = 1;
-    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;},
-                { scs = 1; bwpStart = 0; bwpSize = 24;});
-```
-
-This example configures 3 additional BWPs, with IDs from 1 to 3. A similar
-example can be found in configuration file
-`ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf` tested in CI.

doc/NR_NFAPI_archi.md

@@ -161,9 +161,9 @@ unpack function is called.
 ## P7 DL Transmission by VNF
 
 DL messages are scheduled at the VNF, through gNB_dlsch_ulsch_scheduler(). gNB_dlsch_ulsch_scheduler() is called when
-handling a SLOT.indication message in phy_nr_slot_indication().
+handling a SLOT.indication message in trigger_scheduler().
 
-The function phy_nr_slot_indication(nfapi_nr_slot_indication_scf_t *slot_ind) calls the functions oai_nfapi_[DL P7 msg]_
+The function trigger_scheduler(nfapi_nr_slot_indication_scf_t *slot_ind) calls the functions oai_nfapi_[DL P7 msg]_
 req(), calling in turn call the send_p7_msg function pointer, which contain the logic to pack the message into a buffer
 and send it to the PNF.
 Finally, NR_UL_indication is called to process the other P7 messages received from the PNF that were put in theire
@@ -215,7 +215,7 @@ bool nfapi_vnf_p7_tx_data_req(nfapi_vnf_p7_config_t* config, nfapi_nr_tx_data_re
 graph TD
     softmodem_start[nr-softmodem init] --> P5_configuration[configure_nr_nfapi_vnf] --> transport_init[Transport mechanism init] --> send_first_msg[Send first P5 message to PNF]
     transport_init[Transport mechanism init] --> P5_recv_loop[P5 receive loop] -- P5 Message processing --> P5_recv_loop[P5 receive loop]
-    P5_recv_loop[P5 receive loop] -- Start.response callback called --> P7_config[P7 Configuration] --> P7_loop[P7 Loop] --> P7_msg_recv[P7 message received] --> call_vnf_handle_p7[Call vnf_nr_handle_p7_msg] --> hdr_unpack[Unpack header] --> call_specific_p7_handler[Call specific P7 message handler] --> slot_ind[Is a SLOT.indication?] -- Yes --> trig_scheduler[Call phy_nr_slot_indication] --> gNB_ulsch_dlsch_sched[Call gNB_dlsch_ulsch_scheduler] --> send_p7_dl[Process and send P7 messages to PNF] --> call_ul_ind[Call NR_UL_indication] --> proc_p7[Process P7 messages in queue] --> P7_loop[P7 Loop]
+    P5_recv_loop[P5 receive loop] -- Start.response callback called --> P7_config[P7 Configuration] --> P7_loop[P7 Loop] --> P7_msg_recv[P7 message received] --> call_vnf_handle_p7[Call vnf_nr_handle_p7_msg] --> hdr_unpack[Unpack header] --> call_specific_p7_handler[Call specific P7 message handler] --> slot_ind[Is a SLOT.indication?] -- Yes --> trig_scheduler[Call trigger_scheduler] --> gNB_ulsch_dlsch_sched[Call gNB_dlsch_ulsch_scheduler] --> send_p7_dl[Process and send P7 messages to PNF] --> call_ul_ind[Call NR_UL_indication] --> proc_p7[Process P7 messages in queue] --> P7_loop[P7 Loop]
     slot_ind[Is a SLOT.indication?] -- No --> put_queue[Put message in queue] --> P7_loop[P7 Loop];
 
 

doc/ORAN_FHI7.2_Tutorial.md

@@ -1243,8 +1243,8 @@ In OAI gNB, we support:
 ```
 
 The reference specifications:
-* `O-RAN.WG4.MP.0-R004-v16.01`
-* `O-RAN.WG4.MP-YANGs-R004-v16.01`
+* `O-RAN.WG4.MP.0-v05.00`
+* `O-RAN.WG4.MP-YANGs-v04.00`
 
 ## M-plane prerequisites
 Before proceeding, please make sure you have a support for 7.2 interface, as described in [Prerequisites](#prerequisites).
@@ -1366,7 +1366,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/650 v1.2.2 and v1.4.1 have been successfully tested.
+Note: Only v1.2.2 RAN550 and RAN650 have been successfully tested.
 
 ### One time steps
 Connect to the RU as user `root`, enable the mplane service, and reboot:
@@ -1400,8 +1400,6 @@ The reference DU configuration file for two Benetel RAN650:
 [gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650-mplane.conf](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650-mplane.conf)
 
 In order to run gNB/DU with M-plane, we need to modify Tx gain `att_tx` in RU section, as well as the `fhi_72` section in the configuration file.
-
-**Important note: Benetel v1.4.1 requires only one VF if the same VLAN tag is used for both C-/U-planes. Otherwise, C-plane will not be properly configured. Benetel v1.2.2 will receive the C-plane packets no matter the DU MAC address value.**
 Example for one RU:
 ```bash
 fhi_72 = {
@@ -1575,14 +1573,14 @@ sequenceDiagram
 
 
 <details>
-<summary>4x4 MIMO and 100MHz BW with Benetel 550 RU v1.2.2 example run</summary>
+<summary>4x4 MIMO and 100MHz BW with Benetel 550 RU example run</summary>
 
 ```
 [HW]   [MPLANE] RPC request to RU "192.168.80.9" = <connect> with username "oranbenetel" and port ID "830".
 [HW]   [MPLANE] Successfuly connected to RU "192.168.80.9" with username "oranbenetel" and port ID "830".
 [HW]   [MPLANE] RPC request to RU "192.168.80.9" = <get> operational datastore.
 [HW]   [MPLANE] Successfully retrieved operational datastore from RU "192.168.80.9".
-[HW]   [MPLANE] RU is in "LOCKED" sync state.
+[HW]   [MPLANE] RU is already PTP synchronized.
 [HW]   [MPLANE] RPC request to RU "192.168.80.9" = <subscribe> with stream "NETCONF" and filter "(null)".
 [HW]   [MPLANE] RPC reply = OK.
 [HW]   [MPLANE] Successfully subscribed to all notifications from RU "192.168.80.9".
@@ -2225,861 +2223,6 @@ sequenceDiagram
 ```
 </details>
 
-<details>
-<summary>4x4 MIMO and 100MHz BW with Benetel 550 RU v1.4.1 example run</summary>
-
-```
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <connect> with username "oranbenetel" and port ID "830".
-[HW]   [MPLANE] Successfuly connected to RU "192.168.81.4" with username "oranbenetel" and port ID "830".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get> operational datastore.
-[HW]   [MPLANE] Successfully retrieved operational datastore from RU "192.168.81.4".
-[HW]   [MPLANE] RU is already PTP synchronized.
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <subscribe> with stream "NETCONF" and filter "(null)".
-[HW]   [MPLANE] RPC reply = OK.
-[HW]   [MPLANE] Successfully subscribed to all notifications from RU "192.168.81.4".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = "<supervision-watchdog-reset xmlns="urn:o-ran:supervision:1.0">
-<supervision-notification-interval>65535</supervision-notification-interval>
-<guard-timer-overhead>65535</guard-timer-overhead>
-</supervision-watchdog-reset>".
-[HW]   [MPLANE] Successfully updated supervision timer to (65535+65535)[s] for RU "192.168.81.4".
-[HW]   [MPLANE] Watchdog timer answer: 
-	<next-update-at xmlns="urn:o-ran:supervision:1.0">2025-08-29T06:49:32+02:00</next-update-at>
-
-[HW]   [MPLANE] Interface MTU 1500 unreliable/not correctly reported by Benetel O-RU, hardcoding to 9600.
-[HW]   [MPLANE] IQ bitwidth 16 unreliable/not correctly reported by Benetel O-RU, hardcoding to 9.
-[HW]   [MPLANE] Storing the following information to forward to xran:
-    RU MAC address 70:b3:d5:e1:5b:81
-    MTU 9600
-    IQ bitwidth 9
-    PRACH offset 4
-    DU port bitmask 61440
-    Band sector bitmask 3840
-    CC ID bitmask 240
-    RU port ID bitmask 15
-    DU port ID 0
-    Band sector ID 0
-    CC ID 0
-    RU port ID 0
-    max Tx gain 24.0
-[HW]   [MPLANE] Successfully retrieved all the U-plane info - interface name, TX/RX carrier names, and TX/RX endpoint names.
-[HW]   [MPLANE] Successfully retreived all performance measurement names.
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-yang-metadata".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "yang".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-inet-types".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-yang-types".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-yang-schema-mount".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-yang-structure-ext".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-datastores".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "sysrepo".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-netconf-acm".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-factory-default".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "sysrepo-factory-default".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-yang-library".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "sysrepo-monitoring".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "sysrepo-plugind".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-netconf".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-netconf-with-defaults".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-netconf-notifications".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-origin".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-netconf-monitoring".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "ietf-netconf-nmda".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <get-schema> for module "nc-notifications".
-[HW]   [MPLANE] [LIBYANG] ERROR: Data model "notifications" not found in local searchdirs. (path: (null)).
-[HW]   [MPLANE] [LIBYANG] ERROR: Loading "notifications" module failed. (path: (null)).
-[HW]   [MPLANE] [LIBYANG] ERROR: Parsing module "nc-notifications" failed. (path: (null)).
-[HW]   [MPLANE] Unable to load module "nc-notifications" from RU "192.168.81.4".
-[HW]   [MPLANE] Unable to load all yang modules from operational datastore for RU "192.168.81.4". Using yang models present in "models" subfolder.
-[HW]   [MPLANE] Successfully loaded all yang modules for RU "192.168.81.4".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <edit-config>:
-<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
-  <interface>
-    <name>INTERFACE_0</name>
-    <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:l2vlan</type>
-    <enabled>true</enabled>
-    <mac-address xmlns="urn:o-ran:interfaces:1.0">70:b3:d5:e1:5b:81</mac-address>
-    <base-interface xmlns="urn:o-ran:interfaces:1.0">eth0</base-interface>
-    <vlan-id xmlns="urn:o-ran:interfaces:1.0">3</vlan-id>
-  </interface>
-</interfaces>
-<performance-measurement-objects xmlns="urn:o-ran:performance-management:1.0">
-  <rx-window-measurement-interval>10</rx-window-measurement-interval>
-  <tx-measurement-interval>10</tx-measurement-interval>
-  <notification-interval>10</notification-interval>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_ON_TIME</measurement-object>
-    <active>false</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_EARLY</measurement-object>
-    <active>false</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_LATE</measurement-object>
-    <active>false</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_TOTAL</measurement-object>
-    <active>false</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_ON_TIME_C</measurement-object>
-    <active>false</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_EARLY_C</measurement-object>
-    <active>false</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_LATE_C</measurement-object>
-    <active>false</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <tx-measurement-objects>
-    <measurement-object>TX_TOTAL</measurement-object>
-    <active>false</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </tx-measurement-objects>
-</performance-measurement-objects>
-<processing-elements xmlns="urn:o-ran:processing-element:1.0">
-  <transport-session-type>ETH-INTERFACE</transport-session-type>
-  <ru-elements>
-    <name>PLANE_0</name>
-    <transport-flow>
-      <interface-name>INTERFACE_0</interface-name>
-      <eth-flow>
-        <ru-mac-address>70:b3:d5:e1:5b:81</ru-mac-address>
-        <vlan-id>3</vlan-id>
-        <o-du-mac-address>00:11:22:33:44:66</o-du-mac-address>
-      </eth-flow>
-    </transport-flow>
-  </ru-elements>
-</processing-elements>
-<user-plane-configuration xmlns="urn:o-ran:uplane-conf:1.0">
-  <low-level-tx-links>
-    <name>PdschLink0</name>
-    <processing-element>PLANE_0</processing-element>
-    <tx-array-carrier>TxArray0</tx-array-carrier>
-    <low-level-tx-endpoint>LowLevelTxEndpoint0</low-level-tx-endpoint>
-  </low-level-tx-links>
-  <low-level-tx-links>
-    <name>PdschLink1</name>
-    <processing-element>PLANE_0</processing-element>
-    <tx-array-carrier>TxArray1</tx-array-carrier>
-    <low-level-tx-endpoint>LowLevelTxEndpoint1</low-level-tx-endpoint>
-  </low-level-tx-links>
-  <low-level-tx-links>
-    <name>PdschLink2</name>
-    <processing-element>PLANE_0</processing-element>
-    <tx-array-carrier>TxArray2</tx-array-carrier>
-    <low-level-tx-endpoint>LowLevelTxEndpoint2</low-level-tx-endpoint>
-  </low-level-tx-links>
-  <low-level-tx-links>
-    <name>PdschLink3</name>
-    <processing-element>PLANE_0</processing-element>
-    <tx-array-carrier>TxArray3</tx-array-carrier>
-    <low-level-tx-endpoint>LowLevelTxEndpoint3</low-level-tx-endpoint>
-  </low-level-tx-links>
-  <low-level-rx-links>
-    <name>PuschLink0</name>
-    <processing-element>PLANE_0</processing-element>
-    <rx-array-carrier>RxArray0</rx-array-carrier>
-    <low-level-rx-endpoint>LowLevelRxEndpoint0</low-level-rx-endpoint>
-  </low-level-rx-links>
-  <low-level-rx-links>
-    <name>PrachLink0</name>
-    <processing-element>PLANE_0</processing-element>
-    <rx-array-carrier>RxArray0</rx-array-carrier>
-    <low-level-rx-endpoint>LowLevelRxPrachEndpoint0</low-level-rx-endpoint>
-  </low-level-rx-links>
-  <low-level-rx-links>
-    <name>PuschLink1</name>
-    <processing-element>PLANE_0</processing-element>
-    <rx-array-carrier>RxArray1</rx-array-carrier>
-    <low-level-rx-endpoint>LowLevelRxEndpoint1</low-level-rx-endpoint>
-  </low-level-rx-links>
-  <low-level-rx-links>
-    <name>PrachLink1</name>
-    <processing-element>PLANE_0</processing-element>
-    <rx-array-carrier>RxArray1</rx-array-carrier>
-    <low-level-rx-endpoint>LowLevelRxPrachEndpoint1</low-level-rx-endpoint>
-  </low-level-rx-links>
-  <low-level-rx-links>
-    <name>PuschLink2</name>
-    <processing-element>PLANE_0</processing-element>
-    <rx-array-carrier>RxArray2</rx-array-carrier>
-    <low-level-rx-endpoint>LowLevelRxEndpoint2</low-level-rx-endpoint>
-  </low-level-rx-links>
-  <low-level-rx-links>
-    <name>PrachLink2</name>
-    <processing-element>PLANE_0</processing-element>
-    <rx-array-carrier>RxArray2</rx-array-carrier>
-    <low-level-rx-endpoint>LowLevelRxPrachEndpoint2</low-level-rx-endpoint>
-  </low-level-rx-links>
-  <low-level-rx-links>
-    <name>PuschLink3</name>
-    <processing-element>PLANE_0</processing-element>
-    <rx-array-carrier>RxArray3</rx-array-carrier>
-    <low-level-rx-endpoint>LowLevelRxEndpoint3</low-level-rx-endpoint>
-  </low-level-rx-links>
-  <low-level-rx-links>
-    <name>PrachLink3</name>
-    <processing-element>PLANE_0</processing-element>
-    <rx-array-carrier>RxArray3</rx-array-carrier>
-    <low-level-rx-endpoint>LowLevelRxPrachEndpoint3</low-level-rx-endpoint>
-  </low-level-rx-links>
-  <low-level-tx-endpoints>
-    <name>LowLevelTxEndpoint0</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>0</eaxc-id>
-    </e-axcid>
-  </low-level-tx-endpoints>
-  <low-level-tx-endpoints>
-    <name>LowLevelTxEndpoint1</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>1</eaxc-id>
-    </e-axcid>
-  </low-level-tx-endpoints>
-  <low-level-tx-endpoints>
-    <name>LowLevelTxEndpoint2</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>2</eaxc-id>
-    </e-axcid>
-  </low-level-tx-endpoints>
-  <low-level-tx-endpoints>
-    <name>LowLevelTxEndpoint3</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>3</eaxc-id>
-    </e-axcid>
-  </low-level-tx-endpoints>
-  <low-level-rx-endpoints>
-    <name>LowLevelRxEndpoint0</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <ul-fft-sampling-offsets>
-      <scs>KHZ_30</scs>
-      <ul-fft-sampling-offset>0</ul-fft-sampling-offset>
-    </ul-fft-sampling-offsets>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>0</eaxc-id>
-    </e-axcid>
-    <non-time-managed-delay-enabled>true</non-time-managed-delay-enabled>
-  </low-level-rx-endpoints>
-  <low-level-rx-endpoints>
-    <name>LowLevelRxPrachEndpoint0</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <ul-fft-sampling-offsets>
-      <scs>KHZ_30</scs>
-      <ul-fft-sampling-offset>0</ul-fft-sampling-offset>
-    </ul-fft-sampling-offsets>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>4</eaxc-id>
-    </e-axcid>
-    <non-time-managed-delay-enabled>true</non-time-managed-delay-enabled>
-  </low-level-rx-endpoints>
-  <low-level-rx-endpoints>
-    <name>LowLevelRxEndpoint1</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <ul-fft-sampling-offsets>
-      <scs>KHZ_30</scs>
-      <ul-fft-sampling-offset>0</ul-fft-sampling-offset>
-    </ul-fft-sampling-offsets>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>1</eaxc-id>
-    </e-axcid>
-    <non-time-managed-delay-enabled>true</non-time-managed-delay-enabled>
-  </low-level-rx-endpoints>
-  <low-level-rx-endpoints>
-    <name>LowLevelRxPrachEndpoint1</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <ul-fft-sampling-offsets>
-      <scs>KHZ_30</scs>
-      <ul-fft-sampling-offset>0</ul-fft-sampling-offset>
-    </ul-fft-sampling-offsets>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>5</eaxc-id>
-    </e-axcid>
-    <non-time-managed-delay-enabled>true</non-time-managed-delay-enabled>
-  </low-level-rx-endpoints>
-  <low-level-rx-endpoints>
-    <name>LowLevelRxEndpoint2</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <ul-fft-sampling-offsets>
-      <scs>KHZ_30</scs>
-      <ul-fft-sampling-offset>0</ul-fft-sampling-offset>
-    </ul-fft-sampling-offsets>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>2</eaxc-id>
-    </e-axcid>
-    <non-time-managed-delay-enabled>true</non-time-managed-delay-enabled>
-  </low-level-rx-endpoints>
-  <low-level-rx-endpoints>
-    <name>LowLevelRxPrachEndpoint2</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <ul-fft-sampling-offsets>
-      <scs>KHZ_30</scs>
-      <ul-fft-sampling-offset>0</ul-fft-sampling-offset>
-    </ul-fft-sampling-offsets>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>6</eaxc-id>
-    </e-axcid>
-    <non-time-managed-delay-enabled>true</non-time-managed-delay-enabled>
-  </low-level-rx-endpoints>
-  <low-level-rx-endpoints>
-    <name>LowLevelRxEndpoint3</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <ul-fft-sampling-offsets>
-      <scs>KHZ_30</scs>
-      <ul-fft-sampling-offset>0</ul-fft-sampling-offset>
-    </ul-fft-sampling-offsets>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>3</eaxc-id>
-    </e-axcid>
-    <non-time-managed-delay-enabled>true</non-time-managed-delay-enabled>
-  </low-level-rx-endpoints>
-  <low-level-rx-endpoints>
-    <name>LowLevelRxPrachEndpoint3</name>
-    <compression>
-      <iq-bitwidth>9</iq-bitwidth>
-      <compression-type>STATIC</compression-type>
-    </compression>
-    <frame-structure>193</frame-structure>
-    <cp-type>NORMAL</cp-type>
-    <cp-length>352</cp-length>
-    <cp-length-other>288</cp-length-other>
-    <offset-to-absolute-frequency-center>0</offset-to-absolute-frequency-center>
-    <ul-fft-sampling-offsets>
-      <scs>KHZ_30</scs>
-      <ul-fft-sampling-offset>0</ul-fft-sampling-offset>
-    </ul-fft-sampling-offsets>
-    <e-axcid>
-      <o-du-port-bitmask>61440</o-du-port-bitmask>
-      <band-sector-bitmask>3840</band-sector-bitmask>
-      <ccid-bitmask>240</ccid-bitmask>
-      <ru-port-bitmask>15</ru-port-bitmask>
-      <eaxc-id>7</eaxc-id>
-    </e-axcid>
-    <non-time-managed-delay-enabled>true</non-time-managed-delay-enabled>
-  </low-level-rx-endpoints>
-  <tx-array-carriers>
-    <name>TxArray0</name>
-    <absolute-frequency-center>623334</absolute-frequency-center>
-    <center-of-channel-bandwidth>3350010000</center-of-channel-bandwidth>
-    <channel-bandwidth>100000000</channel-bandwidth>
-    <active>ACTIVE</active>
-    <gain>24.0</gain>
-    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
-    <downlink-sfn-offset>0</downlink-sfn-offset>
-  </tx-array-carriers>
-  <tx-array-carriers>
-    <name>TxArray1</name>
-    <absolute-frequency-center>623334</absolute-frequency-center>
-    <center-of-channel-bandwidth>3350010000</center-of-channel-bandwidth>
-    <channel-bandwidth>100000000</channel-bandwidth>
-    <active>ACTIVE</active>
-    <gain>24.0</gain>
-    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
-    <downlink-sfn-offset>0</downlink-sfn-offset>
-  </tx-array-carriers>
-  <tx-array-carriers>
-    <name>TxArray2</name>
-    <absolute-frequency-center>623334</absolute-frequency-center>
-    <center-of-channel-bandwidth>3350010000</center-of-channel-bandwidth>
-    <channel-bandwidth>100000000</channel-bandwidth>
-    <active>ACTIVE</active>
-    <gain>24.0</gain>
-    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
-    <downlink-sfn-offset>0</downlink-sfn-offset>
-  </tx-array-carriers>
-  <tx-array-carriers>
-    <name>TxArray3</name>
-    <absolute-frequency-center>623334</absolute-frequency-center>
-    <center-of-channel-bandwidth>3350010000</center-of-channel-bandwidth>
-    <channel-bandwidth>100000000</channel-bandwidth>
-    <active>ACTIVE</active>
-    <gain>24.0</gain>
-    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
-    <downlink-sfn-offset>0</downlink-sfn-offset>
-  </tx-array-carriers>
-  <rx-array-carriers>
-    <name>RxArray0</name>
-    <absolute-frequency-center>623334</absolute-frequency-center>
-    <center-of-channel-bandwidth>3350010000</center-of-channel-bandwidth>
-    <channel-bandwidth>100000000</channel-bandwidth>
-    <active>ACTIVE</active>
-    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
-    <downlink-sfn-offset>0</downlink-sfn-offset>
-    <gain-correction>0.0</gain-correction>
-    <n-ta-offset>0</n-ta-offset>
-  </rx-array-carriers>
-  <rx-array-carriers>
-    <name>RxArray1</name>
-    <absolute-frequency-center>623334</absolute-frequency-center>
-    <center-of-channel-bandwidth>3350010000</center-of-channel-bandwidth>
-    <channel-bandwidth>100000000</channel-bandwidth>
-    <active>ACTIVE</active>
-    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
-    <downlink-sfn-offset>0</downlink-sfn-offset>
-    <gain-correction>0.0</gain-correction>
-    <n-ta-offset>0</n-ta-offset>
-  </rx-array-carriers>
-  <rx-array-carriers>
-    <name>RxArray2</name>
-    <absolute-frequency-center>623334</absolute-frequency-center>
-    <center-of-channel-bandwidth>3350010000</center-of-channel-bandwidth>
-    <channel-bandwidth>100000000</channel-bandwidth>
-    <active>ACTIVE</active>
-    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
-    <downlink-sfn-offset>0</downlink-sfn-offset>
-    <gain-correction>0.0</gain-correction>
-    <n-ta-offset>0</n-ta-offset>
-  </rx-array-carriers>
-  <rx-array-carriers>
-    <name>RxArray3</name>
-    <absolute-frequency-center>623334</absolute-frequency-center>
-    <center-of-channel-bandwidth>3350010000</center-of-channel-bandwidth>
-    <channel-bandwidth>100000000</channel-bandwidth>
-    <active>ACTIVE</active>
-    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
-    <downlink-sfn-offset>0</downlink-sfn-offset>
-    <gain-correction>0.0</gain-correction>
-    <n-ta-offset>0</n-ta-offset>
-  </rx-array-carriers>
-</user-plane-configuration>
-
-[HW]   [MPLANE] RPC reply = OK.
-[HW]   [MPLANE] Successfully edited the candidate datastore for RU "192.168.81.4".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <validate> candidate datastore.
-[HW]   [MPLANE] RPC reply = OK.
-[HW]   [MPLANE] Successfully validated candidate datastore for RU "192.168.81.4".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <commit> candidate datastore.
-[HW]   [MPLANE] RPC reply = OK.
-[HW]   [MPLANE] Successfully commited configuration into running datastore for RU "192.168.81.4".
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:19.335228846+00:00)
-{
-  "o-ran-uplane-conf:rx-array-carriers-state-change": {
-    "rx-array-carriers": [
-      {
-        "name": "RxArray0",
-        "state": "BUSY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:19.368360865+00:00)
-{
-  "o-ran-uplane-conf:rx-array-carriers-state-change": {
-    "rx-array-carriers": [
-      {
-        "name": "RxArray1",
-        "state": "BUSY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:19.414703766+00:00)
-{
-  "o-ran-uplane-conf:rx-array-carriers-state-change": {
-    "rx-array-carriers": [
-      {
-        "name": "RxArray2",
-        "state": "BUSY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:19.452921618+00:00)
-{
-  "o-ran-uplane-conf:rx-array-carriers-state-change": {
-    "rx-array-carriers": [
-      {
-        "name": "RxArray3",
-        "state": "BUSY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:19.471419021+00:00)
-{
-  "ietf-netconf-notifications:netconf-config-change": {
-    "changed-by": {
-      "username": "root",
-      "session-id": 0
-    },
-    "datastore": "running",
-    "edit": [
-      {
-        "target": "/ietf-interfaces:interfaces/interface[name='INTERFACE_0']",
-        "operation": "create"
-      },
-      {
-        "target": "/ietf-interfaces:interfaces/interface[name='INTERFACE_0']/name",
-        "operation": "create"
-      },
-...
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:19.678251110+00:00)
-{
-  "o-ran-uplane-conf:tx-array-carriers-state-change": {
-    "tx-array-carriers": [
-      {
-        "name": "TxArray0",
-        "state": "BUSY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:19.715498360+00:00)
-{
-  "o-ran-uplane-conf:tx-array-carriers-state-change": {
-    "tx-array-carriers": [
-      {
-        "name": "TxArray1",
-        "state": "BUSY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:19.830268973+00:00)
-{
-  "o-ran-uplane-conf:tx-array-carriers-state-change": {
-    "tx-array-carriers": [
-      {
-        "name": "TxArray2",
-        "state": "BUSY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:19.853387657+00:00)
-{
-  "o-ran-uplane-conf:tx-array-carriers-state-change": {
-    "tx-array-carriers": [
-      {
-        "name": "TxArray3",
-        "state": "BUSY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:24.515262267+00:00)
-{
-  "o-ran-uplane-conf:rx-array-carriers-state-change": {
-    "rx-array-carriers": [
-      {
-        "name": "RxArray0",
-        "state": "READY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:24.535692962+00:00)
-{
-  "o-ran-uplane-conf:rx-array-carriers-state-change": {
-    "rx-array-carriers": [
-      {
-        "name": "RxArray1",
-        "state": "READY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:24.557423764+00:00)
-{
-  "o-ran-uplane-conf:rx-array-carriers-state-change": {
-    "rx-array-carriers": [
-      {
-        "name": "RxArray2",
-        "state": "READY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:24.579066867+00:00)
-{
-  "o-ran-uplane-conf:rx-array-carriers-state-change": {
-    "rx-array-carriers": [
-      {
-        "name": "RxArray3",
-        "state": "READY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:24.604192995+00:00)
-{
-  "o-ran-uplane-conf:tx-array-carriers-state-change": {
-    "tx-array-carriers": [
-      {
-        "name": "TxArray0",
-        "state": "READY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:24.629830498+00:00)
-{
-  "o-ran-uplane-conf:tx-array-carriers-state-change": {
-    "tx-array-carriers": [
-      {
-        "name": "TxArray1",
-        "state": "READY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:24.651062685+00:00)
-{
-  "o-ran-uplane-conf:tx-array-carriers-state-change": {
-    "tx-array-carriers": [
-      {
-        "name": "TxArray2",
-        "state": "READY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] Received notification from RU "192.168.81.4" at (2025-08-28T10:37:24.672865767+00:00)
-{
-  "o-ran-uplane-conf:tx-array-carriers-state-change": {
-    "tx-array-carriers": [
-      {
-        "name": "TxArray3",
-        "state": "READY"
-      }
-    ]
-  }
-}
-
-[HW]   [MPLANE] RU "192.168.81.4" is now ready.
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <edit-config>:
-<performance-measurement-objects xmlns="urn:o-ran:performance-management:1.0">
-  <rx-window-measurement-interval>10</rx-window-measurement-interval>
-  <tx-measurement-interval>10</tx-measurement-interval>
-  <notification-interval>10</notification-interval>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_ON_TIME</measurement-object>
-    <active>true</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_EARLY</measurement-object>
-    <active>true</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_LATE</measurement-object>
-    <active>true</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_TOTAL</measurement-object>
-    <active>true</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_ON_TIME_C</measurement-object>
-    <active>true</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_EARLY_C</measurement-object>
-    <active>true</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <rx-window-measurement-objects>
-    <measurement-object>RX_LATE_C</measurement-object>
-    <active>true</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </rx-window-measurement-objects>
-  <tx-measurement-objects>
-    <measurement-object>TX_TOTAL</measurement-object>
-    <active>true</active>
-    <object-unit>RU</object-unit>
-    <report-info>COUNT</report-info>
-  </tx-measurement-objects>
-</performance-measurement-objects>
-
-[HW]   [MPLANE] RPC reply = OK.
-[HW]   [MPLANE] Successfully edited the candidate datastore for RU "192.168.81.4".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <validate> candidate datastore.
-[HW]   [MPLANE] RPC reply = OK.
-[HW]   [MPLANE] Successfully validated candidate datastore for RU "192.168.81.4".
-[HW]   [MPLANE] RPC request to RU "192.168.81.4" = <commit> candidate datastore.
-[HW]   [MPLANE] RPC reply = OK.
-[HW]   [MPLANE] Successfully commited configuration into running datastore for RU "192.168.81.4".
-[HW]   [MPLANE] Sucessfully activated PM after start-up procedure for RU "192.168.81.4".
-```
-</details>
 
 Note: If you wish to run the fronthaul without M-plane, no need for recompilation, as the library `oran_fhlib_5g` already exists.
 The only mandatory step is to link `oran_fhlib_5g` to `oai_transpro` library.

doc/RUN_NR_multiple_BWPs.md

@@ -0,0 +1,44 @@
+# Procedure to add dedicated Bandwidth part (BWP)
+
+## Contributed by 5G Testbed IISc 
+
+### Developers: Abhijith A, Shruthi S
+
+# Terminology #
+
+## Bandwidth part (BWP) ##
+Bandwidth Part (BWP) is a set of contiguous Resource Blocks in the resource grid. 
+
+Parameters of a BWP are communicated to UE using RRC parameters: BWP-Downlink and BWP-Uplink. 
+
+A UE can be configured with a set of 4 BWPs in uplink (UL) and downlink (DL) direction (3GPP TS 38.331 Annex B.2 Description of BWP configuration options). But only 1 BWP can be active in UL and DL direction at a given time.
+
+# Procedure to run multiple dedicated BWPs #
+
+A maximum of 4 dedicated BWPs can be configured for a UE.
+
+To configure multiple BWPs, add the following parameters in the physical parameters section:
+
+## Setup of the Configuration files ##
+
+In the configuration file you have the option to select the 1st active BWP, the RIV and SCS of each BWP in the following way (example with 3 additional BWPs):
+```
+    first_active_bwp = 1;
+    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;},
+                { scs = 1; bwpStart = 0; bwpSize = 51;},
+                { scs = 1; bwpStart = 0; bwpSize = 24;});
+```
+
+This example configures 3 additional BWPs, with IDs from 1 to 3. Find these parameters in this configuration file: "ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf"
+     
+# Testing gNB and UE in RF simulator
+
+## gNB command:
+```
+    sudo ./nr-softmodem -O ../../../ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf --rfsim --rfsimulator.serveraddr server
+```
+
+## UE command:
+```
+    sudo ./nr-uesoftmodem -C 3319680000 -r 106 --numerology 1 --ssb 516 --band 78  --rfsim --rfsimulator.serveraddr 127.0.0.1
+```

doc/SW-archi-graph.md

@@ -1,97 +1,74 @@
-This document is a high-level overview over the L1 threading mechanism.
-
 ```mermaid
 flowchart TB
-    ru_thread --> RFin[block rx_rf] --> UL{is UL slot?}
-    UL -- yes --> wait_free_rx_tti --> fep_rx --> rx_nr_prach_ru --> msg:L1_tx_out
-    UL -- no  --> msg:L1_tx_out
-    msg:L1_tx_out -- asnyc launch --> L1_tx_thread
-    msg:L1_tx_out --> RFin
-```
+    A[ru_thread] --> RFin>block rx_rf] --> feprx
+    feprx --> half-slot --> end_feprx
+    feprx --> second-thread -- block_end_feprx --> end_feprx>feprx]
+    end_feprx --> rx_nr_prach_ru
+rx_nr_prach_ru -- block_queue_singleton --> resp_L1>resp L1]
+resp_L1 -- async launch --> rx_func
+resp_L1 -- immediate return --> RFin
 
-The main thread is `ru_thread()`. It blocks on reception of radio samples
-(either time domain or frequency domain).  In the case of an UL slot, it waits
-that no more than N UL jobs are scheduled (via `wait_free_rx_tti()`, which
-waits on queue `L1_rx_out`, cf. the RX L1 processing further below). Then:
-
-- if the radio is time domain-based, it performs RX front-end processing (RX
-  FEP -> `fep_rx()`, i.e. DFT) to reach a frequency domain representation of
-  the RX signal, as well as does DFT for PRACH.
-- if the radio is frequency domain-based, nothing is done.
-
-Afterwards, it triggers TX processing by pushing a message into the FIFO queue
-`L1_tx_out`, which asynchronously starts a TX job in `L1_tx_thread()` (see
-below). After that, it blocks again on reception on the radio.
+subgraph rxfunc
+rx_func_implem[rx_func] 
+    subgraph rxfuncbeg
+      handle_nr_slot_ind
+      --> rnti_to_remove-mgmt
+      --> L1_nr_prach_procedures
+      --> apply_nr_rotation_RX
+    end 
+    subgraph phy_procedures_gNB_uespec_RX
+      fill_ul_rb_mask
+      --> pucch(decode each gNB->pucch)
+      -->nr_fill_ul_indication
+      --> nr_ulsch_procedures
+      --> nr_ulsch_decoding
+      --> segInParallel[[all segments decode in parallel]]
+      --> barrier_end_of_ulsch_decoding
+    end 
+    subgraph NR_UL_indication
+      handle_nr_rach
+      --> handle_nr_uci
+      --> handle_nr_ulsch
+      subgraph gNB_dlsch_ulsch_scheduler
+          run_pdcp
+          --> schedule_xxxx
+      end
+      handle_nr_ulsch --> gNB_dlsch_ulsch_scheduler
+      subgraph NR_Schedule_response
+         L1_tx_free3>L1_tx_free]
+         --> handle_nr_nfapi_xxx_pdu
+         --> sendTxFilled((L1_tx_filled))
+         --> nr_fill_ul_xxx
+         --> nr_schedule_rx_prach()
+      end
+      gNB_dlsch_ulsch_scheduler --> NR_Schedule_response
+    end 
+    rx_func_implem --> rxfuncbeg
+    rxfuncbeg --> phy_procedures_gNB_uespec_RX
+phy_procedures_gNB_uespec_RX --> NR_UL_indication
+-- block_queue_block_PNF_monolithic --> L1_tx_free2>L1 tx filled]
+-- async launch --> tx_func
+L1_tx_free2 -- send_msg --> rsp((resp_L1))
+end 
+rx_func --> rxfunc
 
 
-```mermaid
-flowchart TB
-    L1_tx_thread --> TX_in[block L1_tx_out] --> NR_slot_indication
-
-    subgraph tx_func
-
-        NR_slot_indication --> msg:resp_L1 --> phy_procedures_gNB_tx --> ru_tx_func
-        NR_slot_indication["run the scheduler:
-          - monolithic: run_scheduler_monolithic()
-          - nFAPI: send indication via pnf_send_slot_ind()"]
-        msg:resp_L1 -- async launch --> L1_RX_thread
+subgraph tx_func
+    direction LR
+    subgraph phy_procedures_gNB_TX
+       dcitop[nr_generate dci top]
+       --> nr_generate_csi_rs
+       --> apply_nr_rotation_TX
+       -- send_msg --> end_tx_func((L1_tx_out))
     end
-    ru_tx_func --> TX_in
+    subgraph tx_reorder_thread
+        L1_tx_out>L1_tx_out]
+        --> reorder{re order} --> reorder
+        reorder --> ru_tx_func
+        reorder --> L1_tx_free((L1_tx_free))
+        ru_tx_func --> feptx_prec
+        --> feptx_ofdm
+    end 
+end
+
 ```
-
-The `L1_tx_thread()` processes individual TX jobs sequentially, by waiting for
-new messages on queue `L1_tx_out`, signalling individual TX jobs. For each
-message, it calls `tx_func()` which does in order:
-
-- run the scheduler through `NR_slot_indication`, which corresponds to a
-  "Slot.indication" in FAPI parlance. This runs the scheduler, and schedules a
-  given slot (either downlink, uplink, or both).
-- trigger RX processing by pushing a message into the FIFO queue `resp_L1`,
-  asynchronously starting an RX job in `L1_rx_thread()` (see below).
-- process the current L1 TX job through `phy_procedures_gNB_tx()`
-- write to the radio board via `ru_tx_func()`.
-
-After these steps, `tx_func()` return to `L1_tx_thread()`, which will wait for
-the next TX job.
-
-```mermaid
-flowchart TB
-    L1_rx_thread --> RX_in[block resp_L1] --> L1_nr_prach_proc
-
-    subgraph rx_func
-
-        L1_nr_prach_proc --> phase_comp{apply phase comp.?}
-        phase_comp -- yes --> apply_nr_rotation --> phy_procedures_gNB_uespec_RX
-        phase_comp -- no --> phy_procedures_gNB_uespec_RX
-        phy_procedures_gNB_uespec_RX --> NR_ul_indication --> msg:L1_rx_out
-        NR_ul_indication["run the scheduler: NR_UL_indication()"]
-        msg:L1_rx_out -- async signal free --> ru_thread
-    end
-    msg:L1_rx_out --> RX_in
-```
-
-The `L1_rx_thread()` processes individual RX jobs sequentially. It waits for a
-new RX job through the queue `resp_L1`, and then calls `rx_func()`, which does
-in order:
-
-- run PRACH processing via `L1_nr_prach_proc()`
-- optionally apply rotation to the RX signal if phase compensation is to be
-  applied
-- run the current L1 RX job through (`phy_procedures_gNB_uespec_RX()`), which
-  notably includes PUCCH, PUSCH, SRS processing
-- call the scheduler through `NR_ul_indication()`, which corresponds to FAPI
-  uplink messages (e.g., `RX_data.indication`, `CRC.indication`,
-  `UCI.indication` etc.)
-- signal completion via FIFO queue `L1_rx_out()`, which tells `ru_thread()`
-  that RX processing finished.
-
-The signalling of scheduler data is done through a variable `UL_INFO`, which is
-filled by `L1_nr_prach_proc()` (for PRACH) and `phy_procedures_gNB_uespec_RX()`
-(for PUCCH, PUSCH, SRS).
-
-After these steps, `rx_func()` returns to `L1_rx_thread()`, which will wait the
-next RX job.
-
-Note that while individual TX (RX) jobs are run sequentially through
-`L1_tx_thread()` (`L1_rx_thread()`), both TX and RX processing run in
-parallel.

doc/SW_archi.md

@@ -177,7 +177,7 @@ it would be better to call **NR_UL_indication()** now instead of before (on prev
 * nr_common_signal_procedures()  
 generate common signals
 {: .func4}
-* nr_generate_dci()
+* nr_generate_dci_top()
 generate DCI: the scheduling informtion for each UE in both DL and UL
 {: .func4}
 * nr_generate_pdsch()  

doc/d2d_emulator_setup.txt

@@ -1,104 +0,0 @@
-Scenario 1 : Off-network UE2UE link
-SynchREF UE (UE1)
-
-UE1(eth0 - 10.10.10.1)--------UE2(eno1 - 10.10.10.2)
-
-Here's an example of /etc/network/interfaces configuration for UE1
-auto eth0
-   iface eth0 inet static
-   address 10.10.10.1
-   netmask 255.255.255.0
-   gateway 10.10.10.1
-
-Prepare the environment:
- - git clone https://gitlab.eurecom.fr/matzakos/LTE-D2D.git  #branch: master
-This branch contains all the current development for DDPS
- - UE MAC<-> UE MAC for Scenario 1
- - eNB MAC<->UE MAC (NFAPI Transport)
- - RRC Extensions for “on-network” cases
- 
-NFAPI configuration (required even for Scenario 1 target)
- - git clone https://github.com/cisco/open-nFAPI.git
- - cd open-nfapi
- - patch -p1 --dry-run < $OPENAIR_HOME/open-nfapi.oai.patch
-Validate that there are no errors
- - patch -p1 < $OPENAIR_HOME/open-nfapi.oai.patch
- 
-OAI build/execute
- - export NFAPI_DIR=XXX (place where NFAPI was installed)
- - cd cmake_targets
- - ./build_oai --UE --ninja
- (if necessary, use ./build_oai -I --UE to install required packages)
- - cd ran_build/build/
-
-UE1: 
- - sudo ifconfig oip0 10.0.0.1
- - sudo iptables -A POSTROUTING  -t mangle -o oip0 -d 224.0.0.3 -j MARK --set-mark 3
- - (if necessary) sudo route add default gw 10.10.10.1 eth0
-UE2:
- - sudo ifconfig oip0 10.0.0.2
- - sudo iptables -A POSTROUTING  -t mangle -o oip0 -d 224.0.0.3 -j MARK --set-mark 3
- - (if necessary) sudo route add default gw 10.10.10.1 eno1
-
-UE1 and UE2: Get and build vencore_app from d2d-l3-stub (branch: l3_stub)
- - gcc -I . vencore_app.c -o vencore_app -lpthread
- 
---------------------------------
-TEST ONE-TO-MANY
-Run UE1 then UE2, for example:
-UE1: sudo ./lte-softmodem-stub -U --emul-iface eth0
-UE2: sudo ./lte-softmodem-stub -U --emul-iface eno1
-
-Test with Ping
-- Sender - UE1: ping -I oip0 224.0.0.3
-- Receiver - UE2: using wireshark
-
-Test with Iperf
-- Sender - UE1: iperf -c 224.0.0.3 -u -b 0.1M --bind 10.0.0.1 -t 100
-- Receiver - UE2: sudo ./mcreceive 224.0.0.3 5001 
-
-Filter the incomming packets according to GroupL2Id: receiver (one-to-many) can discard the packets if it doesn't belong to this group. 
-For the moment, both sender and receiver use the same set of Ids (hardcoded)  
-
-UE1 (sender)
- - sudo ./lte-softmodem-stub -U --emul-iface eth0
- - ./vencore_app  #send the sourceL2Id, groupL2Id to OAI
- - ping -I oip0 224.0.0.3
- UE2(receiver)
-  - sudo ./lte-softmodem-stub -U --emul-iface eno1 
-  #we can see the incomming packets from OAI log, however, cannot see from Wireshark -> they are discarded at MAC layer
-  - ./vencore_app  #we can see the packets appearing in Wireshark
- 
- --------------------------------------
-TEST PC5-S (UE1 -sender, UE2 - receiver) and PC5-U for ONE-TO-ONE scenario
-Configure UE1/UE2
-UE1: 
- - sudo ifconfig oip0 10.0.0.1
- - sudo iptables -A POSTROUTING  -t mangle -o oip0 -d 10.0.0.2 -j MARK --set-mark 3
- - sudo route add default gw 10.10.10.1 eth0
-UE2:
- - sudo ifconfig oip0 10.0.0.2
- - sudo iptables -A POSTROUTING  -t mangle -o oip0 -d 10.0.0.1 -j MARK --set-mark 3
- - sudo route add default gw 10.10.10.1 eno1
- 
-step 1:
-- UE1: sudo ./lte-softmodem-stub -U --emul-iface eth0
-step 2:
-- UE2: sudo ./lte-softmodem-stub -U --emul-iface eno1
-- UE2: ./vencore_app -r #listen to incomming message from PC5-S 
-step 3: 
-- UE1: ./vencore_app -s #send a message via PC5-S (e.g., DirectCommunicationRequest)
-
-Generate unicast traffic
-UE1: ping -I oip0 10.0.0.2
- 
- 
-  --------------------------------------
-TEST PC5-D
-step 1:
-- UE1: sudo ./lte-softmodem-stub -U --emul-iface eth0
-- UE1: ./vencore_app -d #send a PC5-Discovery-Announcement via PC5D
-step 2:
-- UE2: sudo ./lte-softmodem-stub -U --emul-iface eno1
-- UE2: ./vencore_app -d #send a PC5-Discovery-Announcement via PC5D
-

doc/environment-variables.md

@@ -9,8 +9,7 @@ OAI uses/supports a number of environment variables, documented in the following
 - `NVRAM_DIR`: directory to read/write NVRAM data in (5G) `nvram` tool; if not defined, will use `PWD` (working directory)
 - `OAI_CONFIGMODULE`: can be used to pass the configuration file instead of `-O`
 - `OAI_GDBSTACKS`: if defined when hitting an assertion (`DevAssert()`, `AssertFatal()`, ...), OAI will load `gdb` and provide a backtrace for every thread
-- `OAI_RNGSEED`: provide a fixed seed for random number generators (RNG). If
-  this variable is absent, a random seed will be read (from `/dev/urandom`).
+- `OAI_RNGSEED`: overwrites any seed for random number generators (RNG) in simulators
 - `USIM_DIR`: directory to read/write USIM data in (4G) `usim` tool; if not defined, will use `PWD` (working directory)
 
 Furthermore, these variables appear in code that is not maintained and maybe not even compiled anywhere:

doc/nfapi.md

@@ -1,5 +1,3 @@
-# FAPI/nFAPI split in OAI
-
 This document describes the SmallCellForum (SCF) (n)FAPI split in 5G, i.e.,
 between the MAC/L2 and PHY/L1. It also describes how to make use of the 
 multiple transport mechanisms between the 2.
@@ -12,7 +10,7 @@ about nFAPI can be found in SCF 225.2.0.
 
 [[_TOC_]]
 
-## Quickstart
+# Quickstart
 
 Compile OAI as normal. Start the CN and make sure that the VNF configuration
 matches the PLMN/IP addresses. Then, run the VNF
@@ -31,7 +29,7 @@ VNF!)
 You should not observe a difference between nFAPI split and monolithic.
 
 
-## Status
+# Status
 
 All FAPI message can be transferred between VNF and PNF. This is because OAI
 uses FAPI with its corresponding messages internally, whether a split is in use
@@ -56,7 +54,7 @@ When using RFsim, the system might run slower than in monolithic. This is
 because the PNF needs to slow down the execution time of a specific slot,
 because it has to send a Slot.indication to the VNF for scheduling.
 
-## Configuration
+# Configuration
 
 Both PNF and VNF are run through the `nr-softmodem` executable. The type of
 mode is switched through the `--nfapi` switch, with options `MONOLITHIC`
@@ -175,26 +173,6 @@ After installing WLS, you can run the build command as shown below:
 
 Refer to the above steps in [Quickstart](#quickstart), but run the PNF first as it is the WLS "master".
 
-To optimize the performance of your setup, you can provide the option
-`--thread-pool <list of allocated CPUs>` in the PNF command line. This allows
-you to pin PNF processing threads to specific CPU cores, as they might
-otherwise interfere with DPDK used by WLS.
-
-Before selecting which CPU cores to allocate: run `nr-softmodem` without the
-`--thread-pool` option and use a process monitoring tool such as htop to check
-CPU availability. Check for lightly loaded cores, and use them in the
-thread-pool for the PNF.
-
-Example commands for running an OTA test with USRP B200 on 40MHz:
-
-Run PNF
-
-    sudo NFAPI_TRACE_LEVEL=info ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf --nfapi PNF --continuous-tx -E --thread-pool 1,2,3,4,5
-
-Run VNF
-
-    sudo NFAPI_TRACE_LEVEL=info ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.106prb.nfapi.conf --nfapi VNF
-
 #### How to run OAI PNF with OSC/Radisys O-DU
 
 Set up the hugepages for DPDK (1GB page size, 6 pages; this only needs to be
@@ -216,19 +194,14 @@ Clone the Radisys repository (We're currently using the `oai_integration` branch
 
     git clone https://gerrit.o-ran-sc.org/r/o-du/l2 -b oai-integration
 
-Build the O-DU (More details can be found in O-RAN's documentation page [here](https://docs.o-ran-sc.org/projects/o-ran-sc-o-du-l2/en/latest/user-guide.html#i-execution-on-locally-compiling-o-du-high-source-code))
+Build the O-DU
 
     cd ~/l2/build/odu
     make clean_all;make odu PHY=INTEL_L1 MACHINE=BIT64 MODE=TDD;make cu_stub NODE=TEST_STUB MACHINE=BIT64 MODE=TDD;make ric_stub NODE=TEST_STUB MACHINE=BIT64 MODE=TDD
 
-The O-DU requires some virtual interfaces to be setup in order to enable communication between the O-DU, CU_stub and RIC_stub
 Setup local interfaces for the cu_stub, ric_stub and o_du
-The IP addresses shown match the ones specified in OSC ODU configuration file, found in <o-du directory>/build/config/tdd_odu_config.xml
-The parameters referenced are <DU_IP_V4_ADDR>, <CU_IP_V4_ADDR> and <RIC_IP_V4_ADDR>
 
-    sudo ifconfig <interface name>:ODU "192.168.130.81" 
-    sudo ifconfig <interface name>:CU_STUB "192.168.130.82"
-    sudo ifconfig <interface name>:RIC_STUB "192.168.130.80"
+    sudo ifconfig enp7s0:ODU "192.168.130.81" && sudo ifconfig enp7s0:CU_STUB "192.168.130.82" && sudo ifconfig enp7s0:RIC_STUB "192.168.130.80"
 
 Run cu_stu and ric_stub in separate terminals
 
@@ -258,7 +231,7 @@ Run the OAI-UE
 
     sudo ./nr-uesoftmodem -r 273 --numerology 1 --band 78 -C 3400140000 --ssb 1518 --uicc0.imsi 001010000000001 --rfsim
 
-## nFAPI logging system
+# nFAPI logging system
 
 nFAPI has its own logging system, independent of OAI's. It can be activated by
 setting the `NFAPI_TRACE_LEVEL` environment variable to an appropriate value;
@@ -269,10 +242,10 @@ To see the (any) periodical output at the PNF, define `NFAPI_TRACE_LEVEL=info`.
 This output shows:
 
 ```
-41056.739654 [I] 3556767424: nr_pnf_p7_get_msgs: [P7:1] msgs ontime 489 thr DL 0.06 UL 0.01 msg late 0 (vtime)
+41056.739654 [I] 3556767424: pnf_p7_slot_ind: [P7:1] msgs ontime 489 thr DL 0.06 UL 0.01 msg late 0 (vtime)
 ```
 
-The first numbers are timestamps. `nr_pnf_p7_get_msgs` is the name of the
+The first numbers are timestamps. `pnf_p7_slot_ind` is the name of the
 functions that prints the output. `[P7:1]` refers to the fact that these are
 information on P7, of PHY ID 1. Finally, `msgs ontime 489` means that in the
 last window (since the last print), 489 messages arrived at the PNF in total.
@@ -285,26 +258,3 @@ done over virtual time, i.e., frames/slots as executed by the 5G Systems. For
 instance, these numbers might be slightly higher or slower in RFsim than in
 wall-clock time, depending if the system advances faster or slower than
 wall-clock time.
-
-## Troubleshoot
-
-When operating using the FAPI split, the PNF needs to give the VNF extra time
-to schedule the next slot. Especially since the current nFAPI split still
-relies on slot indications, extra time due to transport delays need to be
-accounted for.  Currently, this delay is set conservatively, meaning that it
-should work for most systems, but can create problems during random access:
-
-    [NR_MAC] exceeded RA window: preamble at 411.19 now 413.0 (diff 21), ra_ResponseWindow 5/20 slots
-    [NR_MAC] sfn: 413.0 UE RA-RNTI 010b TC-RNTI 5d82: exceeded RA window, cannot schedule Msg2
-
-means that the VNF received a preamble (411.19), but the current slot to be
-scheduled (413.0) is beyond the random access response window (20 slots). In
-this case, try one of the following:
-
-- If the radio allows, reduce the L1 TX advance `RUs.[0].sl_ahead` by some
-  slots, but note that this could make the system less stable.
-- Change the code to reduce `sl_ahead` inside function `handle_nr_slot_ind()`,
-  to reduce the FAPI scheduling slot time budget.
-- Non-standard: You can manually increase the response window by setting
-  `gNBs.[0].servingCellConfigCommon.[0].ra_ResponseWindow` to, e.g., 6. Note
-  that the maximum allowed response window is 10ms.

doc/tutorial_resources/oru/README.md

@@ -0,0 +1,42 @@
+# Reproduction steps to run OAI O-RU with NR UE on broadbill with gNB on peafowl
+
+1. Reserve both machines using the `auto_resrve` script
+
+2. Compile the code on both machines. Example configuration:
+
+```
+cmake ../../ -GNinja -DOAI_FHI72=ON -Dxran_LOCATION=/home/bpodrygajlo/phy/fhi_lib/lib
+cmake --build . --target vrtsim oainr_ru oran_fhlib_5g nr-softmodem ldpc params_libconfig nr-uesoftmodem
+```
+
+3. On broadbill, run `setup_ru_ifs_broadbill.sh`
+
+4. On peafowl, run `setup_ifs_peafowl.sh`
+
+5. On broadbill, run the O-RU:
+
+```
+sudo ./oainr_ru -O ../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ru.band77.106prb.fhi72.4x4.conf --vrtsim.role server
+```
+
+and UE 
+
+```
+sudo taskset -c 50-63 ./nr-uesoftmodem -C 4049760000 -r 106 --numerology 1 --band 77 --ssb 516 --device.name vrtsim
+```
+
+6. On peafowl, run the gNB:
+
+```
+sudo ./nr-softmodem -O ../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-oairu.conf
+```
+
+7. Observe UE detecting SSB and decoding SIB1
+
+# New config file used on my MS-A2 PC
+
+Two sets of config files were added that I've been using on my minipc. These need to be adapted to OAI INFRA
+
+`ru.band77.106prb.fhi72.2x2.conf`, `gnb.2x2.conf` - 2x2 106 PRB mu1 
+`ru.band77.106prb.fhi72.4x4.conf`, `gnb.conf` - 4x4 106 PRB mu1
+`setup_ru_ifs.sh` - the way to setup the vfs on the minipc

doc/tutorial_resources/oru/gnb.2x2.conf

@@ -0,0 +1,272 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ( { sst = 1; }); });
+
+    nr_cellid = 1;
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2;
+    pdsch_AntennaPorts_N1 = 1;
+    maxMIMO_layers        = 2;
+    pusch_AntennaPorts    = 2;
+    do_CSIRS              = 1;
+    do_SRS                = 0;
+    sib1_tda                            = 15;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+     # n_TimingAdvanceOffset                                         = 0;
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # center frequency = 4049.76 MHz
+      # selected SSB frequency = 4049.76 MHz
+      absoluteFrequencySSB                                          = 669984;
+      dl_frequencyBand                                              = 77;
+      # frequency point A = 4030.68 MHz
+      dl_absoluteFrequencyPointA                                    = 668712;
+      #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                                              = 77;
+      #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                                  = 159;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 0;
+          preambleReceivedTargetPower                               = -100;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 7;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 2;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
+        msg3_DeltaPreamble                                          = 2;
+        p0_NominalWithGrant                                         = -100;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 0;
+        p0_nominal                                                  = -96;
+
+      ssb_PositionsInBurst_Bitmap                                   = 0x1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 3;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 1;
+      nrofUplinkSymbols                                             = 4;
+
+  ssPBCH_BlockPower                                                 = 0;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "172.21.6.5"; });
+
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.51";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.51";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+  }
+);
+
+MACRLCs = (
+{
+  num_cc                      = 1;
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 200;
+  pucch_TargetSNRx10          = 200;
+ # dl_bler_target_upper        = .35;
+ # dl_bler_target_lower        = .15;
+  ul_bler_target_upper        = .35;
+  ul_bler_target_lower        = .15;
+  pusch_FailureThres          = 100;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 110;
+  pucch0_dtx_threshold = 80;
+  pusch_dtx_threshold = -100;
+ # thread_pool_size = 8;
+  tx_amp_backoff_dB = 36;
+  L1_rx_thread_core = 11;
+  L1_tx_thread_core = 12;
+  phase_compensation = 0; # needs to match O-RU configuration
+}
+);
+
+RUs = (
+{
+  local_rf       = "no";
+  nb_tx          = 2;
+  nb_rx          = 2;
+  att_tx         = 0;
+  att_rx         = 0;
+  bands          = [77];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  ru_thread_core = 10;
+  sl_ahead       = 5;
+  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:05:02.2", "0000:05:02.3"); # one VF can be used as well
+  system_core = 7;
+  io_core = 8;
+  worker_cores = (9);
+  ru_addr = ("00:11:22:33:64:66", "00:11:22:33:64:67");
+  mtu = 9600;
+  fh_config = ({
+    T1a_cp_dl = (285, 470);
+    T1a_cp_ul = (285, 429);
+    Ta3_up = (100, 350);
+    T1a_up = (200, 400);
+    Ta4 = (100, 350);
+    ru_config = {
+      iq_width = 16;
+      iq_width_prach = 16;
+    };
+  });
+};

doc/tutorial_resources/oru/gnb.conf

@@ -0,0 +1,272 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ( { sst = 1; }); });
+
+    nr_cellid = 1;
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2;
+    pdsch_AntennaPorts_N1 = 2;
+    maxMIMO_layers        = 2;
+    pusch_AntennaPorts    = 4;
+    do_CSIRS              = 1;
+    do_SRS                = 0;
+    sib1_tda                            = 15;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+     # n_TimingAdvanceOffset                                         = 0;
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # center frequency = 4049.76 MHz
+      # selected SSB frequency = 4049.76 MHz
+      absoluteFrequencySSB                                          = 669984;
+      dl_frequencyBand                                              = 77;
+      # frequency point A = 4030.68 MHz
+      dl_absoluteFrequencyPointA                                    = 668712;
+      #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                                              = 77;
+      #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                                  = 159;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 0;
+          preambleReceivedTargetPower                               = -100;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 7;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 2;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
+        msg3_DeltaPreamble                                          = 2;
+        p0_NominalWithGrant                                         = -100;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 0;
+        p0_nominal                                                  = -96;
+
+      ssb_PositionsInBurst_Bitmap                                   = 0x1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 3;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 1;
+      nrofUplinkSymbols                                             = 4;
+
+  ssPBCH_BlockPower                                                 = 0;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "172.21.6.5"; });
+
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.51";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.51";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+  }
+);
+
+MACRLCs = (
+{
+  num_cc                      = 1;
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 200;
+  pucch_TargetSNRx10          = 200;
+ # dl_bler_target_upper        = .35;
+ # dl_bler_target_lower        = .15;
+  ul_bler_target_upper        = .35;
+  ul_bler_target_lower        = .15;
+  pusch_FailureThres          = 100;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 110;
+  pucch0_dtx_threshold = 80;
+  pusch_dtx_threshold = -100;
+ # thread_pool_size = 8;
+  tx_amp_backoff_dB = 36;
+  L1_rx_thread_core = 11;
+  L1_tx_thread_core = 12;
+  phase_compensation = 0; # needs to match O-RU configuration
+}
+);
+
+RUs = (
+{
+  local_rf       = "no";
+  nb_tx          = 4;
+  nb_rx          = 4;
+  att_tx         = 0;
+  att_rx         = 0;
+  bands          = [77];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  ru_thread_core = 10;
+  sl_ahead       = 5;
+  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:05:02.2", "0000:05:02.3"); # one VF can be used as well
+  system_core = 7;
+  io_core = 8;
+  worker_cores = (9);
+  ru_addr = ("00:11:22:33:64:66", "00:11:22:33:64:67");
+  mtu = 9600;
+  fh_config = ({
+    T1a_cp_dl = (285, 470);
+    T1a_cp_ul = (285, 429);
+    Ta3_up = (100, 350);
+    T1a_up = (400, 450);
+    Ta4 = (100, 350);
+    ru_config = {
+      iq_width = 16;
+      iq_width_prach = 16;
+    };
+  });
+};

doc/tutorial_resources/oru/ru.band77.106prb.fhi72.2x2.conf

@@ -0,0 +1,93 @@
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+RUs = (
+{
+  local_rf       = "no";
+  nb_tx          = 2;
+  nb_rx          = 2;
+  att_tx         = 0;
+  att_rx         = 0;
+  bands          = [77];
+  tx_bw = [106];
+  rx_bw = [106];
+  carrier_tx = [4049760];
+  carrier_rx = [4049760];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  sl_ahead       = 5;
+  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
+  do_precoding   = 0; # needs to match O-RU configuration
+  # PRACH configuration
+  prach_config_index = 159;
+  prach_msg1_start = 0;
+  tdd_period = 5;
+  num_dl_slots = 3;
+  num_dl_symbols = 6;
+  num_ul_slots = 1;
+  num_ul_symbols = 4;
+});
+
+
+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:05:02.0", "0000:05:02.1"); # one VF can be used as well
+  system_core = 25;
+  io_core = 26;
+  worker_cores = (27);
+  du_addr = ("00:11:22:33:64:68", "00:11:22:33:64:69");
+  mtu = 9600;
+  file_prefix = "ru";
+  fh_config = ({
+    T1a_cp_dl = (285, 470);
+    T1a_cp_ul = (285, 429);
+    Ta3_up = (200, 350);
+    T1a_up = (400, 450);
+    T2a_up = (300, 450);
+    Ta4 = (100, 350);
+    ru_config = {
+      iq_width = 16;
+      iq_width_prach = 16;
+    };
+  });
+};
+
+
+channelmod = { 
+  max_chan=10;
+  modellist="modellist_rfsimu_1";
+  modellist_rfsimu_1 = (
+    {
+        model_name                       = "server_tx_channel_model"
+      	type                             = "Rayleigh8";			  
+      	ploss_dB                         = 0;
+        noise_power_dB                   = 0; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
+    },
+    {
+        model_name                       = "rfsimu_channel_ue0"
+      	type                             = "AWGN";			  
+      	ploss_dB                         = 0;
+        noise_power_dB                   = 0; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
+    }    
+  );
+}

doc/tutorial_resources/oru/ru.band77.106prb.fhi72.4x4.conf

@@ -0,0 +1,87 @@
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+RUs = (
+{
+  local_rf       = "no";
+  nb_tx          = 4;
+  nb_rx          = 4;
+  att_tx         = 0;
+  att_rx         = 0;
+  bands          = [77];
+  tx_bw = [106];
+  rx_bw = [106];
+  carrier_tx = [4049760];
+  carrier_rx = [4049760];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  sl_ahead       = 5;
+  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
+  do_precoding   = 0; # needs to match O-RU configuration
+  # PRACH configuration
+  prach_config_index = 159;
+  prach_msg1_start = 0;
+});
+
+
+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:05:02.0", "0000:05:02.1"); # one VF can be used as well
+  system_core = 25;
+  io_core = 26;
+  worker_cores = (27);
+  du_addr = ("00:11:22:33:64:68", "00:11:22:33:64:69");
+  mtu = 9600;
+  file_prefix = "ru";
+  fh_config = ({
+    T1a_cp_dl = (285, 470);
+    T1a_cp_ul = (285, 429);
+    Ta3_up = (100, 350);
+    T1a_up = (400, 450);
+    Ta4 = (110, 180);
+    ru_config = {
+      iq_width = 16;
+      iq_width_prach = 16;
+    };
+  });
+};
+
+
+channelmod = { 
+  max_chan=10;
+  modellist="modellist_rfsimu_1";
+  modellist_rfsimu_1 = (
+    {
+        model_name                       = "server_tx_channel_model"
+      	type                             = "Rayleigh8";			  
+      	ploss_dB                         = 0;
+        noise_power_dB                   = 0; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
+    },
+    {
+        model_name                       = "rfsimu_channel_ue0"
+      	type                             = "AWGN";			  
+      	ploss_dB                         = 0;
+        noise_power_dB                   = 0; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
+    }    
+  );
+}

doc/tutorial_resources/oru/setup_ifs_peafowl.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+#### 100G interface --> enp1s0f0 | VFs pcie-address --> 01:01.0, 01:01.1
+#### 25G interface (PTP) --> enp193s0f1 | VFs pcie-address --> c1:11.0,c1:11.1
+
+set -x
+IF_NAME=enp193s0f1
+NUM_VFs=2
+U_PLANE_MAC_ADD=00:11:22:33:54:00
+C_PLANE_MAC_ADD=00:11:22:33:54:01
+VLAN=3
+MTU=9600
+U_PLANE_PCI=0000:c1:11.0
+C_PLANE_PCI=0000:c1:11.1
+## It will be something like this --> $DPDK_INST/bin
+DPDK_DEVBIND_PREFIX=
+sudo ethtool -G $IF_NAME rx 8160 tx 8160
+sudo sh -c "echo 0 > /sys/class/net/$IF_NAME/device/sriov_numvfs"
+sudo sh -c "echo $NUM_VFs > /sys/class/net/$IF_NAME/device/sriov_numvfs"
+sudo modprobe -r iavf
+sudo modprobe iavf
+# this next 2 lines is for C/U planes
+sudo ip link set $IF_NAME vf 0 mac $U_PLANE_MAC_ADD vlan $VLAN spoofchk off mtu $MTU
+sudo ip link set $IF_NAME vf 1 mac $C_PLANE_MAC_ADD vlan $VLAN spoofchk off mtu $MTU
+sleep 1
+sudo dpdk-devbind.py --unbind $U_PLANE_PCI
+sudo dpdk-devbind.py --unbind $C_PLANE_PCI
+sudo modprobe vfio-pci
+sudo dpdk-devbind.py --bind vfio-pci $U_PLANE_PCI
+sudo dpdk-devbind.py --bind vfio-pci $C_PLANE_PCI