set 1st active bwp in dlsim and ulsim

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

CMakeLists.txt

@@ -3,6 +3,7 @@
 cmake_minimum_required (VERSION 3.19)
 project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(OAI_VERSION 2.4.0)
 
 option(ENABLE_CHANNEL_SIM_CUDA "Enable CUDA accelerated channel simulation" OFF)
@@ -233,16 +234,9 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang
   set(commonOpts "${commonOpts} -Wno-unused-command-line-argument -Wno-default-const-init-field-unsafe")
 endif()
 
-if (ENABLE_LDPC_CUDA)
-  # TODO only on specific targets!!
-  set(commonOpts "${commonOpts} -DLDPC_CUDA")
-endif()
-
 set(CMAKE_C_FLAGS
   "${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops ${CMAKE_C_FLAGS}")
-set(CMAKE_CXX_FLAGS
-  "${C_FLAGS_PROCESSOR}  ${commonOpts} -std=c++11 ${CMAKE_CXX_FLAGS}")
-
+set(CMAKE_CXX_FLAGS "${C_FLAGS_PROCESSOR} ${commonOpts} ${CMAKE_CXX_FLAGS}")
 
 add_boolean_option(SANITIZE_ADDRESS OFF "enable the address sanitizer (ASan)" ON)
 if (SANITIZE_ADDRESS)
@@ -629,12 +623,6 @@ include_directories("${OPENAIR2_DIR}/COMMON")
 include_directories("${OPENAIR2_DIR}/UTIL")
 include_directories("${OPENAIR3_DIR}/COMMON")
 include_directories("${OPENAIR3_DIR}/UTILS")
-include_directories("${NFAPI_DIR}/nfapi/public_inc")
-include_directories("${NFAPI_DIR}/common/public_inc")
-include_directories("${NFAPI_DIR}/pnf/public_inc")
-include_directories("${NFAPI_DIR}/nfapi/inc")
-include_directories("${NFAPI_DIR}/sim_common/inc")
-include_directories("${NFAPI_DIR}/pnf_sim/inc")
 include_directories("${OPENAIR1_DIR}")
 include_directories("${OPENAIR2_DIR}")
 include_directories("${OPENAIR3_DIR}/NAS/TOOLS")
@@ -731,6 +719,7 @@ set(SCHED_SRC
 )
 add_library(SCHED_LIB ${SCHED_SRC})
 target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)
+target_link_libraries(SCHED_LIB PRIVATE nfapi_pnf_lib)
 
 set(SCHED_NR_SRC
   ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
@@ -740,14 +729,14 @@ set(SCHED_NR_SRC
 )
 add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
 target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs UTIL)
-target_link_libraries(SCHED_NR_LIB PRIVATE NFAPI_LIB) # some FAPI messages pack "subPDUs"
+target_link_libraries(SCHED_NR_LIB PRIVATE nfapi_nr_lib nfapi_user_lib) # some FAPI messages pack "subPDUs"
 
 set(SCHED_SRC_RU
   ${OPENAIR1_DIR}/SCHED/ru_procedures.c
   ${OPENAIR1_DIR}/SCHED/prach_procedures.c
 )
 add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
-target_link_libraries(SCHED_RU_LIB PRIVATE asn1_lte_rrc_hdrs)
+target_link_libraries(SCHED_RU_LIB PRIVATE asn1_lte_rrc_hdrs nfapi_user_lib)
 
 set(SCHED_SRC_UE
   ${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
@@ -769,80 +758,6 @@ set(SCHED_SRC_NR_UE
 add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
 target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
 
-# nFAPI
-#################################
-set(NFAPI_SRC
-  ${NFAPI_DIR}/nfapi/src/nfapi_p4.c
-  ${NFAPI_DIR}/nfapi/src/nfapi_p5.c
-  ${NFAPI_DIR}/nfapi/src/nfapi_p7.c
-)
-add_library(NFAPI_LIB ${NFAPI_SRC})
-target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
-target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7)
-target_link_libraries(NFAPI_LIB PRIVATE z)
-
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_LIB PRIVATE ENABLE_WLS)
-else()
-  target_compile_definitions(NFAPI_LIB PRIVATE ENABLE_SOCKET)
-endif()
-include_directories(${NFAPI_DIR}/nfapi/public_inc)
-include_directories(${NFAPI_DIR}/nfapi/inc)
-
-set(NFAPI_PNF_SRC
-  ${NFAPI_DIR}/pnf/src/pnf.c
-  ${NFAPI_DIR}/pnf/src/pnf_interface.c
-  ${NFAPI_DIR}/pnf/src/pnf_p7.c
-  ${NFAPI_DIR}/pnf/src/pnf_p7_interface.c
-)
-add_library(NFAPI_PNF_LIB ${NFAPI_PNF_SRC})
-target_link_libraries(NFAPI_PNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_link_libraries(NFAPI_PNF_LIB PUBLIC nr_fapi_p7)
-
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_PNF_LIB PRIVATE ENABLE_WLS)
-endif()
-include_directories(${NFAPI_DIR}/pnf/public_inc)
-include_directories(${NFAPI_DIR}/pnf/inc)
-
-set(NFAPI_VNF_SRC
-  ${NFAPI_DIR}/vnf/src/vnf.c
-  ${NFAPI_DIR}/vnf/src/vnf_interface.c
-  ${NFAPI_DIR}/vnf/src/vnf_p7.c
-  ${NFAPI_DIR}/vnf/src/vnf_p7_interface.c
-)
-add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})
-target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5 nr_fapi_p7)
-if(OAI_AERIAL)
-  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL)
-endif()
-include_directories(${NFAPI_DIR}/vnf/public_inc)
-include_directories(${NFAPI_DIR}/vnf/inc)
-
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_WLS)
-endif()
-# nFAPI user defined code
-#############################
-set(NFAPI_USER_SRC
-  ${NFAPI_USER_DIR}/nfapi.c
-  ${NFAPI_USER_DIR}/nfapi_pnf.c
-  ${NFAPI_USER_DIR}/nfapi_vnf.c
-  ${NFAPI_USER_DIR}/gnb_ind_vars.c
-)
-add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_WLS)
-elseif (OAI_AERIAL)
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_AERIAL)
-else()
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_SOCKET)
-endif()
-target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
-target_link_libraries(NFAPI_USER_LIB PRIVATE nr_fapi_p7)
-include_directories(${NFAPI_USER_DIR})
-
 # Layer 1
 #############################
 set(PHY_TURBOIF
@@ -1099,30 +1014,15 @@ target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
 
-if (ENABLE_LDPC_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_80 -g -ggdb") # A100
-  #SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-arch=sm_90") # GH200
-  #SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-arch=sm_87") # Jetson
-  #SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-arch=sm_89") # L40S
-  SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-arch=sm_121") # GB10
-  set(CUDA_VERBOS_BUILD_ON)
-  cuda_add_library(PHY_NR ${PHY_NR_SRC} ${PHY_NR_SRC_CU})
-  cuda_add_library(PHY_NR_UE ${PHY_NR_UE_SRC} ${PHY_NR_UE_SRC_CU})
-else()
-  add_library(PHY_NR ${PHY_NR_SRC})
-  add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-endif()
+add_library(PHY_NR ${PHY_NR_SRC})
 target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5 polar smallblock ds)
 
 add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
 target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
 target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)
 
-target_link_libraries(PHY_NR_UE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL polar smallblock)
+add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL polar smallblock)
 
 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)
@@ -1364,6 +1264,7 @@ set (MISC_NFAPI_LTE
  )
 
 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})
+target_link_libraries(MISC_NFAPI_LTE_LIB PRIVATE nfapi_vnf_lib nfapi_pnf_lib)
 
 add_library(L2
   ${L2_SRC}
@@ -1373,6 +1274,7 @@ add_library(L2
   )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+target_link_libraries(L2 PRIVATE nfapi_vnf_lib nfapi_pnf_lib)
 if(E2_AGENT)
   target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()
@@ -1390,6 +1292,7 @@ add_library(L2_NR
   )
 target_link_libraries(L2_NR PRIVATE ds alg)
 target_link_libraries(L2_NR PRIVATE f1ap_lib)
+target_link_libraries(L2_NR PRIVATE nfapi_vnf_lib)
 target_include_directories(L2_NR PRIVATE ${F1AP_DIR}/lib)
 if(E2_AGENT)
   target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
@@ -1414,6 +1317,7 @@ add_library(L2_LTE_NR
 )
 
 target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap nr_rrc)
