feat(ldpc_tee): Add LDPC library tee

ldpc_tee is an LDPC library acting as a tee that distributes TBs between
two libraries according to some criterion implmented in the tee library.

.gitignore

@@ -20,6 +20,14 @@ GRTAGS
 GTAGS
 tags
 
+# Package conffiles
+
+tools/packages/oai-lte/conffiles
+tools/packages/oai-nr/conffiles
+tools/packages/liboai-common/conffiles
+tools/packages/liboai-usrp/conffiles
+
+
 # others
 nfapi_nr_interface_scf
 *.log

CMakeLists.txt

@@ -22,38 +22,7 @@
 cmake_minimum_required (VERSION 3.16)
 project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
-
-option(CUDA_ENABLE "Enable CUDA accelerated channel simulation" OFF)
-if(CUDA_ENABLE)
-    find_package(CUDA REQUIRED)
-    find_package(CUDAToolkit REQUIRED)
-    message(STATUS "CUDA explicitly enabled, building with GPU acceleration support.")
-
-    enable_language(CUDA)
-
-    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-        set(CMAKE_CUDA_ARCHITECTURES 90)
-    endif()
-
-    option(USE_UNIFIED_MEMORY "Enable CUDA Unified Memory path" OFF)
-    option(USE_ATS_MEMORY "Enable ATS Hybrid Memory path" ON)
-
-    if(USE_UNIFIED_MEMORY AND USE_ATS_MEMORY)
-        message(FATAL_ERROR "Cannot enable both USE_UNIFIED_MEMORY and USE_ATS_MEMORY at the same time.")
-    endif()
-
-    if(USE_UNIFIED_MEMORY)
-        add_compile_definitions(USE_UNIFIED_MEMORY)
-        message(STATUS "CUDA Unified Memory path enabled.")
-    elseif(USE_ATS_MEMORY)
-        add_compile_definitions(USE_ATS_MEMORY)
-        message(STATUS "CUDA ATS Hybrid Memory path enabled.")
-    else()
-        message(STATUS "CUDA Explicit Copy path enabled (default ATS was overridden).")
-    endif()
-
-    add_compile_definitions(ENABLE_CUDA)
-endif()
+set(OAI_VERSION 2.4.0)
 
 #########################################################
 # Base directories, compatible with legacy OAI building #
@@ -93,6 +62,15 @@ endif()
 ###################################
 include(FindPkgConfig)
 
+
+option(PACKAGING_RPM "By default will create debian packages, with this option willl create rpm packages" OFF)
+option(PACKAGING_NR "Will produce a package containing nr target, configuration files and docs" OFF)
+option(PACKAGING_LTE "Will produce a package containing lte target, configuration files and docs" OFF)
+option(PACKAGING_COMMON "Will produce a package containing common target, configuration files and docs" OFF)
+option(PACKAGING_USRP "Will produce a package containing usrp target, configuration files and docs" OFF)
+option(PACKAGING_PHYSIM "Will produce a package containing physim target, configuration files and docs" OFF)
+
+
 # Check if asn1c is installed, and check if it supports all options we need
 # a user can provide ASN1C_EXEC to override an asn1c to use (e.g., parallel
 # installation)
@@ -119,8 +97,6 @@ set (NFAPI_USER_DIR  ${OPENAIR_DIR}/nfapi/oai_integration)
 set (OPENAIR1_DIR    ${OPENAIR_DIR}/openair1)
 set (OPENAIR2_DIR    ${OPENAIR_DIR}/openair2)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
-set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
-set (OPENAIR_CMAKE   ${OPENAIR_DIR}/cmake_targets)
 
 project (OpenAirInterface)
 
@@ -254,9 +230,16 @@ endif()
 
 add_definitions("-DASN_DISABLE_OER_SUPPORT -DHAVE_CONFIG_H -DHAVE_CONFIG_H_")
 
-#########################
-set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -ggdb2 -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}")
-#########################
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+set(CMAKE_BUILD_RPATH ${CMAKE_CURRENT_BINARY_DIR})
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+set(CMAKE_INSTALL_RPATH "")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+
+if(PACKAGING_LTE OR PACKAGING_NR OR PACKAGING_COMMON OR PACKAGING_USRP OR PACKAGING_PHYSIM)
+  set(CMAKE_SKIP_INSTALL_RPATH TRUE)
+endif()
+
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
 set(debugOpt "-ggdb2 -DMALLOC_CHECK_=3 -fno-delete-null-pointer-checks")
@@ -299,22 +282,6 @@ if(GIT_FOUND)
   )
 endif()
 
-option(USE_UNIFIED_MEMORY "Enable CUDA Unified Memory path instead of explicit copies" OFF)
-
-option(USE_ATS_MEMORY "Enable Hybrid ATS (CPU->GPU) and Explicit Copy (GPU->CPU) path" OFF)
-
-if(USE_UNIFIED_MEMORY AND USE_ATS_MEMORY)
-  message(FATAL_ERROR "Cannot enable both USE_UNIFIED_MEMORY and USE_ATS_MEMORY at the same time.")
-endif()
-
-if(USE_UNIFIED_MEMORY)
-  add_compile_definitions(USE_UNIFIED_MEMORY)
-  message(STATUS "CUDA Unified Memory path enabled.")
-elseif(USE_ATS_MEMORY)
-  add_compile_definitions(USE_ATS_MEMORY)
-  message(STATUS "CUDA ATS Hybrid Memory path enabled.")
-endif()
-
 # Debug related options
 #########################################
 # asn1c skeletons have hardcoded this flag to make customized debug logs
@@ -1720,17 +1687,6 @@ set (SIMUSRC
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
 
-option(CHANNEL_SSE "Enable SSE optimizations for channel simulation" OFF)
-if(CHANNEL_SSE)
-    message(STATUS "SSE-optimized channel simulation enabled.")
-    target_compile_definitions(SIMU PRIVATE CHANNEL_SSE)
-endif()
-
-if(CUDA_FOUND)
-  set_property(TARGET SIMU PROPERTY CUDA_ARCHITECTURES ${CMAKE_CUDA_ARCHITECTURES})
-  set_property(TARGET SIMU PROPERTY LINKER_LANGUAGE CXX)
-endif()
-
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
 include_directories("${NFAPI_DIR}/pnf/public_inc")
@@ -1848,6 +1804,24 @@ target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIE
 target_link_libraries(lte-uesoftmodem PRIVATE
                       asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)
 
+# nr RRU
+add_executable(nr-oru
+  ${OPENAIR_DIR}/executables/nr-ru.c
+  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
+  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
+  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
+  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
+  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
+  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR_DIR}/executables/main_nr_ru.c
+)
+target_link_libraries(nr-oru PRIVATE
+  UTIL SCHED_RU_LIB PHY_COMMON PHY_RU PHY_NR shlib_loader z dl)
+target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
+  barrier actor)
+target_link_libraries(nr-oru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)
+
 # nr-softmodem
 ###################################################
 
@@ -1931,6 +1905,7 @@ add_executable(nr-uesoftmodem
   ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
   ${OPENAIR_DIR}/executables/position_interface.c
   ${OPENAIR_DIR}/executables/nr-ue.c
+  ${OPENAIR_DIR}/executables/nr-ue-ru.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
@@ -2109,16 +2084,6 @@ target_link_libraries(nr_srssim PRIVATE
   m pthread ITTI dl nr_ue_phy_meas physim_common
   )
 
-if(CUDA_ENABLE)
-  if (TARGET oai_cuda_lib)
-      target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)
-      target_link_libraries(nr_ulsim PRIVATE oai_cuda_lib)
-
-      target_compile_definitions(nr_dlsim PRIVATE ENABLE_CUDA)
-      target_compile_definitions(nr_ulsim PRIVATE ENABLE_CUDA)
-  endif()
-endif()
-
 # these simulators do not compile:
 # dlsim_tm7 pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
 foreach(myExe dlsim ulsim)
@@ -2232,8 +2197,7 @@ add_subdirectory(openair3)
 add_subdirectory(radio)
 add_subdirectory(tests)
 
-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)
-    target_link_libraries(nr_ulsim PRIVATE oai_cuda_lib)
+
+if(PACKAGING_LTE OR PACKAGING_NR OR PACKAGING_COMMON OR PACKAGING_USRP OR PACKAGING_PHYSIM)
+  include("tools/packages/packages.cmake")
 endif()

ci-scripts/Jenkinsfile

@@ -115,6 +115,7 @@ pipeline {
             } else {
               sh "git fetch"
               sh "git checkout -f ${commitID}"
+              sh "git reset --hard origin/${commitID}"
             }
           } else {
             echo "\u274C Some parameters are missing"

ci-scripts/Jenkinsfile-GitLab-Container

@@ -334,29 +334,6 @@ pipeline {
             }
           }
         }
-        stage ("Channel-Simulation") {
-          when { expression {do5Gtest || do5GUeTest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-Channel-Simulation', 'Channel-Simulation')
-            }
-          }
-          post {
-            always {
-              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')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += channelSimStatus
-              }
-            }
-          }
-        }
         stage ("PhySim-Cluster-4G") {
           when { expression {do4Gtest} }
           steps {

ci-scripts/cls_containerize.py

@@ -304,7 +304,7 @@ class Containerize():
 		result = re.search('gNB', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-		result = re.search('all', self.imageKind)
+		result = re.search('x86', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
@@ -315,7 +315,6 @@ class Containerize():
 				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
 			if self.host == 'Ubuntu':
 				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
-				imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 				# Building again the 5G images with Address Sanitizer
 				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
@@ -325,6 +324,7 @@ class Containerize():
 				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
 				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
+				imageNames.append(('oai-nr-oru', 'nrORU.fhi72', 'oai-nr-oru', ''))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu.cross-arm64'
@@ -413,18 +413,18 @@ class Containerize():
 			# target images should use the proper ran-build image
 			if image != 'ran-build' and "-asan" in name:
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			elif "fhi72" in name:
+			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}{self.dockerfileprefix}')
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2025.10.09.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2026.01.07.tar.gz .')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
 			t = (name, archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2025.10.09.tar.gz')
+				cmd.run('rm -f nvipc_src.2026.01.07.tar.gz')
 			# check the status of the build
 			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
@@ -582,7 +582,7 @@ class Containerize():
 		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
 		if ret.returncode != 0:
 			logging.error(f'No {baseImage} image present, cannot build tests')
-			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', CONST.ALL_PROCESSES_OK)
 			return False
 
 		# build ran-unittests image

ci-scripts/cls_oaicitest.py

@@ -255,7 +255,7 @@ def Deploy_Physim(ctx, HTML, node, workdir, script, options):
 	logging.debug(f'Running physims on server {node} workdir {workdir}')
 	with cls_cmd.getConnection(node) as c:
 		sys_info = c.exec_script("scripts/sys-info.sh", 5)
-		ret = c.exec_script(script, 1500, options)
+		ret = c.exec_script(script, 1000, options)
 	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
 	HTML.CreateHtmlTestRowQueue('Query system info', 'OK', [sys_info.stdout])
 	with cls_cmd.getConnection(node) as ssh:

ci-scripts/conf_files/enb.band38.25prb.rfsim.conf

@@ -200,9 +200,11 @@ RUs = (
     }
 );  
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT = (
   {

ci-scripts/conf_files/enb.band7.100prb.rfsim.conf

@@ -233,9 +233,11 @@ RUs =
   }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.25prb.rfsim.conf

@@ -233,9 +233,11 @@ RUs =
   }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf

@@ -233,9 +233,11 @@ RUs =
   }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.50prb.rfsim.conf

@@ -233,9 +233,11 @@ RUs =
   }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf

@@ -362,9 +362,11 @@ RUs = (
     }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT = (
   {

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

@@ -197,13 +197,15 @@ RUs = (
     }
 );  
 
-rfsimulator: {
-serveraddr = "server";
+rfsimulator = (
+  {
+    serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs"
-}
+    IQfile = "/tmp/rfsimulator.iqs";
+  }
+);
 
 log_config: {
   global_log_level = "info";

ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf

@@ -27,14 +27,15 @@ RUs = ({
   eNB_instances  = [0];
 });
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 log_config: {
   global_log_level = "info";

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

@@ -13,16 +13,7 @@ gNBs =
 
     // 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;
-                    }
-                  );
-                  });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }) });
 
     nr_cellid = 12345678L;
 
@@ -186,19 +177,19 @@ gNBs =
 
 MACRLCs = (
 {
-  num_cc           = 1;
-  remote_s_address = "127.0.0.1"; // pnf addr [!]
-  local_s_address  = "127.0.0.2"; // vnf addr
-  local_s_portc    = 50001; // vnf p5 port
-  remote_s_portc   = 50000; // pnf p5 port [!]
-  local_s_portd    = 50011; // vnf p7 port [!]
-  remote_s_portd   = 50010; // pnf p7 port [!]
-  tr_s_preference             = "aerial";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 280; # 150;
-  pucch_TargetSNRx10          = 200; #200;
-  dl_max_mcs = 28;
-  ul_max_mcs = 28;
+  num_cc             = 1;
+  remote_s_address   = "127.0.0.1"; // pnf addr [!]
+  local_s_address    = "127.0.0.2"; // vnf addr
+  local_s_portc      = 50001; // vnf p5 port
+  remote_s_portc     = 50000; // pnf p5 port [!]
+  local_s_portd      = 50011; // vnf p7 port [!]
+  remote_s_portd     = 50010; // pnf p7 port [!]
+  tr_s_preference    = "aerial";
+  tr_n_preference    = "local_RRC";
+  pusch_TargetSNRx10 = 280; # 150;
+  pucch_TargetSNRx10 = 200; #200;
+  dl_max_mcs         = 28;
+  ul_max_mcs         = 28;
 }
 );
 
@@ -222,13 +213,13 @@ security = {
 
 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                        ="debug";
-  f1ap_log_level                        ="debug";
+  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   ="debug";
+  f1ap_log_level   ="debug";
 };

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

@@ -191,10 +191,11 @@ RUs = (
     }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
-
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -200,10 +200,11 @@ RUs = (
     }
 );  
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
-
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -234,14 +234,15 @@ RUs = (
     }
 );
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = ("chanmod"); #("saviq"); or/and "chanmod"
   prop_delay = 20;
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 channelmod = {
   max_chan=10;

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

@@ -242,14 +242,15 @@ RUs = (
     }
 );
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   prop_delay = 238.74;
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -29,40 +29,40 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is pointA + 16 PRBs@120kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 2071387;
-      dl_frequencyBand                                                 = 261;
+      absoluteFrequencySSB                                             = 2078299;
+      dl_frequencyBand                                                 = 257;
       # this is 27.900 GHz
-      dl_absoluteFrequencyPointA                                       = 2071001;
+      dl_absoluteFrequencyPointA                                       = 2077963;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         dl_subcarrierSpacing                                           = 3;
-        dl_carrierBandwidth                                            = 32;
+        dl_carrierBandwidth                                            = 66;
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=0,L=32 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 8525;
+        initialDLBWPlocationAndBandwidth                                        = 6349;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 3;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 1;
+        initialDLBWPcontrolResourceSetZero                                      = 4;
         initialDLBWPsearchSpaceZero                                             = 0;
 
   #uplinkConfigCommon 
      #frequencyInfoUL
-      ul_frequencyBand                                                 = 261;
+      ul_frequencyBand                                                 = 257;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
       ul_subcarrierSpacing                                           = 3;
-      ul_carrierBandwidth                                            = 32;
+      ul_carrierBandwidth                                            = 66;
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 8525;
+        initialULBWPlocationAndBandwidth                                        = 6349;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 3;
@@ -143,6 +143,11 @@ gNBs =
 
   );
 