+target_link_libraries(L2_LTE_NR PRIVATE nfapi_vnf_lib)
 
 add_library(L2_UE
   ${L2_SRC_UE}
@@ -1421,6 +1325,7 @@ add_library(L2_UE
 )
 target_link_libraries(L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(L2_UE PRIVATE GTPV1U)
+target_link_libraries(L2_UE PRIVATE nfapi_pnf_lib)
 
 target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)
 
@@ -1454,6 +1359,7 @@ set (MME_APP_SRC
 add_library(MME_APP ${MME_APP_SRC})
 target_link_libraries(MME_APP PRIVATE m2ap m3ap)
 target_link_libraries(MME_APP PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(MME_APP PRIVATE nfapi_vnf_lib nfapi_user_lib)
 
 find_package(sctp REQUIRED)
 set(SCTP_SRC
@@ -1757,7 +1663,6 @@ endif()
 
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
-include_directories("${NFAPI_DIR}/pnf/public_inc")
 include_directories("${NFAPI_DIR}/nfapi/inc")
 include_directories("${NFAPI_DIR}/sim_common/inc")
 include_directories("${NFAPI_DIR}/pnf_sim/inc")
@@ -1799,7 +1704,7 @@ add_dependencies(lte-softmodem oai_iqplayer)
 target_link_libraries(lte-softmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
-  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  PHY_COMMON PHY PHY_RU  L2 L2_LTE nfapi_vnf_lib nfapi_pnf_lib nfapi_user_lib MISC_NFAPI_LTE_LIB
   ${NAS_UE_LIB} ITTI SIMU radio_common softmodem_common
   -Wl,--end-group dl)
 
@@ -1853,7 +1758,7 @@ target_link_libraries(lte-uesoftmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap x2ap m2ap m3ap
   SECURITY UTIL SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
-  PHY_UE PHY_RU L2_UE L2_LTE SIMU NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  PHY_UE PHY_RU L2_UE L2_LTE SIMU nfapi_pnf_lib nfapi_user_lib MISC_NFAPI_LTE_LIB
   ${NAS_UE_LIB} ITTI radio_common softmodem_common
   -Wl,--end-group dl)
 
@@ -1864,7 +1769,6 @@ target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-uesoftmodem PRIVATE
                       asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)
-
 # nr RRU
 add_executable(nr-oru
   ${OPENAIR_DIR}/executables/nr-ru.c
@@ -1877,9 +1781,9 @@ add_executable(nr-oru
 )
 target_link_libraries(nr-oru PRIVATE
   UTIL NR_PHY_RU PHY_NR shlib_loader dl
-  radio_common softmodem_common)
+  radio_common softmodem_common nfapi_pnf_lib)
 target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
-  barrier actor)
+  barrier actor nfapi_user_lib)
 target_link_libraries(nr-oru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)
 
 # nr-softmodem
@@ -1902,7 +1806,7 @@ target_link_libraries(nr-softmodem PRIVATE
   -Wl,--start-group
   UTIL SCTP_CLIENT SCHED_LIB SCHED_NR_LIB PHY_NR PHY PHY_NR_COMMON NR_PHY_RU GTPV1U SECURITY
   ITTI ${NAS_UE_LIB} nr_rrc
-  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
+  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON nfapi_vnf_lib nfapi_pnf_lib nfapi_user_lib SIMU
   x2ap f1ap m2ap m3ap e1ap radio_common
   time_management softmodem_common
   -Wl,--end-group dl)
@@ -1912,16 +1816,15 @@ target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_boolean_option(OAI_WLS OFF "Activate OAI's WLS driver" OFF)
+add_boolean_option(OAI_AERIAL OFF "Activate OAI's AERIAL driver" OFF)
 if (OAI_WLS)
     target_link_libraries(nr-softmodem PUBLIC wls_integration_lib)
+elseif (OAI_AERIAL)
+    target_compile_definitions(nr-softmodem PUBLIC ENABLE_AERIAL)
+    target_link_libraries(nr-softmodem PUBLIC aerial_lib)
 else()
     target_link_libraries(nr-softmodem PUBLIC nfapi_socket_lib)
 endif()
-add_boolean_option(OAI_AERIAL OFF "Activate OAI's AERIAL driver" OFF)
-if (OAI_AERIAL)
-  target_compile_definitions(nr-softmodem PUBLIC ENABLE_AERIAL)
-  target_link_libraries(nr-softmodem PUBLIC aerial_lib)
-endif()
 if(E2_AGENT)
   target_link_libraries(nr-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
   target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
@@ -1971,7 +1874,7 @@ add_executable(nr-uesoftmodem
 target_link_libraries(nr-uesoftmodem PRIVATE
   -Wl,--start-group
   nr_rrc SECURITY UTIL SCHED_NR_UE_LIB
-  PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB
+  PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON nfapi_nr_lib
   ITTI SIMU radio_common
   time_management softmodem_common
   -Wl,--end-group dl)
@@ -2036,19 +1939,12 @@ add_executable(ldpctest
 )
 target_link_libraries(ldpctest PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
-  m pthread dl ${T_LIB} ${CUDA_LIBRARIES}
+  m pthread dl ${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'
   -Wl,--whole-archive crc_byte -Wl,--no-whole-archive
 )
-if (ENABLE_LDPC_CUDA)
-  # ldpctest.c uses cudaHostAlloc(), so include dir/link libr to make available
-  # TODO don't write it directly into ldpctest, but separate compilation unit?
-  find_package(CUDA REQUIRED)
-  target_link_libraries(ldpctest PRIVATE ${CUDA_LIBRARIES})
-  target_include_directories(ldpctest PRIVATE ${CUDA_INCLUDE_DIRS})
-endif()
 
 add_library(physim_common OBJECT ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_unitary_common.c)
 target_link_libraries(physim_common PRIVATE UTIL)
@@ -2198,7 +2094,7 @@ if (${T_TRACER})
         params_libconfig
         oai_eth_transpro UTIL
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
-        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
+        nfapi_lte_lib nfapi_nr_lib nfapi_pnf_lib nfapi_vnf_lib nfapi_user_lib
         MISC_NFAPI_LTE_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU NR_PHY_RU
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
@@ -2243,7 +2139,7 @@ if(ENABLE_TESTS)
       NAME benchmark
       GITHUB_REPOSITORY google/benchmark
       VERSION 1.9.0
-      OPTIONS "BENCHMARK_ENABLE_TESTING OFF"
+      OPTIONS "BENCHMARK_ENABLE_TESTING OFF" "BENCHMARK_ENABLE_WERROR OFF"
     )
   endif()
 endif()
@@ -2258,6 +2154,11 @@ add_subdirectory(openair3)
 add_subdirectory(radio)
 add_subdirectory(tests)
 
+add_boolean_option(OAI_RU_FRONTHAUL OFF "Whether to configure OAI fronthaul library" OFF)
+if(OAI_RU_FRONTHAUL)
+  add_subdirectory(fronthaul)
+endif()
+
 if(TARGET oai_cuda_lib)
     message(STATUS "CUDA library 'oai_cuda_lib' found, linking to targets...")
     target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)

ci-scripts/Jenkinsfile

@@ -20,13 +20,11 @@ if (params.LockResources != null && params.LockResources.trim().length() > 0)
 // Global Parameters. Normally they should be populated when the master job
 // triggers the slave job with parameters
 
-def INTERNAL_REPO = "asterix:/home/git/openairinterface5g.git"
-def sourceBranch = params.sourceBranch ?: env.GIT_BRANCH
 def targetBranch = params.targetBranch ?: 'develop'
-def commitID = params.sourceCommit ?: env.GIT_COMMIT
-def testRepository = params.customRepository ?: INTERNAL_REPO
-def testBranch = params.customBranch ?: "${sourceBranch}-${commitID}"
+def testRepository = params.repository ?: 'git@asterix:/home/git/openairinterface5g.git'
+def testBranch = params.branch ?: 'develop'
 def mergeWithTarget = params.mergeWithTarget ?: false
+def sourceBranch = params.sourceBranch ?: testBranch
 
 def flexricOption = ""
 def runWithOC = false
@@ -41,11 +39,17 @@ pipeline {
     timestamps()
     ansiColor('xterm')
     lock(extra: lockResources)
+    skipDefaultCheckout()
   }
 
   stages {
     stage("Build Init") {
       steps {
+        checkout(
+          scmGit(branches: [[name: "${branch}"]],
+                 userRemoteConfigs: [[url: "${repository}"]],
+                 extensions: [cleanBeforeCheckout()])
+        )
         script {
           echo '\u2705 \u001B[94mBuild Init\u001B[0m'
           JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
@@ -113,8 +117,7 @@ pipeline {
             }
             sh """
               python3 main.py --mode=InitiateHtml --repository=${testRepository} \
-                              --branch=${testBranch} --commitID=${commitID} \
-                              ${mainPythonAllXmlFiles}
+                              --branch=${testBranch} ${mainPythonAllXmlFiles}
             """
             if (runWithOC) {
               withCredentials([usernamePassword(credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password')]) {

ci-scripts/Jenkinsfile-GitLab-Container

@@ -115,7 +115,7 @@ pipeline {
     stage ("Local-Repo-Push") {
       steps {
         script {
-          triggerSlaveJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
+          triggerDownstreamJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
         }
       }
       post {
@@ -135,7 +135,7 @@ pipeline {
         stage ("Ubuntu-Image-Builder") {
           steps {
             script {
-              triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu-Image-Builder')
+              triggerDownstreamJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu-Image-Builder')
             }
           }
           post {
@@ -143,7 +143,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                ubuntuBuildStatus = finalizeSlaveJob('RAN-Ubuntu18-Image-Builder')
+                ubuntuBuildStatus = finalizeDownstreamJob('RAN-Ubuntu18-Image-Builder')
               }
             }
             failure {
@@ -157,7 +157,7 @@ pipeline {
         stage ("Ubuntu-ARM-Image-Builder") {
           steps {
             script {
-              triggerSlaveJob ('RAN-Ubuntu-ARM-Image-Builder', 'Ubuntu-ARM-Image-Builder')
+              triggerDownstreamJob ('RAN-Ubuntu-ARM-Image-Builder', 'Ubuntu-ARM-Image-Builder')
             }
           }
           post {
@@ -165,7 +165,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                ubuntuArmBuildStatus = finalizeSlaveJob('RAN-Ubuntu-ARM-Image-Builder')
+                ubuntuArmBuildStatus = finalizeDownstreamJob('RAN-Ubuntu-ARM-Image-Builder')
               }
             }
             failure {
@@ -179,7 +179,7 @@ pipeline {
         stage ("Ubuntu-Jetson-Image-Builder") {
           steps {
             script {
-              triggerSlaveJob ('RAN-Ubuntu-Jetson-Image-Builder', 'Ubuntu-Jetson-Image-Builder')
+              triggerDownstreamJob ('RAN-Ubuntu-Jetson-Image-Builder', 'Ubuntu-Jetson-Image-Builder')
             }
           }
           post {
@@ -187,7 +187,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                ubuntuJetsonBuildStatus = finalizeSlaveJob('RAN-Ubuntu-Jetson-Image-Builder')
+                ubuntuJetsonBuildStatus = finalizeDownstreamJob('RAN-Ubuntu-Jetson-Image-Builder')
               }
             }
             failure {
@@ -201,7 +201,7 @@ pipeline {
         stage ("RHEL-Cluster-Image-Builder") {
           steps {
             script {
-              triggerSlaveJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL-Cluster-Image-Builder')
+              triggerDownstreamJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL-Cluster-Image-Builder')
             }
           }
           post {
@@ -209,7 +209,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                rhelBuildStatus = finalizeSlaveJob('RAN-RHEL8-Cluster-Image-Builder')
+                rhelBuildStatus = finalizeDownstreamJob('RAN-RHEL8-Cluster-Image-Builder')
               }
             }
             failure {
@@ -223,7 +223,7 @@ pipeline {
         stage ("ARM-Cross-Compile") {
           steps {
             script {
-              triggerSlaveJob ('RAN-ARM-Cross-Compile-Builder', 'ARM-Cross-Compilation')
+              triggerDownstreamJob ('RAN-ARM-Cross-Compile-Builder', 'ARM-Cross-Compilation')
             }
           }
           post {
@@ -231,7 +231,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                armBuildStatus = finalizeSlaveJob('RAN-ARM-Cross-Compile-Builder')
+                armBuildStatus = finalizeDownstreamJob('RAN-ARM-Cross-Compile-Builder')
               }
             }
             failure {
@@ -249,7 +249,7 @@ pipeline {
       steps {
         script {
           catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
+            triggerDownstreamJob ('RAN-DockerHub-Push', 'DockerHub-Push')
           }
         }
       }
@@ -269,7 +269,7 @@ pipeline {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-PhySim-Cluster-5G', 'PhySim-Cluster-5G')
+              triggerDownstreamJob ('RAN-PhySim-Cluster-5G', 'PhySim-Cluster-5G')
             }
           }
           post {
@@ -277,7 +277,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                physim5GStatus = finalizeSlaveJob('RAN-PhySim-Cluster-5G')
+                physim5GStatus = finalizeDownstreamJob('RAN-PhySim-Cluster-5G')
               }
             }
             failure {
@@ -292,7 +292,7 @@ pipeline {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-PhySim-GraceHopper-5G', 'PhySim-GraceHopper-5G')
+              triggerDownstreamJob ('RAN-PhySim-GraceHopper-5G', 'PhySim-GraceHopper-5G')
             }
           }
           post {
@@ -300,7 +300,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                physimGH5GStatus = finalizeSlaveJob('RAN-PhySim-GraceHopper-5G')
+                physimGH5GStatus = finalizeDownstreamJob('RAN-PhySim-GraceHopper-5G')
               }
             }
             failure {
@@ -315,7 +315,7 @@ pipeline {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-Channel-Simulation', 'Channel-Simulation')
+              triggerDownstreamJob ('RAN-Channel-Simulation', 'Channel-Simulation')
             }
           }
           post {
@@ -323,7 +323,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                channelSimStatus = finalizeSlaveJob('RAN-Channel-Simulation')
+                channelSimStatus = finalizeDownstreamJob('RAN-Channel-Simulation')
               }
             }
             failure {
@@ -338,7 +338,7 @@ pipeline {
           when { expression {do4Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-PhySim-Cluster-4G', 'PhySim-Cluster-4G')
+              triggerDownstreamJob ('RAN-PhySim-Cluster-4G', 'PhySim-Cluster-4G')
             }
           }
           post {
@@ -346,7 +346,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                physim4GStatus = finalizeSlaveJob('RAN-PhySim-Cluster-4G')
+                physim4GStatus = finalizeDownstreamJob('RAN-PhySim-Cluster-4G')
               }
             }
             failure {
@@ -361,7 +361,7 @@ pipeline {
           when { expression {do4Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-RF-Sim-Test-4G', 'RF-Sim-Test-4G')
+              triggerDownstreamJob ('RAN-RF-Sim-Test-4G', 'RF-Sim-Test-4G')
             }
           }
           post {
@@ -369,7 +369,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                rfSim4GStatus = finalizeSlaveJob('RAN-RF-Sim-Test-4G')
+                rfSim4GStatus = finalizeDownstreamJob('RAN-RF-Sim-Test-4G')
               }
             }
             failure {
@@ -384,7 +384,7 @@ pipeline {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-VRT-Sim-Test-5G', 'VRT-Sim-Test-5G')
+              triggerDownstreamJob ('RAN-VRT-Sim-Test-5G', 'VRT-Sim-Test-5G')
             }
           }
           post {
@@ -392,7 +392,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                vrtSim5GStatus = finalizeSlaveJob('RAN-VRT-Sim-Test-5G')
+                vrtSim5GStatus = finalizeDownstreamJob('RAN-VRT-Sim-Test-5G')
               }
             }
             failure {
@@ -407,7 +407,7 @@ pipeline {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-RF-Sim-Test-5G', 'RF-Sim-Test-5G')
+              triggerDownstreamJob ('RAN-RF-Sim-Test-5G', 'RF-Sim-Test-5G')
             }
           }
           post {
@@ -415,7 +415,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                rfSim5GStatus = finalizeSlaveJob('RAN-RF-Sim-Test-5G')
+                rfSim5GStatus = finalizeDownstreamJob('RAN-RF-Sim-Test-5G')
               }
             }
             failure {
@@ -430,7 +430,7 @@ pipeline {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
             script {
-              triggerSlaveJob ('OAI-FLEXRIC-RAN-Integration-Test', 'OAI-FLEXRIC-RAN-Integration-Test')
+              triggerDownstreamJob ('OAI-FLEXRIC-RAN-Integration-Test', 'OAI-FLEXRIC-RAN-Integration-Test')
             }
           }
           post {
@@ -438,7 +438,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                flexricRAN5GStatus = finalizeSlaveJob('OAI-FLEXRIC-RAN-Integration-Test')
+                flexricRAN5GStatus = finalizeDownstreamJob('OAI-FLEXRIC-RAN-Integration-Test')
               }
             }
             failure {
@@ -453,7 +453,7 @@ pipeline {
           when { expression {do4Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-L2-Sim-Test-4G', 'L2-Sim-Test-4G')
+              triggerDownstreamJob ('RAN-L2-Sim-Test-4G', 'L2-Sim-Test-4G')
             }
           }
           post {
@@ -461,7 +461,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                l2Sim4GStatus = finalizeSlaveJob('RAN-L2-Sim-Test-4G')
+                l2Sim4GStatus = finalizeDownstreamJob('RAN-L2-Sim-Test-4G')
               }
             }
             failure {
@@ -476,7 +476,7 @@ pipeline {
           when { expression {do4Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-LTE-FDD-LTEBOX-Container', 'LTE-FDD-LTEBOX-Container')
+              triggerDownstreamJob ('RAN-LTE-FDD-LTEBOX-Container', 'LTE-FDD-LTEBOX-Container')
             }
           }
           post {
@@ -484,7 +484,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                lteTDDB200Status = finalizeSlaveJob('RAN-LTE-FDD-LTEBOX-Container')
+                lteTDDB200Status = finalizeDownstreamJob('RAN-LTE-FDD-LTEBOX-Container')
               }
             }
             failure {
@@ -500,7 +500,7 @@ pipeline {
           when { expression {do4Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-LTE-FDD-OAIUE-OAICN4G-Container', 'LTE-FDD-OAIUE-OAICN4G-Container')
+              triggerDownstreamJob ('RAN-LTE-FDD-OAIUE-OAICN4G-Container', 'LTE-FDD-OAIUE-OAICN4G-Container')
             }
           }
           post {
@@ -508,7 +508,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                lteFDDB200OAIUEStatus = finalizeSlaveJob('RAN-LTE-FDD-OAIUE-OAICN4G-Container')
+                lteFDDB200OAIUEStatus = finalizeDownstreamJob('RAN-LTE-FDD-OAIUE-OAICN4G-Container')
               }
             }
             failure {
@@ -523,7 +523,7 @@ pipeline {
           when { expression {do4Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-LTE-TDD-LTEBOX-Container', 'LTE-TDD-LTEBOX-Container')
+              triggerDownstreamJob ('RAN-LTE-TDD-LTEBOX-Container', 'LTE-TDD-LTEBOX-Container')
             }
           }
           post {
@@ -531,7 +531,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                lteFDDB200Status = finalizeSlaveJob('RAN-LTE-TDD-LTEBOX-Container')
+                lteFDDB200Status = finalizeDownstreamJob('RAN-LTE-TDD-LTEBOX-Container')
               }
             }
             failure {
@@ -546,7 +546,7 @@ pipeline {
           when { expression {do4Gtest || do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-NSA-B200-Module-LTEBOX-Container', 'NSA-B200-Module-LTEBOX-Container')
+              triggerDownstreamJob ('RAN-NSA-B200-Module-LTEBOX-Container', 'NSA-B200-Module-LTEBOX-Container')
             }
           }
           post {
@@ -554,7 +554,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                nsaTDDB200Status = finalizeSlaveJob('RAN-NSA-B200-Module-LTEBOX-Container')
+                nsaTDDB200Status = finalizeDownstreamJob('RAN-NSA-B200-Module-LTEBOX-Container')
               }
             }
             failure {
@@ -569,7 +569,7 @@ pipeline {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-B200-Module-SABOX-Container', 'SA-B200-Module-SABOX-Container')
+              triggerDownstreamJob ('RAN-SA-B200-Module-SABOX-Container', 'SA-B200-Module-SABOX-Container')
             }
           }
           post {
@@ -577,7 +577,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saTDDB200Status = finalizeSlaveJob('RAN-SA-B200-Module-SABOX-Container')
+                saTDDB200Status = finalizeDownstreamJob('RAN-SA-B200-Module-SABOX-Container')
               }
             }
             failure {
@@ -592,7 +592,7 @@ pipeline {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-gNB-N300-Timing-Phytest-LDPC', 'gNB-N300-Timing-Phytest-LDPC')
+              triggerDownstreamJob ('RAN-gNB-N300-Timing-Phytest-LDPC', 'gNB-N300-Timing-Phytest-LDPC')
             }
           }
           post {
@@ -600,7 +600,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                phytestLDPCoffloadStatus = finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
+                phytestLDPCoffloadStatus = finalizeDownstreamJob('RAN-gNB-N300-Timing-Phytest-LDPC')
               }
             }
             failure {
@@ -615,7 +615,7 @@ pipeline {
           when { expression {do4Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-LTE-TDD-2x2-Container', 'LTE-TDD-2x2-Container')
+              triggerDownstreamJob ('RAN-LTE-TDD-2x2-Container', 'LTE-TDD-2x2-Container')
             }
           }
           post {
@@ -623,7 +623,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                lteTDD2x2N3xxStatus = finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
+                lteTDD2x2N3xxStatus = finalizeDownstreamJob('RAN-LTE-TDD-2x2-Container')
               }
             }
             failure {
@@ -638,7 +638,7 @@ pipeline {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-AW2S-CN5G', 'SA-AW2S-CN5G')
+              triggerDownstreamJob ('RAN-SA-AW2S-CN5G', 'SA-AW2S-CN5G')
             }
           }
           post {
@@ -646,7 +646,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saAW2SStatus = finalizeSlaveJob('RAN-SA-AW2S-CN5G')
+                saAW2SStatus = finalizeDownstreamJob('RAN-SA-AW2S-CN5G')
               }
             }
             failure {
@@ -661,7 +661,7 @@ pipeline {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerCN5GSlaveJob ('OAI-CN5G-COTS-UE-Test', 'OAI-CN5G-COTS-UE-Test')
+              triggerCN5GDownstreamJob ('OAI-CN5G-COTS-UE-Test', 'OAI-CN5G-COTS-UE-Test')
             }
           }
           post {
@@ -669,7 +669,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                cn5gCOTSUESanityCheck = finalizeSlaveJob('OAI-CN5G-COTS-UE-Test')
+                cn5gCOTSUESanityCheck = finalizeDownstreamJob('OAI-CN5G-COTS-UE-Test')
               }
             }
             failure {
@@ -684,7 +684,7 @@ pipeline {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-AERIAL-CN5G', 'SA-AERIAL-CN5G')
+              triggerDownstreamJob ('RAN-SA-AERIAL-CN5G', 'SA-AERIAL-CN5G')
             }
           }
           post {
@@ -692,7 +692,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saAERIALStatus = finalizeSlaveJob('RAN-SA-AERIAL-CN5G')
+                saAERIALStatus = finalizeDownstreamJob('RAN-SA-AERIAL-CN5G')
               }
             }
             failure {
@@ -707,7 +707,7 @@ pipeline {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-Multi-Antenna-CN5G', 'SA-Multi-Antenna-CN5G')
+              triggerDownstreamJob ('RAN-SA-Multi-Antenna-CN5G', 'SA-Multi-Antenna-CN5G')
             }
           }
           post {
@@ -715,7 +715,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saMultiAntennaStatus = finalizeSlaveJob('RAN-SA-Multi-Antenna-CN5G')
+                saMultiAntennaStatus = finalizeDownstreamJob('RAN-SA-Multi-Antenna-CN5G')
               }
             }
             failure {
@@ -730,7 +730,7 @@ pipeline {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-FHI72-CN5G', 'SA-FHI72-CN5G')
+              triggerDownstreamJob ('RAN-SA-FHI72-CN5G', 'SA-FHI72-CN5G')
             }
           }
           post {
@@ -738,7 +738,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saFHI72Status = finalizeSlaveJob('RAN-SA-FHI72-CN5G')
+                saFHI72Status = finalizeDownstreamJob('RAN-SA-FHI72-CN5G')
               }
             }
             failure {
@@ -753,7 +753,7 @@ pipeline {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-FHI72-MPLANE-CN5G', 'SA-FHI72-MPLANE-CN5G')
+              triggerDownstreamJob ('RAN-SA-FHI72-MPLANE-CN5G', 'SA-FHI72-MPLANE-CN5G')
             }
           }
           post {
@@ -761,7 +761,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saFHI72MplaneStatus = finalizeSlaveJob('RAN-SA-FHI72-MPLANE-CN5G')
+                saFHI72MplaneStatus = finalizeDownstreamJob('RAN-SA-FHI72-MPLANE-CN5G')
               }
             }
             failure {
@@ -776,7 +776,7 @@ pipeline {
           when { expression {do5Gtest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-Handover-CN5G', 'SA-Handover-CN5G')
+              triggerDownstreamJob ('RAN-SA-Handover-CN5G', 'SA-Handover-CN5G')
             }
           }
           post {
@@ -784,7 +784,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saHandoverStatus = finalizeSlaveJob('RAN-SA-Handover-CN5G')
+                saHandoverStatus = finalizeDownstreamJob('RAN-SA-Handover-CN5G')
               }
             }
             failure {
@@ -799,7 +799,7 @@ pipeline {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-AERIAL-OAIUE-CN5G', 'SA-AERIAL-OAIUE-CN5G')
+              triggerDownstreamJob ('RAN-SA-AERIAL-OAIUE-CN5G', 'SA-AERIAL-OAIUE-CN5G')
             }
           }
           post {
@@ -807,7 +807,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saAERIALOAIUEStatus = finalizeSlaveJob('RAN-SA-AERIAL-OAIUE-CN5G')
+                saAERIALOAIUEStatus = finalizeDownstreamJob('RAN-SA-AERIAL-OAIUE-CN5G')
               }
             }
             failure {
@@ -822,7 +822,7 @@ pipeline {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
             script {
-              triggerSlaveJob ('RAN-SA-OAIUE-CN5G', 'SA-OAIUE-CN5G')
+              triggerDownstreamJob ('RAN-SA-OAIUE-CN5G', 'SA-OAIUE-CN5G')
             }
           }
           post {
@@ -830,7 +830,7 @@ pipeline {
               script {
                 // Using a unique variable name for each test stage to avoid overwriting on a global variable
                 // due to parallel-time concurrency
-                saOAIUEStatus = finalizeSlaveJob('RAN-SA-OAIUE-CN5G')
+                saOAIUEStatus = finalizeDownstreamJob('RAN-SA-OAIUE-CN5G')
               }
             }
             failure {
@@ -871,28 +871,23 @@ pipeline {
 
 // ----  Slave Job functions
 
-def triggerSlaveJob (jobName, gitlabStatusName) {
+def triggerDownstreamJob (jobName, gitlabStatusName) {
   def MR_NUMBER = "MERGE".equals(env.gitlabActionType) ? env.gitlabMergeRequestIid : 'develop'
   // Workaround for the "cancelled" GitLab pipeline notification
-  // The slave job is triggered with the propagate false so the following commands are executed
+  // The downstream job is triggered with the propagate false so the following commands are executed
   // Its status is now PASS/SUCCESS from a stage pipeline point of view
   // localStatus variable MUST be analyzed to properly assess the status
   def localStatus = build job: jobName,
     parameters: [
-      string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-      string(name: 'targetRepo', value: String.valueOf(GIT_URL)),
-      string(name: 'SourceRepo', value: String.valueOf(env.gitlabSourceRepoHttpUrl)),
+      string(name: 'targetRepo', value: String.valueOf(env.gitlabTargetRepoHttpUrl)),
       string(name: 'sourceRepo', value: String.valueOf(env.gitlabSourceRepoHttpUrl)),
-      string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
       string(name: 'sourceBranch', value: String.valueOf(env.gitlabSourceBranch)),
-      string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
       string(name: 'sourceCommit', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
-      string(name: 'eNB_MR', value: String.valueOf(MR_NUMBER)),
       string(name: 'requestNumber', value: String.valueOf(MR_NUMBER)),
-      booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
       booleanParam(name: 'mergeWithTarget', value: "MERGE".equals(env.gitlabActionType)),
-      string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch)),
-      string(name: 'targetBranch', value: String.valueOf(env.gitlabTargetBranch))
+      string(name: 'targetBranch', value: String.valueOf(env.gitlabTargetBranch)),
+      string(name: 'repository', value: String.valueOf(params.ciRepositoryURL)),
+      string(name: 'branch', value: "${env.gitlabSourceBranch.replace('/', '-')}-${env.gitlabMergeRequestLastCommit}")
     ], propagate: false
   def localResult = localStatus.getResult()
   echo "${jobName} Slave Job status is ${localResult}"
@@ -905,18 +900,14 @@ def triggerSlaveJob (jobName, gitlabStatusName) {
   }
 }
 
-def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
+def triggerCN5GDownstreamJob (jobName, gitlabStatusName) {
   if ("MERGE".equals(env.gitlabActionType)) {
-    shaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%H" ' + env.gitlabMergeRequestLastCommit
-    shaOne = shaOne.trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shaOne
+    fullRanTag = OAI_Registry + '/oai-gnb:' + "${env.gitlabSourceBranch.replace('/', '-')}-${env.gitlabMergeRequestLastCommit}"
   } else {
-    shaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%H" ' + env.GIT_COMMIT
-    shaOne = shaOne.trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + shaOne
+    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + env.GIT_COMMIT
   }
   // Workaround for the "cancelled" GitLab pipeline notification
-  // The slave job is triggered with the propagate false so the following commands are executed
+  // The downstream job is triggered with the propagate false so the following commands are executed
   // Its status is now PASS/SUCCESS from a stage pipeline point of view
   // localStatus variable MUST be analyzed to properly assess the status
   def localStatus = build job: jobName,
@@ -934,10 +925,10 @@ def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
   }
 }
 
-def finalizeSlaveJob(jobName) {
+def finalizeDownstreamJob(jobName) {
   lock ('Parent-Lock') {
     // In case of any non-success, we are retrieving the HTML report of the last completed
-    // slave job. The only drop-back is that we may retrieve the HTML report of a previous build
+    // downstream job. The only drop-back is that we may retrieve the HTML report of a previous build
     if (jobName == 'OAI-CN5G-COTS-UE-Test') {
       fileName = "test_results_oai_cn5g_cots_ue.html"
     } else {
@@ -947,7 +938,8 @@ def finalizeSlaveJob(jobName) {
     if (!fileExists(fileName)) {
       copyArtifacts(projectName: jobName,
         filter: 'test_results*.html',
-        selector: lastCompleted())
+        selector: lastCompleted(),
+        optional: true)
       if (fileExists(fileName)) {
         sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${env.JOB_TIMESTAMP}#' ${fileName}"
       } else {

ci-scripts/Jenkinsfile-push-local-repo

@@ -77,15 +77,11 @@ pipeline {
         }
       }
     }
-    stage('Create temporary branch for CI') {
+    stage('Create testing branch for CI') {
       steps {
-        script {
-          env.NEW_BRANCH = "${params.sourceBranch}-${params.sourceCommit}"
-          echo "New branch: ${env.NEW_BRANCH}"
-        }
         sh """
           # Checkout source commit
-          git checkout -B ${env.NEW_BRANCH} ${params.sourceCommit}
+          git checkout -B ${params.branch} ${params.sourceCommit}
         """
       }
     }
@@ -93,7 +89,7 @@ pipeline {
       when { expression { return params.mergeWithTarget } }
       steps {
         sh """
-          echo "Merging target branch ${params.targetBranch} into source branch ${env.NEW_BRANCH}"
+          echo "Merging target branch ${params.targetBranch} into source branch ${params.branch}"
           if ! git merge --ff target/${params.targetBranch} \
             -m "Merge ${params.targetBranch} into ${params.sourceBranch} for CI"; then
             echo "Merge conflicts detected. Aborting."
@@ -106,9 +102,9 @@ pipeline {
     stage('Push merged branch to internal repository') {
       steps {
         sh """
-          git remote add internal-repo ${internalRepoURL} || true
-          echo "Pushing ${env.NEW_BRANCH} to internal repo"
-          git push --force internal-repo ${env.NEW_BRANCH}
+          git remote add internal-repo ${params.repository} || true
+          echo "Pushing ${params.branch} to internal repo"
+          git push --force internal-repo ${params.branch}
         """
       }
     }

ci-scripts/Jenkinsfile-push-registry

@@ -82,12 +82,6 @@ pipeline {
               }
               sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:develop-${WEEK_SHA} || true"
             }
-            // Proxy is not following the same pattern.
-            sh "docker image tag proxy:develop ${DH_Account}/proxy:develop"
-            sh "docker image tag proxy:develop ${DH_Account}/proxy:${WEEK_TAG}"
-            sh "docker push --quiet ${DH_Account}/proxy:develop"
-            sh "docker push --quiet ${DH_Account}/proxy:${WEEK_TAG}"
-            sh "docker rmi ${DH_Account}/proxy:develop ${DH_Account}/proxy:${WEEK_TAG}"
             // Logging out on both registries
             sh "docker logout ${OAI_Registry} > /dev/null 2>&1"
             sh "docker logout > /dev/null 2>&1"

ci-scripts/Jenkinsfile-scheduled-run

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

ci-scripts/args_parse.py

@@ -44,11 +44,8 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
         elif re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
             mode = matchReg.group(1)
-        elif re.match(r'^\-\-repository=(.+)$|^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-repository=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-repository=(.+)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match(r'^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match(r'^\-\-repository=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-repository=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.repository = matchReg.group(1)
             RAN.repository=matchReg.group(1)
             HTML.repository=matchReg.group(1)
@@ -61,27 +58,15 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
                 RAN.merge=True
                 CONTAINERS.merge=True
                 CLUSTER.merge=True
-        elif re.match(r'^\-\-branch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match(r'^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.branch = matchReg.group(1)
             RAN.branch=matchReg.group(1)
             HTML.branch=matchReg.group(1)
             CONTAINERS.branch=matchReg.group(1)
             CLUSTER.branch=matchReg.group(1)
-        elif re.match(r'^\-\-commitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-commitID=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-commitID=(.*)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match(r'^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
-            HTML.commitID=matchReg.group(1)
-        elif re.match(r'^\-\-targetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match(r'^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
+        elif re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE)
             RAN.targetBranch=matchReg.group(1)
             CONTAINERS.targetBranch=matchReg.group(1)
             CLUSTER.targetBranch=matchReg.group(1)

ci-scripts/checkCodingFormattingRules.sh

@@ -55,8 +55,9 @@ then
        IS_OAI_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: LicenseRef-CSSL-1.0" $FILE || true`
        IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FILE || true`
        IS_MIT_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: MIT" $FILE || true`
+       IS_APACHE_LICENSE_PRESENT=`grep -E -c "SPDX-License-Identifier: Apache-2.0" $FILE || true`
        IS_EXCEPTION=`echo $FILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`
-       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ] && [ $IS_APACHE_LICENSE_PRESENT -eq 0 ]
        then
            if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
            then
@@ -166,8 +167,9 @@ do
             IS_OAI_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: LicenseRef-CSSL-1.0" $FULLFILE || true`
             IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FULLFILE || true`
             IS_MIT_LICENCE_PRESENT=`grep -E -c "SPDX-License-Identifier: MIT" $FULLFILE || true`
+            IS_APACHE_LICENSE_PRESENT=`grep -E -c "SPDX-License-Identifier: Apache-2.0" $FULLFILE || true`
             IS_EXCEPTION=`echo $FULLFILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`
-            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ] && [ $IS_APACHE_LICENSE_PRESENT -eq 0 ]
             then
                 if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
                 then

ci-scripts/ci_infra.yaml

@@ -44,6 +44,14 @@ up2-aerial:
   IF: wwan0
   MTU: 1500
 
+up3:
+  Host: up3
+  AttachScript: /opt/mbim/start_quectel_mbim.sh
+  DetachScript: /opt/mbim/stop_quectel_mbim.sh
+  NetworkScript: ip a show dev wwan0
+  IF: wwan0
+  MTU: 1500
+
 adb_ue_1:
   Host: nano
   InitScript: /home/oaicicd/ci_ctl_adb.sh initialize R3CM40LZPHT
@@ -117,6 +125,19 @@ oc-cn5g-00104:
   Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-00104 oaicicd-core-for-nvidia-aerial"
   LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-00104 oaicicd-core-for-nvidia-aerial %%log_dir%%"
 
+oc-cn5g-20897-stonechat:
+  Host: stonechat
+  NetworkScript: echo "inet 172.21.6.105"
+  RunIperf3Server: False
+  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
+  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
+  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72  %%log_dir%%"
+
+oc-cn5g-20899-always-on:
+  Host: stonechat
+  NetworkScript: echo "inet 172.21.6.12"
+  RunIperf3Server: False
+
 matix-cn5g:
   Host: matix
   NetworkScript: docker exec prod-trf-gen ip a show dev eth0

ci-scripts/cls_containerize.py

@@ -29,7 +29,7 @@ from cls_ci_helper import archiveArtifact
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72', 'oai-gnb-fhi72-t2']
 DEFAULT_REGISTRY = "gracehopper3-oai.sboai.cs.eurecom.fr"
 
 def CreateWorkspace(host, sourcePath, repository, branch):
@@ -55,7 +55,7 @@ def AnalyzeBuildLogs(image, lf):
 			committed = committed or lineHasCommit
 			if re.search(r'error:|Errors|ERROR', line):
 				errors.append(f"=> {line.strip()}")
-	status = (committed or tagged)
+	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)
@@ -178,20 +178,9 @@ class Containerize():
 	
 		dockerfileprefix = '.ubuntu'
 
-		baseImage = 'ran-base'
-		baseTag = 'develop'
-		buildImage = 'ran-build'
-		forceBaseImageBuild = False
-		imageTag = 'develop'
-
-		result = re.search('native_cuda_armv8', self.imageKind)
-		if result is not None:
-			baseImage = 'ran-base-cuda'
-			buildImage = 'ran-build-cuda'
-			dockerfileprefix = '.cuda.ubuntu'
 		# we always build the ran-build image with all targets
 		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
-		imageNames = [(buildImage, 'build', f'{buildImage}', '')]
+		imageNames = [('ran-build', 'build', 'ran-build', '')]
 		result = re.search('eNB', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
@@ -231,13 +220,17 @@ class Containerize():
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
 			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
 			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
-		result = re.search('native_cuda_armv8', self.imageKind)
+		result = re.search('fhi72-t2', self.imageKind)
 		if result is not None:
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
+			imageNames.append(('ran-build-fhi72-t2', 'build.fhi72.t2', 'ran-build-fhi72-t2', ''))
+			imageNames.append(('oai-gnb', 'gNB.fhi72.t2', 'oai-gnb-fhi72-t2', ''))
 
 		cmd.cd(lSourcePath)
 
+		baseImage = 'ran-base'
+		baseTag = 'develop'
+		forceBaseImageBuild = False
+		imageTag = 'develop'
 		if (self.merge):
 			imageTag = 'ci-temp'
 			if self.targetBranch == 'develop':
@@ -265,17 +258,17 @@ class Containerize():
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
 			cmd.run(f"docker image rm {baseImage}:{baseTag}")
-			logfile = f'{lSourcePath}/cmake_targets/log/{baseImage}.docker.log'
+			logfile = f'{lSourcePath}/cmake_targets/log/ran-base.docker.log'
 			option = f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
 			cmd.run(f"docker build --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{dockerfileprefix} {option} . &> {logfile}", timeout=1600)
-			t = (baseImage, archiveArtifact(cmd, ctx, logfile))
+			t = ("ran-base", archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 
+		# First verify if the base image was properly created.
 		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
-
 		allImagesSize = {}
 		if ret.returncode != 0:
-			logging.error(f'\u001B[1m Could not build properly {baseImage}\u001B[0m')
+			logging.error('\u001B[1m Could not build properly ran-base\u001B[0m')
 			# Recover the name of the failed container?
 			cmd.run(f"docker ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty docker rm -f")
 			cmd.run(f"docker image prune --force")
@@ -288,10 +281,10 @@ class Containerize():
 			if result is not None:
 				size = float(result.group("size")) / 1000000
 				imageSizeStr = f'{size:.1f}'
-				logging.debug(f'\u001B[1m {baseImage} size is {imageSizeStr} Mbytes\u001B[0m')
-				allImagesSize[baseImage] = f'{imageSizeStr} Mbytes'
+				logging.debug(f'\u001B[1m   ran-base size is {imageSizeStr} Mbytes\u001B[0m')
+				allImagesSize['ran-base'] = f'{imageSizeStr} Mbytes'
 			else:
-				logging.debug(f'{baseImage} size is unknown')
+				logging.debug('ran-base size is unknown')
 
 		# Build the target image(s)
 		status = True
@@ -302,13 +295,17 @@ class Containerize():
 			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			# target images should use the proper ran-build image
 			if image != 'ran-build' and "-asan" in name:
-				cmd.run(f'sed -i -e "s#{buildImage}:latest#{buildImage}-asan:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
+				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			elif "fhi72" in name or name == "oai-nr-oru":
 				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			elif image != 'ran-build':
-				cmd.run(f'sed -i -e "s#{buildImage}:latest#{buildImage}:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
+				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
 				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2026.01.07.tar.gz .')
+			if image == 'ran-build-fhi72-t2':
+				cmd.run('cp -f /opt/t2-patch/AMD-T2-SDFEC_25-03-1.patch .')
+			if name == 'oai-gnb-fhi72-t2':
+				cmd.run(f'sed -i -e "s#ran-build-fhi72-t2:latest#ran-build-fhi72-t2:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
 			option = option + f" --build-arg UBUNTU_IMAGE={DEFAULT_REGISTRY}/{ubuntuImage}"
 			ret = cmd.run(f'docker build --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
@@ -316,6 +313,8 @@ class Containerize():
 			log_files.append(t)
 			if image == 'oai-gnb-aerial':
 				cmd.run('rm -f nvipc_src.2026.01.07.tar.gz')
+			if image == 'ran-build-fhi72-t2':
+				cmd.run('rm -f AMD-T2-SDFEC_25-03-1.patch')
 			# check the status of the build
 			ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:

ci-scripts/cls_oai_html.py

@@ -35,7 +35,6 @@ class HTMLManagement():
 
 		self.repository = ''
 		self.branch = ''
-		self.commitID = ''
 
 		self.nbTestXMLfiles = 0
 		self.htmlTabRefs = []
@@ -100,7 +99,13 @@ class HTMLManagement():
 			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Test Branch </td>\n')
 			self.htmlFile.write('       <td>' + self.branch + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
-			commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.commitID, shell=True, universal_newlines=True)
+			commit_id = subprocess.check_output("git log -n1 --pretty=format:\"%H\" ", shell=True, universal_newlines=True)
+			commit_id = commit_id.strip()
+			self.htmlFile.write('     <tr>\n')
+			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
+			self.htmlFile.write('       <td>' + commit_id + '</td>\n')
+			self.htmlFile.write('     </tr>\n')
+			commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" ", shell=True, universal_newlines=True)
 			commit_message = commit_message.strip()
 			self.htmlFile.write('     <tr>\n')
 			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')

ci-scripts/cls_oaicitest.py

@@ -276,6 +276,38 @@ def Deploy_Physim(ctx, HTML, node, workdir, script, options):
 		logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
 	return test_status
 
+def DeployWithScript(HTML, node, script, options, tag):
+	logging.debug(f'Deploy with script {script} on node: {node}')
+	opt = options.replace('%%image_tag%%', tag)
+	with cls_cmd.getConnection(node) as c:
+		ret = c.exec_script(script, 600, opt)
+	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
+	HTML.CreateHtmlTestRowQueue(f'on node {node}', 'OK' if ret.returncode == 0 else 'KO', [f'{ret.stdout}'])
+	return ret.returncode == 0
+
+def UndeployWithScript(HTML, ctx, node, script, options):
+	logging.debug(f'Undeploy with script {script} on node: {node}')
+	remote_dir = '/tmp/undeploy'
+	opt = options.replace('%%log_dir%%', remote_dir)
+	with cls_cmd.getConnection(node) as c:
+		# create a directory for log collection
+		c.run(f'rm -rf {remote_dir}')
+		ret = c.run(f'mkdir {remote_dir}')
+		if ret.returncode != 0:
+			logging.error("cannot create directory for log collection")
+			return False
+		ret = c.exec_script(script, 600, opt)
+		logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
+		ret_ls = c.run(f'ls -1 {remote_dir}')
+		files = ret_ls.stdout.strip().splitlines()
+		log_files = []
+		for lf in files:
+			name = archiveArtifact(c, ctx, f'{remote_dir}/{lf}')
+			log_files.append(name)
+	msg = "Log files:\n" + "\n".join([os.path.basename(lf) for lf in log_files])
+	HTML.CreateHtmlTestRowQueue(f'on node {node}', 'OK' if ret.returncode == 0 else 'KO', [f'{ret.stdout}\n\n{msg}'])
+	return ret.returncode == 0
+
 #-----------------------------------------------------------
 # OaiCiTest Class Definition
 #-----------------------------------------------------------

ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf

@@ -48,8 +48,6 @@ gNBs =
         dl_carrierBandwidth                                            = 52;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 14025; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                  = 0;
@@ -70,7 +68,6 @@ gNBs =
       pMax                                                             = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                               = 14025;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                  = 0;

ci-scripts/conf_files/gnb-du.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf

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

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

@@ -47,8 +47,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -68,7 +66,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

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

@@ -25,7 +25,7 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime = 2;
-    do_SRS       = 1;
+    do_SRS       = "periodic";
 
     servingCellConfigCommon = (
     {
@@ -46,7 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        initialDLBWPlocationAndBandwidth                               = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -66,7 +65,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;
@@ -147,11 +145,9 @@ gNBs =
 
   );
 
-    first_active_bwp = 1;
     bwp_list = (
-      { scs = 1; bwpStart = 0; bwpSize = 106;},
-      { scs = 1; bwpStart = 0; bwpSize = 36;},
-      { scs = 1; bwpStart = 40; bwpSize = 50;}
+      { scs = 1; bwpStart = 0; bwpSize = 36; bwpId = 2;},
+      { scs = 1; bwpStart = 40; bwpSize = 50; bwpId = 3;}
     );
 
     # ------- SCTP definitions

ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-benetel550.conf

@@ -0,0 +1,245 @@
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+Active_gNBs = ( "gNB-OAI-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_DU_ID =  0xe00;
+    gNB_name  =  "gNB-OAI-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
+
+    nr_cellid = 1;
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2; 
+    pdsch_AntennaPorts_N1 = 2;
+    pusch_AntennaPorts    = 4;
+    do_CSIRS              = 1;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 1;
+     # n_TimingAdvanceOffset                                         = 0;
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      absoluteFrequencySSB = 663360;
+      dl_frequencyBand     = 77;
+      dl_absoluteFrequencyPointA = 660084;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 273;
+     #initialDownlinkBWP
+      #genericParameters
+       #
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                               = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                          = 10;
+        initialDLBWPsearchSpaceZero                                 = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 77;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 273;
+      pMax                                                          = 23;
+     #initialUplinkBWP
+      #genericParameters
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 159;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 0;
+          preambleReceivedTargetPower                               = -100;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 8;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 3;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
+        msg3_DeltaPreamble                                          = 2;
+        p0_NominalWithGrant                                         = -96;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 0;
+        p0_nominal                                                  = -96;
+      ssb_PositionsInBurst_Bitmap                                   = 0x1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 3;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 1;
+      nrofUplinkSymbols                                             = 4;
+
+  ssPBCH_BlockPower                                                 = -11;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+
+MACRLCs = (
+{
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "f1";
+  local_n_address             = "172.21.10.20";
+  remote_n_address            = "172.21.6.112";
+  local_n_portd               = 2153;
+  remote_n_portd              = 2153;
+  pusch_TargetSNRx10          = 250;
+  pucch_TargetSNRx10          = 220;
+  pusch_FailureThres          = 100;
+  dl_min_mcs                  = 20;
+}
+);
+
+L1s = (
+{
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 100;
+  pucch0_dtx_threshold = 10;
+  pusch_dtx_threshold = 10;
+  max_ldpc_iterations = 15;
+  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
+  L1_rx_thread_core = 10;
+  L1_tx_thread_core = 11; # relevant after merge of l1_tx_thread
+  phase_compensation = 0; # needs to match O-RU configuration
+}
+);
+
+RUs = (
+{
+  local_rf       = "no";
+  nb_tx          = 4;
+  nb_rx          = 4;
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [77];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  ru_thread_core = 12;
+  sl_ahead       = 5;
+  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
+  do_precoding = 0; # needs to match O-RU configuration
+  
+}
+);
+
+log_config :
+{
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="info";
+  f1ap_log_level                        ="info";
+};
+
+fhi_72 = {
+  dpdk_devices = ("0000:41:11.0", "0000:41:11.1");
+  system_core = 7;
+  io_core = 8;
+  worker_cores = (9);
+  dpdk_iova_mode = "VA";
+  ru_addr = ("8c:1f:64:d1:11:c0","8c:1f:64:d1:11:c0");
+  mtu = 9216; # check if xran uses this properly
+  file_prefix = "fhi_72";
+  fh_config = ({
+    T1a_cp_dl = (419, 470);
+    T1a_cp_ul = (285, 336);
+    T1a_up = (294, 345);
+    Ta4 = (0, 200);
+    ru_config = {
+      iq_width = 9;
+      iq_width_prach = 9;
+    };
+  });
+};
+
+nrLDPC_coding_aal : {
+  dpdk_dev : "0000:01:00.0";
+  dpdk_core_list : "18-19";
+  is_t2 : 1;
+};

ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-liteon.conf

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

ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.4x4-4L-metanoia.conf

@@ -0,0 +1,228 @@
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+Active_gNBs = ( "gNB-OAI-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_DU_ID =  0xe00;
+    gNB_name  =  "gNB-OAI-DU";
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
+    nr_cellid = 1;
+
+    ////////// Physical parameters:
+    pdsch_AntennaPorts_XP = 2;
+    pusch_AntennaPorts    = 4;
+    pdsch_AntennaPorts_N1 = 2;
+    maxMIMO_layers        = 4;
+    do_CSIRS              = 1;
+    do_SRS                = "periodic";
+
+    servingCellConfigCommon = (
+    {
+#spCellConfigCommon
+      physCellId                                                    = 0;
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741)
+      absoluteFrequencySSB                                          = 649920;
+      dl_frequencyBand                                              = 78;
+      # this is 3300.24 MHz
+      dl_absoluteFrequencyPointA                                    = 646724;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 273;
+     #initialDownlinkBWP
+      #genericParameters
+       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                               = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                          = 12;
+        initialDLBWPsearchSpaceZero                                 = 0;
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 273;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 148;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 12;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 5;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         = -90;
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 3;
+      nrofDownlinkSymbols                                           = 8;
+      nrofUplinkSlots                                               = 1;
+      nrofUplinkSymbols                                             = 2;
+  ssPBCH_BlockPower                                                 = -11;
+  }
+  );
+
+  # ------- SCTP definitions
+  SCTP :
+  {
+    # Number of streams to use in input/output
+    SCTP_INSTREAMS  = 2;
+    SCTP_OUTSTREAMS = 2;
+  };
+
+}
+);
+
+MACRLCs = (
+{
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "f1";
+  local_n_address             = "172.21.10.20";
+  remote_n_address            = "172.21.6.112";
+  local_n_portd               = 2153;
+  remote_n_portd              = 2153;
+  pusch_TargetSNRx10          = 220;
+  pucch_TargetSNRx10          = 220;
+  pusch_FailureThres          = 100;
+  dl_min_mcs                  = 20;
+}
+);
+
+L1s = (
+{
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 130;
+  pucch0_dtx_threshold = 80;
+  pusch_dtx_threshold = 10;
+  max_ldpc_iterations = 10;
+  tx_amp_backoff_dB = 10; #9; needs to match O-RU configuration # JF important to check
+  L1_rx_thread_core = 11;
+  L1_tx_thread_core = 12; # relevant after merge of l1_tx_thread
+  phase_compensation = 0; # needs to match O-RU configuration # JF to be tested
+}
+);
+
+RUs = (
+{
+  local_rf       = "no";
+  nb_tx          = 4;
+  nb_rx          = 4;
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  ru_thread_core = 10;
+  sl_ahead       = 8;
+  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
+  do_precoding = 0; # needs to match O-RU configuration
+}
+);
+
+log_config :
+{
+  global_log_level                      ="info";
+};
+
+fhi_72 = {
+  dpdk_devices = ("0000:41:11.0", "0000:41:11.1");
+  dpdk_iova_mode = "VA";
+  system_core = 7;
+  io_core = 8;
+  worker_cores = (9);
+  ru_addr = ("00:E0:0C:00:AE:06", "00:E0:0C:00:AE:06");
+  mtu = 9000;
+  fh_config = ({
+    T1a_cp_dl = (285, 470);
+    T1a_cp_ul = (285, 429);
+    T1a_up = (125, 350);
+    Ta4 = (110, 180);
+    ru_config = {
+      iq_width = 9;
+      iq_width_prach = 9;
+    };
+  });
+};
+
+nrLDPC_coding_aal : {
+  dpdk_dev : "0000:01:00.0";
+  dpdk_core_list : "18-19";
+  is_t2 : 1;
+};

ci-scripts/conf_files/gnb-du.sa.band78.273prb.fhi72.8x8-benetel650_650.conf

@@ -0,0 +1,263 @@
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+Active_gNBs = ( "gNB-OAI-DU");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_DU_ID =  0xe00;
+    gNB_name  =  "gNB-OAI-DU";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ( { sst = 1; }); });
+
+    nr_cellid = 1;
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2;
+    pdsch_AntennaPorts_N1 = 4;
+    pusch_AntennaPorts    = 8;
+    do_CSIRS              = 1;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+     # n_TimingAdvanceOffset                                         = 0;
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # center frequency = 3950.4 MHz
+      # selected SSB frequency = 3950.4 MHz
+      absoluteFrequencySSB                                          = 663360;
+      dl_frequencyBand                                              = 77;
+      # frequency point A = 3901.26 MHz
+      dl_absoluteFrequencyPointA                                    = 660084;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 273;
+     #initialDownlinkBWP
+      #genericParameters
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                               = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                          = 11;
+        initialDLBWPsearchSpaceZero                                 = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 77;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 273;
+      pMax                                                          = 23;
+     #initialUplinkBWP
+      #genericParameters
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 152;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 0;
+          preambleReceivedTargetPower                               = -100;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 8;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 3;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
+        msg3_DeltaPreamble                                          = 2;
+        p0_NominalWithGrant                                         = -96;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 0;
+        p0_nominal                                                  = -96;
+
+      ssb_PositionsInBurst_Bitmap                                   = 0x1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 3;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 1;
+      nrofUplinkSymbols                                             = 4;
+
+    ssPBCH_BlockPower                                               = 0;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+  }
+);
+
+
+MACRLCs = (
+{
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "f1";
+  local_n_address             = "172.21.10.20";
+  remote_n_address            = "172.21.6.92";
+  local_n_portd               = 2153;
+  remote_n_portd              = 2153;
+  pusch_TargetSNRx10          = 220;
+  pucch_TargetSNRx10          = 200;
+  dl_bler_target_upper        = .35;
+  dl_bler_target_lower        = .15;
+  ul_bler_target_upper        = .35;
+  ul_bler_target_lower        = .15;
+  pusch_FailureThres          = 100;
+}
+);
+
+L1s = (
+{
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 100;
+  pucch0_dtx_threshold = 80;
+  pusch_dtx_threshold = 10;
+  max_ldpc_iterations = 10;
+  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
+  L1_rx_thread_core = 11;
+  L1_tx_thread_core = 12; # relevant after merge of l1_tx_thread
+  phase_compensation = 0; # needs to match O-RU configuration
+}
+);
+
+RUs = (
+{
+  local_rf       = "no";
+  nb_tx          = 8;
+  nb_rx          = 8;
+  att_tx         = 0;
+  att_rx         = 0;
+  bands          = [77];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  ru_thread_core = 10;
+  sl_ahead       = 10;
+  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
+  do_precoding   = 0; # needs to match O-RU configuration
+}
+);
+
+log_config :
+{
+  global_log_level = "info";
+  hw_log_level     = "info";
+  phy_log_level    = "info";
+  mac_log_level    = "info";
+  rlc_log_level    = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+  ngap_log_level   = "info";
+  f1ap_log_level   = "info";
+};
+
+fhi_72 = {
+  dpdk_devices = ("0000:41:11.0", "0000:41:11.1", "0000:41:11.2", "0000:41:11.3"); # two VFs can be used as well
+  dpdk_iova_mode = "VA";
+  system_core = 7;
+  io_core = 8;
+  worker_cores = (9);
+  ru_addr = ("8c:1f:64:d1:10:46","8c:1f:64:d1:10:46","8c:1f:64:d1:10:43","8c:1f:64:d1:10:43"); # if two VFs, set two RU MAC addresses (one per RU)
+  mtu = 9216;
+  fh_config = (
+# RAN650 #1
+  {
+    T1a_cp_dl = (419, 470);
+    T1a_cp_ul = (285, 336);
+    T1a_up = (294, 345);
+    Ta4 = (0, 200);
+    ru_config = {
+      iq_width = 9;
+      iq_width_prach = 9;
+    };
+  },
+# RAN650 #2
+  {
+    T1a_cp_dl = (419, 470);
+    T1a_cp_ul = (285, 336);
+    T1a_up = (294, 345);
+    Ta4 = (0, 200);
+    ru_config = {
+      iq_width = 9;
+      iq_width_prach = 9;
+    };
+  });
+};
+
+nrLDPC_coding_aal : {
+  dpdk_dev : "0000:01:00.0";
+  dpdk_core_list : "18-19";
+  is_t2 : 1;
+};

ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf

@@ -41,8 +41,6 @@ gNBs =
         dl_carrierBandwidth                                         = 51;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 1;
@@ -62,7 +60,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf

@@ -41,8 +41,6 @@ gNBs =
         dl_carrierBandwidth                                         = 51;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 1;
@@ -62,7 +60,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/gnb-pnf.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf

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

ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf

@@ -41,8 +41,6 @@ gNBs =
         dl_carrierBandwidth                                         = 25;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=25 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 0;
@@ -64,7 +62,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 0;

ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf

@@ -24,7 +24,7 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     maxMIMO_layers        = 4;
     do_CSIRS              = 1;
-    do_SRS                = 1;
+    do_SRS                = "periodic";
 
     servingCellConfigCommon = (
     {
@@ -47,9 +47,6 @@ gNBs =
         dl_carrierBandwidth                                            = 162;
      #initialDownlinkBWP
       #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                                        = 31624;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -69,7 +66,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/gnb-vnf.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf

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

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

@@ -25,7 +25,7 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = 1;
+    do_SRS                = "periodic";
     min_rxtxtime          = 2;
     uess_agg_levels       = [0, 4, 2, 1, 0];
 
@@ -51,9 +51,6 @@ gNBs =
         dl_carrierBandwidth                                         = 273;
      #initialDownlinkBWP
       #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 1;
@@ -73,7 +70,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

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

@@ -26,7 +26,7 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = 1;
+    do_SRS                = "periodic";
     min_rxtxtime          = 2;
     force_UL256qam_off    = 1;
     servingCellConfigCommon = (
@@ -50,10 +50,6 @@ gNBs =
         dl_subcarrierSpacing                                        = 1;
         dl_carrierBandwidth                                         = 273;
      #initialDownlinkBWP
-      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 1;
@@ -72,8 +68,6 @@ gNBs =
       ul_carrierBandwidth                                           = 273;
       pMax                                                          = 20;
      #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

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

@@ -24,8 +24,6 @@ gNBs =
     pdsch_AntennaPorts_XP = 2;
     pdsch_AntennaPorts_N1 = 2;
     pusch_AntennaPorts    = 2;
-    do_CSIRS              = 0;
-    do_SRS                = 0;
     min_rxtxtime          = 6;
 
     servingCellConfigCommon = (
@@ -50,9 +48,6 @@ gNBs =
         dl_carrierBandwidth                                         = 78;
      #initialDownlinkBWP
       #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 21175;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 1;
@@ -72,7 +67,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 21175;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

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

@@ -46,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=50 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 13475;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -68,7 +66,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 13475;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf

@@ -23,8 +23,6 @@ gNBs =
     pdsch_AntennaPorts_N1 = 2;
     maxMIMO_layers        = 4;
     pusch_AntennaPorts    = 4;
-    do_CSIRS              = 0;
-    do_SRS                = 0;
 
     servingCellConfigCommon = (
     {
@@ -46,8 +44,6 @@ gNBs =
         dl_carrierBandwidth                                         = 273;
      #initialDownlinkBWP
       #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 1;
@@ -66,8 +62,6 @@ gNBs =
       ul_carrierBandwidth                                           = 273;
       pMax                                                          = 23;
      #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

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

@@ -46,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf

@@ -46,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf

@@ -46,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 162;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf

@@ -48,8 +48,6 @@ gNBs =
         dl_carrierBandwidth                                            = 273;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -69,7 +67,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

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

@@ -43,8 +43,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -61,7 +59,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf

@@ -45,8 +45,6 @@ gNBs =
         dl_carrierBandwidth                                         = 25;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=25 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 0;
@@ -68,7 +66,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 0;

ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf

@@ -45,8 +45,6 @@ gNBs =
         dl_carrierBandwidth                                         = 25;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=25 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 0;
@@ -68,7 +66,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6600;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 0;

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

@@ -43,8 +43,6 @@ gNBs =
         dl_carrierBandwidth                                            = 66;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=32 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6349;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 3;
@@ -64,7 +62,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6349;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 3;
@@ -145,11 +142,6 @@ gNBs =
 
   );
 
-    first_active_bwp = 1;
-    bwp_list = (
-      { scs = 3; bwpStart = 0; bwpSize = 66;}
-    );
-
     # ------- SCTP definitions
     SCTP :
     {

ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf

@@ -43,8 +43,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
@@ -65,7 +63,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf

@@ -25,7 +25,7 @@ gNBs =
     pdsch_AntennaPorts_XP = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
-    do_SRS                = 1;
+    do_SRS                = "periodic";
     uess_agg_levels = [4,2,0,0,0];
 
     servingCellConfigCommon = (
@@ -49,9 +49,6 @@ gNBs =
         dl_carrierBandwidth                                            = 162;
      #initialDownlinkBWP
       #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                                        = 31624;
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -71,7 +68,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-4layers-vvdn.conf

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

ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf

@@ -24,7 +24,6 @@ gNBs =
     maxMIMO_layers        = 2;
     pusch_AntennaPorts    = 4;
     do_CSIRS              = 1;
-    do_SRS                = 0;
     force_UL256qam_off    = 1;
 
     servingCellConfigCommon = (
@@ -47,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                         = 273;
      #initialDownlinkBWP
       #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 1;
@@ -68,7 +65,6 @@ gNBs =
       pMax                                                          = 23;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf

@@ -23,7 +23,7 @@ gNBs = (
   pdsch_AntennaPorts_XP = 2;
   pusch_AntennaPorts    = 2;
   do_CSIRS              = 1;
-  do_SRS                = 1;
+  do_SRS                = "periodic";
 
   servingCellConfigCommon = (
   {
@@ -46,8 +46,6 @@ gNBs = (
       dl_carrierBandwidth                   = 273;
 
       # initialDownlinkBWP
-        # genericParameters
-        initialDLBWPlocationAndBandwidth                = 1099;
         # subcarrierSpacing
         # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                   = 1;
@@ -69,7 +67,6 @@ gNBs = (
 
       # initialUplinkBWP
         # genericParameters
-        initialULBWPlocationAndBandwidth                = 1099;
         # subcarrierSpacing
         # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                   = 1;

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

@@ -44,8 +44,6 @@ gNBs =
         dl_carrierBandwidth                                         = 51;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 1;
@@ -64,8 +62,7 @@ gNBs =
       ul_carrierBandwidth                                           = 51;
       pMax                                                          = 20;
      #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
+
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/gnb.sa.band78.106prb.fhi72.4x4-benetel550-9b-mplane.conf

@@ -46,8 +46,6 @@ gNBs =
         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;
@@ -67,7 +65,6 @@ gNBs =
       pMax                                                          = 23;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf

@@ -22,7 +22,6 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 5;
-    do_SRS                                                    = 0;
     force_256qam_off                                          = 1;
     pdsch_AntennaPorts_N1                                     = 1;
     pdsch_AntennaPorts_XP                                     = 1;
@@ -47,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                          = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                             = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                = 1;
@@ -68,7 +65,6 @@ gNBs =
       pMax                                                           = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                             = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                = 1;

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

@@ -47,8 +47,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -70,7 +68,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf

@@ -43,8 +43,6 @@ gNBs =
       dl_carrierBandwidth                                           = 106;
       #initialDownlinkBWP
       #genericParameters
-      # this is RBstart=0,L=106 (275*(L-1))+RBstart
-      initialDLBWPlocationAndBandwidth                              = 28875;
       # subcarrierSpacing
       # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
       initialDLBWPsubcarrierSpacing                                 = 1;
@@ -64,7 +62,6 @@ gNBs =
       pMax                                                          = 20;
       #initialUplinkBWP
       #genericParameters
-      initialULBWPlocationAndBandwidth                              = 28875;
       # subcarrierSpacing
       # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
       initialULBWPsubcarrierSpacing                                 = 1;

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf

@@ -43,8 +43,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -64,7 +62,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;
@@ -145,11 +142,8 @@ gNBs =
 
     );
 
-    first_active_bwp = 1;
-    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;},
-                { scs = 1; bwpStart = 0; bwpSize = 51;},
-                { scs = 1; bwpStart = 0; bwpSize = 24;});
-
+    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 51; bwpId = 2;},
+                { scs = 1; bwpStart = 0; bwpSize = 24; bwpId = 3;});
 
     # ------- SCTP definitions
     SCTP : {

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf

@@ -39,9 +39,7 @@ gNBs =
         dl_subcarrierSpacing                                         = 1;
         dl_carrierBandwidth                                          = 106;
      #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                             = 28875;
+
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                = 1;
@@ -60,8 +58,7 @@ gNBs =
       ul_carrierBandwidth                                            = 106;
       pMax                                                           = 20;
      #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                             = 28875;
+
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                = 1;

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml

@@ -36,8 +36,6 @@ gNBs:
         dl_carrierBandwidth: 106
         #initialDownlinkBWP
         #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth: 28875
         # subcarrierSpacing
         # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing: 1
@@ -56,7 +54,6 @@ gNBs:
         pMax: 20
         #initialUplinkBWP
         #genericParameters
-        initialULBWPlocationAndBandwidth: 28875
         # subcarrierSpacing
         # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing: 1

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

@@ -41,8 +41,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
@@ -62,7 +60,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

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

@@ -39,8 +39,6 @@ gNBs:
         dl_carrierBandwidth: 106
         #initialDownlinkBWP
         #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth: 28875
         # subcarrierSpacing
         # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing: 1
@@ -59,7 +57,6 @@ gNBs:
         pMax: 20
         #initialUplinkBWP
         #genericParameters
-        initialULBWPlocationAndBandwidth: 28875
         # subcarrierSpacing
         # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing: 1

ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf

@@ -41,8 +41,6 @@ gNBs =
         dl_carrierBandwidth                                            = 24;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 6325;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
@@ -62,7 +60,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 6325;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.2x2-benetel550-9b-mplane.conf

@@ -44,8 +44,6 @@ gNBs =
         dl_carrierBandwidth                                         = 273;
      #initialDownlinkBWP
       #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                               = 1;
@@ -65,7 +63,6 @@ gNBs =
       pMax                                                          = 23;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf

@@ -22,7 +22,7 @@ gNBs =
     pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
     do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
+    do_SRS                                                    = "periodic";
     min_rxtxtime = 5;
 
     servingCellConfigCommon = (
@@ -46,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 273;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 1099; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                  = 1;
@@ -67,7 +65,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf

@@ -26,7 +26,7 @@ gNBs =
     pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
     do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
+    do_SRS                                                    = "periodic";
 
     servingCellConfigCommon = (
     {
@@ -49,8 +49,6 @@ gNBs =
         dl_carrierBandwidth                                            = 51;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=50 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -71,7 +69,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf

@@ -46,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 51;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=50 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -68,7 +66,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

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

@@ -41,8 +41,6 @@ gNBs =
         dl_carrierBandwidth                                            = 51;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
@@ -62,7 +60,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/untested/benetel-5g.conf

@@ -44,8 +44,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368; 
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -65,7 +63,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368; 
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf

@@ -46,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf

@@ -45,8 +45,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 12952; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
@@ -66,7 +64,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 12952;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/untested/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf

@@ -46,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6366;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6366;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf

@@ -61,8 +61,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -82,7 +80,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf

@@ -57,8 +57,6 @@ gNBs =
         dl_carrierBandwidth                                            = 133;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=133 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 36300;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -78,7 +76,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 36300;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -29,7 +29,7 @@ gNBs =
     #pucch_TargetSNRx10                                        = 200;
     ul_prbblacklist                                           = "51,52,53,54"
     min_rxtxtime = 6;
-    do_SRS                                                    = 1;
+    do_SRS                                                    = "periodic";
 
     servingCellConfigCommon = (
     {
@@ -64,8 +64,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -87,7 +85,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf

@@ -43,8 +43,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -61,7 +59,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf

@@ -45,8 +45,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -66,7 +64,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf

@@ -46,8 +46,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=43,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -67,7 +65,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf

@@ -43,8 +43,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
@@ -65,7 +63,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf

@@ -48,8 +48,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -69,7 +67,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf

@@ -61,8 +61,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -82,7 +80,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf

@@ -62,8 +62,6 @@ gNBs =
         dl_carrierBandwidth                                            = 162;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                           = 1;
@@ -83,7 +81,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                                           = 1;

ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf

@@ -40,8 +40,6 @@ gNBs =
         dl_carrierBandwidth                                            = 51;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
@@ -61,7 +59,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -42,8 +42,6 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 12952; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
@@ -63,7 +61,6 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 12952;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;

ci-scripts/datalog_rt_stats.60.2x2.yaml

@@ -20,7 +20,7 @@ Ref :
   DL & UL scheduling timing : 8.0
   UL Indication : 3.0
   Slot Indication : 9.0
-  feprx : 85.0
+  feprx : 50.0
   feptx_ofdm (per port, half_slot) : 31
   feptx_total : 92
 DeviationThreshold :

ci-scripts/docker/Dockerfile.build.optional.ubuntu

@@ -0,0 +1,37 @@
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+FROM ran-base:latest AS optional-base
+
+RUN DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && \
+    apt upgrade --yes && \
+    apt install --yes \
+    libglfw3-dev
+
+WORKDIR /oai-src
+COPY . .
+
+FROM optional-base AS build-imscope
+
+RUN \
+    # Mount CCache cache directory
+    --mount=type=cache,target=/root/.cache/ccache/,id=ccache_imscope \
+    # Mount CPM package cache
+    --mount=type=cache,target=/root/.cache/cpm/,id=cpmcache_imscope \
+    mkdir -p /build-imscope && \
+    cd /build-imscope && \
+    cmake /oai-src/ -DENABLE_IMSCOPE=ON -GNinja && \
+    ninja imscope nr-softmodem nr-uesoftmodem
+
+FROM optional-base AS build-tracy
+
+RUN \
+    # Mount CCache cache directory
+    --mount=type=cache,target=/root/.cache/ccache/,id=ccache_tracy \
+    # Mount CPM package cache
+    --mount=type=cache,target=/root/.cache/cpm/,id=cpmcache_tracy \
+    mkdir -p /build-tracy && \
+    cd /build-tracy && \
+    cmake /oai-src/ -DTRACY_ENABLE=ON -GNinja && \
+    ninja nr-softmodem nr-uesoftmodem

ci-scripts/docker/Dockerfile.unittest.ubuntu

@@ -14,11 +14,20 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libgtest-dev \
         libyaml-cpp-dev \
-        libzmq3-dev
+        libzmq3-dev \
+        flatbuffers-compiler \
+        libnanomsg-dev \
+        dpdk-dev \
+        dpdk \
+        curl
 
 RUN rm -Rf /oai-ran
 WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DOAI_ZMQ=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja
+RUN cmake .. -GNinja \
+      -DENABLE_TESTS=ON -DOAI_ZMQ=ON -DCMAKE_BUILD_TYPE=Debug \
+      -DSANITIZE_ADDRESS=True -DOAI_VRTSIM_TAPS_CLIENT=ON -DOAI_RU_FRONTHAUL=ON \
+    && \
+    ninja

ci-scripts/helpreadme.py

@@ -27,10 +27,9 @@ def GenericHelp(vers):
 	print('  --local Force local execution: rewrites the test xml script before running to always execute on localhost. Assumes')
 	print('          images are available locally, will not remove any images and will run inside the current repo directory')
 
-def GitSrvHelp(repository,branch,commit,mergeallow,targetbranch):
+def GitSrvHelp(repository,branch,mergeallow,targetbranch):
 	print('  --repository=[OAI RAN Repository URL]                                      -- ' + repository)
 	print('  --branch=[OAI RAN Repository Branch]                                       -- ' + branch)
-	print('  --commitID=[OAI RAN Repository Commit SHA-1]                               -- ' + commit)
 	print('  --ranAllowMerge=[Allow Merge Request (with target branch) (true or false)]    -- ' + mergeallow)
 	print('  --targetBranch=[Target Branch in case of a Merge Request]                  -- ' + targetbranch)
 

ci-scripts/main.py

@@ -165,6 +165,15 @@ def ExecuteActionWithParam(action, ctx, node):
 		core_op = getattr(cls_oaicitest.OaiCiTest, action)
 		success = core_op(cn_id, ctx, HTML)
 
+	elif action == 'DeployWithScript' or action == 'UndeployWithScript':
+		script = test.findtext('script')
+		options = test.findtext('options')
+		if action == 'DeployWithScript':
+			deploymentTag = RAN.branch
+			success = cls_oaicitest.DeployWithScript(HTML, node, script, options, deploymentTag)
+		elif action == 'UndeployWithScript':
+			success = cls_oaicitest.UndeployWithScript(HTML, ctx, node, script, options)
+
 	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace" or action == "Stop_Object":
 		CONTAINERS.yamlPath = test.findtext('yaml_path')
 		CONTAINERS.services = test.findtext('services')

ci-scripts/scripts/oc-chart-deploy.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# SPDX-License-Identifier: MIT
+
+export PS4='[\D{%Y-%m-%d %H:%M:%S}] '
+
+function die() { echo $@; exit 1; }
+[ $# -eq 3 ] || die "usage: $0 <path-to-dir> <namespace> <image-tag>"
+
+OC_NS=${2}
+IMAGE_TAG=${3}
+OC_DIR=${1}
+OC_RELEASE=$(basename "${1}")
+
+cat /opt/oc-password | oc login -u oaicicd --server https://api.oai.cs.eurecom.fr:6443 > /dev/null
+oc project ${OC_NS} > /dev/null
+set -x
+helm install --wait --timeout 120s ${OC_RELEASE} --set nfimage.version=${IMAGE_TAG} --hide-notes ${OC_DIR}/.
+status=$?
+set +x
+oc logout > /dev/null
+
+[ $status -eq 0 ] || die "OC chart deployment failed"

ci-scripts/scripts/oc-chart-undeploy.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# SPDX-License-Identifier: MIT
+
+function die() { echo $@; exit 1; }
+[ $# -eq 3 ] || die "usage: $0 <path-to-dir> <namespace> <log-dir>"
+
+export PS4='[\D{%Y-%m-%d %H:%M:%S}] '
+
+OC_DIR=${1}
+OC_NS=${2}
+LOG_DIR=${3}
+OC_RELEASE=$(basename "${OC_DIR}")
+
+cat ${OC_DIR}/oc-password | oc login -u oaicicd --server https://api.oai.cs.eurecom.fr:6443 > /dev/null
+oc project ${OC_NS} > /dev/null
+
+oc describe pod > ${LOG_DIR}/describe-pods-post-test.log
+oc get pods.metrics.k8s &> ${LOG_DIR}/nf-resource-consumption.log
+oc logs -l app.kubernetes.io/name=${OC_RELEASE} --tail=-1 > ${LOG_DIR}/${OC_RELEASE}.log
+set -x
+helm uninstall ${OC_RELEASE} --wait
+status=$?
+set +x
+oc logout > /dev/null
+
+[ $status -eq 0 ] || die "OC chart undeployment failed"

ci-scripts/tests/README.md

@@ -21,6 +21,7 @@ To run individual unit tests, start them like so:
     python tests/log-analysis.py -v
     python tests/ping-iperf.py -v
     python tests/pull-clean-int-registry.py -v
+    python tests/script-deployment.py -v
 
 The logs will indicate if all tests passed. `tests/deployment.py` requires
 these images to be present:

ci-scripts/tests/script-deployment.py

@@ -0,0 +1,65 @@
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+import sys
+import logging
+logging.basicConfig(
+	level=logging.DEBUG,
+	stream=sys.stdout,
+	format="[%(asctime)s] %(levelname)8s: %(message)s"
+)
+import os
+import tempfile
+
+import unittest
+
+sys.path.append('./') # to find OAI imports below
+import cls_oaicitest
+import cls_oai_html
+import cls_cmd
+from cls_ci_helper import TestCaseCtx
+
+class TestScriptDeployment(unittest.TestCase):
+    def setUp(self):
+        self.tmpdir = tempfile.mkdtemp()
+        self.html = cls_oai_html.HTMLManagement()
+        self.node = 'localhost'
+        self.tag = 'develop-12345678'
+        self.ctx = TestCaseCtx.Default(self.tmpdir)
+    def tearDown(self):
+        with cls_cmd.LocalCmd() as c:
+            c.run(f'rm -rf {self.ctx.logPath}')
+
+    def test_simple_deployment(self):
+        script = 'tests/scripts/deploy-with-script.sh'
+        options = 'WILL PASS'
+        success = cls_oaicitest.DeployWithScript(self.html, self.node, script, options, self.tag)
+        self.assertTrue(success)
+
+    def test_simple_deployment_fail(self):
+        script = 'tests/scripts/deploy-with-script.sh'
+        options = 'WILLFAIL'
+        success = cls_oaicitest.DeployWithScript(self.html, self.node, script, options, self.tag)
+        self.assertFalse(success)
+
+    def test_simple_undeployment(self):
+        script = 'tests/scripts/undeploy-with-script.sh'
+        options = '%%log_dir%% WILL PASS'
+        success = cls_oaicitest.UndeployWithScript(self.html, self.ctx, self.node, script, options)
+        self.assertTrue(success)
+        # verify logs were created
+        files = os.listdir(self.tmpdir)
+        self.assertIn('112233-log1.txt', files)
+        self.assertIn('112233-log2.txt', files)
+
+    def test_simple_undeployment_fail(self):
+        script = 'tests/scripts/undeploy-with-script.sh'
+        options = '%%log_dir%% WILLFAILL'
+        success = cls_oaicitest.UndeployWithScript(self.html, self.ctx, self.node, script, options)
+        self.assertFalse(success)
+        # verify logs were created
+        files = os.listdir(self.tmpdir)
+        self.assertIn('112233-log1.txt', files)
+        self.assertIn('112233-log2.txt', files)
+
+if __name__ == '__main__':
+    unittest.main()

ci-scripts/tests/scripts/deploy-with-script.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# SPDX-License-Identifier: MIT
+
+function die() { echo $@; exit 1; }
+
+echo "Deploy script executed with options: $@"
+
+[ $# -lt 2 ] && die "failing"
+
+exit 0

ci-scripts/tests/scripts/undeploy-with-script.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# SPDX-License-Identifier: MIT
+
+function die() { echo $@; exit 1; }
+
+echo "Undeploy script executed with options: $@"
+
+LOG_DIR="$1"
+mkdir -p "$LOG_DIR"
+echo "Undeployment started" > "$LOG_DIR/log1.txt"
+echo "Undeployment finished successfully" > "$LOG_DIR/log2.txt"
+
+[ $# -lt 3 ] && die "failing"
+
+exit 0

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

@@ -1,8 +1,7 @@
-#/bin/bash
+#!/bin/bash
 # SPDX-License-Identifier: MIT
 
 branch=$(git rev-parse --abbrev-ref HEAD)
-commit=$(git rev-parse HEAD)
 file=../../test_results.html
 rm -f ${file}
 

ci-scripts/xml_class_list.yml

@@ -33,3 +33,5 @@
   - Create_Workspace
   - AnalyzeRTStats
   - AnalyzeRTStats_Object
+  - DeployWithScript
+  - UndeployWithScript

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

@@ -70,7 +70,7 @@
     <class>Attach_UE</class>
     <desc>Attach OAI UE 1 and 2</desc>
     <id>rfsim5g_ue rfsim5g_ue2</id>
-    <node>carabe</node>
+    <node>localhost</node>
   </testCase>
 
   <testCase>
@@ -98,21 +98,32 @@
   </testCase>
 
   <testCase>
-    <class>Ping</class>
-    <desc>Ping ext-dn from both UEs</desc>
+    <class>Iperf</class>
+    <desc>Iperf (DL/TCP)(20 sec)</desc>
+    <iperf_args>-t 20 -R</iperf_args>
     <id>rfsim5g_ue rfsim5g_ue2</id>
-    <node>carabe</node>
+    <node>localhost</node>
     <svr_id>oai_ext_dn</svr_id>
-    <svr_node>carabe</svr_node>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+    <svr_node>localhost</svr_node>
+    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/TCP)(20 sec)</desc>
+    <iperf_args>-t 20</iperf_args>
+    <id>rfsim5g_ue rfsim5g_ue2</id>
+    <node>localhost</node>
+    <svr_id>oai_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_tcp_rate_target>5</iperf_tcp_rate_target>
   </testCase>
 
   <testCase>
     <class>Detach_UE</class>
     <desc>Detach OAI UE 1 and 2</desc>
     <id>rfsim5g_ue rfsim5g_ue2</id>
-    <node>carabe</node>
+    <node>localhost</node>
   </testCase>
 
   <testCase>
@@ -178,7 +189,7 @@
     <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
     <always_exec>true</always_exec>
     <analysis>
-      <service>nearRT-RIC=LastLineContains=Removing E2 Node</service>
+      <service>nearRT-RIC=LastLineContains=The nearRT-RIC run SUCCESSFULLY</service>
       <service>xapp-rc-moni=LastLineContains=Test xApp run SUCCESSFULLY</service>
       <service>xapp-kpm-moni=LastLineContains=Test xApp run SUCCESSFULLY</service>
       <service>xapp-kpm-rc=LastLineContains=Test xApp run SUCCESSFULLY</service>

ci-scripts/xml_files/container_image_build_t2.xml

@@ -1,28 +1,26 @@
 <!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
 
 <testCaseList>
-  <htmlTabRef>build-cuda-tab</htmlTabRef>
-  <htmlTabName>Build Container Images for ARM with CUDA</htmlTabName>
+  <htmlTabRef>build-tab</htmlTabRef>
+  <htmlTabName>Build Images with T2 support</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
-
   <testCase>
     <class>Create_Workspace</class>
     <desc>Create new Workspace for server 0</desc>
-    <node>jetson3-oai</node>
+    <node>stonechat</node>
   </testCase>
 
   <testCase>
     <class>Build_Image</class>
-    <desc>Build all Images</desc>
-    <node>jetson3-oai</node>
-    <kind>native_cuda_armv8</kind>
+    <desc>Build Images with T2</desc>
+    <kind>fhi72-t2</kind>
+    <node>stonechat</node>
   </testCase>
 
   <testCase>
     <class>Push_Local_Registry</class>
     <desc>Push Images to Local Registry</desc>
-    <node>jetson3-oai</node>
-    <tag_prefix>armv8_cuda_</tag_prefix>
+    <node>stonechat</node>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_sa_b200_nrue_cuda_jetson.xml

@@ -1,192 +0,0 @@
-<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
-
-<testCaseList>
-  <htmlTabRef>JETSON-5G-NRUE-CUDA</htmlTabRef>
-  <htmlTabName>30 MHz TDD SA JETSON with CUDA</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <testCase>
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00104</cn_id>
-  </testCase>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>jetson2-oai</node>
-    <images>oai-nr-ue</images>
-    <tag_prefix>armv8_cuda_</tag_prefix>
-  </testCase>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>gracehopper1-oai</node>
-    <images>oai-gnb-aerial</images>
-    <tag_prefix>arm_</tag_prefix>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>jetson2-oai</node>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>gracehopper1-oai</node>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Script</class>
-    <desc>Configure 30 MHz bandwidth on WNC RU</desc>
-    <node>gracehopper1-oai</node>
-    <script>scripts/set-wnc-bandwidth.sh</script>
-    <args>30</args>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy PNF/Nvidia CUBB in a container</desc>
-    <node>gracehopper1-oai</node>
-    <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_30MHz</yaml_path>
-    <services>nv-cubb</services>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy VNF in a container</desc>
-    <node>gracehopper1-oai</node>
-    <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_30MHz</yaml_path>
-    <services>oai-gnb-aerial</services>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy nrUE (TDD/Band78/40MHz/N310) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_b200_jetson_cuda_nrue</yaml_path>
-    <node>jetson2-oai</node>
-    <num_attempts>3</num_attempts>
-  </testCase>
-
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach OAIUE</desc>
-    <id>oai_ue_jetson2</id>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Configure IP route</desc>
-    <node>jetson2-oai</node>
-    <command>sudo ip route add 172.21.6.105 via 13.1.1.100 dev oaitun_ue1</command>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
-    <id>oai_ue_jetson2</id>
-    <svr_id>oc-cn5g-00104</svr_id>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>25</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/10Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 10M -t 30 -i 1</iperf_args>
-    <id>oai_ue_jetson2</id>
-    <svr_id>oc-cn5g-00104</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/10Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 10M -t 30 -i 1 -R</iperf_args>
-    <id>oai_ue_jetson2</id>
-    <svr_id>oc-cn5g-00104</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/30Mbps/UDP)(30 sec)</desc>
-    <may_fail>true</may_fail>
-    <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
-    <id>oai_ue_jetson2</id>
-    <svr_id>oc-cn5g-00104</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/30Mbps/UDP)(30 sec)</desc>
-    <may_fail>true</may_fail>
-    <iperf_args>-u -b 30M -t 30 -i 1 -R</iperf_args>
-    <id>oai_ue_jetson2</id>
-    <svr_id>oc-cn5g-00104</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy nr UE</desc>
-    <node>jetson2-oai</node>
-    <yaml_path>ci-scripts/yaml_files/sa_b200_jetson_cuda_nrue</yaml_path>
-    <analysis>
-      <services>oai-nr-ue</services>
-    </analysis>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy gNB</desc>
-    <node>gracehopper1-oai</node>
-    <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_30MHz</yaml_path>
-    <analysis>
-      <services>oai-gnb-aerial=RetxCheck=20,100,100,100 oai-gnb-aerial=EndsWithBye</services>
-    </analysis>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Script</class>
-    <always_exec>true</always_exec>
-    <desc>Configure 100 MHz bandwidth on WNC RU</desc>
-    <node>gracehopper1-oai</node>
-    <script>scripts/set-wnc-bandwidth.sh</script>
-    <args>100</args>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>gracehopper1-oai</node>
-    <images>oai-gnb-aerial</images>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>jetson2-oai</node>
-    <images>oai-nr-ue</images>
-  </testCase>
-
-  <testCase>
-    <class>UndeployCoreNetwork</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-00104</cn_id>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_benetel_4x4_up2.xml

@@ -0,0 +1,171 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>test-5g-fhi72-4x4-benetel</htmlTabRef>
+  <htmlTabName>100 MHz 4x4 TDD SA Benetel</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <testCase>
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>DeployWithScript</class>
+    <desc>Deploy CU</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-deploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%image_tag%%</options>
+  </testCase>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>stonechat</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy DU (TDD/Band77/100MHz/Benetel) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel_4x4_du</yaml_path>
+    <services>oai-du</services>
+    <node>stonechat</node>
+    <num_attempts>2</num_attempts>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100 pings in 10 sec</desc>
+    <id>up2-fhi72</id>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+    <ping_args>-c 100 -i 0.1</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/600Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 600M -t 60 -R -l1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/800Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 800M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Optional iperf (DL/1000Mbps/UDP)(60 sec)</desc>
+    <may_fail>true</may_fail>
+    <iperf_args>-u -b 1000M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/60Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 60M -t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy DU</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel_4x4_du</yaml_path>
+    <services>oai-du</services>
+    <node>stonechat</node>
+    <analysis>
+      <services>oai-du=EndsWithBye</services>
+    </analysis>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>UndeployWithScript</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy CU on OC</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-undeploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%log_dir%%</options>
+  </testCase>
+
+  <testCase>
+    <class>UndeployCoreNetwork</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_benetel_8x8_up3.xml

@@ -0,0 +1,108 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>test-5g-fhi72-8x8-benetel</htmlTabRef>
+  <htmlTabName>100 MHz 8x8 TDD SA Benetel</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>stonechat</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy DU (TDD/Band77/100MHz/Benetel/8x8) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel_8x8_du</yaml_path>
+    <services>oai-du</services>
+    <node>stonechat</node>
+    <num_attempts>2</num_attempts>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up3</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100 pings in 10 sec</desc>
+    <id>up3</id>
+    <svr_id>oc-cn5g-20899-always-on</svr_id>
+    <ping_args>-c 100 -i 0.1</ping_args>
+    <ping_packetloss_threshold>20</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/200Mbps/UDP)(60 sec)</desc>
+    <may_fail>true</may_fail>
+    <iperf_args>-u -b 200M -t 60 -R -l1428 -p 5209</iperf_args>
+    <id>up3</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20899-always-on</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/400Mbps/UDP)(60 sec)</desc>
+    <may_fail>true</may_fail>
+    <iperf_args>-u -b 400M -t 60 -R -l 1428 -p 5209</iperf_args>
+    <id>up3</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <svr_id>oc-cn5g-20899-always-on</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up3</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy DU</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel_8x8_du</yaml_path>
+    <services>oai-du</services>
+    <node>stonechat</node>
+    <analysis>
+      <services>oai-du=EndsWithBye</services>
+    </analysis>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_liteon_4x4_up2.xml

@@ -0,0 +1,170 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>test-5g-fhi72-4x4-liteon</htmlTabRef>
+  <htmlTabName>100 MHz 4x4 TDD SA LiteON</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+
+  <testCase>
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>DeployWithScript</class>
+    <desc>Deploy CU</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-deploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%image_tag%%</options>
+  </testCase>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>stonechat</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy DU (TDD/Band78/100MHz/VVDN) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_liteon_4x4_gnb</yaml_path>
+    <node>stonechat</node>
+    <num_attempts>2</num_attempts>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100 pings in 10 sec</desc>
+    <id>up2-fhi72</id>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+    <ping_args>-c 100 -i 0.1</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/600Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 600M -t 60 -R -l1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/800Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 800M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Optional iperf (DL/1000Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 1000M -t 60 -R -l 1428</iperf_args>
+    <may_fail>true</may_fail>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/60Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 60M -t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy DU</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_liteon_4x4_gnb</yaml_path>
+    <node>stonechat</node>
+    <analysis>
+      <services>oai-du=EndsWithBye</services>
+    </analysis>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>UndeployWithScript</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy CU on OC</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-undeploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%log_dir%%</options>
+  </testCase>
+
+  <testCase>
+    <class>UndeployCoreNetwork</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_metanoia_4x4_up2.xml

@@ -0,0 +1,169 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>test-5g-fhi72-4x4-metanoia</htmlTabRef>
+  <htmlTabName>100 MHz 4x4 TDD SA Metanoia</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <testCase>
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>DeployWithScript</class>
+    <desc>Deploy CU</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-deploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%image_tag%%</options>
+  </testCase>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>stonechat</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy DU (TDD/Band78/100MHz/VVDN) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_metanoia_4x4_gnb</yaml_path>
+    <node>stonechat</node>
+    <num_attempts>2</num_attempts>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100 pings in 10 sec</desc>
+    <id>up2-fhi72</id>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+    <ping_args>-c 100 -i 0.1</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/600Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 600M -t 60 -R -l1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/800Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 800M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Optional iperf (DL/1000Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 1000M -t 60 -R -l 1428</iperf_args>
+    <may_fail>true</may_fail>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/100Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 100M -t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy DU</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_metanoia_4x4_gnb</yaml_path>
+    <node>stonechat</node>
+    <analysis>
+      <services>oai-du=EndsWithBye</services>
+    </analysis>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>UndeployWithScript</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy CU on OC</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-undeploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%log_dir%%</options>
+  </testCase>
+
+  <testCase>
+    <class>UndeployCoreNetwork</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_vvdn_4x4_monolithic_up2.xml

@@ -0,0 +1,162 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>test-5g-fhi72-4x4-vvdn-monolithic</htmlTabRef>
+  <htmlTabName>100 MHz 4x4 TDD SA VVDN Monolithic</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <testCase>
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>stonechat</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB (TDD/Band77/100MHz/VVDN) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_4x4_monolithic_gnb</yaml_path>
+    <services>oai-gnb-monolithic</services>
+    <node>stonechat</node>
+    <num_attempts>2</num_attempts>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100 pings in 10 sec</desc>
+    <id>up2-fhi72</id>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+    <ping_args>-c 100 -i 0.1</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/600Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 600M -t 60 -R -l1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/800Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 800M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/1000Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 1000M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Optional iperf (DL/1200Mbps/UDP)(60 sec)</desc>
+    <may_fail>true</may_fail>
+    <iperf_args>-u -b 1200M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/100Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 100M -t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy gNB</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_4x4_monolithic_gnb</yaml_path>
+    <services>oai-gnb-monolithic</services>
+    <node>stonechat</node>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>UndeployCoreNetwork</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_vvdn_4x4_up2.xml

@@ -0,0 +1,198 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>test-5g-fhi72-4x4-vvdn</htmlTabRef>
+  <htmlTabName>100 MHz 4x4 TDD SA VVDN</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+
+  <testCase>
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Script</class>
+    <desc>Activate carriers on VVDN RU</desc>
+    <node>stonechat</node>
+    <script>scripts/vvdn-activate-carriers.sh</script>
+  </testCase>
+
+  <testCase>
+    <class>DeployWithScript</class>
+    <desc>Deploy CU</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-deploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%image_tag%%</options>
+  </testCase>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <node>stonechat</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy DU (TDD/Band77/100MHz/VVDN) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_4x4_du</yaml_path>
+    <services>oai-du</services>
+    <node>stonechat</node>
+    <num_attempts>2</num_attempts>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100 pings in 10 sec</desc>
+    <id>up2-fhi72</id>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+    <ping_args>-c 100 -i 0.1</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/600Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 600M -t 60 -R -l1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/800Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 800M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/1000Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 1000M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Optional iperf (DL/1200Mbps/UDP)(60 sec)</desc>
+    <may_fail>true</may_fail>
+    <iperf_args>-u -b 1100M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/100Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 100M -t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy DU</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_4x4_du</yaml_path>
+    <services>oai-du</services>
+    <node>stonechat</node>
+    <analysis>
+      <services>oai-du=EndsWithBye</services>
+    </analysis>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>UndeployWithScript</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy CU on OC</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-undeploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%log_dir%%</options>
+  </testCase>
+
+  <testCase>
+    <class>UndeployCoreNetwork</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Script</class>
+    <always_exec>true</always_exec>
+    <desc>Inactivate carriers on VVDN RU</desc>
+    <node>stonechat</node>
+    <script>scripts/vvdn-inactivate-carriers.sh</script>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_vvdn_4x4_up2_nfapi.xml

@@ -0,0 +1,190 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>test-5g-fhi72-4x4-vvdn-nfapi</htmlTabRef>
+  <htmlTabName>100 MHz 4x4 TDD SA VVDN nFAPI</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+
+  <testCase>
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Script</class>
+    <desc>Activate carriers on VVDN RU</desc>
+    <node>stonechat</node>
+    <script>scripts/vvdn-activate-carriers.sh</script>
+  </testCase>
+
+  <testCase>
+    <class>DeployWithScript</class>
+    <desc>Deploy CU</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-deploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%image_tag%%</options>
+  </testCase>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy DU-High (TDD/Band77/100MHz/VVDN) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_4x4_nfapi</yaml_path>
+    <services>oai-du-high</services>
+    <node>stonechat</node>
+    <num_attempts>2</num_attempts>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy DU-Low (TDD/Band77/100MHz/VVDN) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_4x4_nfapi</yaml_path>
+    <services>oai-du-low</services>
+    <node>stonechat</node>
+    <num_attempts>2</num_attempts>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping: 100 pings in 10 sec</desc>
+    <id>up2-fhi72</id>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+    <ping_args>-c 100 -i 0.1</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/800Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 800M -t 60 -R -l1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/1200Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 1200M -t 60 -R -l 1428</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/1400Mbps/UDP)(60 sec)</desc>
+    <iperf_args>-u -b 1400M -t 60 -R -l 1428</iperf_args>
+    <may_fail>true</may_fail>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/100Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 100M -t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897-stonechat</svr_id>
+  </testCase>
+
+  <testCase>
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy DU</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_4x4_nfapi</yaml_path>
+    <services>oai-du-low oai-du-high</services>
+    <node>stonechat</node>
+    <analysis>
+      <services>oai-du-high=EndsWithBye</services>
+    </analysis>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>stonechat</node>
+    <images>oai-gnb-fhi72-t2</images>
+  </testCase>
+
+  <testCase>
+    <class>UndeployWithScript</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy CU on OC</desc>
+    <node>stonechat</node>
+    <script>scripts/oc-chart-undeploy.sh</script>
+    <options>/opt/oai-cn5g-fed-develop-2025-jan/ci-scripts/charts/oai-cu/ oaicicd-core-for-fhi72 %%log_dir%%</options>
+  </testCase>
+
+  <testCase>
+    <class>UndeployCoreNetwork</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate 5G Core</desc>
+    <cn_id>oc-cn5g-20897-stonechat</cn_id>
+  </testCase>
+
+  <testCase>
+    <class>Custom_Script</class>
+    <always_exec>true</always_exec>
+    <desc>Inactivate carriers on VVDN RU</desc>
+    <node>stonechat</node>
+    <script>scripts/vvdn-inactivate-carriers.sh</script>
+  </testCase>
+
+</testCaseList>

ci-scripts/yaml_files/sa_b200_jetson_cuda_nrue/docker-compose.yml

@@ -1,40 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-services:
-    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
-        network_mode: host
-        runtime: nvidia
-        container_name: oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
-            - SYS_NICE   # for performance
-            - IPC_LOCK   # for memory locking
-        devices:
-            - /dev/net/tun:/dev/net/tun
-            - /dev/bus/usb/:/dev/bus/usb/
-        ulimits:
-          core: -1 # for core dumps
-        environment:
-            TZ: Europe/Paris
-            USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS:  --usrp-args type=b200 -C 3350010000 -r 78 --numerology 1 --band 78 --ssb 345 --ue-fo-compensation --uicc0.imsi 001040000000001 --uicc0.pdu_sessions.[0].dnn oai.ipv4 --thread-pool 5,6,7,8,9 --ue-txgain 15 --ue-rxgain 90 --loader.ldpc.shlibversion _cuda -A 60
-        cpuset: "3-11"
-        volumes:
-            - ../../conf_files/ue.sa.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        deploy:
-          resources:
-            reservations:
-              devices:
-                - driver: nvidia
-                  count: all
-                  capabilities: [gpu]
-