+    first_active_bwp = 1;
+    bwp_list = (
+      { scs = 3; bwpStart = 0; bwpSize = 66;}
+    );
+
     # ------- SCTP definitions
     SCTP :
     {
@@ -197,9 +202,11 @@ RUs = ({
   eNB_instances  = [0];
 });
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -205,14 +205,15 @@ RUs = (
 );
 
 
-rfsimulator :
-{
+rfsimulator = (
+  {
     serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -251,7 +251,7 @@ fhi_72 = {
   io_core = 1;
   worker_cores = (2);
   ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3");
-  mtu = 9600;
+  mtu = 9216;
   fh_config = ({
     T1a_cp_dl = (285, 470);
     T1a_cp_ul = (285, 429);

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

@@ -208,9 +208,11 @@ RUs = (
 );
 
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -197,9 +197,11 @@ RUs = (
     }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -204,13 +204,15 @@ RUs = ({
 });
 
 
-rfsimulator: {
+rfsimulator = (
+{
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs"
 }
+);
 
 security = {
 # preferred ciphering algorithms

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

@@ -155,8 +155,8 @@ gNBs =
         NETWORK_INTERFACES :
         {
 
-           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
-           GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
+           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
+           GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };
 
@@ -217,14 +217,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options    = (); #("saviq"); or/and "chanmod"
   modelname  = "AWGN";
   IQfile     = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -63,7 +63,7 @@ gNBs:
         prach_ConfigurationIndex: 98
         #prach_msg1_FDM
         #0 = one, 1=two, 2=four, 3=eight
-        prach_msg1_FDM: 0
+        prach_msg1_FDM: 1
         prach_msg1_FrequencyStart: 0
         zeroCorrelationZoneConfig: 12
         preambleReceivedTargetPower: -104
@@ -99,7 +99,7 @@ gNBs:
         pucchGroupHopping: 0
         hoppingId: 40
         p0_nominal: -90
-        ssb_PositionsInBurst_Bitmap: 1
+        ssb_PositionsInBurst_Bitmap: 2
         # ssb_periodicityServingCell
         # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
         ssb_periodicityServingCell: 2
@@ -168,7 +168,7 @@ RUs:
     sdr_addrs: serial=XXXXXXX
 
 rfsimulator:
-  serveraddr: server
+  - serveraddr: server
 
 security:
   # preferred ciphering algorithms

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

@@ -203,10 +203,11 @@ RUs = (
 }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
-
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -258,7 +258,7 @@ fhi_72 = {
   io_core = 1;
   worker_cores = (2);
   ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81");
-  mtu = 9600;
+  mtu = 9216;
   fh_config = ({
     T1a_cp_dl = (419, 470);
     T1a_cp_ul = (285, 336);

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

@@ -203,14 +203,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/lteue.rfsim.conf

@@ -0,0 +1,5 @@
+rfsimulator = (
+  {
+    serveraddr = "127.0.0.1";
+  }
+);

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

@@ -12,8 +12,7 @@ uicc0 = {
 imsi = "208990100001100";
 key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
-dnn= "oai";
-nssai_sst=1;
+pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 
 MACRLCs = (

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

@@ -87,3 +87,9 @@ PRSs =
     );
   }
 );
+
+rfsimulator = (
+  {
+    serveraddr = "127.0.0.1";
+  }
+);

ci-scripts/conf_files/nrue.uicc.2pdu.conf

@@ -0,0 +1,17 @@
+uicc0 = {
+  imsi = "208990100001100";
+  key = "fec86ba6eb707ed08905757b1bb44b8f";
+  opc= "C42449363BBAD02B66D16BC975D77CC1";
+  pdu_sessions = (
+    { id = 1; dnn = "oai"; nssai_sst = 1; },
+    { id = 2; dnn = "oai"; nssai_sst = 1; }
+  )
+}
+
+thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+
+rfsimulator = (
+  {
+    serveraddr = "127.0.0.1";
+  }
+);

ci-scripts/conf_files/nrue.uicc.conf

@@ -2,8 +2,7 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 
 position0 = {
@@ -14,6 +13,12 @@ position0 = {
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
+rfsimulator = (
+  {
+    serveraddr = "127.0.0.1";
+  }
+);
+
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
@@ -40,4 +45,4 @@ channelmod = {
       ds_tdl         = 0;
     }
   );
-};
+};

ci-scripts/conf_files/nrue.uicc.ntn-leo.conf

@@ -2,8 +2,7 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 
 position0 = {
@@ -14,6 +13,40 @@ position0 = {
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
+rfsimulator = (
+    {
+        prop_delay = 20;
+        options = ("chanmod");
+    }
+);
+
+RUs = (
+    {
+        nb_tx      = 1;
+        nb_rx      = 1;
+        att_tx     = 0;
+        att_rx     = 0;
+        max_rxgain = 114;
+        sdr_addrs  = "type=x300";
+        clock_src  = "internal";
+        time_src   = "internal";
+        # if_freq    = 3700000000L;
+        # if_offset  = 1000000;
+    }
+);
+
+cells = (
+    {
+        ru_id      = 0;
+        band       = 254;
+        rf_freq    = 2488400000L;
+        rf_offset  = -873500000L;
+        numerology = 0;
+        N_RB_DL    = 25;
+        ssb_start  = 60;
+    }
+);
+
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */

ci-scripts/conf_files/nrue.uicc.yaml

@@ -2,11 +2,15 @@ uicc0:
   imsi: 208990100001100
   key: fec86ba6eb707ed08905757b1bb44b8f
   opc: C42449363BBAD02B66D16BC975D77CC1
-  dnn: oai
-  nssai_sst: 1
+  pdu_sessions:
+    - dnn: oai
+      nssai_sst: 1
 
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
+rfsimulator:
+  - serveraddr: "127.0.0.1"
+
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */

ci-scripts/conf_files/nrue.vrtsim.chanmod.yaml

@@ -2,8 +2,9 @@ uicc0:
   imsi: 208990100001100
   key: fec86ba6eb707ed08905757b1bb44b8f
   opc: C42449363BBAD02B66D16BC975D77CC1
-  dnn: oai
-  nssai_sst: 1
+  pdu_sessions:
+    - dnn: oai
+      nssai_sst: 1
 
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 

ci-scripts/conf_files/ue.sa.conf

@@ -2,8 +2,7 @@ uicc0 = {
   imsi = "208970100001127";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "c42449363bbad02b66d16bc975d77cc1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

ci-scripts/conf_files/untested/episci/episci_nr-ue.nfapi.conf

@@ -12,9 +12,7 @@ uicc0 = {
 imsi = "208950000000031";
 key = "0c0a34601d4f07677303652c0462535b";
 opc= "63bfa50ee6523365ff14c1f45f88737d";
-dnn= "oai";
-nssai_sst=222;
-nssai_sd=123;
+pdu_sessions = ({ dnn = "oai"; nssai_sst = 222; nssai_sd = 123; });
 }
 
 MACRLCs = (

ci-scripts/conf_files/untested/episci/proxy_nr-ue.nfapi.conf

@@ -12,9 +12,7 @@ uicc0 = {
 imsi = "2089900007487";
 key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
-dnn= "oai";
-nssai_sst=1;
-nssai_sd=1;
+pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; nssai_sd = 1; });
 }
 
 MACRLCs = (

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

@@ -205,14 +205,15 @@ RUs = (
 );
 
 
-rfsimulator :
-{
+rfsimulator = (
+  {
     serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -200,14 +200,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/docker/Dockerfile.physim.ubuntu

@@ -24,29 +24,24 @@
 #   Valid for Ubuntu 24.04
 #
 #---------------------------------------------------------------------
-FROM nvidia/cuda:12.9.1-devel-ubuntu22.04 AS cuda-image
+
 FROM ran-base:develop AS ran-tests
 
+#RUN apt-get update && \
+#    DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
+#    DEBIAN_FRONTEND=noninteractive apt-get install --yes \
+#        libgtest-dev \
+#        libyaml-cpp-dev
+
 RUN rm -Rf /oai-ran
-COPY --from=cuda-image /usr/local/cuda/ /usr/local/cuda/
-
-# Set the LD_LIBRARY_PATH to ensure the system can find the copied libraries.
-# This is crucial for applications that use CUDA.
-ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/targets/sbsa-linux/lib
-ENV PATH=/usr/local/cuda/bin:$PATH
-ENV C_INCLUDE_PATH=/usr/local/cuda/include
-
 WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
+# TODO should SANITIZE be ON? it makes it compile much longer
+RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON \
         -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
         -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
-        -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake;ThresholdsCuda.cmake" \
-        -DCUDA_ENABLE=ON \
-        -DUSE_UNIFIED_MEMORY=ON \
-        -DUSE_ATS_MEMORY=OFF \
-        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \
+        -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake" \
         .. && \
-    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim test_channel_scalability
+    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim

ci-scripts/scripts/docker-build-and-deploy-physims.sh

@@ -33,7 +33,7 @@ JSON_RES=$?
 # run the actual tests: we don't suppy --rm as we have to copy the files
 # similar to unit tests, we can't mount the file where we write physims-5g-run.xml to
 # as it would write a file as root, but this script is run as a normal user
-docker run -a STDOUT --gpus all --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --output-junit results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${RESULT_DIR}/physim_log.txt
+docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --output-junit results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${RESULT_DIR}/physim_log.txt
 RUN_RES=$?
 docker cp ${CONTAINER}:/oai-ran/build/results-run.xml ${RESULT_DIR}/
 docker cp ${CONTAINER}:/oai-ran/build/Testing/Temporary/LastTestsFailed.log ${RESULT_DIR}/

ci-scripts/tests/nr_physim_gpu_benchmark/gpu_performance_baselines.yaml

@@ -1,183 +0,0 @@
-# --- Test Suite 1: Scalability vs. Channel Count ---
-Channels_16_Batch:
-  'Total GPU Time (us)': 5265.72
-  'Avg Time per Channel - GPU (us)': 329.11
-  'Threshold': 100.00
-
-Channels_16_Stream:
-  'Total GPU Time (us)': 5265.72
-  'Avg Time per Channel - GPU (us)': 329.11
-  'Threshold': 100.00
-
-Channels_16_Serial:
-  'Total GPU Time (us)': 5265.72
-  'Avg Time per Channel - GPU (us)': 329.11
-  'Threshold': 100.00
-
-Channels_256_Batch:
-  'Total GPU Time (us)': 85696.71
-  'Avg Time per Channel - GPU (us)': 334.75
-  'Threshold': 100.00
-
-Channels_256_Stream:
-  'Total GPU Time (us)': 85696.71
-  'Avg Time per Channel - GPU (us)': 334.75
-  'Threshold': 100.00
-
-Channels_256_Serial:
-  'Total GPU Time (us)': 85696.71
-  'Avg Time per Channel - GPU (us)': 334.75
-  'Threshold': 100.00
-
-Channels_1024_Batch:
-  'Total GPU Time (us)': 337217.10
-  'Avg Time per Channel - GPU (us)': 329.31
-  'Threshold': 100.00
-
-Channels_1024_Stream:
-  'Total GPU Time (us)': 337217.10
-  'Avg Time per Channel - GPU (us)': 329.31
-  'Threshold': 100.00 
-
-Channels_1024_Serial:
-  'Total GPU Time (us)': 337217.10
-  'Avg Time per Channel - GPU (us)': 329.31
-  'Threshold': 100.00
-
-# --- Test Suite 2: Performance vs. Channel Complexity ---
-Length_16_Batch:
-  'Total GPU Time (us)': 319082.56
-  'Avg Time per Channel - GPU (us)': 311.60
-  'Threshold': 100.00
-
-Length_16_Stream:
-  'Total GPU Time (us)': 319082.56
-  'Avg Time per Channel - GPU (us)': 311.60
-  'Threshold': 100.00
-
-Length_16_Serial:
-  'Total GPU Time (us)': 319082.56
-  'Avg Time per Channel - GPU (us)': 311.60
-  'Threshold': 100.00
-
-Length_64_Batch:
-  'Total GPU Time (us)': 366564.52
-  'Avg Time per Channel - GPU (us)': 357.97
-  'Threshold': 100.00
-
-Length_64_Stream:
-  'Total GPU Time (us)': 366564.52
-  'Avg Time per Channel - GPU (us)': 357.97
-  'Threshold': 100.00
-
-Length_64_Serial:
-  'Total GPU Time (us)': 366564.52
-  'Avg Time per Channel - GPU (us)': 357.97
-  'Threshold': 100.00
-
-Length_128_Batch:
-  'Total GPU Time (us)': 425883.51
-  'Avg Time per Channel - GPU (us)': 415.90
-  'Threshold': 100.00
-
-Length_128_Stream:
-  'Total GPU Time (us)': 425883.51
-  'Avg Time per Channel - GPU (us)': 415.90
-  'Threshold': 100.00 
-
-Length_128_Serial:
-  'Total GPU Time (us)': 425883.51
-  'Avg Time per Channel - GPU (us)': 415.90
-  'Threshold': 100.00
-
-# --- Test Suite 3: Performance vs. MIMO Configuration ---
-MIMO_2x2_Batch:
-  'Total GPU Time (us)': 158999.06
-  'Avg Time per Channel - GPU (us)': 155.27
-  'Threshold': 100.00
-
-MIMO_2x2_Stream:
-  'Total GPU Time (us)': 158999.06
-  'Avg Time per Channel - GPU (us)': 155.27
-  'Threshold': 100.00
-
-MIMO_2x2_Serial:
-  'Total GPU Time (us)': 158999.06
-  'Avg Time per Channel - GPU (us)': 155.27
-  'Threshold': 100.00
-
-MIMO_4x4_Batch:
-  'Total GPU Time (us)': 336377.55
-  'Avg Time per Channel - GPU (us)': 328.49
-  'Threshold': 100.00
-
-MIMO_4x4_Stream:
-  'Total GPU Time (us)': 336377.55
-  'Avg Time per Channel - GPU (us)': 328.49
-  'Threshold': 100.00
-
-MIMO_4x4_Serial:
-  'Total GPU Time (us)': 336377.55
-  'Avg Time per Channel - GPU (us)': 328.49
-  'Threshold': 100.00
-
-MIMO_8x8_Batch:
-  'Total GPU Time (us)': 718312.46
-  'Avg Time per Channel - GPU (us)': 701.48
-  'Threshold': 100.00
-
-MIMO_8x8_Stream:
-  'Total GPU Time (us)': 718312.46
-  'Avg Time per Channel - GPU (us)': 701.48
-  'Threshold': 100.00
-
-MIMO_8x8_Serial:
-  'Total GPU Time (us)': 718312.46
-  'Avg Time per Channel - GPU (us)': 701.48
-  'Threshold': 100.00
-
-# --- Test Suite 4: Performance vs. Signal Samples ---
-Samples_30720_Batch:
-  'Total GPU Time (us)': 84702.49
-  'Avg Time per Channel - GPU (us)': 82.72
-  'Threshold': 100.00
-
-Samples_30720_Stream:
-  'Total GPU Time (us)': 84702.49
-  'Avg Time per Channel - GPU (us)': 82.72
-  'Threshold': 100.00
-
-Samples_30720_Serial:
-  'Total GPU Time (us)': 84702.49
-  'Avg Time per Channel - GPU (us)': 82.72
-  'Threshold': 100.00
-
-Samples_61440_Batch:
-  'Total GPU Time (us)': 168761.94
-  'Avg Time per Channel - GPU (us)': 164.81
-  'Threshold': 100.00
-
-Samples_61440_Stream:
-  'Total GPU Time (us)': 168761.94
-  'Avg Time per Channel - GPU (us)': 164.81
-  'Threshold': 100.00
-
-Samples_61440_Serial:
-  'Total GPU Time (us)': 168761.94
-  'Avg Time per Channel - GPU (us)': 164.81
-  'Threshold': 100.00
-
-Samples_122880_Batch:
-  'Total GPU Time (us)': 336500.40
-  'Avg Time per Channel - GPU (us)': 328.61
-  'Threshold': 100.00
-
-Samples_122880_Stream:
-  'Total GPU Time (us)': 336500.40
-  'Avg Time per Channel - GPU (us)': 328.61
-  'Threshold': 100.00
-
-Samples_122880_Serial:
-  'Total GPU Time (us)': 336500.40
-  'Avg Time per Channel - GPU (us)': 328.61
-  'Threshold': 100.00

ci-scripts/tests/nr_physim_gpu_benchmark/gpu_test_driver.py

@@ -1,65 +0,0 @@
-import argparse
-import os
-import subprocess
-import sys
-import yaml
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Test driver for the GPU benchmark suite.")
-    parser.add_argument("--executable", required=True, help="Path to the test_channel_scalability executable")
-    cli_args = parser.parse_args()
-
-    script_dir = os.path.dirname(os.path.realpath(__file__))
-    matrix_file_path = os.path.join(script_dir, "gpu_test_matrix.yaml")
-
-    try:
-        with open(matrix_file_path) as f:
-            test_matrix = yaml.safe_load(f)
-    except FileNotFoundError:
-        print(f"ERROR: Test matrix file not found at {matrix_file_path}")
-        sys.exit(1)
-
-    failed_tests = []
-
-    for test_case in test_matrix["tests"]:
-        name = test_case["name"]
-        args = test_case["args"]
-
-        print(f"\n{'='*80}")
-        print(f"--- Running Test Case: {name} ---")
-        print(f"{'='*80}\n")
-
-        command = [
-            "python3",
-            os.path.join(script_dir, "run_gpu_benchmark.py"),
-            "--executable",
-            cli_args.executable,
-            "--args",
-            args,
-            "--test-case-name",
-            name,
-        ]
-
-        result = subprocess.run(command)
-
-        if result.returncode != 0:
-            print(f"\n--- !!! Test Case FAILED: {name} !!! ---\n")
-            failed_tests.append(name)
-        else:
-            print(f"\n--- Test Case PASSED: {name} ---\n")
-
-    print(f"\n{'='*80}")
-    print("--- Test Suite Summary ---")
-    if not failed_tests:
-        print("\033[92mAll test cases PASSED.\033[0m")
-        sys.exit(0)
-    else:
-        print(f"\033[91mThe following {len(failed_tests)} test case(s) FAILED:\033[0m")
-        for test_name in failed_tests:
-            print(f"  - {test_name}")
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()

ci-scripts/tests/nr_physim_gpu_benchmark/gpu_test_matrix.yaml

@@ -1,76 +0,0 @@
-tests:
-  # --- Test Suite 1: Scalability vs. Channel Count ---
-  - name: "Channels_16_Batch"
-    args: "-c 16 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
-  - name: "Channels_16_Stream"
-    args: "-c 16 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
-  - name: "Channels_16_Serial"
-    args: "-c 16 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
-  - name: "Channels_256_Batch"
-    args: "-c 256 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
-  - name: "Channels_256_Stream"
-    args: "-c 256 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
-  - name: "Channels_256_Serial"
-    args: "-c 256 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
-  - name: "Channels_1024_Batch"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
-  - name: "Channels_1024_Stream"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
-  - name: "Channels_1024_Serial"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
-
-  # --- Test Suite 2: Performance vs. Channel Complexity ---
-  - name: "Length_16_Batch"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 16 -m batch -n 25"
-  - name: "Length_64_Batch"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 64 -m batch -n 25"
-  - name: "Length_64_Stream"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 64 -m stream -n 25"
-  - name: "Length_64_Serial"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 64 -m serial -n 25"
-  - name: "Length_128_Batch"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 128 -m batch -n 25"
-  - name: "Length_128_Stream"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 128 -m stream -n 25"
-  - name: "Length_128_Serial"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 128 -m serial -n 25"
-
-  # --- Test Suite 3: Performance vs. MIMO Configuration ---
-  - name: "MIMO_2x2_Batch"
-    args: "-c 1024 -t 2 -r 2 -s 122880 -l 32 -m batch -n 25"
-  - name: "MIMO_2x2_Stream"
-    args: "-c 1024 -t 2 -r 2 -s 122880 -l 32 -m stream -n 25"
-  - name: "MIMO_2x2_Serial"
-    args: "-c 1024 -t 2 -r 2 -s 122880 -l 32 -m serial -n 25"
-  - name: "MIMO_4x4_Batch"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
-  - name: "MIMO_4x4_Stream"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
-  - name: "MIMO_4x4_Serial"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"
-  - name: "MIMO_8x8_Batch"
-    args: "-c 1024 -t 8 -r 8 -s 122880 -l 32 -m batch -n 25"
-  - name: "MIMO_8x8_Stream"
-    args: "-c 1024 -t 8 -r 8 -s 122880 -l 32 -m stream -n 25"
-  - name: "MIMO_8x8_Serial"
-    args: "-c 1024 -t 8 -r 8 -s 122880 -l 32 -m serial -n 25"
-
-  # --- Test Suite 4: Performance vs. Signal Samples ---
-  - name: "Samples_30720_Batch"
-    args: "-c 1024 -t 4 -r 4 -s 30720 -l 32 -m batch -n 25"
-  - name: "Samples_30720_Stream"
-    args: "-c 1024 -t 4 -r 4 -s 30720 -l 32 -m stream -n 25"
-  - name: "Samples_30720_Serial"
-    args: "-c 1024 -t 4 -r 4 -s 30720 -l 32 -m serial -n 25"
-  - name: "Samples_61440_Batch"
-    args: "-c 1024 -t 4 -r 4 -s 61440 -l 32 -m batch -n 25"
-  - name: "Samples_61440_Stream"
-    args: "-c 1024 -t 4 -r 4 -s 61440 -l 32 -m stream -n 25"
-  - name: "Samples_61440_Serial"
-    args: "-c 1024 -t 4 -r 4 -s 61440 -l 32 -m serial -n 25"
-  - name: "Samples_122880_Batch"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m batch -n 25"
-  - name: "Samples_122880_Stream"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m stream -n 25"
-  - name: "Samples_122880_Serial"
-    args: "-c 1024 -t 4 -r 4 -s 122880 -l 32 -m serial -n 25"

ci-scripts/tests/nr_physim_gpu_benchmark/run_gpu_benchmark.py

@@ -1,130 +0,0 @@
-import argparse
-import json
-import os
-import re
-import subprocess
-import sys
-import time
-import yaml
-
-
-def parse_benchmark_output(log_text):
-    metrics = {}
-    pattern = re.compile(r"\|\s*(?P<key>[\w\s\(\)\-]+?)\s*\|\s*(?P<value>[\d\.]+)x?\s*\|")
-    for line in log_text.splitlines():
-        match = pattern.search(line)
-        if match:
-            key = match.group("key").strip()
-            value = float(match.group("value"))
-            metrics[key] = value
-    return metrics
-
-
-def analyze_gpu_log(log_file):
-    util_vals, power_vals = [], []
-    try:
-        with open(log_file, "r") as f:
-            for line in f:
-                if "utilization.gpu" in line:
-                    continue
-                parts = line.strip().split(",")
-                if len(parts) >= 2:
-                    try:
-                        util_vals.append(float(parts[0].strip()))
-                        power_vals.append(float(parts[1].strip()))
-                    except (ValueError, IndexError):
-                        continue
-    except FileNotFoundError:
-        return "N/A", "N/A"
-    if not util_vals or not power_vals:
-        return "N/A", "N/A"
-    avg_util = sum(util_vals) / len(util_vals)
-    max_util = max(util_vals)
-    avg_power = sum(power_vals) / len(power_vals)
-    max_power = max(power_vals)
-    return (f"Avg: {avg_util:.1f}%, Max: {max_util:.1f}%", f"Avg: {avg_power:.1f}W, Max: {max_power:.1f}W")
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Run a single GPU benchmark and compare against a baseline.")
-    parser.add_argument("--executable", required=True, help="Path to the test_channel_scalability executable")
-    parser.add_argument("--args", required=True, help="Arguments to pass to the executable, in quotes")
-    parser.add_argument("--test-case-name", required=True, help="The name of the test case to look up in the baseline file")
-    cli_args = parser.parse_args()
-
-    gpu_log_file = "nvidia-smi.log"
-    monitor_command = f"nvidia-smi --query-gpu=utilization.gpu,power.draw --format=csv,noheader,nounits -l 1 > {gpu_log_file}"
-    monitor_process = subprocess.Popen(monitor_command, shell=True)
-    command = [cli_args.executable] + cli_args.args.split()
-    print(f"Running command: {' '.join(command)}")
-    result = subprocess.run(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    monitor_process.terminate()
-    time.sleep(1)
-
-    if result.returncode != 0:
-        print("--- Benchmark FAILED to run ---")
-        print(result.stdout)
-        print(result.stderr)
-        sys.exit(1)
-
-    print("--- Benchmark Ran Successfully ---")
-    print(result.stdout)
-
-    gpu_util_summary, gpu_power_summary = analyze_gpu_log(gpu_log_file)
-    print("\n--- GPU Monitoring Summary ---")
-    print(f"GPU Utilization: {gpu_util_summary}")
-    print(f"GPU Power Draw:  {gpu_power_summary}")
-
-    measured_metrics = parse_benchmark_output(result.stdout)
-    if not measured_metrics:
-        print("ERROR: Could not parse any metrics from the benchmark's text output.")
-        sys.exit(1)
-
-    try:
-        script_dir = os.path.dirname(os.path.realpath(__file__))
-        baseline_file_path = os.path.join(script_dir, "gpu_performance_baselines.yaml")
-        with open(baseline_file_path) as f:
-            all_baselines = yaml.safe_load(f)
-    except FileNotFoundError:
-        print(f"ERROR: Master baseline file not found at {baseline_file_path}")
-        sys.exit(1)
-
-    baseline_metrics = all_baselines.get(cli_args.test_case_name)
-    if not baseline_metrics:
-        print(f"ERROR: Could not find baseline entry for '{cli_args.test_case_name}' in {baseline_file_path}")
-        sys.exit(1)
-
-    all_metrics_ok = True
-    print("\n--- Performance Validation ---")
-    for key, baseline_value in baseline_metrics.items():
-        if key == "Threshold":
-            continue
-
-        if key in measured_metrics:
-            measured_value = measured_metrics[key]
-            threshold = baseline_metrics.get("Threshold", 0.25)
-            upper_bound = baseline_value * (1 + threshold)
-
-            print(f"Metric: '{key}'")
-            print(f"  - Measured: {measured_value:.2f}")
-            print(f"  - Baseline: {baseline_value:.2f}")
-            print(f"  - Allowed Upper Bound: {upper_bound:.2f}")
-
-            if measured_value > upper_bound:
-                print("  - STATUS: \033[91mFAILED (Exceeded threshold)\033[0m")
-                all_metrics_ok = False
-            else:
-                print("  - STATUS: \033[92mPASSED\033[0m")
-        else:
-            print(f"Metric '{key}' from baseline not found in run output. SKIPPING.")
-
-    if all_metrics_ok:
-        print("\nOverall Performance: PASSED")
-        sys.exit(0)
-    else:
-        print("\nOverall Performance: FAILED due to regression.")
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -240,7 +240,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
@@ -271,7 +271,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 0?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
@@ -302,7 +302,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_5g_rfsim_fr2_66prb.xml

@@ -21,7 +21,7 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
+  <htmlTabRef>rfsim-fr2-66prb-5gnr-tdd</htmlTabRef>
   <htmlTabName>Monolithic FR2 gNB</htmlTabName>
   <htmlTabIcon>wrench</htmlTabIcon>
 
@@ -42,7 +42,7 @@
     <class>Deploy_Object</class>
     <desc>Deploy OAI gNB</desc>
     <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
     <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
@@ -50,7 +50,7 @@
     <class>Deploy_Object</class>
     <desc>Deploy OAI NR-UE</desc>
     <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
     <services>oai-gnb oai-nr-ue</services>
   </testCase>
 
@@ -88,7 +88,7 @@
     <always_exec>true</always_exec>
     <desc>Undeploy all OAI 5G stack</desc>
     <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+    <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
     <d_retx_th>10,0,0,0</d_retx_th>
     <u_retx_th>10,0,0,0</u_retx_th>
   </testCase>

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -120,7 +120,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.180 9090 | grep "1234"</command>
   </testCase>
 
   <testCase>
@@ -181,7 +181,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 0?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
@@ -218,7 +218,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.180 9090 | grep "1234"</command>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_build_run_tests.xml

@@ -29,7 +29,6 @@
     <class>Build_Run_Tests</class>
     <desc>Build and Run UnitTests</desc>
     <node>obelix</node>
-    <kind>all</kind>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_image_build.xml

@@ -35,7 +35,7 @@
     <class>Build_Image</class>
     <desc>Build all Images</desc>
     <node>obelix</node>
-    <kind>all</kind>
+    <kind>x86</kind>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -80,7 +80,7 @@
   <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/UDP/800M)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 800M -t 30 -R</iperf_args>
+    <iperf_args>-u -b 800M -t 30 -R -l 1428</iperf_args>
     <svr_id>oc-cn5g-20897-aerial</svr_id>
     <id>up2-aerial</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -101,7 +101,7 @@
     <class>Iperf</class>
     <desc>Optional iperf (DL/UDP/1000M)(30 sec)(single-ue profile)</desc>
     <may_fail>true</may_fail>
-    <iperf_args>-u -b 1000M -t 30 -R</iperf_args>
+    <iperf_args>-u -b 1000M -t 30 -R -l 1428</iperf_args>
     <svr_id>oc-cn5g-20897-aerial</svr_id>
     <id>up2-aerial</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

@@ -101,7 +101,7 @@
   <testCase>
     <class>Iperf</class>
     <desc>iperf (DL/UDP/200M)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 200M -t 30 -R</iperf_args>
+    <iperf_args>-u -b 200M -t 30 -R -l 1428</iperf_args>
     <svr_id>oc-cn5g-20897-aerial</svr_id>
     <id>up2-aerial</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml

@@ -129,7 +129,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
@@ -152,7 +152,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to DU0?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
@@ -175,7 +175,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml

@@ -121,7 +121,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to gNB-PCI1?</desc>
     <node>rocket</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
@@ -144,7 +144,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to gNB-PCI0?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/physim_gracehopper.xml

@@ -35,7 +35,7 @@
     <class>Build_Deploy_Docker_PhySim</class>
     <desc>Build and Deploy PhySim</desc>
     <node>localhost</node>
-    <ctest-opt>-R 5g -E "nr_dlsim|nr_ulsim|ldpctest|cuda" -j32</ctest-opt>
+    <ctest-opt>-R 5g -E "nr_dlsim|nr_ulsim|ldpctest" -j32</ctest-opt>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/test_channel_scalability_gracehopper.xml

@@ -1,41 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>physim-tab</htmlTabRef>
-  <htmlTabName>PhySim</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </testCase>
-
-  <testCase>
-    <class>Build_Deploy_Docker_PhySim</class>
-    <desc>Build and Deploy Test Channel Scalability</desc>
-    <node>localhost</node>
-    <ctest-opt>-R cuda</ctest-opt>
-  </testCase>
-
-</testCaseList>

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml

@@ -208,9 +208,10 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
+            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml

@@ -30,9 +30,10 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
+            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml

@@ -208,9 +208,10 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes: 
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
+            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml

@@ -208,9 +208,10 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
+            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml

@@ -28,9 +28,10 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf
+            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml

@@ -33,9 +33,10 @@ services:
             TZ: Europe/Paris
             HOSTNAME: oai_ue0
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf
+            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml

@@ -208,9 +208,10 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
+            - ../../conf_files/lteue.rfsim.conf:/opt/oai-lte-ue/etc/ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep lte-uesoftmodem"
             interval: 10s

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

@@ -130,10 +130,10 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
                                     --log_config.global_log_options level,nocolor,time
-                                    --rfsimulator.options chanmod
+                                    --rfsimulator.[0].options chanmod
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.171
                                     --telnetsrv.shrmod ci
-                                    --rfsimulator.serveraddr 192.168.71.181
+                                    --rfsimulator.[0].serveraddr 192.168.71.181
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cu
@@ -168,7 +168,7 @@ services:
                                     --gNBs.[0].servingCellConfigCommon.[0].dl_absoluteFrequencyPointA 642024
                                     --gNBs.[0].servingCellConfigCommon.[0].ssb_PositionsInBurst_Bitmap 3
                                     --MACRLCs.[0].local_n_address 192.168.71.172
-                                    --rfsimulator.serveraddr 192.168.71.181
+                                    --rfsimulator.[0].serveraddr 192.168.71.181
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cu
@@ -199,8 +199,8 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001100
-                                    --rfsimulator.options chanmod
-                                    --rfsimulator.serveraddr server
+                                    --rfsimulator.[0].options chanmod
+                                    --rfsimulator.[0].serveraddr server
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.181 --telnetsrv.listenport 8091
                                     --channelmod.modellist_rfsimu_1.[0].model_name rfsimu_channel_ue0
                                     --channelmod.modellist_rfsimu_1.[1].model_name rfsimu_channel_ue1

ci-scripts/yaml_files/5g_rfsimulator/README.md

@@ -256,7 +256,7 @@ Create the entry for the second UE in `docker-compose.yaml` file as follows:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         devices:
@@ -518,8 +518,7 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 ```
 

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

@@ -123,7 +123,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -150,7 +150,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -177,7 +177,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -204,7 +204,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -231,7 +231,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -258,7 +258,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -285,7 +285,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -312,7 +312,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -339,7 +339,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -366,7 +366,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator/local-override-ue-gdb.yaml

@@ -3,4 +3,4 @@ services:
     privileged: true
     stdin_open: true
     tty: true
-    command: gdb --args /opt/oai-nr-ue/bin/nr-uesoftmodem -O /opt/oai-nr-ue/etc/nr-ue.conf -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+    command: gdb --args /opt/oai-nr-ue/bin/nr-uesoftmodem -O /opt/oai-nr-ue/etc/nr-ue.conf -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time

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

@@ -121,7 +121,7 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100
-                                    --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+                                    --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:

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

@@ -124,7 +124,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: --rfsim -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

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

@@ -309,7 +309,7 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001100
-                                    --rfsimulator.serveraddr oai-du
+                                    --rfsimulator.[0].serveraddr oai-du
         depends_on:
             - oai-du
         networks:
@@ -338,8 +338,8 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
-                                    --uicc0.imsi 208990100001101 --uicc0.nssai_sst 2
-                                    --rfsimulator.serveraddr 192.168.78.3
+                                    --uicc0.imsi 208990100001101 --uicc0.pdu_sessions.[0].nssai_sst 2
+                                    --rfsimulator.[0].serveraddr 192.168.78.3
         depends_on:
             - oai-du2
         networks:
@@ -368,8 +368,8 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
-                                    --uicc0.imsi 208990100001102 --uicc0.nssai_sst 3
-                                    --rfsimulator.serveraddr 192.168.78.4
+                                    --uicc0.imsi 208990100001102 --uicc0.pdu_sessions.[0].nssai_sst 3
+                                    --rfsimulator.[0].serveraddr 192.168.78.4
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-du3

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

@@ -8,7 +8,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.[0].wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
@@ -33,7 +33,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         devices:
             - /dev/net/tun:/dev/net/tun

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

@@ -105,7 +105,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000003 --rfsimulator.serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000003 --rfsimulator.[0].serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -124,7 +124,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue2
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000004 --rfsimulator.serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000004 --rfsimulator.[0].serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

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

@@ -102,7 +102,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.140
         volumes:
-            - ../../conf_files/gnb.sa.band261.u3.32prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb.sa.band257.u3.66prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             start_period: 10s
@@ -121,8 +121,8 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
-                                    --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-                                    -r 32 --numerology 3 --band 261 -C 27533160000 --ssb 73
+                                    --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+                                    -C 27975360000 -r 66 --numerology 3 --ssb 48 --band 257
             ASAN_OPTIONS: detect_leaks=0
         devices:
              - /dev/net/tun:/dev/net/tun

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

@@ -111,7 +111,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time --num-ues 10
+            USE_ADDITIONAL_OPTIONS: -E --rfsim --log_config.global_log_options level,nocolor,time --num-ues 10
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_multiue/nrue.uicc.conf

@@ -2,74 +2,193 @@ uicc0 = {
   imsi = "208990100001100";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 uicc1 = {
   imsi = "208990100001101";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 uicc2 = {
   imsi = "208990100001102";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 uicc3 = {
   imsi = "208990100001103";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 uicc4 = {
   imsi = "208990100001104";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 uicc5 = {
   imsi = "208990100001105";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 uicc6 = {
   imsi = "208990100001106";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 uicc7 = {
   imsi = "208990100001107";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 uicc8 = {
   imsi = "208990100001108";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 uicc9 = {
   imsi = "208990100001109";
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
+  pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
 }
 
-
-
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
+rfsimulator = (
+  {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }
+);
+
+RUs = (
+  {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }
+);
+
+cells = (
+  {
+    ru_id      = 0;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 1;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 2;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 3;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 4;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 5;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 6;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 7;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 8;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 9;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }
+);

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

@@ -149,7 +149,7 @@ services:
                                     --gNBs.[0].nr_cellid 0
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.171
                                     --telnetsrv.shrmod ci
-                                    --rfsimulator.serveraddr 192.168.71.190
+                                    --rfsimulator.[0].serveraddr 192.168.71.190
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cucp-0
@@ -176,7 +176,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --rfsim --rfsimulator.serveraddr server
+            USE_ADDITIONAL_OPTIONS: --rfsim --rfsimulator.[0].serveraddr server
                                     --band 78 -C 3619200000 -r 106 --numerology 1 --ssb 516
                                     --uicc0.imsi 208990100001100
                                     --log_config.global_log_options level,nocolor,time
@@ -259,7 +259,7 @@ services:
             - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
-                                    --rfsimulator.serveraddr 192.168.71.190
+                                    --rfsimulator.[0].serveraddr 192.168.71.190
                                     --log_config.global_log_options level,nocolor,time
                                     --gNBs.[0].gNB_DU_ID 1234
                                     --gNBs.[0].gNB_ID 0xb00

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

@@ -123,7 +123,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.prop_delay 238.74 --rfsimulator.serveraddr 192.168.71.140 --num-ul-actors 1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.[0].prop_delay 238.74 --rfsimulator.[0].serveraddr 192.168.71.140 --num-ul-actors 1 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

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

@@ -121,13 +121,10 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS:
-                --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60
-                --rfsim --rfsimulator.prop_delay 20 --rfsimulator.options chanmod
-                --rfsimulator.serveraddr 192.168.71.140
+                --rfsim --rfsimulator.[0].serveraddr 192.168.71.140
                 --time-sync-I 0.1 --ntn-initial-time-drift -46
-                --initial-fo 57340 --cont-fo-comp 2
+                --initial-fo 57340 --cont-fo-comp 3
                 --log_config.global_log_options level,nocolor,time
-                --num-ul-actors 1
         depends_on:
             - oai-gnb
         networks:

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

@@ -36,7 +36,7 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim -E
                                     --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw
-                                    --rfsimulator.serveraddr 192.168.71.140
+                                    --rfsimulator.[0].serveraddr 192.168.71.140
                                     --log_config.global_log_options level,nocolor,time
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
                                     --telnetsrv.shrmod ciUE

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

@@ -8,7 +8,7 @@ services:
             - NET_ADMIN
             - NET_RAW
         environment:
-            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --sync-ref 4 --rfsim --rfsimulator.serveraddr server --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --sync-ref 4 --rfsim --rfsimulator.[0].serveraddr server --log_config.global_log_options level,nocolor,time
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
@@ -33,7 +33,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --rfsim --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --rfsim --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-nr-ue-1
         networks:

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

@@ -8,7 +8,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.[0].wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
@@ -33,7 +33,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         devices:
             - /dev/net/tun:/dev/net/tun

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

@@ -149,7 +149,7 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48
-                                    --rfsimulator.serveraddr 192.168.71.141 --extra-pdu-id 2 --log_config.global_log_options level,nocolor,time
+                                    --rfsimulator.[0].serveraddr 192.168.71.141 --log_config.global_log_options level,nocolor,time
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
@@ -160,7 +160,7 @@ services:
         devices:
              - /dev/net/tun:/dev/net/tun
         volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+            - ../../conf_files/nrue.uicc.2pdu.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
             start_period: 10s

ci-scripts/yaml_files/sa_gnb_aerial/aerial_l1_entrypoint.sh

@@ -4,8 +4,6 @@
 cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"
 
 cd "$cuBB_Path" || exit 1
-# Add gdrcopy to LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/opt/mellanox/dpdk/lib/x86_64-linux-gnu:/opt/mellanox/doca/lib/x86_64-linux-gnu:/opt/nvidia/cuBB/cuPHY-CP/external/gdrcopy/build/x86_64/
 
 # Restart MPS
 # Export variables
@@ -14,7 +12,7 @@ export CUDA_MPS_PIPE_DIRECTORY=/var
 export CUDA_MPS_LOG_DIRECTORY=/var
 
 # Stop existing MPS
-sudo -E echo quit | sudo -E nvidia-cuda-mps-control
+echo quit | sudo -E nvidia-cuda-mps-control
 
 # Start MPS
 sudo -E nvidia-cuda-mps-control -d
@@ -24,11 +22,11 @@ sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control
 # Check if an argument is provided
 if [ $# -eq 0 ]; then
     # No argument provided, use default value
-    argument="P5G_FXN_GH"
+    argument="P5G_WNC_GH"
 else
     # Argument provided, use it
     argument="$1"
 fi
 
-sudo -E "$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
-sudo -E ./build/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect
+sudo -E "$cuBB_Path"/build.$(uname -m)/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
+sudo -E ./build.$(uname -m)/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect

ci-scripts/yaml_files/sa_gnb_aerial/cuphycontroller_P5G_WNC_GH.yaml

@@ -0,0 +1,243 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+aerial_sdk_version: 25-3-cubb
+l2adapter_filename: l2_adapter_config_P5G_GH.yaml
+aerial_metrics_backend_address: 127.0.0.1:8081
+
+# CPU core shared by all low-priority threads
+low_priority_core: 10
+enable_ptp_svc_monitoring: 0
+ptp_rms_threshold: 20 #ns
+nic_tput_alert_threshold_mbps: 85000
+
+cuphydriver_config:
+  standalone: 0
+  validation: 0
+  num_slots: 8
+  log_level: DBG
+  profiler_sec: 0
+  dpdk_thread: 10
+  dpdk_verbose_logs: 0
+  accu_tx_sched_res_ns: 500
+  accu_tx_sched_disable: 0 #Flag applicable only for CX6-DX : BF3/CX7 HW and beyond support accurate send scheduling directly on timestamp, for CX6-DX this is implemented via software emulation
+  fh_stats_dump_cpu_core: -1
+  pdump_client_thread: -1
+  use_green_contexts: 0
+  use_batched_memcpy: 0 # Experimental feature; requires >= CUDA 12.8
+  mps_sm_pusch: 100
+  mps_sm_pucch: 2
+  mps_sm_prach: 2
+  mps_sm_ul_order: 20
+  mps_sm_pdsch: 102
+  mps_sm_pdcch: 10
+  mps_sm_pbch: 2
+  mps_sm_gpu_comms: 16
+  mps_sm_srs: 16
+  pdsch_fallback: 0
+  dpdk_file_prefix: cuphycontroller
+  nics:
+    - nic: '0000:01:00.0'
+      mtu: 9216
+      cpu_mbufs: 196608
+      uplane_tx_handles: 64
+      txq_size: 8192
+      rxq_size: 16384
+      gpu: 0
+  cus_port_failover: 0
+  gpus:
+    - 0
+    # Set GPUID to the GPU sharing the PCIe switch as NIC
+    # run nvidia-smi topo -m to find out which GPU
+  workers_ul: [4,5]
+  workers_dl: [6,7,8]
+  debug_worker: -1
+  workers_sched_priority: 95
+  prometheus_thread: -1
+  start_section_id_srs: 3072
+  start_section_id_prach: 2048
+  enable_ul_cuphy_graphs: 1
+  enable_dl_cuphy_graphs: 1
+  ul_order_kernel_mode: 0 # 0: Ping-Pong, 1: dual CTA
+  ul_order_timeout_cpu_ns: 8000000
+  ul_order_timeout_log_interval_ns: 1000000000
+  ul_order_timeout_gpu_ns: 3000000
+  ul_order_timeout_gpu_srs_ns: 5200000
+  ul_srs_aggr3_task_launch_offset_ns: 500000
+  ul_order_timeout_gpu_log_enable: 0
+  ul_order_max_rx_pkts: 512
+  ul_order_rx_pkts_timeout_ns: 100000
+  cplane_disable: 0
+  gpu_init_comms_dl: 1
+  cell_group: 1
+  cell_group_num: 1
+  fix_beta_dl: 0
+  bfw_beta_prescaler: 16384
+  pusch_workCancelMode: 2  # set cuphyPuschStatPrms_t workCancelMode field to PUSCH_DEVICE_GRAPHS; this only sets the mode and does not cancel work;
+                           # work cancellation (i.e., not launching some of the device graphs) can only occur after an explicit internal
+                           # memory write is timely observed by a PUSCH graph.
+  pusch_sinr: 2
+  pusch_rssi: 1
+  pusch_tdi: 1
+  pusch_cfo: 1
+  pusch_dftsofdm: 0
+  pusch_to: 1
+  pusch_select_eqcoeffalgo: 3
+  pusch_select_chestalgo: 1
+  pusch_enable_perprgchest: 0
+  pusch_tbsizecheck: 1
+  pusch_deviceGraphLaunchEn: 1
+  pusch_waitTimeOutPreEarlyHarqUs: 3000
+  pusch_waitTimeOutPostEarlyHarqUs: 3000
+  puxch_polarDcdrListSz: 8
+  enable_cpu_task_tracing: 0
+  enable_prepare_tracing: 0
+  disable_empw: 0 #1=>Disables Multi packet WQE feature
+  cqe_tracer_config:
+    enable_dl_cqe_tracing: 0
+    cqe_trace_cell_mask: 1 #[64 bit mask: Bit0->Cell0, Bit1->Cell1...]
+    cqe_trace_slot_mask: 196800 #[20 bit mask: Bit0->Slot0, Bit1->Slot1...] 196800=>All *6,*7 DL Slots
+  ul_rx_pkt_tracing_level: 0
+  ul_rx_pkt_tracing_level_srs: 0
+  pmu_metrics: 0 #Enable and select PMU metrics, 0=disabled, 1=General Counters (platform agnostic), 2=Topdown Metrics (Grace only), 3=Cache Metrics (Grace only)
+  enable_h2d_copy_thread: 1
+  h2d_copy_thread_cpu_affinity : 11
+  h2d_copy_thread_sched_priority : 95 #0->SCHED_OTHER, >0->Actual
+  split_ul_cuda_streams: 0 # 1=Put UL slot 4 and slot 5 on different streams for DDDSUUDDDD pattern
+  serialize_pucch_pusch: 0 # 1=Force serialization of PUSCH/PUCCH
+                           # Note: for Early Harq (EH) order is PUSCH EH -> PUCCH -> PUSCH non EH
+                           #       for non-Early Harq order is PUCCH -> all PUSCH processing
+  aggr_obj_non_avail_th: 5 # Threshold for consecutive non-availability of Aggregated objects(UL/DL) or DL/UL buffers
+  dl_wait_th_ns:
+    - 500000  #H2D copy wait threshold
+    - 4000000 #cuPHY DL channel wait threshold
+  sendCPlane_timing_error_th_ns : 0
+  sendCPlane_ulbfw_backoff_th_ns: 300000    # ULBFW must be completed by cplane send time - this is the backoff time
+  sendCPlane_dlbfw_backoff_th_ns: 300000    # DLBFW must be completed by cplane send time - this is the backoff time
+  pusch_forcedNumCsi2Bits: 0
+  mMIMO_enable: 0
+  enable_srs: 1
+  ue_mode: 0
+  mCh_segment_proc_enable: 0
+  pusch_aggr_per_ctx: 3
+  prach_aggr_per_ctx: 2
+  pucch_aggr_per_ctx: 4
+  srs_aggr_per_ctx: 3
+  ul_input_buffer_per_cell: 10
+  ul_input_buffer_per_cell_srs: 6
+  max_harq_pools: 384
+  max_harq_tx_count_bundled: 10
+  max_harq_tx_count_non_bundled: 4
+  ok_testbench_config:
+    enable_ok_tb: 0
+    num_ok_tb_slot: 0 #Presently not used
+  max_ru_unhealthy_ul_slots: 100
+  srs_chest_algo_type: 0
+  srs_chest_tol2_normalization_algo_type: 1
+  srs_chest_tol2_constant_scaler: 32768.0
+  bfw_power_normalization_alg_selector: 1
+  total_num_srs_chest_buffers: 6144
+  send_static_bfw_wt_all_cplane: 1
+  ul_pcap_capture_enable: 0
+  ul_pcap_capture_thread_cpu_affinity: 10
+  ul_pcap_capture_thread_sched_priority: 95
+  pcap_logger_ul_cplane_enable: 0
+  pcap_logger_dl_cplane_enable: 0
+  pcap_logger_thread_cpu_affinity: 10
+  pcap_logger_thread_sched_prio: 95
+  pcap_logger_file_save_dir: ./
+  dlc_bfw_enable_divide_per_cell: 0 # Enable/disable dividing DL BFW C-Plane transmission window among multiple cells in a slot
+  ulc_bfw_enable_divide_per_cell: 0 # Enable/disable dividing UL BFW C-Plane transmission window among multiple cells in a slot
+  dlc_alloc_cplane_bfw_txq: 0 # Allocates a second separate queue for BFW DL C-Plane transmission
+  ulc_alloc_cplane_bfw_txq: 1 # Allocates a second separate queue for BFW UL C-Plane transmission
+  #static beam id range
+  static_beam_id_start: 1
+  static_beam_id_end: 16527
+  #dynamic beam id range
+  dynamic_beam_id_start: 16528 #Dynamic beam ID start should be after static beam ID end
+  dynamic_beam_id_end: 32767 #15bit max value
+  bfw_c_plane_chaining_mode: 0 # 0: Default memcpy of BFW weights, 1: CPU mbuf chaining of BFW weights, 2: GPU mbuf chaining
+  enable_l1_param_sanity_check: 0
+  pusch_nMaxLdpcHetConfigs: 32
+  notify_ul_harq_buffer_release: 0
+
+  # data_config:
+    # datalake_core: 12           # This must be set for Data Lake and/or E3 Agent to be used
+    # datalake_db_write_enable: 1   # Enable/disable ClickHouse writes based on datalake_data_types
+    # datalake_samples: 1000000
+    # datalake_address: localhost
+    # datalake_engine: "MergeTree() PRIMARY KEY (TsTaiNs)"
+    # # datalake_drop_tables: 0   # Set to 1 to drop Clickhouse tables at startup
+    # datalake_data_types: [fh, pusch, hest]  # Data types to write to ClickHouse DB (all types always collected in memory for E3 Agent):
+                                            # fh = Fronthaul IQ samples,pusch = PUSCH/FAPI data, hest = channel estimates
+    # datalake_store_failed_pdu: 0      # Set to 1 to store PDU data even when CRC fails
+    # e3_agent_enable: 0          # Enable/disable E3 Agent and dApp capabilities
+    # num_rows_fh: 120
+    # num_rows_pusch: 200
+    # num_rows_hest: 140
+    # e3_pub_port: 5555           # E3 publisher port for indication messages
+    # e3_rep_port: 5556           # E3 reply port for E3AP requests
+    # e3_sub_port: 5560           # E3 subscriber port for Manager messages
+
+  cells:
+    - name: O-RU 0
+      cell_id: 1
+      ru_type: 1
+      # set to 00:00:00:00:00:00 to use the MAC address of the NIC port to use
+      src_mac_addr: 00:00:00:00:00:00
+      dst_mac_addr: e8:c7:cf:ad:12:0b #WNC n78
+      nic: '0000:01:00.0'
+      vlan: 500
+      pcp: 7
+      txq_count_uplane: 1
+      eAxC_id_ssb_pbch: [0, 1, 2, 3]
+      eAxC_id_pdcch: [0, 1, 2, 3]
+      eAxC_id_pdsch: [0, 1, 2, 3]
+      eAxC_id_csirs: [0, 1, 2, 3]
+      eAxC_id_pusch: [0, 1, 2, 3]
+      eAxC_id_pucch: [0, 1, 2, 3]
+      eAxC_id_srs: [8, 9, 10, 11]
+      eAxC_id_prach: [4, 5, 6, 7]
+      dl_iq_data_fmt: {comp_meth: 1, bit_width: 9}
+      ul_iq_data_fmt: {comp_meth: 1, bit_width: 9}
+      section_3_time_offset: 484
+      fs_offset_dl: 7
+      exponent_dl: 4
+      ref_dl: 0
+      fs_offset_ul: -5
+      exponent_ul: 4
+      max_amp_ul: 65504
+      mu: 1
+      T1a_max_up_ns: 280000
+      T1a_max_cp_ul_ns: 405000
+      Ta4_min_ns: 50000
+      Ta4_max_ns: 331000
+      Tcp_adv_dl_ns: 125000
+      ul_u_plane_tx_offset_ns: 280000
+      fh_len_range: 0
+      pusch_prb_stride: 273
+      prach_prb_stride: 12
+      srs_prb_stride: 273
+      pusch_ldpc_max_num_itr_algo_type: 1
+      pusch_fixed_max_num_ldpc_itrs: 10
+      pusch_ldpc_early_termination: 0
+      pusch_ldpc_algo_index: 0
+      pusch_ldpc_flags: 2
+      pusch_ldpc_use_half: 1
+      pusch_nMaxPrb: 273
+      pusch_nMaxRx: 4
+      ul_gain_calibration: 78.68
+      lower_guard_bw: 845
+      tv_pusch: cuPhyChEstCoeffs.h5

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

@@ -18,12 +18,13 @@ services:
       - /lib/modules:/lib/modules
       - /dev/hugepages:/dev/hugepages
       - /usr/src:/usr/src
+      - ./cuphycontroller_P5G_WNC_GH.yaml:/opt/nvidia/cuBB/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_WNC_GH.yaml
       - ./aerial_l1_entrypoint.sh:/opt/nvidia/cuBB/aerial_l1_entrypoint.sh
       - /var/log/aerial:/var/log/aerial
       - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:25-2.1
+    image: cubb-build:25-3
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
     command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
@@ -45,7 +46,7 @@ services:
       - IPC_LOCK
     ipc: "container:nv-cubb"
     environment:
-      USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
+      USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,utc_time
     deploy:
       resources:
         reservations:

ci-scripts/yaml_files/sa_gnb_aerial_ul/aerial_l1_entrypoint.sh

@@ -4,8 +4,6 @@
 cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"
 
 cd "$cuBB_Path" || exit 1
-# Add gdrcopy to LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/opt/mellanox/dpdk/lib/x86_64-linux-gnu:/opt/mellanox/doca/lib/x86_64-linux-gnu:/opt/nvidia/cuBB/cuPHY-CP/external/gdrcopy/build/x86_64/
 
 # Restart MPS
 # Export variables
@@ -14,7 +12,7 @@ export CUDA_MPS_PIPE_DIRECTORY=/var
 export CUDA_MPS_LOG_DIRECTORY=/var
 
 # Stop existing MPS
-sudo -E echo quit | sudo -E nvidia-cuda-mps-control
+echo quit | sudo -E nvidia-cuda-mps-control
 
 # Start MPS
 sudo -E nvidia-cuda-mps-control -d
@@ -24,11 +22,11 @@ sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control
 # Check if an argument is provided
 if [ $# -eq 0 ]; then
     # No argument provided, use default value
-    argument="P5G_FXN_GH"
+    argument="P5G_WNC_GH"
 else
     # Argument provided, use it
     argument="$1"
 fi
 
-sudo -E "$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
-sudo -E ./build/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect
+sudo -E "$cuBB_Path"/build.$(uname -m)/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
+sudo -E ./build.$(uname -m)/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect

ci-scripts/yaml_files/sa_gnb_aerial_ul/cuphycontroller_P5G_WNC_GH_ul.yaml

@@ -0,0 +1,243 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+aerial_sdk_version: 25-3-cubb
+l2adapter_filename: l2_adapter_config_P5G_GH.yaml
+aerial_metrics_backend_address: 127.0.0.1:8081
+
+# CPU core shared by all low-priority threads
+low_priority_core: 10
+enable_ptp_svc_monitoring: 0
+ptp_rms_threshold: 20 #ns
+nic_tput_alert_threshold_mbps: 85000
+
+cuphydriver_config:
+  standalone: 0
+  validation: 0
+  num_slots: 8
+  log_level: DBG
+  profiler_sec: 0
+  dpdk_thread: 10
+  dpdk_verbose_logs: 0
+  accu_tx_sched_res_ns: 500
+  accu_tx_sched_disable: 0 #Flag applicable only for CX6-DX : BF3/CX7 HW and beyond support accurate send scheduling directly on timestamp, for CX6-DX this is implemented via software emulation
+  fh_stats_dump_cpu_core: -1
+  pdump_client_thread: -1
+  use_green_contexts: 0
+  use_batched_memcpy: 0 # Experimental feature; requires >= CUDA 12.8
+  mps_sm_pusch: 100
+  mps_sm_pucch: 2
+  mps_sm_prach: 2
+  mps_sm_ul_order: 20
+  mps_sm_pdsch: 102
+  mps_sm_pdcch: 10
+  mps_sm_pbch: 2
+  mps_sm_gpu_comms: 16
+  mps_sm_srs: 16
+  pdsch_fallback: 0
+  dpdk_file_prefix: cuphycontroller
+  nics:
+    - nic: '0000:01:00.0'
+      mtu: 9216
+      cpu_mbufs: 196608
+      uplane_tx_handles: 64
+      txq_size: 8192
+      rxq_size: 16384
+      gpu: 0
+  cus_port_failover: 0
+  gpus:
+    - 0
+    # Set GPUID to the GPU sharing the PCIe switch as NIC
+    # run nvidia-smi topo -m to find out which GPU
+  workers_ul: [4,5]
+  workers_dl: [6,7,8]
+  debug_worker: -1
+  workers_sched_priority: 95
+  prometheus_thread: -1
+  start_section_id_srs: 3072
+  start_section_id_prach: 2048
+  enable_ul_cuphy_graphs: 1
+  enable_dl_cuphy_graphs: 1
+  ul_order_kernel_mode: 0 # 0: Ping-Pong, 1: dual CTA
+  ul_order_timeout_cpu_ns: 8000000
+  ul_order_timeout_log_interval_ns: 1000000000
+  ul_order_timeout_gpu_ns: 3000000
+  ul_order_timeout_gpu_srs_ns: 5200000
+  ul_srs_aggr3_task_launch_offset_ns: 500000
+  ul_order_timeout_gpu_log_enable: 0
+  ul_order_max_rx_pkts: 512
+  ul_order_rx_pkts_timeout_ns: 100000
+  cplane_disable: 0
+  gpu_init_comms_dl: 1
+  cell_group: 1
+  cell_group_num: 1
+  fix_beta_dl: 0
+  bfw_beta_prescaler: 16384
+  pusch_workCancelMode: 2  # set cuphyPuschStatPrms_t workCancelMode field to PUSCH_DEVICE_GRAPHS; this only sets the mode and does not cancel work;
+                           # work cancellation (i.e., not launching some of the device graphs) can only occur after an explicit internal
+                           # memory write is timely observed by a PUSCH graph.
+  pusch_sinr: 2
+  pusch_rssi: 1
+  pusch_tdi: 1
+  pusch_cfo: 1
+  pusch_dftsofdm: 0
+  pusch_to: 1
+  pusch_select_eqcoeffalgo: 3
+  pusch_select_chestalgo: 1
+  pusch_enable_perprgchest: 0
+  pusch_tbsizecheck: 1
+  pusch_deviceGraphLaunchEn: 1
+  pusch_waitTimeOutPreEarlyHarqUs: 3000
+  pusch_waitTimeOutPostEarlyHarqUs: 3000
+  puxch_polarDcdrListSz: 8
+  enable_cpu_task_tracing: 0
+  enable_prepare_tracing: 0
+  disable_empw: 0 #1=>Disables Multi packet WQE feature
+  cqe_tracer_config:
+    enable_dl_cqe_tracing: 0
+    cqe_trace_cell_mask: 1 #[64 bit mask: Bit0->Cell0, Bit1->Cell1...]
+    cqe_trace_slot_mask: 196800 #[20 bit mask: Bit0->Slot0, Bit1->Slot1...] 196800=>All *6,*7 DL Slots
+  ul_rx_pkt_tracing_level: 0
+  ul_rx_pkt_tracing_level_srs: 0
+  pmu_metrics: 0 #Enable and select PMU metrics, 0=disabled, 1=General Counters (platform agnostic), 2=Topdown Metrics (Grace only), 3=Cache Metrics (Grace only)
+  enable_h2d_copy_thread: 1
+  h2d_copy_thread_cpu_affinity : 11
+  h2d_copy_thread_sched_priority : 95 #0->SCHED_OTHER, >0->Actual
+  split_ul_cuda_streams: 0 # 1=Put UL slot 4 and slot 5 on different streams for DDDSUUDDDD pattern
+  serialize_pucch_pusch: 0 # 1=Force serialization of PUSCH/PUCCH
+                           # Note: for Early Harq (EH) order is PUSCH EH -> PUCCH -> PUSCH non EH
+                           #       for non-Early Harq order is PUCCH -> all PUSCH processing
+  aggr_obj_non_avail_th: 5 # Threshold for consecutive non-availability of Aggregated objects(UL/DL) or DL/UL buffers
+  dl_wait_th_ns:
+    - 500000  #H2D copy wait threshold
+    - 4000000 #cuPHY DL channel wait threshold
+  sendCPlane_timing_error_th_ns : 0
+  sendCPlane_ulbfw_backoff_th_ns: 300000    # ULBFW must be completed by cplane send time - this is the backoff time
+  sendCPlane_dlbfw_backoff_th_ns: 300000    # DLBFW must be completed by cplane send time - this is the backoff time
+  pusch_forcedNumCsi2Bits: 0
+  mMIMO_enable: 0
+  enable_srs: 1
+  ue_mode: 0
+  mCh_segment_proc_enable: 0
+  pusch_aggr_per_ctx: 9 #3
+  prach_aggr_per_ctx: 2
+  pucch_aggr_per_ctx: 4
+  srs_aggr_per_ctx: 3
+  ul_input_buffer_per_cell: 10
+  ul_input_buffer_per_cell_srs: 6
+  max_harq_pools: 384
+  max_harq_tx_count_bundled: 10
+  max_harq_tx_count_non_bundled: 4
+  ok_testbench_config:
+    enable_ok_tb: 0
+    num_ok_tb_slot: 0 #Presently not used
+  max_ru_unhealthy_ul_slots: 100
+  srs_chest_algo_type: 0
+  srs_chest_tol2_normalization_algo_type: 1
+  srs_chest_tol2_constant_scaler: 32768.0
+  bfw_power_normalization_alg_selector: 1
+  total_num_srs_chest_buffers: 6144
+  send_static_bfw_wt_all_cplane: 1
+  ul_pcap_capture_enable: 0
+  ul_pcap_capture_thread_cpu_affinity: 10
+  ul_pcap_capture_thread_sched_priority: 95
+  pcap_logger_ul_cplane_enable: 0
+  pcap_logger_dl_cplane_enable: 0
+  pcap_logger_thread_cpu_affinity: 10
+  pcap_logger_thread_sched_prio: 95
+  pcap_logger_file_save_dir: ./
+  dlc_bfw_enable_divide_per_cell: 0 # Enable/disable dividing DL BFW C-Plane transmission window among multiple cells in a slot
+  ulc_bfw_enable_divide_per_cell: 0 # Enable/disable dividing UL BFW C-Plane transmission window among multiple cells in a slot
+  dlc_alloc_cplane_bfw_txq: 0 # Allocates a second separate queue for BFW DL C-Plane transmission
+  ulc_alloc_cplane_bfw_txq: 1 # Allocates a second separate queue for BFW UL C-Plane transmission
+  #static beam id range
+  static_beam_id_start: 1
+  static_beam_id_end: 16527
+  #dynamic beam id range
+  dynamic_beam_id_start: 16528 #Dynamic beam ID start should be after static beam ID end
+  dynamic_beam_id_end: 32767 #15bit max value
+  bfw_c_plane_chaining_mode: 0 # 0: Default memcpy of BFW weights, 1: CPU mbuf chaining of BFW weights, 2: GPU mbuf chaining
+  enable_l1_param_sanity_check: 0
+  pusch_nMaxLdpcHetConfigs: 32
+  notify_ul_harq_buffer_release: 0
+
+  # data_config:
+    # datalake_core: 12           # This must be set for Data Lake and/or E3 Agent to be used
+    # datalake_db_write_enable: 1   # Enable/disable ClickHouse writes based on datalake_data_types
+    # datalake_samples: 1000000
+    # datalake_address: localhost
+    # datalake_engine: "MergeTree() PRIMARY KEY (TsTaiNs)"
+    # # datalake_drop_tables: 0   # Set to 1 to drop Clickhouse tables at startup
+    # datalake_data_types: [fh, pusch, hest]  # Data types to write to ClickHouse DB (all types always collected in memory for E3 Agent):
+                                            # fh = Fronthaul IQ samples,pusch = PUSCH/FAPI data, hest = channel estimates
+    # datalake_store_failed_pdu: 0      # Set to 1 to store PDU data even when CRC fails
+    # e3_agent_enable: 0          # Enable/disable E3 Agent and dApp capabilities
+    # num_rows_fh: 120
+    # num_rows_pusch: 200
+    # num_rows_hest: 140
+    # e3_pub_port: 5555           # E3 publisher port for indication messages
+    # e3_rep_port: 5556           # E3 reply port for E3AP requests
+    # e3_sub_port: 5560           # E3 subscriber port for Manager messages
+
+  cells:
+    - name: O-RU 0
+      cell_id: 1
+      ru_type: 1
+      # set to 00:00:00:00:00:00 to use the MAC address of the NIC port to use
+      src_mac_addr: 00:00:00:00:00:00
+      dst_mac_addr: e8:c7:cf:ad:12:0b #WNC n78
+      nic: '0000:01:00.0'
+      vlan: 500
+      pcp: 7
+      txq_count_uplane: 1
+      eAxC_id_ssb_pbch: [0, 1, 2, 3]
+      eAxC_id_pdcch: [0, 1, 2, 3]
+      eAxC_id_pdsch: [0, 1, 2, 3]
+      eAxC_id_csirs: [0, 1, 2, 3]
+      eAxC_id_pusch: [0, 1, 2, 3]
+      eAxC_id_pucch: [0, 1, 2, 3]
+      eAxC_id_srs: [8, 9, 10, 11]
+      eAxC_id_prach: [4, 5, 6, 7]
+      dl_iq_data_fmt: {comp_meth: 1, bit_width: 9}
+      ul_iq_data_fmt: {comp_meth: 1, bit_width: 9}
+      section_3_time_offset: 484
+      fs_offset_dl: 7
+      exponent_dl: 4
+      ref_dl: 0
+      fs_offset_ul: -5
+      exponent_ul: 4
+      max_amp_ul: 65504
+      mu: 1
+      T1a_max_up_ns: 280000
+      T1a_max_cp_ul_ns: 405000
+      Ta4_min_ns: 50000
+      Ta4_max_ns: 331000
+      Tcp_adv_dl_ns: 125000
+      ul_u_plane_tx_offset_ns: 280000
+      fh_len_range: 0
+      pusch_prb_stride: 273
+      prach_prb_stride: 12
+      srs_prb_stride: 273
+      pusch_ldpc_max_num_itr_algo_type: 1
+      pusch_fixed_max_num_ldpc_itrs: 10
+      pusch_ldpc_early_termination: 0
+      pusch_ldpc_algo_index: 0
+      pusch_ldpc_flags: 2
+      pusch_ldpc_use_half: 1
+      pusch_nMaxPrb: 273
+      pusch_nMaxRx: 4
+      ul_gain_calibration: 78.68
+      lower_guard_bw: 845
+      tv_pusch: cuPhyChEstCoeffs.h5

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

@@ -18,12 +18,13 @@ services:
       - /lib/modules:/lib/modules
       - /dev/hugepages:/dev/hugepages
       - /usr/src:/usr/src
+      - ./cuphycontroller_P5G_WNC_GH_ul.yaml:/opt/nvidia/cuBB/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_WNC_GH.yaml
       - ./aerial_l1_entrypoint.sh:/opt/nvidia/cuBB/aerial_l1_entrypoint.sh
       - /var/log/aerial:/var/log/aerial
       - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:25-2.1_srs-ul-heavy
+    image: cubb-build:25-3
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
     command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
@@ -45,7 +46,7 @@ services:
       - IPC_LOCK
     ipc: "container:nv-cubb"
     environment:
-      USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
+      USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,utc_time
     deploy:
       resources:
         reservations:

cmake_targets/build_oai

@@ -41,7 +41,7 @@ BUILD_DIR=ran_build
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_aal ldpc_xdma websrv oai_iqplayer imscope imscope_record"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_aal ldpc_xdma ldpc_tee websrv oai_iqplayer imscope imscope_record"
 TARGET_LIST=""
 BUILD_TOOL_OPT="-j$(nproc)"
 
@@ -82,6 +82,8 @@ Options:
   Makes the NR softmodem
 --RU
   Makes the OAI RRU
+--nrRU
+  Makes the NR RRU
 --UE
    Makes the UE specific parts (usim, nvram) from the given configuration file
 --nrUE
@@ -227,6 +229,11 @@ function main() {
             TARGET_LIST="$TARGET_LIST oairu"
             echo_info "Will compile RRU"
             shift;;
+       --nrRU)
+            NRRU=1
+            TARGET_LIST="$TARGET_LIST nr-oru"
+            echo_info "Will compile NR O-RU"
+            shift;;
        --UE)
             UE=1
             TARGET_LIST="$TARGET_LIST lte-uesoftmodem conf2uedata usim nvram"
@@ -452,7 +459,7 @@ function main() {
   if [[ $TARGET_LIST != "" ]] && [[ -f $OPENAIR_DIR/CMakeLists.txt ]]; then
     # add some default libraries that should always be built
     # for eNB, gNB, UEs, simulators
-    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ]]; then
+    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 || $NRRU == 1 ]]; then
       TARGET_LIST="$TARGET_LIST params_libconfig coding rfsimulator dfts params_yaml vrtsim rf_emulator"
     fi
 

cmake_targets/tools/build_helper

@@ -278,7 +278,7 @@ check_install_usrp_uhd_driver(){
             x=$((x + 1))
         done
         $SUDO apt-get update
-        $SUDO apt-get -y install python-tk  $boost_libs_ubuntu libusb-1.0-0-dev
+        $SUDO apt-get -y install python3-tk  $boost_libs_ubuntu libusb-1.0-0-dev
         case "$(get_distribution_release)" in
           "ubuntu20.04" | "ubuntu22.04")
             $SUDO apt-get -y install libuhd-dev libuhd4.5.0 uhd-host
@@ -288,7 +288,7 @@ check_install_usrp_uhd_driver(){
         boost_libs_fedora="boost-chrono boost-date-time boost-filesystem boost-program-options boost-thread boost-test boost-regex boost-devel"
         if [ $IS_CONTAINER -eq 0 ]
         then
-            $SUDO $INSTALLER -y install python3 $boost_libs_fedora libusb-devel libusbx-devel  python3-mako python3-docutils python3-pip $CMAKE
+            $SUDO $INSTALLER -y install python3 $boost_libs_fedora libusb1-devel libusbx-devel  python3-mako python3-docutils python3-pip $CMAKE
             $SUDO pip3 install requests
         else
             $SUDO $INSTALLER -y install $boost_libs_fedora $CMAKE

cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch

@@ -1,5 +1,5 @@
 diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h
-index ac5f471..94c2d7c 100644
+index ac5f471..b1acb26 100644
 --- a/fhi_lib/app/src/common.h
 +++ b/fhi_lib/app/src/common.h
 @@ -28,7 +28,7 @@
@@ -7,7 +7,7 @@ index ac5f471..94c2d7c 100644
  #include <rte_mbuf.h>
  
 -#define VERSIONX                "oran_f_release_v1.0"
-+#define VERSIONX                "oran_f_release_v1.6"
++#define VERSIONX                "oran_f_release_v1.8"
  
  #define APP_O_DU  0
  #define APP_O_RU  1
@@ -173,7 +173,7 @@ index eccc4ae..a97fdc6 100644
  CPP_FLAGS_FULL := $(CPP_FLAGS) $(CPP_COMP) $(INC) $(DEF)
  CPP_FLAGS_FULL_SNC := $(CPP_FLAGS) $(CPP_COMP_SNC) $(INC) $(DEF)
 diff --git a/fhi_lib/lib/api/xran_fh_o_du.h b/fhi_lib/lib/api/xran_fh_o_du.h
-index bacf597..2aeaaae 100644
+index bacf597..18597d6 100644
 --- a/fhi_lib/lib/api/xran_fh_o_du.h
 +++ b/fhi_lib/lib/api/xran_fh_o_du.h
 @@ -141,8 +141,8 @@ extern "C" {
@@ -182,7 +182,7 @@ index bacf597..2aeaaae 100644
  
 -#define XRAN_MAX_FRAGMENT            (4)   /**< Max number of fragmentations in single symbol */
 -#define XRAN_MAX_SET_BFWS            (64)  /**< Assumed 64Ant, BFP 9bit with 9K jumbo frame */
-+#define XRAN_MAX_FRAGMENT            (6)   /**< Max number of fragmentations in single symbol */
++#define XRAN_MAX_FRAGMENT            (7)   /**< Max number of fragmentations in single symbol */
 +#define XRAN_MAX_SET_BFWS            (1) //(64)  /**< Assumed 64Ant, BFP 9bit with 9K jumbo frame */
  
  #define XRAN_MAX_PKT_BURST (448+4) /**< 4x14x8 symbols per ms */
@@ -530,7 +530,7 @@ index 59b6850..322d238 100644
 \ No newline at end of file
 +}
 diff --git a/fhi_lib/lib/src/xran_cb_proc.c b/fhi_lib/lib/src/xran_cb_proc.c
-index 08660f3..2bb5187 100644
+index 08660f3..b5de607 100644
 --- a/fhi_lib/lib/src/xran_cb_proc.c
 +++ b/fhi_lib/lib/src/xran_cb_proc.c
 @@ -25,7 +25,10 @@
@@ -544,6 +544,55 @@ index 08660f3..2bb5187 100644
  #include <rte_common.h>
  #include <rte_eal.h>
  #include <rte_errno.h>
+@@ -106,6 +109,12 @@ void xran_timer_arm_for_deadline(struct rte_timer *tim, void* arg,  void *p_dev_
+            + nSubframeIdx*SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local)
+            + nSlotIdx;
+ 
++    /* correction to rx_tti for Ta4 values larger than a TTI */
++    rx_tti -= p_xran_dev_ctx->offset_num_slots_up_ul;
++    if (rx_tti < 0) {
++        rx_tti += (SUBFRAMES_PER_SYSTEMFRAME*SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local)*1024);
++    }
++
+     p_xran_dev_ctx->cb_timer_ctx[p_xran_dev_ctx->timer_put %  MAX_CB_TIMER_CTX].tti_to_process = rx_tti;
+     if (xran_if_current_state == XRAN_RUNNING){
+         rte_timer_cb_t fct = (rte_timer_cb_t)arg;
+@@ -195,6 +204,7 @@ xran_timing_create_cbs(void *args)
+             max_dl_delay_offset += interval_us_local;
+             numSlots++;
+         }
++        p_dev_ctx->offset_num_slots_cp_dl = numSlots;
+ 
+         /* Delay from start of 'a' slot */
+         delay_cp_dl_max = max_dl_delay_offset - p_dev_ctx->fh_cfg.T1a_max_cp_dl;
+@@ -227,6 +237,7 @@ xran_timing_create_cbs(void *args)
+             ul_delay_offset += interval_us_local;
+             numSlots++;
+         }
++        p_dev_ctx->offset_num_slots_cp_ul = numSlots;
+         delay_cp_ul = ul_delay_offset - p_dev_ctx->fh_cfg.T1a_max_cp_ul;
+         sym_cp_ul = (delay_cp_ul*1000/(interval_us_local*1000/N_SYM_PER_SLOT)+1);
+         uint8_t ul_offset_sym = (numSlots+1)*N_SYM_PER_SLOT - sym_cp_ul;
+@@ -242,8 +253,18 @@ xran_timing_create_cbs(void *args)
+ 
+         delay_up    = p_dev_ctx->fh_cfg.T1a_max_up;
+         time_diff_us = p_dev_ctx->fh_cfg.Ta4_max;
++        uint32_t ul_up_delay_offset=interval_us_local;
++        numSlots=0;
++        while(time_diff_us > ul_up_delay_offset) {
++            ul_up_delay_offset += interval_us_local;
++            numSlots++;
++        }
++        p_dev_ctx->offset_num_slots_up_ul = numSlots;
++
++        printf("offset_num_slots_cp_dl=%d, offset_num_slots_cp_ul=%d, offset_num_slots_up_ul=%d\n",
++            p_dev_ctx->offset_num_slots_cp_dl, p_dev_ctx->offset_num_slots_cp_ul, p_dev_ctx->offset_num_slots_up_ul);
+ 
+-        delay_cp2up = delay_up-delay_cp_dl_max;
++        delay_cp2up = p_dev_ctx->fh_cfg.T1a_max_cp_dl - p_dev_ctx->fh_cfg.T1a_max_up;
+ 
+ 
+         time_diff_nSymb = time_diff_us*1000/(interval_us_local*1000/N_SYM_PER_SLOT);
 diff --git a/fhi_lib/lib/src/xran_common.c b/fhi_lib/lib/src/xran_common.c
 index dc40ad9..1b88013 100644
 --- a/fhi_lib/lib/src/xran_common.c
@@ -1032,7 +1081,7 @@ index 4acade1..c939edc 100644
          for(i = 0; i < xran_ports_num; i++){
              g_xran_dev_ctx[i] = pCtx;
 diff --git a/fhi_lib/lib/src/xran_dev.h b/fhi_lib/lib/src/xran_dev.h
-index 0371a53..dd76b49 100644
+index 0371a53..778b38d 100644
 --- a/fhi_lib/lib/src/xran_dev.h
 +++ b/fhi_lib/lib/src/xran_dev.h
 @@ -201,6 +201,7 @@ struct __rte_cache_aligned xran_device_ctx
@@ -1043,6 +1092,18 @@ index 0371a53..dd76b49 100644
      int64_t offset_sec;
      int64_t offset_nsec;    //offset to GPS time calcuated based on alpha and beta
      uint32_t interval_us_local;
+@@ -254,6 +255,11 @@ struct __rte_cache_aligned xran_device_ctx
+     int32_t sym_up; /**< when we start sym 0 of up with respect to OTA time as measured in symbols */
+     int32_t sym_up_ul;
+ 
++    /* used to support large T1a/Ta4 values */
++    int32_t offset_num_slots_cp_dl;
++    int32_t offset_num_slots_cp_ul;
++    int32_t offset_num_slots_up_ul;
++
+     xran_fh_tti_callback_fn ttiCb[XRAN_CB_MAX];
+     void *TtiCbParam[XRAN_CB_MAX];
+     uint32_t SkipTti[XRAN_CB_MAX];
 diff --git a/fhi_lib/lib/src/xran_frame_struct.c b/fhi_lib/lib/src/xran_frame_struct.c
 index fbb1298..44aaf92 100644
 --- a/fhi_lib/lib/src/xran_frame_struct.c
@@ -1082,7 +1143,7 @@ index 7ed0a3a..8e66945 100644
  #ifdef __cplusplus
  }
 diff --git a/fhi_lib/lib/src/xran_main.c b/fhi_lib/lib/src/xran_main.c
-index 7c472d7..7c7cf91 100644
+index 7c472d7..db03d94 100644
 --- a/fhi_lib/lib/src/xran_main.c
 +++ b/fhi_lib/lib/src/xran_main.c
 @@ -35,7 +35,11 @@
@@ -1132,7 +1193,42 @@ index 7c472d7..7c7cf91 100644
      print_dbg("PRACH eAxC_offset %d\n",  pPrachCPConfig->eAxC_offset);
  
      /* Save some configs for app */
-@@ -1169,6 +1192,10 @@ xran_prepare_cp_ul_slot(uint16_t xran_port_id, uint32_t nSlotIdx,  uint32_t nCcS
+@@ -623,6 +646,8 @@ xran_prepare_cp_dl_slot(uint16_t xran_port_id, uint32_t nSlotIdx,  uint32_t nCcS
+     return ret;
+ }
+ 
++uint32_t prev_dl_tti = -1;
++
+ void
+ tx_cp_dl_cb(struct rte_timer *tim, void *arg)
+ {
+@@ -655,7 +680,7 @@ tx_cp_dl_cb(struct rte_timer *tim, void *arg)
+ 
+     if(first_call && p_xran_dev_ctx->enableCP)
+     {
+-        tti = pTCtx[(xran_lib_ota_tti[PortId] & 1) ^ 1].tti_to_process;
++        tti = pTCtx[(xran_lib_ota_tti[PortId] & 1) ^ 1].tti_to_process + p_xran_dev_ctx->offset_num_slots_cp_dl;
+         buf_id = tti % XRAN_N_FE_BUF_LEN;
+ 
+         slot_id     = XranGetSlotNum(tti, SLOTNUM_PER_SUBFRAME(interval_us_local));
+@@ -665,6 +690,16 @@ tx_cp_dl_cb(struct rte_timer *tim, void *arg)
+         {
+             /* Wrap around to next second */
+             frame_id = (frame_id + NUM_OF_FRAMES_PER_SECOND) & 0x3ff;
++            prev_dl_tti = -1;
++        }
++        else if (p_xran_dev_ctx->offset_num_slots_cp_dl > 0 && prev_dl_tti == xran_fs_get_max_slot(PortId) - 1 + p_xran_dev_ctx->offset_num_slots_cp_dl)
++        {
++            prev_dl_tti = tti;
++            tti = xran_fs_get_max_slot(PortId) + p_xran_dev_ctx->offset_num_slots_cp_dl;
++        }
++        else
++        {
++            prev_dl_tti = tti;
+         }
+ 
+         ctx_id      = tti % XRAN_MAX_SECTIONDB_CTX;
+@@ -1169,6 +1204,10 @@ xran_prepare_cp_ul_slot(uint16_t xran_port_id, uint32_t nSlotIdx,  uint32_t nCcS
                              uint8_t seqid = xran_get_cp_seqid(pHandle, XRAN_DIR_UL, cc_id, port_id);
  
                              beam_id = xran_get_beamid(pHandle, XRAN_DIR_UL, cc_id, port_id, slot_id);
@@ -1143,7 +1239,45 @@ index 7c472d7..7c7cf91 100644
                              ret = generate_cpmsg_prach(pHandle, &params, sect_geninfo, mbuf, p_xran_dev_ctx,
                                          frame_id, subframe_id, slot_id, tti,
                                          beam_id, cc_id, port_id, occasionid, seqid);
-@@ -1338,6 +1365,10 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
+@@ -1213,6 +1252,7 @@ xran_prepare_cp_ul_slot(uint16_t xran_port_id, uint32_t nSlotIdx,  uint32_t nCcS
+     return ret;
+ }
+ 
++uint32_t prev_ul_tti = -1;
+ 
+ void
+ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
+@@ -1254,7 +1294,7 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
+         pTCtx       = &p_xran_dev_ctx->timer_ctx[0];
+         interval    = p_xran_dev_ctx->interval_us_local;
+         PortId      = p_xran_dev_ctx->xran_port_id;
+-    tti = pTCtx[(xran_lib_ota_tti[PortId] & 1) ^ 1].tti_to_process;
++    tti = pTCtx[(xran_lib_ota_tti[PortId] & 1) ^ 1].tti_to_process + p_xran_dev_ctx->offset_num_slots_cp_ul;
+ 
+     buf_id = tti % XRAN_N_FE_BUF_LEN;
+         ctx_id      = tti % XRAN_MAX_SECTIONDB_CTX;
+@@ -1264,7 +1304,20 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
+ 
+         /* Wrap around to next second */
+         if(tti == 0)
++        {
+             frame_id = (frame_id + NUM_OF_FRAMES_PER_SECOND) & 0x3ff;
++            prev_ul_tti = tti;
++        }
++        else if (p_xran_dev_ctx->offset_num_slots_cp_ul > 0 && prev_ul_tti == xran_fs_get_max_slot(PortId) - 1 + p_xran_dev_ctx->offset_num_slots_cp_ul)
++        {
++            prev_ul_tti = tti;
++            tti = xran_fs_get_max_slot(PortId) + p_xran_dev_ctx->offset_num_slots_cp_ul;
++        }
++        else
++        {
++            prev_ul_tti = tti;
++        }
++
+     if(xran_get_ru_category(pHandle) == XRAN_CATEGORY_A)
+         num_eAxc    = xran_get_num_eAxc(pHandle);
+     else
+@@ -1338,6 +1391,10 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
                              uint8_t seqid = xran_get_cp_seqid(pHandle, XRAN_DIR_UL, cc_id, port_id);
  
                              beam_id = xran_get_beamid(pHandle, XRAN_DIR_UL, cc_id, port_id, slot_id);
@@ -1154,7 +1288,7 @@ index 7c472d7..7c7cf91 100644
                          ret = generate_cpmsg_prach(pHandle, &params, sect_geninfo, mbuf, p_xran_dev_ctx,
                                          frame_id, subframe_id, slot_id, tti,
                                          beam_id, cc_id, port_id, occasionid, seqid);
-@@ -1570,6 +1601,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
+@@ -1570,6 +1627,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
          {
          case ECPRI_IQ_DATA:
                  pkt_data[num_data++] = pkt;
@@ -1162,7 +1296,7 @@ index 7c472d7..7c7cf91 100644
              break;
          // For RU emulation
          case ECPRI_RT_CONTROL_DATA:
-@@ -1587,7 +1619,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
+@@ -1587,7 +1645,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
                  break;
              default:
                  if (p_dev_ctx->fh_init.io_cfg.id == O_DU) {
@@ -1171,7 +1305,7 @@ index 7c472d7..7c7cf91 100644
          }
                  break;
      }
-@@ -1876,7 +1908,7 @@ xran_sector_get_instances (uint32_t xran_port, void * pDevHandle, uint16_t nNumI
+@@ -1876,7 +1934,7 @@ xran_sector_get_instances (uint32_t xran_port, void * pDevHandle, uint16_t nNumI
      for (i = 0; i < nNumInstances; i++) {
  
          /* Allocate Memory for CC handles */
@@ -1180,7 +1314,7 @@ index 7c472d7..7c7cf91 100644
  
          if(pCcHandle == NULL)
              return XRAN_STATUS_RESOURCE;
-@@ -2347,8 +2379,7 @@ ring_processing_func_per_port(void* args)
+@@ -2347,8 +2405,7 @@ ring_processing_func_per_port(void* args)
      for (i = 0; i < ctx->io_cfg.num_vfs && i < XRAN_VF_MAX; i = i+1) {
          if (ctx->vf2xran_port[i] == port_id) {
              for(qi = 0; qi < ctx->rxq_per_port[port_id]; qi++){
@@ -1190,7 +1324,7 @@ index 7c472d7..7c7cf91 100644
              }
          }
      }
-@@ -2414,9 +2445,6 @@ xran_spawn_workers(void)
+@@ -2414,9 +2471,6 @@ xran_spawn_workers(void)
          nWorkerCore = nWorkerCore << 1;
      }
  
@@ -1200,7 +1334,7 @@ index 7c472d7..7c7cf91 100644
      printf("O-XU      %d\n", eth_ctx->io_cfg.id);
      printf("HW        %d\n", icx_cpu);
      printf("Num cores %d\n", total_num_cores);
-@@ -2453,7 +2481,7 @@ xran_spawn_workers(void)
+@@ -2453,7 +2507,7 @@ xran_spawn_workers(void)
                  eth_ctx->time_wrk_cfg.arg   = NULL;
                  eth_ctx->time_wrk_cfg.state = 1;
  
@@ -1209,7 +1343,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -2475,7 +2503,7 @@ xran_spawn_workers(void)
+@@ -2475,7 +2529,7 @@ xran_spawn_workers(void)
  
                  /* workers */
                  /** 0 **/
@@ -1218,7 +1352,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -2502,7 +2530,7 @@ xran_spawn_workers(void)
+@@ -2502,7 +2556,7 @@ xran_spawn_workers(void)
                  }
  
                  /** 1 - CP GEN **/
@@ -1227,7 +1361,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -2536,7 +2564,7 @@ xran_spawn_workers(void)
+@@ -2536,7 +2590,7 @@ xran_spawn_workers(void)
                  else
                  p_dev->tx_sym_gen_func = xran_process_tx_sym_cp_on_opt;
  
@@ -1236,7 +1370,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -2559,7 +2587,7 @@ xran_spawn_workers(void)
+@@ -2559,7 +2613,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0 **/
@@ -1245,7 +1379,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2586,7 +2614,7 @@ xran_spawn_workers(void)
+@@ -2586,7 +2640,7 @@ xran_spawn_workers(void)
                      }
  
                      /** 1 - CP GEN **/
@@ -1254,7 +1388,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2613,7 +2641,7 @@ xran_spawn_workers(void)
+@@ -2613,7 +2667,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0 **/
@@ -1263,7 +1397,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2628,7 +2656,7 @@ xran_spawn_workers(void)
+@@ -2628,7 +2682,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 1 - CP GEN **/
@@ -1272,7 +1406,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2643,7 +2671,7 @@ xran_spawn_workers(void)
+@@ -2643,7 +2697,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 2 UP GEN **/
@@ -1281,7 +1415,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2682,7 +2710,7 @@ xran_spawn_workers(void)
+@@ -2682,7 +2736,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0 **/
@@ -1290,7 +1424,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2697,7 +2725,7 @@ xran_spawn_workers(void)
+@@ -2697,7 +2751,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 1 - CP GEN **/
@@ -1299,7 +1433,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2712,7 +2740,7 @@ xran_spawn_workers(void)
+@@ -2712,7 +2766,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 2 UP GEN **/
@@ -1308,7 +1442,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2727,7 +2755,7 @@ xran_spawn_workers(void)
+@@ -2727,7 +2781,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 3 UP GEN **/
@@ -1317,7 +1451,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2766,7 +2794,7 @@ xran_spawn_workers(void)
+@@ -2766,7 +2820,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0 **/
@@ -1326,7 +1460,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2781,7 +2809,7 @@ xran_spawn_workers(void)
+@@ -2781,7 +2835,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 1 Eth Tx **/
@@ -1335,7 +1469,7 @@ index 7c472d7..7c7cf91 100644
  
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
-@@ -2797,7 +2825,7 @@ xran_spawn_workers(void)
+@@ -2797,7 +2851,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 2 - CP GEN **/
@@ -1344,7 +1478,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2812,7 +2840,7 @@ xran_spawn_workers(void)
+@@ -2812,7 +2866,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 3 UP GEN **/
@@ -1353,7 +1487,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2827,7 +2855,7 @@ xran_spawn_workers(void)
+@@ -2827,7 +2881,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 4 UP GEN **/
@@ -1362,7 +1496,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2861,7 +2889,7 @@ xran_spawn_workers(void)
+@@ -2861,7 +2915,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0  Eth RX */
@@ -1371,7 +1505,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2876,7 +2904,7 @@ xran_spawn_workers(void)
+@@ -2876,7 +2930,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 1  FH RX and BBDEV */
@@ -1380,7 +1514,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2891,7 +2919,7 @@ xran_spawn_workers(void)
+@@ -2891,7 +2945,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 2  FH RX and BBDEV */
@@ -1389,7 +1523,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2906,7 +2934,7 @@ xran_spawn_workers(void)
+@@ -2906,7 +2960,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 3  FH RX and BBDEV */
@@ -1398,7 +1532,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2921,7 +2949,7 @@ xran_spawn_workers(void)
+@@ -2921,7 +2975,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /**  FH TX and BBDEV */
@@ -1407,7 +1541,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -2969,7 +2997,7 @@ xran_spawn_workers(void)
+@@ -2969,7 +3023,7 @@ xran_spawn_workers(void)
  
              /* p_dev->tx_sym_gen_func = xran_process_tx_sym_cp_on_opt; */
  
@@ -1416,7 +1550,7 @@ index 7c472d7..7c7cf91 100644
              if(pThCtx == NULL){
                  print_err("pThCtx allocation error\n");
                  return XRAN_STATUS_FAIL;
-@@ -3004,7 +3032,7 @@ xran_spawn_workers(void)
+@@ -3004,7 +3058,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0 **/
@@ -1425,7 +1559,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3031,7 +3059,7 @@ xran_spawn_workers(void)
+@@ -3031,7 +3085,7 @@ xran_spawn_workers(void)
                      }
  
                      /** 1 - CP GEN **/
@@ -1434,7 +1568,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3062,7 +3090,7 @@ xran_spawn_workers(void)
+@@ -3062,7 +3116,7 @@ xran_spawn_workers(void)
  
                  /* workers */
                  /** 0 **/
@@ -1443,7 +1577,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3089,7 +3117,7 @@ xran_spawn_workers(void)
+@@ -3089,7 +3143,7 @@ xran_spawn_workers(void)
                  }
  
                  /** 1 - CP GEN **/
@@ -1452,7 +1586,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3115,7 +3143,7 @@ xran_spawn_workers(void)
+@@ -3115,7 +3169,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0 **/
@@ -1461,7 +1595,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3130,7 +3158,7 @@ xran_spawn_workers(void)
+@@ -3130,7 +3184,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 1 - CP GEN **/
@@ -1470,7 +1604,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3145,7 +3173,7 @@ xran_spawn_workers(void)
+@@ -3145,7 +3199,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 2 UP GEN **/
@@ -1479,7 +1613,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3184,7 +3212,7 @@ xran_spawn_workers(void)
+@@ -3184,7 +3238,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0  FH RX and BBDEV */
@@ -1488,7 +1622,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3199,7 +3227,7 @@ xran_spawn_workers(void)
+@@ -3199,7 +3253,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 1 - CP GEN **/
@@ -1497,7 +1631,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3214,7 +3242,7 @@ xran_spawn_workers(void)
+@@ -3214,7 +3268,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 2 UP GEN **/
@@ -1506,7 +1640,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3229,7 +3257,7 @@ xran_spawn_workers(void)
+@@ -3229,7 +3283,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 3 UP GEN **/
@@ -1515,7 +1649,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3266,7 +3294,7 @@ xran_spawn_workers(void)
+@@ -3266,7 +3320,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0 **/
@@ -1524,7 +1658,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3281,7 +3309,7 @@ xran_spawn_workers(void)
+@@ -3281,7 +3335,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 1 - CP GEN **/
@@ -1533,7 +1667,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3296,7 +3324,7 @@ xran_spawn_workers(void)
+@@ -3296,7 +3350,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 2 UP GEN **/
@@ -1542,7 +1676,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3311,7 +3339,7 @@ xran_spawn_workers(void)
+@@ -3311,7 +3365,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 3 UP GEN **/
@@ -1551,7 +1685,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3326,7 +3354,7 @@ xran_spawn_workers(void)
+@@ -3326,7 +3380,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 4 UP GEN **/
@@ -1560,7 +1694,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3348,7 +3376,7 @@ xran_spawn_workers(void)
+@@ -3348,7 +3402,7 @@ xran_spawn_workers(void)
  
                      /* workers */
                      /** 0  Eth RX */
@@ -1569,7 +1703,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3363,7 +3391,7 @@ xran_spawn_workers(void)
+@@ -3363,7 +3417,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 1  FH RX and BBDEV */
@@ -1578,7 +1712,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3378,7 +3406,7 @@ xran_spawn_workers(void)
+@@ -3378,7 +3432,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 2  FH RX and BBDEV */
@@ -1587,7 +1721,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3393,7 +3421,7 @@ xran_spawn_workers(void)
+@@ -3393,7 +3447,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /** 3  FH RX and BBDEV */
@@ -1596,7 +1730,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3408,7 +3436,7 @@ xran_spawn_workers(void)
+@@ -3408,7 +3462,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                      /**  FH TX and BBDEV */
@@ -1605,7 +1739,7 @@ index 7c472d7..7c7cf91 100644
                      if(pThCtx == NULL){
                          print_err("pThCtx allocation error\n");
                          return XRAN_STATUS_FAIL;
-@@ -3435,7 +3463,7 @@ xran_spawn_workers(void)
+@@ -3435,7 +3489,7 @@ xran_spawn_workers(void)
  
                  /* workers */
                  /** 0  Eth RX */
@@ -1614,7 +1748,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3450,7 +3478,7 @@ xran_spawn_workers(void)
+@@ -3450,7 +3504,7 @@ xran_spawn_workers(void)
                  eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                  /** 1  FH RX and BBDEV */
@@ -1623,7 +1757,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3465,7 +3493,7 @@ xran_spawn_workers(void)
+@@ -3465,7 +3519,7 @@ xran_spawn_workers(void)
                  eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                  /** 2  FH RX and BBDEV */
@@ -1632,7 +1766,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3480,7 +3508,7 @@ xran_spawn_workers(void)
+@@ -3480,7 +3534,7 @@ xran_spawn_workers(void)
                  eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                  /** 3  FH RX and BBDEV */
@@ -1641,7 +1775,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3495,7 +3523,7 @@ xran_spawn_workers(void)
+@@ -3495,7 +3549,7 @@ xran_spawn_workers(void)
                      eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                  /** 4  FH RX and BBDEV */
@@ -1650,7 +1784,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3510,7 +3538,7 @@ xran_spawn_workers(void)
+@@ -3510,7 +3564,7 @@ xran_spawn_workers(void)
                  eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                  /**  FH TX and BBDEV */
@@ -1659,7 +1793,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3537,7 +3565,7 @@ xran_spawn_workers(void)
+@@ -3537,7 +3591,7 @@ xran_spawn_workers(void)
  
                  /* workers */
                  /** 0 **/
@@ -1668,7 +1802,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3562,7 +3590,7 @@ xran_spawn_workers(void)
+@@ -3562,7 +3616,7 @@ xran_spawn_workers(void)
                  }
  
                  /** 1 - CP GEN **/
@@ -1677,7 +1811,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3577,7 +3605,7 @@ xran_spawn_workers(void)
+@@ -3577,7 +3631,7 @@ xran_spawn_workers(void)
                  eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                  /** 2 UP GEN **/
@@ -1686,7 +1820,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3602,7 +3630,7 @@ xran_spawn_workers(void)
+@@ -3602,7 +3656,7 @@ xran_spawn_workers(void)
                  }
  
                  /** 3 UP GEN **/
@@ -1695,7 +1829,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3627,7 +3655,7 @@ xran_spawn_workers(void)
+@@ -3627,7 +3681,7 @@ xran_spawn_workers(void)
                  }
  
                  /** 4 UP GEN **/
@@ -1704,7 +1838,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3642,7 +3670,7 @@ xran_spawn_workers(void)
+@@ -3642,7 +3696,7 @@ xran_spawn_workers(void)
                  eth_ctx->pkt_wrk_cfg[pThCtx->worker_id].arg   = pThCtx;
  
                  /** 5 UP GEN **/
@@ -1713,7 +1847,7 @@ index 7c472d7..7c7cf91 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -3754,6 +3782,7 @@ xran_open(void *pHandle, struct xran_fh_config* pConf)
+@@ -3754,6 +3808,7 @@ xran_open(void *pHandle, struct xran_fh_config* pConf)
      p_xran_dev_ctx->puschMaskSlot = pConf->puschMaskSlot;
      p_xran_dev_ctx->DynamicSectionEna = pConf->DynamicSectionEna;
      p_xran_dev_ctx->RunSlotPrbMapBySymbolEnable = pConf->RunSlotPrbMapBySymbolEnable;
@@ -1721,7 +1855,7 @@ index 7c472d7..7c7cf91 100644
      p_xran_dev_ctx->dssEnable = pConf->dssEnable;
      p_xran_dev_ctx->dssPeriod = pConf->dssPeriod;
      for(i=0; i<pConf->dssPeriod; i++) {
-@@ -4034,6 +4063,24 @@ xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,
+@@ -4034,6 +4089,24 @@ xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,
      return tti;
  }
  
@@ -1746,7 +1880,7 @@ index 7c472d7..7c7cf91 100644
  int32_t
  xran_set_debug_stop(int32_t value, int32_t count)
  {
-@@ -4208,7 +4255,7 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
+@@ -4208,7 +4281,7 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
      int32_t i = 0, j = 0, nPrbElm = 0;
      int16_t iqwidth = p_PrbMapIn->prbMap[0].iqWidth;
      struct xran_prb_elm *p_prb_elm_src, *p_prb_elm_dst;
@@ -1755,7 +1889,7 @@ index 7c472d7..7c7cf91 100644
      int32_t nRBStart_tmp, nRBremain, nStartSymb, nEndSymb, nRBStart, nRBEnd, nRBSize;
      // int32_t eth_xran_up_headers_sz = sizeof(struct eth_xran_up_pkt_hdr);
      // int32_t nmaxRB = (mtu - eth_xran_up_headers_sz - RTE_PKTMBUF_HEADROOM)/XRAN_PAYLOAD_1_RB_SZ(iqwidth);
-@@ -4217,7 +4264,6 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
+@@ -4217,7 +4290,6 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
      if (mtu==9600)
          nmaxRB--;   //for some reason when mtu is 9600, only 195 RB can be sent, not 196
  
@@ -1763,7 +1897,7 @@ index 7c472d7..7c7cf91 100644
      memcpy(p_PrbMapOut, p_PrbMapIn, sizeof(struct xran_prb_map));
      for(i = 0; i < XRAN_NUM_OF_SYMBOL_PER_SLOT; i++)
      {
-@@ -4292,26 +4338,30 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
+@@ -4292,26 +4364,30 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
  
      for(; i < XRAN_NUM_OF_SYMBOL_PER_SLOT; i++)
      {
@@ -2045,7 +2179,7 @@ index 72249bc..6b30084 100644
  #include <rte_config.h>
  
 diff --git a/fhi_lib/lib/src/xran_tx_proc.c b/fhi_lib/lib/src/xran_tx_proc.c
-index 45a17a8..85ce6fa 100644
+index 45a17a8..cca2dcc 100644
 --- a/fhi_lib/lib/src/xran_tx_proc.c
 +++ b/fhi_lib/lib/src/xran_tx_proc.c
 @@ -35,7 +35,11 @@
@@ -2060,7 +2194,19 @@ index 45a17a8..85ce6fa 100644
  
  #include <rte_common.h>
  #include <rte_eal.h>
-@@ -1514,7 +1518,11 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
+@@ -1399,6 +1403,11 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
+ 
+             if(0!=ptr_sect_elm->cur_index)
+             {
++                /* prevent xran from sending DL U-plane packets when it should not */
++                if(p_xran_dev_ctx->fh_init.io_cfg.id == O_DU && xran_fs_get_slot_type(xran_port_id, 0, tti, XRAN_SLOT_TYPE_DL) != 1)
++                {
++                    return 0;
++                }
+                 num_sections = ptr_sect_elm->cur_index;
+                 /* iterate C-Plane configuration to generate corresponding U-Plane */
+                 vf_id = p_xran_dev_ctx->map2vf[direction][cc_id][ant_id][XRAN_UP_VF];
+@@ -1514,7 +1523,11 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
                          mb_oran_hdr_ext->buf_addr = ext_buff;
                          mb_oran_hdr_ext->buf_iova = ((struct rte_mempool_objhdr*)RTE_PTR_SUB(mb_base, rte_mempool_objhdr_size))->iova + RTE_PTR_DIFF(ext_buff, mb_base);
                          mb_oran_hdr_ext->buf_len = ext_buff_len;
@@ -2072,7 +2218,7 @@ index 45a17a8..85ce6fa 100644
                          mb_oran_hdr_ext->shinfo = p_share_data;
                          mb_oran_hdr_ext->data_off = (uint16_t)RTE_MIN((uint16_t)RTE_PKTMBUF_HEADROOM, (uint16_t)mb_oran_hdr_ext->buf_len) - rte_ether_hdr_size;
                          mb_oran_hdr_ext->data_len = (uint16_t)(mb_oran_hdr_ext->data_len + rte_ether_hdr_size);
-@@ -1532,8 +1540,13 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
+@@ -1532,8 +1545,13 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
  
                          /* Fill in the ethernet header. */
  #ifndef TRANSMIT_BURST
@@ -2086,7 +2232,7 @@ index 45a17a8..85ce6fa 100644
                          ((struct rte_ether_hdr*)pStart)->ether_type = ETHER_TYPE_ECPRI_BE;                            /* ethertype */
  #endif
                          nPktSize = sizeof(struct rte_ether_hdr)
-@@ -1878,7 +1891,11 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
+@@ -1878,7 +1896,11 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
                          mb_oran_hdr_ext->buf_addr = ext_buff;
                          mb_oran_hdr_ext->buf_iova = ((struct rte_mempool_objhdr*)RTE_PTR_SUB(mb_base, rte_mempool_objhdr_size))->iova + RTE_PTR_DIFF(ext_buff, mb_base);
                          mb_oran_hdr_ext->buf_len = ext_buff_len;
@@ -2098,7 +2244,7 @@ index 45a17a8..85ce6fa 100644
                          mb_oran_hdr_ext->shinfo = p_share_data;
                          mb_oran_hdr_ext->data_off = (uint16_t)RTE_MIN((uint16_t)RTE_PKTMBUF_HEADROOM, (uint16_t)mb_oran_hdr_ext->buf_len) - rte_ether_hdr_size;
                          mb_oran_hdr_ext->data_len = (uint16_t)(mb_oran_hdr_ext->data_len + rte_ether_hdr_size);
-@@ -1887,8 +1904,13 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
+@@ -1887,8 +1909,13 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
                          pStart = (char*)((char*)mb_oran_hdr_ext->buf_addr + mb_oran_hdr_ext->data_off);
  
                          /* Fill in the ethernet header. */

common/config/config_load_configmodule.c

@@ -38,7 +38,6 @@
 #include <dlfcn.h>
 #include "common/platform_types.h"
 
-#define CONFIG_LOADCONFIG_MAIN
 #include "config_load_configmodule.h"
 #include "config_userapi.h"
 #include "../utils/LOG/log.h"
@@ -144,7 +143,7 @@ int config_cmdlineonly_getlist(configmodule_interface_t *cfg,
                                paramlist_def_t *ParamList,
                                paramdef_t *params,
                                int numparams,
-                               char *prefix)
+                               const char *prefix)
 {
   ParamList->numelt = 0;
   return 0;

common/config/config_load_configmodule.h

@@ -61,7 +61,7 @@
 struct configmodule_interface;
 typedef int (*configmodule_getfunc_t)(struct configmodule_interface *, paramdef_t *, int numparams, const char *prefix);
 typedef int (
-    *configmodule_getlistfunc_t)(struct configmodule_interface *, paramlist_def_t *, paramdef_t *, int numparams, char *prefix);
+    *configmodule_getlistfunc_t)(struct configmodule_interface *, paramlist_def_t *, paramdef_t *, int numparams, const char *prefix);
 typedef int (*configmodule_setfunc_t)(paramdef_t *cfgoptions, int numoptions, const char *prefix);
 typedef void (*configmodule_endfunc_t)(struct configmodule_interface *cfg);
 

common/config/config_userapi.c

@@ -142,7 +142,7 @@ int config_get(configmodule_interface_t *cfgif, paramdef_t *params, int numparam
   return ret;
 }
 
-int config_getlist(configmodule_interface_t *cfg, paramlist_def_t *ParamList, paramdef_t *params, int numparams, char *prefix)
+int config_getlist(configmodule_interface_t *cfg, paramlist_def_t *ParamList, paramdef_t *params, int numparams, const char *prefix)
 {
   if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
     fprintf(stderr,"[CONFIG] config_get skipped, config module not properly initialized\n");

common/config/config_userapi.h

@@ -62,7 +62,7 @@ int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions
 #define CONFIG_CHECKALLSECTIONS "ALLSECTIONS"
 int config_check_unknown_cmdlineopt(configmodule_interface_t *cfg, char *prefix);
 int config_get(configmodule_interface_t *cfg, paramdef_t *params, int numparams, const char *prefix);
-int config_getlist(configmodule_interface_t *cfg, paramlist_def_t *ParamList, paramdef_t *params, int numparams, char *prefix);
+int config_getlist(configmodule_interface_t *cfg, paramlist_def_t *ParamList, paramdef_t *params, int numparams, const char *prefix);
 
 /* apis to set some of the paramdef_t fields before using the get/getlist api's */
 void config_set_checkfunctions(paramdef_t *params, checkedparam_t *checkfunctions, int numparams);

common/config/libconfig/config_libconfig.c

@@ -319,6 +319,32 @@ int config_libconfig_set(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
   }
 }
 
+static const char *config_type_to_name(int type)
+{
+  switch (type) {
+    case CONFIG_TYPE_NONE:
+      return "none";
+    case CONFIG_TYPE_GROUP:
+      return "group";
+    case CONFIG_TYPE_INT:
+      return "integer";
+    case CONFIG_TYPE_INT64:
+      return "64-bit integer";
+    case CONFIG_TYPE_FLOAT:
+      return "float";
+    case CONFIG_TYPE_STRING:
+      return "string";
+    case CONFIG_TYPE_BOOL:
+      return "boolean";
+    case CONFIG_TYPE_ARRAY:
+      return "array";
+    case CONFIG_TYPE_LIST:
+      return "list";
+    default:
+      return "unknown";
+  }
+}
+
 int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, char *prefix)
 {
   config_setting_t *setting;
@@ -348,17 +374,26 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
 
     switch(cfgoptions[i].type) {
       case TYPE_STRING:
-        if ( config_lookup_string(&(libconfig_privdata.cfg), cfgpath, (const char**)&str)) {
-          config_check_valptr(cfg, &cfgoptions[i], 1, strlen(str) + 1);
-          if ( strlen(str)+1 > cfgoptions[i].numelt )
-            fprintf(stderr,"[LIBCONFIG] %s:  %s exceeds maximum length of %i bytes, value truncated\n",
-                    cfgpath,str,cfgoptions[i].numelt);
-          snprintf( *cfgoptions[i].strptr , cfgoptions[i].numelt, "%s", str);
-          printf_params(cfg, "[LIBCONFIG] %s: \"%s\"\n", cfgpath, *cfgoptions[i].strptr);
-        } else {
+        setting = config_lookup(&(libconfig_privdata.cfg), cfgpath);
+        if (setting != NULL) {
+          int type = config_setting_type(setting);
+          if (type == CONFIG_TYPE_STRING) {
+            const char *strng = config_setting_get_string(setting);
+            config_check_valptr(cfg, &cfgoptions[i], 1, strlen(strng) + 1);
+            if (strlen(strng) + 1 > cfgoptions[i].numelt)
+              fprintf(stderr,
+                      "[LIBCONFIG] %s:  %s exceeds maximum length of %i bytes, value truncated\n",
+                      cfgpath,
+                      strng,
+                      cfgoptions[i].numelt);
+            snprintf(*cfgoptions[i].strptr, cfgoptions[i].numelt, "%s", strng);
+            printf_params(cfg, "[LIBCONFIG] %s: \"%s\"\n", cfgpath, *cfgoptions[i].strptr);
+          } else {
+            fprintf(stderr,"[LIBCONFIG] expected a string input for %s but got type %s\n", cfgpath, config_type_to_name(type));
+            fatalerror = 1;
+          }
+        } else
           defval = config_common_getdefault(cfg, &cfgoptions[i], prefix);
-        }
-
         break;
 
       case TYPE_STRINGLIST: