e1: no need to pass security information since it does not change

In Bearer Context Modification Request, the security information field is needed only if we change the PDCP algorithms/keys. Since we don't, no need to pass it. Let's keep the old code, maybe the current understanding of the specifications is wrong.
e1: change security settings only if parameters present
2026-07-14 21:20:30 +00:00 · 2025-01-22 16:45:14 +01:00 · 2025-01-22 16:42:59 +01:00 · 2025-01-22 16:42:59 +01:00 · 2025-01-22 16:42:48 +01:00 · 2025-01-21 16:07:00 +01:00
559 changed files with 13821 additions and 10876 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -485,26 +485,6 @@ target_link_libraries(params_libconfig PRIVATE config_internals ${libconfig_LIBR
 add_library(shlib_loader OBJECT common/utils/load_module_shlib.c)
 target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)

-##########################################################
-
-# LDPC offload library - AMD T2 Accelerator Card
-##########################################################
-
-add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)
-if (ENABLE_LDPC_T2)
-  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.9)
-  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS ${LIBDPDK_T2_LIBRARY_DIRS})
-  if (NOT PMD_T2)
-    message(FATAL_ERROR "could not find poll-mode driver for AccelerComm T2 LDPC Offload (rte_baseband_accl_ldpc.so)")
-  endif()
-  message(STATUS "T2 build: use ${PMD_T2}")
-  add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
-  set_target_properties(ldpc_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
-  target_link_libraries(ldpc_t2 ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
-endif()
-
-##########################################################
-
 include_directories ("${OPENAIR_DIR}/radio/COMMON")

 ##############################################################
@@ -770,14 +750,6 @@ include_directories(${NFAPI_USER_DIR})

 # Layer 1
 #############################
-set(PHY_TURBOSRC
-  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_sse.c
-  ${OPENAIR1_DIR}/PHY/CODING/3gpplte.c
-  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
-  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
-  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
-  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder.c
-)
 set(PHY_POLARSRC
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_init.c
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
@@ -800,76 +772,12 @@ set(PHY_TURBOIF
  ${OPENAIR1_DIR}/PHY/CODING/coding_load.c
 )

-set(PHY_LDPC_ORIG_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder.c
+set(PHY_NRLDPC_CODINGIF
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_interface_load.c
 )
-add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )
-target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)
-
-set(PHY_LDPC_OPTIM_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c
-  )
-add_library(ldpc_optim MODULE ${PHY_LDPC_OPTIM_SRC} )
-target_link_libraries(ldpc_optim PRIVATE ldpc_gen_HEADERS)
-
-set(PHY_LDPC_OPTIM8SEG_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c
-)
-add_library(ldpc_optim8seg MODULE ${PHY_LDPC_OPTIM8SEG_SRC} )
-target_link_libraries(ldpc_optim8seg PRIVATE ldpc_gen_HEADERS)
-
-set(PHY_LDPC_OPTIM8SEGMULTI_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
-  )
-add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
-target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
-
-set(PHY_LDPC_CUDA_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
-)
-
-set(PHY_LDPC_CL_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
-)
-add_custom_target( nrLDPC_decoder_kernels_CL
-                   COMMAND gcc ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c -dD -DNRLDPC_KERNEL_SOURCE -E -o ${CMAKE_CURRENT_BINARY_DIR}/nrLDPC_decoder_kernels_CL.clc
-                   SOURCES ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c
-)
-add_library(ldpc_cl MODULE ${PHY_LDPC_CL_SRC} )
-target_link_libraries(ldpc_cl OpenCL)
-add_dependencies(ldpc_cl nrLDPC_decoder_kernels_CL)
-
-set(PHY_NR_CODINGIF
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c
-)
-
-##############################################
-# Base CUDA setting
-##############################################
-
-add_boolean_option(ENABLE_LDPC_CUDA OFF "Build support for CUDA" OFF)
-if (ENABLE_LDPC_CUDA)
-  find_package(CUDA REQUIRED)
-  SET(CUDA_NVCC_FLAG "${CUDA_NVCC_FLAGS};-arch=sm_60;")
-  SET(CUDA_VERBOSE_BUILD ON)
-  cuda_add_library(ldpc_cuda MODULE ${PHY_LDPC_CUDA_SRC})
-  set_target_properties(ldpc_cuda PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
-  if (NOT CUDA_FOUND)
-    message(FATAL_ERROR "no CUDA found")
-  endif()
-endif()
-
-add_library(coding MODULE ${PHY_TURBOSRC} )

 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)

-
 set(PHY_SRC_COMMON
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
@@ -895,8 +803,6 @@ set(PHY_SRC_COMMON
  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_mbsfn.c
  ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_ul_ref.c
  ${OPENAIR1_DIR}/PHY/CODING/lte_segmentation.c
-  ${OPENAIR1_DIR}/PHY/CODING/nr_segmentation.c
-  ${OPENAIR1_DIR}/PHY/CODING/nr_rate_matching.c
  ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte.c
  ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte_lte.c
  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_sse.c
@@ -1007,6 +913,8 @@ set(PHY_SRC_UE
  )

  set(PHY_NR_SRC_COMMON
+  ${OPENAIR1_DIR}/PHY/CODING/nr_segmentation.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
  ${OPENAIR1_DIR}/PHY/nr_phy_common/src/nr_phy_common_csirs.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_scrambling.c
@@ -1030,7 +938,6 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
@@ -1057,7 +964,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c
  ${PHY_POLARSRC}
  ${PHY_SMALLBLOCKSRC}
-  ${PHY_NR_CODINGIF}
+  ${PHY_NRLDPC_CODINGIF}
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/srs_rx.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_uci_tools_common.c
@@ -1078,7 +985,6 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/
@@ -1112,7 +1018,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c
  ${PHY_POLARSRC}
  ${PHY_SMALLBLOCKSRC}
-  ${PHY_NR_CODINGIF}
+  ${PHY_NRLDPC_CODINGIF}
  )


@@ -1474,6 +1380,7 @@ add_library(L2_UE
  ${MAC_SRC_UE}
 )
 target_link_libraries(L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(L2_UE PRIVATE GTPV1U)

 add_library(L2_UE_LTE_NR
  ${L2_RRC_SRC_UE}
@@ -1569,6 +1476,10 @@ set(libnas_emm_msg_OBJS
  ${NAS_SRC}COMMON/EMM/MSG/UplinkNasTransport.c
 )

+set(libnas_fgs_msg_OBJS
+  ${NAS_SRC}COMMON/EMM/MSG/fgs_service_request.c
+)
+
 set(libnas_esm_msg_OBJS
  ${NAS_SRC}COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c
  ${NAS_SRC}COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c
@@ -1682,7 +1593,6 @@ set (libnas_utils_OBJS
  ${NAS_SRC}COMMON/UTIL/nas_timer.c
  ${NAS_SRC}COMMON/UTIL/socket.c
  ${NAS_SRC}COMMON/UTIL/stty.c
-  ${NAS_SRC}COMMON/UTIL/TLVEncoder.c
  ${NAS_SRC}COMMON/UTIL/TLVDecoder.c
  ${NAS_SRC}COMMON/UTIL/OctetString.c
 )
@@ -1793,6 +1703,7 @@ add_library(LIB_NAS_SIMUE
  ${libnas_api_OBJS}
  ${libnas_ue_api_OBJS}
  ${libnas_emm_msg_OBJS}
+  ${libnas_fgs_msg_OBJS}
  ${libnas_esm_msg_OBJS}
  ${libnas_ies_OBJS}
  ${libnas_utils_OBJS}
@@ -1839,6 +1750,7 @@ include_directories(${NAS_SRC}UE)
 include_directories(${NAS_SRC}UE/API/USER)
 include_directories(${NAS_SRC}UE/API/USIM)
 include_directories(${NAS_SRC}UE/EMM)
+include_directories(${NAS_SRC}UE/EMM/MSG)
 include_directories(${NAS_SRC}UE/EMM/SAP)
 include_directories(${NAS_SRC}UE/ESM)
 include_directories(${NAS_SRC}UE/ESM/SAP)
@@ -1905,12 +1817,6 @@ add_executable(measurement_display
  ${OPENAIR_DIR}/common/utils/threadPool/measurement_display.c)
 target_link_libraries (measurement_display minimal_lib)

-add_executable(test5Gnas
-  ${OPENAIR_DIR}/openair3/TEST/test5Gnas.c
-)
-target_link_libraries (test5Gnas LIB_5GNAS_GNB minimal_lib )
-
-
 # lte-softmodem is both eNB and UE implementation
 ###################################################

@@ -1943,6 +1849,7 @@ target_link_libraries(lte-softmodem PRIVATE
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(lte-softmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})

 if(E2_AGENT)
  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
@@ -1998,6 +1905,7 @@ target_link_libraries(lte-uesoftmodem PRIVATE
 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})

 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-uesoftmodem PRIVATE
@@ -2044,12 +1952,6 @@ if(E2_AGENT)
 endif()


-add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
-
-if (ENABLE_LDPC_T2)
-  add_dependencies(nr-softmodem ldpc_t2)
-endif()
-
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-softmodem PRIVATE
  asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
@@ -2080,6 +1982,7 @@ add_executable(nr-uesoftmodem
  ${rrc_h}
  ${s1ap_h}
  ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
+  ${OPENAIR_DIR}/executables/position_interface.c
  ${OPENAIR_DIR}/executables/nr-ue.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
@@ -2101,12 +2004,6 @@ target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_m
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

-add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
-if (ENABLE_LDPC_CUDA)
-   add_dependencies(nr-uesoftmodem ldpc_cuda)
-   add_dependencies(nr-softmodem ldpc_cuda)
-endif()
-
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-uesoftmodem PRIVATE
                      asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
@@ -2157,17 +2054,11 @@ target_link_libraries(smallblocktest PRIVATE


 add_executable(ldpctest
-   ${PHY_NR_CODINGIF}
   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
   )
-
-add_dependencies(ldpctest ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
-if (ENABLE_LDPC_CUDA)
-  add_dependencies(ldpctest ldpc_cuda)
-endif()
 target_link_libraries(ldpctest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
-  m pthread dl shlib_loader ${T_LIB}
+  m pthread dl shlib_loader ${T_LIB} nr_coding_segment_utils
  )

 add_executable(nr_dlschsim
@@ -2261,10 +2152,6 @@ add_executable(nr_ulsim
  ${PHY_INTERFACE_DIR}/queue_t.c
  )

-if (ENABLE_LDPC_T2)
-  add_dependencies(nr_ulsim ldpc_t2)
-endif()
-
 target_link_libraries(nr_ulsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
@@ -2323,14 +2210,14 @@ if (${T_TRACER})
        #all "add_library" definitions
        ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
        params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
-        oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO
+        oai_eth_transpro oai_mobipass HASHTABLE UTIL OMG_SUMO
        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap
        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB
-        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals nr_common)
+        dfts config_internals nr_common)
    if (TARGET ${i})
      add_dependencies(${i} generate_T)
    endif()
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.dlsim100rbtm2}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.dlsim100rbtm2 }}
      {{- end }}
--- a/charts/physims/charts/dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.dlsimbasic}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.dlsimbasic }}
      {{- end }}
--- a/charts/physims/charts/ldpctest/templates/job.yaml
+++ b/charts/physims/charts/ldpctest/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.ldpctest}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.ldpctest }}
      {{- end }}
--- a/charts/physims/charts/nr-dlschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrdlschsim}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrdlschsim }}
      {{- end }}
--- a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrdlsimbasic}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrdlsimbasic }}
      {{- end }}
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrdlsimdmrsptrs}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrdlsimdmrsptrs }}
      {{- end }}
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrdlsimmcsmimo}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrdlsimmcsmimo }}
      {{- end }}
--- a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrdlsimoffset}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrdlsimoffset }}
      {{- end }}
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrpbschsim106rb}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrpbschsim106rb }}
      {{- end }}
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrpbchsim217rb}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrpbchsim217rb }}
      {{- end }}
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrpbchsim273rb}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
      {{- end }}
--- a/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrpbchsim273rb}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
      {{- end }}
--- a/charts/physims/charts/nr-prachsim/templates/job.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrprachsim}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrprachsim }}
      {{- end }}
--- a/charts/physims/charts/nr-psbchsim/templates/job.yaml
+++ b/charts/physims/charts/nr-psbchsim/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrpsbchsim}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrpsbchsim }}
      {{- end }}
--- a/charts/physims/charts/nr-pucchsim/templates/job.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrpucchsim}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrpucchsim }}
      {{- end }}
--- a/charts/physims/charts/nr-ulschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrulschsim}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrulschsim }}
      {{- end }}
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrulsim3gpp}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrulsim3gpp }}
      {{- end }}
--- a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrulsimmimo}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrulsimmimo }}
      {{- end }}
--- a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrulsimmisc}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrulsimmisc }}
      {{- end }}
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        ports:
@@ -39,6 +44,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.nrulsimscfdma}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.nrulsimscfdma }}
      {{- end }}
--- a/charts/physims/charts/polartest/templates/job.yaml
+++ b/charts/physims/charts/polartest/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.polartest}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.polartest }}
      {{- end }}
--- a/charts/physims/charts/smallblocktest/templates/job.yaml
+++ b/charts/physims/charts/smallblocktest/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.smallblocktest}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.smallblocktest }}
      {{- end }}
--- a/charts/physims/charts/ulsim/templates/job.yaml
+++ b/charts/physims/charts/ulsim/templates/job.yaml
@@ -18,6 +18,11 @@ spec:
      - name: physim
        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
        securityContext:
          {{- toYaml .Values.securityContext | nindent 12 }}
        env:
@@ -37,6 +42,6 @@ spec:
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
      {{- end }}
-      {{- if .Values.global.nodeName.ulsim}}
+      {{- if .Values.global.nodeName}}
      nodeName: {{ .Values.global.nodeName.ulsim }}
      {{- end }}
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -1,41 +1,21 @@
 # Default values for oai-physim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-
 global:
  serviceAccountName: oai-physim-sa
  namespace: "OAICICD_PROJECT"
-  image: 
+  image:
    registry: local
    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran/oai-physim
    version: TAG
    # pullPolicy: IfNotPresent or Never or Always
    pullPolicy: Always
  # removing the node selector
-  nodeSelector: {}
-  # It is not a good way of assigning pods to the nodes: this way we bypass the scheduler. At the moment we don't provide the resource information of these pods.
-  # Therefore, Openshift assigns the pods to the same node because it thinks the pods don't consume much resources. This isn't the case, they consume a lot of resources.
-  nodeName:
-    dlsim100rbtm2: acamas
-    dlsimbasic: acamas
-    ldpctest: acamas
-    nrdlschsim: acamas
-    nrdlsimbasic: acamas
-    nrdlsimdmrsptrs: acamas
-    nrdlsimmcsmimo: acamas
-    nrdlsimoffset: dedale
-    nrpbschsim106rb: dedale
-    nrpbchsim217rb: dedale
-    nrpbchsim273rb: dedale
-    nrpbchsimscs: dedale
-    nrpsbchsim: dedale
-    nrprachsim: dedale
-    nrpucchsim: dedale
-    nrulschsim: demophon
-    nrulsim3gpp: demophon
-    nrulsimmimo: demophon
-    nrulsimmisc: demophon
-    nrulsimscfdma: demophon
-    polartest: demophon
-    smallblocktest: demophon
-    ulsim: demophon
+  # will place on two nodes intel 3rd gen and 5th gen with RT kernel
+  nodeSelector:
+    type: ran
+  nodeName: ''
+  resources:
+    define: false
+    requests:
+      cpu: 1.5
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -47,6 +47,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
    py_param_file_present = False
    py_params={}

+    force_local = False
    while len(argvs) > 1:
        myArgv = argvs.pop(1)	# 0th is this file's name

@@ -54,6 +55,9 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
        if re.match('^\-\-help$', myArgv, re.IGNORECASE):
            HELP.GenericHelp(CONST.Version)
            sys.exit(0)
+        if re.match('^\-\-local$', myArgv, re.IGNORECASE):
+            force_local = True
+

 	    #--apply=<filename> as parameters file, to replace inline parameters
        elif re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE):
@@ -271,4 +275,4 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
            HELP.GenericHelp(CONST.Version)
            sys.exit('Invalid Parameter: ' + myArgv)

-    return py_param_file_present, py_params, mode
+    return py_param_file_present, py_params, mode, force_local
--- a/ci-scripts/checkCodingFormattingRules.sh
+++ b/ci-scripts/checkCodingFormattingRules.sh
@@ -73,9 +73,9 @@ then
    do
       IS_NFAPI=`echo $FILE | grep -E -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
       IS_OAI_LICENCE_PRESENT=`grep -E -c "OAI Public License" $FILE || true`
-       IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`
+       IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FILE || true`
       IS_MIT_LICENCE_PRESENT=`grep -E -c "MIT License" $FILE || true`
-       IS_EXCEPTION=`echo $FILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
+       IS_EXCEPTION=`echo $FILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`
       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
       then
           if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
@@ -184,9 +184,9 @@ do
        then
            IS_NFAPI=`echo $FULLFILE | grep -E -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
            IS_OAI_LICENCE_PRESENT=`grep -E -c "OAI Public License" $FULLFILE || true`
-            IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`
+            IS_BSD_LICENCE_PRESENT=`grep -E -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause|License-Identifier: BSD-3-Clause" $FULLFILE || true`
            IS_MIT_LICENCE_PRESENT=`grep -E -c "MIT License" $FULLFILE || true`
-            IS_EXCEPTION=`echo $FULLFILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
+            IS_EXCEPTION=`echo $FULLFILE | grep -E -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h" || true`
            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
            then
                if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -64,21 +64,21 @@ adb_ue_2:
 oc-cn5g:
  Host: avra
  Namespace: "oaicicd-core-for-ci-ran"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-00102"
+  CNPath: "/opt/oai-cn5g-fed-develop-2025-jan"
  NetworkScript: echo "inet 172.21.6.102"
  RunIperf3Server: False

 oc-cn5g-20897:
  Host: cacofonix
  Namespace: "oaicicd-core-for-fhi72"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
+  CNPath: "/opt/oai-cn5g-fed-develop-2025-jan"
  NetworkScript: echo "inet 172.21.6.105"
  RunIperf3Server: False

 oc-cn5g-20897-aerial2:
  Host: aerial2
-  Namespace: "oaicicd-core-for-fhi72"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
+  Namespace: "oaicicd-core-for-nvidia-aerial"
+  CNPath: "/opt/oai-cn5g-fed-develop-2025-jan"
  NetworkScript: echo "inet 172.21.6.105"
  RunIperf3Server: False

--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -129,19 +129,9 @@ class Cluster:

 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
-		self.cmd.run('oc delete secret etc-pki-entitlement')
-		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????.pem | tail -1', silent=True)
-		regres1 = re.search(r"/etc/pki/entitlement/[0-9]+.pem", ret.stdout)
-		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????-key.pem | tail -1', silent=True)
-		regres2 = re.search(r"/etc/pki/entitlement/[0-9]+-key.pem", ret.stdout)
-		if regres1 is None or regres2 is None:
-			logging.error("could not find entitlements")
-			return False
-		file1 = regres1.group(0)
-		file2 = regres2.group(0)
-		ret = self.cmd.run(f'oc create secret generic etc-pki-entitlement --from-file {file1} --from-file {file2}')
-		regres = re.search(r"secret/etc-pki-entitlement created", ret.stdout)
-		if ret.returncode != 0 or regres is None:
+		self.cmd.run(f'oc delete secret etc-pki-entitlement')
+		ret = self.cmd.run(f"oc get secret etc-pki-entitlement -n openshift-config-managed -o json | jq 'del(.metadata.resourceVersion)' | jq 'del(.metadata.creationTimestamp)' | jq 'del(.metadata.uid)' | jq 'del(.metadata.namespace)' | oc create -f -", silent=True)
+		if ret.returncode != 0:
 			logging.error("could not create secret/etc-pki-entitlement")
 			return False
 		return True
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -217,6 +217,8 @@ class RemoteCmd(Cmd):
 		return client

 	def _lookup_ssh_config(hostname):
+		if is_local(hostname):
+			raise ValueError("Using localhost as SSH target is not allowed: use LocalCmd instead.")
 		ssh_config = paramiko.SSHConfig()
 		user_config_file = os.path.expanduser("~/.ssh/config")
 		if os.path.exists(user_config_file):
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -145,10 +145,6 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 		collectInfo[image] = files
 	return collectInfo

-def GetContainerName(ssh, svcName, file):
-	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".container_name'", silent=True)
-	return ret.stdout
-
 def GetImageName(ssh, svcName, file):
 	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".image'", silent=True)
 	if ret.returncode != 0:
@@ -156,17 +152,18 @@ def GetImageName(ssh, svcName, file):
 	else:
 		return ret.stdout.strip()

-def GetContainerHealth(ssh, containerName):
-	if containerName is None:
-		return False
-	if 'db_init' in containerName or 'db-init' in containerName: # exits with 0, there cannot be healthy
-		return True
+def GetServiceHealth(ssh, svcName, file):
+	if svcName is None:
+		return False, f"Service {svcName} not found in {file}"
+	image = GetImageName(ssh, svcName, file)
+	if 'db_init' in svcName or 'db-init' in svcName: # exits with 0, there cannot be healthy
+		return True, f"Service {svcName} healthy, image {image}"
 	for _ in range(8):
-		result = ssh.run(f'docker inspect --format="{{{{.State.Health.Status}}}}" {containerName}', silent=True)
+		result = ssh.run(f"docker compose -f {file} ps --format json {svcName}  | jq -r 'if type==\"array\" then .[0].Health else .Health end'", silent=True)
 		if result.stdout == 'healthy':
-			return True
+			return True, f"Service {svcName} healthy, image {image}"
 		time.sleep(5)
-	return False
+	return False, f"Failed to deploy: service {svcName}"

 def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):
 	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
@@ -218,9 +215,9 @@ def GetServices(ssh, requested, file):
    else:
        return requested

-def CopyinContainerLog(ssh, lSourcePath, yaml, containerName, filename):
+def CopyinServiceLog(ssh, lSourcePath, yaml, svcName, wd_yaml, filename):
 	remote_filename = f"{lSourcePath}/cmake_targets/log/{filename}"
-	ssh.run(f'docker logs {containerName} &> {remote_filename}')
+	ssh.run(f'docker compose -f {wd_yaml} logs {svcName} --no-log-prefix &> {remote_filename}')
 	local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml}"
 	local_filename = f"{local_dir}/{filename}"
 	return ssh.copyin(remote_filename, local_filename)
@@ -336,6 +333,7 @@ class Containerize():
 		self.imageToCopy = ''
 		#checkers from xml
 		self.ran_checkers={}
+		self.num_attempts = 1

 		self.flexricTag = ''

@@ -843,50 +841,55 @@ class Containerize():

 	def DeployObject(self, HTML):
 		svr = self.eNB_serverId[self.eNB_instance]
+		num_attempts = self.num_attempts
 		lIpAddr, lSourcePath = self.GetCredentials(svr)
-		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
+		logging.debug(f'Deploying OAI Object on server: {lIpAddr}')
 		yaml = self.yamlPath[self.eNB_instance].strip('/')
 		# creating the log folder by default
 		local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml.split('/')[-1]}"
 		os.system(f'mkdir -p {local_dir}')
 		wd = f'{lSourcePath}/{yaml}'
-
+		wd_yaml = f'{wd}/docker-compose.y*ml'
+		yaml_dir = yaml.split('/')[-1]
 		with cls_cmd.getConnection(lIpAddr) as ssh:
-			services = GetServices(ssh, self.services[self.eNB_instance], f"{wd}/docker-compose.y*ml")
+			services = GetServices(ssh, self.services[self.eNB_instance], wd_yaml)
 			if services == [] or services == ' ' or services == None:
-				msg = "Cannot determine services to start"
+				msg = 'Cannot determine services to start'
 				logging.error(msg)
 				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
 				return False
-
 			ExistEnvFilePrint(ssh, wd)
 			WriteEnvFile(ssh, services, wd, self.deploymentTag, self.flexricTag)
-
-			logging.info(f"will start services {services}")
-			status = ssh.run(f'docker compose -f {wd}/docker-compose.y*ml up -d -- {services}')
-			if status.returncode != 0:
-				msg = f"cannot deploy services {services}: {status.stdout}"
-				logging.error(msg)
-				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
-				return False
-
-			imagesInfo = []
-			fstatus = True
-			for svc in services.split():
-				containerName = GetContainerName(ssh, svc, f"{wd}/docker-compose.y*ml")
-				healthy = GetContainerHealth(ssh, containerName)
-				if not healthy:
-					imagesInfo += [f"Failed to deploy: service {svc}"]
-					fstatus = False
-				else:
-					image = GetImageName(ssh, svc, f"{wd}/docker-compose.y*ml")
-					logging.info(f"service {svc} healthy, container {containerName}, image {image}")
-					imagesInfo += [f"service {svc} healthy, image {image}"]
-		if fstatus:
+			if num_attempts <= 0:
+				raise ValueError(f'Invalid value for num_attempts: {num_attempts}, must be greater than 0')
+			for attempt in range(num_attempts):
+				imagesInfo = []
+				healthInfo = []
+				logging.info(f'will start services {services}')
+				status = ssh.run(f'docker compose -f {wd_yaml} up -d -- {services}')
+				if status.returncode != 0:
+					msg = f'cannot deploy services {services}: {status.stdout}'
+					logging.error(msg)
+					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [msg])
+					return False
+				for svc in services.split():
+					health, msg = GetServiceHealth(ssh, svc, f'{wd_yaml}')
+					logging.info(msg)
+					imagesInfo.append(msg)
+					healthInfo.append(health)
+				deployed = all(healthInfo)
+				if deployed:
+					break
+				elif (attempt < num_attempts - 1):
+					logging.warning(f'Failed to deploy on attempt {attempt}, restart services {services}')
+					for svc in services.split():
+						CopyinServiceLog(ssh, lSourcePath, yaml_dir, svc, wd_yaml, f'{svc}-{HTML.testCase_id}-attempt{attempt}.log')
+					ssh.run(f'docker compose -f {wd_yaml} down -- {services}')
+		if deployed:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', ['\n'.join(imagesInfo)])
 		else:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['\n'.join(imagesInfo)])
-		return fstatus
+		return deployed

 	def UndeployObject(self, HTML, RAN):
 		svr = self.eNB_serverId[self.eNB_instance]
@@ -902,7 +905,7 @@ class Containerize():
 			if services is not None:
 				all_serv = " ".join([s for s, _ in services])
 				ssh.run(f'docker compose -f {wd}/docker-compose.y*ml stop -- {all_serv}')
-				copyin_res = all(CopyinContainerLog(ssh, lSourcePath, yaml_dir, c, f'{s}-{HTML.testCase_id}.log') for s, c in services)
+				copyin_res = all(CopyinServiceLog(ssh, lSourcePath, yaml_dir, s, f"{wd}/docker-compose.y*ml", f'{s}-{HTML.testCase_id}.log') for s, c in services)
 			else:
 				logging.warning('could not identify services to stop => no log file')
 			ssh.run(f'docker compose -f {wd}/docker-compose.y*ml down -v')
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -137,9 +137,7 @@ class PhySim:
 			logging.debug(f'\u001B[1m   Now using project {ocProjectName}\u001B[0m')

 		# Using helm charts deployment
-		mySSH.command(f'grep -rl OAICICD_PROJECT ./charts/ | xargs sed -i -e "s#OAICICD_PROJECT#{ocProjectName}#"', '\$', 30)
-		mySSH.command(f'sed -i -e "s#TAG#{imageTag}#g" ./charts/physims/values.yaml', '\$', 6)
-		mySSH.command('helm install physim ./charts/physims/ --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
+		mySSH.command(f'helm install physim ./charts/physims/ --set global.image.version={imageTag} --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
 		if mySSH.getBefore().count('STATUS: deployed') == 0:
 			logging.error('\u001B[1m Deploying PhySim Failed using helm chart on OC Cluster\u001B[0m')
 			mySSH.command('helm uninstall physim | tee -a cmake_targets/log/physim_helm_summary.txt 2>&1', '\$', 30)
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
@@ -230,7 +230,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "addr=192.168.80.250";

    }
 );  
--- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf
@@ -230,7 +230,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "addr=192.168.80.250";

    }
 );  
--- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf
@@ -230,7 +230,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "addr=192.168.80.250";

    }
 );  
--- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
@@ -91,8 +91,8 @@ gNBs =
        ra_ResponseWindow                                              = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                   = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                   = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                      = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
@@ -90,7 +90,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -92,7 +92,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -35,13 +35,6 @@ gNBs =
    do_SRS                = 0;
    min_rxtxtime          = 2;

-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      }
-    );
-
    servingCellConfigCommon = (
    {
 #spCellConfigCommon
@@ -116,8 +109,8 @@ gNBs =
        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
@@ -90,7 +90,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
@@ -89,7 +89,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf
@@ -31,11 +31,11 @@ gNBs =

 #  downlinkConfigCommon
    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641032;
+      # this is 3319.68 MHz
+      absoluteFrequencySSB                                             = 621312;
      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640000;
+      # this is 3300.6 MHz
+      dl_absoluteFrequencyPointA                                       = 620040;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -89,7 +89,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf
@@ -89,7 +89,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
@@ -91,7 +91,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -84,8 +84,8 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
        ra_ContentionResolutionTimer                                = 7;
--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf
@@ -89,8 +89,8 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
        ra_ContentionResolutionTimer                                = 7;
--- a/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf
@@ -88,8 +88,8 @@ gNBs =
        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
@@ -87,7 +87,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band66.ntn.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.ntn.25prb.rfsim.conf
@@ -88,7 +88,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
@@ -148,6 +148,13 @@ gNBs =
  #ext2
    #ntn_Config_r17
      cellSpecificKoffset_r17                                       = 478;
+      ta-Common-r17                                                 = 29314900;
+      positionX-r17                                                 = 0;
+      positionY-r17                                                 = 0;
+      positionZ-r17                                                 = 32433846;
+      velocityVX-r17                                                = 0;
+      velocityVY-r17                                                = 0;
+      velocityVZ-r17                                                = 0;
  }

  );
--- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
@@ -88,7 +88,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
@@ -91,8 +91,8 @@ gNBs =
        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.4x4.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.4x4.conf
@@ -93,8 +93,8 @@ gNBs =
        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
@@ -210,8 +210,6 @@ RUs = (
  max_pdschReferenceSignalPower = -27;
  max_rxgain     = 75;
  eNB_instances  = [0];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000, 0x00007fff, 0x0000];
  #clock_src = "internal";
  sdr_addrs = "addr=192.168.80.53, clock_source=internal,time_source=internal"

--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
@@ -24,13 +24,6 @@ gNBs =
    do_CSIRS              = 1;
    do_SRS                = 0;

-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 11;
-        searchSpaceZero = 0;
-      }
-    );
-
    servingCellConfigCommon = (
    {
 #spCellConfigCommon
@@ -95,8 +88,8 @@ gNBs =
        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
@@ -263,11 +256,6 @@ fhi_72 = {
  ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb");
  mtu = 9600;
  fh_config = ({
-    Tadv_cp_dl = 125;
-    T2a_cp_dl = (285, 429);
-    T2a_cp_ul = (285, 429);
-    T2a_up = (125, 428);
-    Ta3 = (130, 170);
    T1a_cp_dl = (285, 470);
    T1a_cp_ul = (285, 429);
    T1a_up = (125, 350);
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf
@@ -1,81 +1,79 @@
-Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+Active_gNBs = ( "oai-du");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
-
 gNBs =
 (
 {
    ////////// Identification parameters:
    gNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-5GNRBox";
-
+    gNB_name  =  "oai-du";
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
-
-    plmn_list = ({mcc = 222; mnc = 01; mnc_length = 2;});	 
-
-    tr_s_preference     = "local_mac"
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
+    nr_cellid = 1;

    ////////// Physical parameters:
+    pdsch_AntennaPorts_XP = 2;
+    pusch_AntennaPorts    = 4;
+    pdsch_AntennaPorts_N1 = 2;
+    maxMIMO_layers        = 2;
+    do_CSIRS              = 1;
+    do_SRS                = 0;
+    force_UL256qam_off    = 1;

    servingCellConfigCommon = (
    {
- #spCellConfigCommon
-
+#spCellConfigCommon
      physCellId                                                    = 0;
-
 #  downlinkConfigCommon
    #frequencyInfoDL
-      # this is 3600 MHz + 84 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641272; //641032;      #641968; 641968=start of ssb at 3600MHz + 82 RBs    641032=center of SSB at center of cell
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640000;
+      # this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741)
+      absoluteFrequencySSB                                          = 649920; #JF maybe we should adjust a bit
+      dl_frequencyBand                                              = 78;
+      # this is 3300.24 MHz
+      dl_absoluteFrequencyPointA                                    = 646724;
      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
+        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 273;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=84,L=13 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 6368;
+       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
+       initialDLBWPlocationAndBandwidth                             = 1099;
+       #
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialDLBWPsubcarrierSpacing                                           = 1;
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                               = 1;
      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 0;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon 
+        initialDLBWPcontrolResourceSetZero                          = 12;
+        initialDLBWPsearchSpaceZero                                 = 0;
+  #uplinkConfigCommon
     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
+      ul_frequencyBand                                              = 78;
      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
+      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 273;
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 6368;
+        initialULBWPlocationAndBandwidth                            = 1099;
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-        initialULBWPsubcarrierSpacing                                           = 1;
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
      #rach-ConfigCommon
        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
+          prach_ConfigurationIndex                                  = 148; # JF check this and other PRACH related params
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
          prach_msg1_FDM                                            = 0;
          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -100;
+          zeroCorrelationZoneConfig                                 = 12;
+          preambleReceivedTargetPower                               = -96;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
          preambleTransMax                                          = 6;
 #powerRampingStep
@@ -87,8 +85,8 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
        ra_ContentionResolutionTimer                                = 7;
@@ -98,57 +96,46 @@ gNBs =
        prach_RootSequenceIndex_PR                                  = 2;
        prach_RootSequenceIndex                                     = 1;
        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #  
+        #
        msg1_SubcarrierSpacing                                      = 1,
-
 # restrictedSetConfig
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
        restrictedSetConfig                                         = 0,
-
        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
+        p0_NominalWithGrant                                         = -90;
 # pucch-ConfigCommon setup :
 # pucchGroupHopping
 # 0 = neither, 1= group hopping, 2=sequence hopping
        pucchGroupHopping                                           = 0;
        hoppingId                                                   = 40;
        p0_nominal                                                  = -90;
-
-      ssb_PositionsInBurst_Bitmap                                   = 1; #0x80;
-
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_Bitmap                                   = 1;
 # ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
      ssb_periodicityServingCell                                    = 2;
-
 # dmrs_TypeA_position
 # 0 = pos2, 1 = pos3
      dmrs_TypeA_Position                                           = 0;
-
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
      subcarrierSpacing                                             = 1;
-
-
  #tdd-UL-DL-ConfigurationCommon
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
      referenceSubcarrierSpacing                                    = 1;
-      # pattern1 
+      # pattern1
      # dl_UL_TransmissionPeriodicity
      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7; //8; //7;
-      nrofDownlinkSymbols                                           = 6; //0; //6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4; //0; //4;
-
-  ssPBCH_BlockPower                                             = -25;
+      dl_UL_TransmissionPeriodicity                                 = 5; #6;
+      nrofDownlinkSlots                                             = 3; #7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 1; #2;
+      nrofUplinkSymbols                                             = 4;
+      ssPBCH_BlockPower                                             = -10;
  }
-
  );
-
-
    # ------- SCTP definitions
    SCTP :
    {
@@ -157,63 +144,64 @@ gNBs =
        SCTP_OUTSTREAMS = 2;
    };

-
-    ////////// MME parameters:
-    amf_ip_address = ({ ipv4 = "192.168.69.131"; });
-
-    ///X2
-    enable_x2 = "yes";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address = ({ ipv4 = "192.168.18.199"; });
+        ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "172.21.6.103"; });

    NETWORK_INTERFACES :
    {
-
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.18.198/24";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.18.198/24";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.18.20";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.18.20";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        GNB_IPV4_ADDRESS_FOR_X2C                 = "192.168.18.198/24";
-        GNB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }
 );
-
 MACRLCs = (
-	{
-	    num_cc              = 1;
-	    tr_s_preference     = "local_L1";
-	    tr_n_preference     = "local_RRC";
-	    pusch_TargetSNRx10  = 200;
-        pucch_TargetSNRx10  = 200;
-    }
+{
+  num_cc                      = 1;
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 220;
+  pucch_TargetSNRx10          = 220;
+  ul_bler_target_upper=.35;
+  ul_bler_target_lower=.15;
+  pusch_FailureThres          = 100;
+  ul_max_mcs                  = 28;
+}
 );
-
 L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+  prach_dtx_threshold = 130;
+  pucch0_dtx_threshold = 80;
+  pusch_dtx_threshold = 10;
+  max_ldpc_iterations = 10;
+  tx_amp_backoff_dB = 12; #9; needs to match O-RU configuration # JF important to check
+  L1_rx_thread_core = 3;
+  L1_tx_thread_core = 4; # relevant after merge of l1_tx_thread
+  phase_compensation = 0; # needs to match O-RU configuration # JF to be tested
 }
 );
-
 RUs = (
-    {		  
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [7];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 114;
-         eNB_instances  = [0];
-         clock_src = "internal";
-    }
-);  
-
+{
+  local_rf       = "no";
+  nb_tx          = 4;
+  nb_rx          = 4;
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  ru_thread_core = 6;
+  sl_ahead       = 10; #5;
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];
+  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
+  do_precoding = 0; # needs to match O-RU configuration
+}
+);

 security = {
  # preferred ciphering algorithms
@@ -232,14 +220,36 @@ security = {
  drb_integrity = "no";
 };

-     log_config :
-     {
-       global_log_level                      ="info";
-       hw_log_level                          ="info";
-       phy_log_level                         ="info";
-       mac_log_level                         ="info";
-       rlc_log_level                         ="info";
-       pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-    };
+log_config :
+{
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="info";
+  f1ap_log_level                        ="info";
+};
+
+fhi_72 = {
+  dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1");
+  dpdk_iova_mode = "VA";
+  system_core = 0;
+  io_core = 1;
+  worker_cores = (2);
+  ru_addr = ("00:E0:0C:00:AE:06", "00:E0:0C:00:AE:06");
+  mtu = 9000;
+  fh_config = ({
+    T1a_cp_dl = (285, 470);
+    T1a_cp_ul = (285, 429);
+    T1a_up = (125, 350);
+    Ta4 = (110, 180);
+    ru_config = {
+      iq_width = 9;
+      iq_width_prach = 9;
+    };
+  });
+};

--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
@@ -91,8 +91,8 @@ gNBs = (
          ra_ResponseWindow                             = 4;
          # ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
          # 1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-          ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR  = 3;
-          # oneHalf (0..15) 4,8,12,16,...60,64
+          ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR  = 4;
+          # one (0..15) 4,8,12,16,...60,64
          ssb_perRACH_OccasionAndCB_PreamblesPerSSB     = 15;
          # ra_ContentionResolutionTimer
          # (0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -26,14 +26,6 @@ gNBs =
    pdsch_AntennaPorts_XP                                     = 1;
    pusch_AntennaPorts                                        = 1;

-
-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      }
-    );
-
    servingCellConfigCommon = (
    {
 #spCellConfigCommon
@@ -97,8 +89,8 @@ gNBs =
        ra_ResponseWindow                                            = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                 = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                 = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                    = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
@@ -91,8 +91,8 @@ gNBs =
        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
@@ -85,8 +85,8 @@ gNBs =
      ra_ResponseWindow                                             = 4;
      #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
      #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-      ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                  = 3;
-      #oneHalf (0..15) 4,8,12,16,...60,64
+      ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                  = 4;
+      #one (0..15) 4,8,12,16,...60,64
      ssb_perRACH_OccasionAndCB_PreamblesPerSSB                     = 15;
      #ra_ContentionResolutionTimer
      #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
@@ -21,12 +21,6 @@ gNBs =
    do_CSIRS                                                  = 0;
    do_SRS                                                    = 0;
    min_rxtxtime = 6;
-      pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      }
-      );

    servingCellConfigCommon = (
    {
@@ -94,7 +88,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
@@ -77,8 +77,8 @@ gNBs:
        ra_ResponseWindow: 5
        #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
        #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR: 3
-        #oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR: 4
+        #one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB: 15
        #ra_ContentionResolutionTimer
        #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
@@ -90,8 +90,8 @@ gNBs =
        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
@@ -84,7 +84,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
@@ -103,8 +103,8 @@ gNBs =
        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf
@@ -104,8 +104,8 @@ gNBs =
        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -86,7 +86,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf
@@ -26,13 +26,6 @@ gNBs =
    sib1_tda			        = 15;
   # force_UL256qam_off    = 1;

-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 11;
-        searchSpaceZero = 0;
-      }
-    );
-
    servingCellConfigCommon = (
    {
 #spCellConfigCommon
@@ -82,7 +75,7 @@ gNBs =
        initialULBWPsubcarrierSpacing                               = 1;
      #rach-ConfigCommon
        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 151;
+          prach_ConfigurationIndex                                  = 152;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
          prach_msg1_FDM                                            = 0;
@@ -99,8 +92,8 @@ gNBs =
        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
@@ -271,11 +264,6 @@ fhi_72 = {
  ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81");
  mtu = 9600;
  fh_config = ({
-    Tadv_cp_dl = 125;
-    T2a_cp_dl = (259, 500);
-    T2a_cp_ul = (25, 500);
-    T2a_up = (134, 375);
-    Ta3 = (152, 160);
    T1a_cp_dl = (419, 470);
    T1a_cp_ul = (285, 336);
    T1a_up = (294, 345);
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
@@ -88,8 +88,8 @@ gNBs =
        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
@@ -75,7 +75,7 @@ gNBs =
        initialULBWPsubcarrierSpacing                                           = 1;
      #rach-ConfigCommon
        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 100;
+          prach_ConfigurationIndex                                  = 101;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
          prach_msg1_FDM                                            = 0;
@@ -92,8 +92,8 @@ gNBs =
        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -75,7 +75,7 @@ gNBs =
        initialULBWPsubcarrierSpacing                                           = 1;
      #rach-ConfigCommon
        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 100;
+          prach_ConfigurationIndex                                  = 101;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
          prach_msg1_FDM                                            = 0;
@@ -92,8 +92,8 @@ gNBs =
        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -26,11 +26,11 @@ gNBs =

 #  downlinkConfigCommon
    #frequencyInfoDL
-      # this is 3300.30 MHz + (19 PRBs + 10 SCs)@30kHz SCS (GSCN: 7715)
-      absoluteFrequencySSB                                             = 620736;
+      # this is 3610.56 MHz
+      absoluteFrequencySSB                                             = 640704;
      dl_frequencyBand                                                 = 78;
-      # this is 3300.30 MHz
-      dl_absoluteFrequencyPointA                                       = 620020;
+      # this is 3599.94 MHz
+      dl_absoluteFrequencyPointA                                       = 639996;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -84,7 +84,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/nrue.uicc.conf
+++ b/ci-scripts/conf_files/nrue.uicc.conf
@@ -6,6 +6,12 @@ uicc0 = {
  nssai_sst=1;
 }

+position0 = {
+    x = 0.0;
+    y = 0.0;
+    z = 6377900.0;
+}
+
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

 #/* configuration for channel modelisation */
@@ -34,4 +40,4 @@ channelmod = {
      ds_tdl         = 0;
    }
  );
-};
+};
--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -10,7 +10,7 @@ Ref :
  feprx : 46.0
  feptx_prec : 15.0
  feptx_ofdm : 35.0
-  feptx_total : 57.0
+  feptx_total : 50.0
  L1 Tx processing : 260.0
  DLSCH encoding : 160.0
  L1 Rx processing : 420.0
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -10,11 +10,11 @@ Ref :
  feprx : 43.0
  feptx_prec : 13.0
  feptx_ofdm : 33.0
-  feptx_total : 55.0
-  L1 Tx processing : 220.0
-  DLSCH encoding : 130.0
-  L1 Rx processing : 387.0
-  PUSCH inner-receiver : 150.0
+  feptx_total : 50.0
+  L1 Tx processing : 200.0
+  DLSCH encoding : 100.0
+  L1 Rx processing : 330.0
+  PUSCH inner-receiver : 120.0
  Schedule Response : 3.0
  DL & UL scheduling timing : 6.0
  UL Indication : 3.0
--- a/ci-scripts/helpreadme.py
+++ b/ci-scripts/helpreadme.py
@@ -43,6 +43,8 @@ def GenericHelp(vers):
 	print('      InitiateHtml, FinalizeHtml')
 	print('      TerminateeNB, TerminateHSS, TerminateMME, TerminateSPGW')
 	print('      LogCollectBuild, LogCollecteNB, LogCollectHSS, LogCollectMME, LogCollectSPGW, LogCollectPing, LogCollectIperf')
+	print('  --local Force local execution: rewrites the test xml script before running to always execute on localhost. Assumes')
+	print('          images are available locally, will not remove any images and will run inside the current repo directory')

 def GitSrvHelp(repository,branch,commit,mergeallow,targetbranch):
 	print('  --ranRepository=[OAI RAN Repository URL]                                      -- ' + repository)
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -212,13 +212,17 @@ def ExecuteActionWithParam(action):

 	elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		if test.findtext('nodes'):
-			CiTestObj.nodes = test.findtext('nodes').split(' ')
-			if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
-				logging.error('Number of Nodes are not equal to the total number of UEs')
-				sys.exit("Mismatch in number of Nodes and UIs")
+		if force_local:
+			# Change all execution targets to localhost
+			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
 		else:
-			CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
+			if test.findtext('nodes'):
+				CiTestObj.nodes = test.findtext('nodes').split(' ')
+				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+					logging.error('Number of Nodes are not equal to the total number of UEs')
+					sys.exit("Mismatch in number of Nodes and UIs")
+			else:
+				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		if action == 'Initialize_UE':
 			success = CiTestObj.InitializeUE(HTML)
 		elif action == 'Attach_UE':
@@ -238,13 +242,17 @@ def ExecuteActionWithParam(action):
 		CiTestObj.ping_args = test.findtext('ping_args')
 		CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		if test.findtext('nodes'):
-			CiTestObj.nodes = test.findtext('nodes').split(' ')
-			if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
-				logging.error('Number of Nodes are not equal to the total number of UEs')
-				sys.exit("Mismatch in number of Nodes and UIs")
+		if force_local:
+			# Change all execution targets to localhost
+			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
 		else:
-			CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
+			if test.findtext('nodes'):
+				CiTestObj.nodes = test.findtext('nodes').split(' ')
+				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+					logging.error('Number of Nodes are not equal to the total number of UEs')
+					sys.exit("Mismatch in number of Nodes and UIs")
+			else:
+				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
 		success = CiTestObj.Ping(HTML,EPC,CONTAINERS)

@@ -252,15 +260,19 @@ def ExecuteActionWithParam(action):
 		CiTestObj.iperf_args = test.findtext('iperf_args')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
 		CiTestObj.svr_id = test.findtext('svr_id') or None
-		if test.findtext('nodes'):
-			CiTestObj.nodes = test.findtext('nodes').split(' ')
-			if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
-				logging.error('Number of Nodes are not equal to the total number of UEs')
-				sys.exit("Mismatch in number of Nodes and UIs")
+		if force_local:
+			# Change all execution targets to localhost
+			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
 		else:
-			CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
+			if test.findtext('nodes'):
+				CiTestObj.nodes = test.findtext('nodes').split(' ')
+				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+					logging.error('Number of Nodes are not equal to the total number of UEs')
+					sys.exit("Mismatch in number of Nodes and UIs")
+			else:
+				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		if test.findtext('svr_node'):
-			CiTestObj.svr_node = test.findtext('svr_node')
+			CiTestObj.svr_node = test.findtext('svr_node') if not force_local else 'localhost'
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
 		CiTestObj.iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold') or '90'
 		CiTestObj.iperf_profile = test.findtext('iperf_profile') or 'balanced'
@@ -349,12 +361,16 @@ def ExecuteActionWithParam(action):
 		string_field = test.findtext('services')
 		if string_field is not None:
 			CONTAINERS.services[CONTAINERS.eNB_instance] = string_field
+		CONTAINERS.num_attempts = int(test.findtext('num_attempts') or 1)
 		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
 		if action == 'Deploy_Object':
 			success = CONTAINERS.DeployObject(HTML)
 		elif action == 'Undeploy_Object':
 			success = CONTAINERS.UndeployObject(HTML, RAN)
 		elif action == 'Create_Workspace':
+			if force_local:
+				# Do not create a working directory when running locally. Current repo directory will be used
+				return True
 			success = CONTAINERS.Create_Workspace(HTML)

 	elif action == 'Run_Physim':
@@ -374,6 +390,9 @@ def ExecuteActionWithParam(action):
 		success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id)

 	elif action == 'Pull_Local_Registry' or action == 'Clean_Test_Server_Images':
+		if force_local:
+			# Do not pull or remove images when running locally. User is supposed to handle image creation & cleanup
+			return True
 		svr_id = test.findtext('svr_id')
 		images = test.findtext('images').split()
 		# hack: for FlexRIC, we need to overwrite the tag to use
@@ -462,7 +481,9 @@ CLUSTER = cls_cluster.Cluster()
 #-----------------------------------------------------------

 import args_parse
-py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER)
+# Force local execution, move all execution targets to localhost
+force_local = False
+py_param_file_present, py_params, mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER)



--- a/ci-scripts/run_locally.sh
+++ b/ci-scripts/run_locally.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+SHORT_COMMIT_SHA=$(git rev-parse --short=8 HEAD)
+COMMIT_SHA=$(git rev-parse HEAD)
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+REPO_PATH=$(dirname $(realpath $0))/../
+TESTCASE=$1
+
+if [ $# -eq 0 ]
+  then
+    echo "Provide a testcase as an argument"
+    exit 1
+fi
+
+# The script assumes you've build the following images:
+#
+# docker build . -f docker/Dockerfile.gNB.ubuntu22 -t oai-gnb
+# docker build . -f docker/Dockerfile.nrUE.ubuntu22 -t oai-nr-ue
+#
+# The images above depend on the following images:
+#
+# docker build . -f docker/Dockerfile.build.ubuntu22 -t ran-build
+# dokcer build . -f docker/Dockerfile.base.ubuntu22 -t ran-base
+
+docker tag oai-nr-ue oai-ci/oai-nr-ue:develop-${SHORT_COMMIT_SHA}
+docker tag oai-gnb oai-ci/oai-gnb:develop-${SHORT_COMMIT_SHA}
+
+python3 main.py --mode=TesteNB --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
+    --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
+    --ranTargetBranch=NONE --eNBIPAddress=NONE --eNBUserName=NONE --eNBPassword=NONE \
+    --eNBSourceCodePath=NONE --EPCIPAddress=NONE --EPCType=OAI --eNBPassword=NONE \
+    --eNBSourceCodePath=${REPO_PATH} --EPCIPAddress=NONE \
+    --EPCUserName=NONE --EPCPassword=NONE  --EPCSourceCodePath=NONE \
+    --XMLTestFile=xml_files/${TESTCASE} --local
--- a/ci-scripts/tests/deployment.py
+++ b/ci-scripts/tests/deployment.py
@@ -47,6 +47,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.eNBUserName = None
 		self.cont.eNBPassword = None
 		self.cont.eNBSourceCodePath = os.getcwd()
+		self.cont.num_attempts = 3

 	def test_deploy(self):
 		self.cont.yamlPath[0] = 'tests/simple-dep/'
@@ -65,6 +66,15 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.assertFalse(deploy)
 		self.cont.yamlPath = old

+	def test_deployfails_2svc(self):
+		# fails reliably
+		old = self.cont.yamlPath
+		self.cont.yamlPath[0] = 'tests/simple-fail-2svc/'
+		deploy = self.cont.DeployObject(self.html)
+		self.cont.UndeployObject(self.html, self.ran)
+		self.assertFalse(deploy)
+		self.cont.yamlPath = old
+
 	def test_deploy_ran(self):
 		self.cont.yamlPath[0] = 'yaml_files/5g_rfsimulator_tdd_dora'
 		self.cont.services[0] = "oai-gnb"
--- a/ci-scripts/tests/simple-fail-2svc/docker-compose.yml
+++ b/ci-scripts/tests/simple-fail-2svc/docker-compose.yml
@@ -0,0 +1,23 @@
+services:
+  test1:
+    image: ubuntu:jammy
+    container_name: test_container1
+    cap_drop:
+      - ALL
+    entrypoint: /bin/bash -c "false"
+    healthcheck:
+      test: /bin/bash -c "true"
+      interval: 1s
+      timeout: 1s
+      retries: 1
+  test2:
+    image: ubuntu:jammy
+    container_name: test_container2
+    cap_drop:
+      - ALL
+    entrypoint: /bin/bash -c "sleep infinity"
+    healthcheck:
+      test: /bin/bash -c "true"
+      interval: 1s
+      timeout: 1s
+      retries: 1
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -39,6 +39,12 @@
 040002
 030021
 030022
+ 040021
+ 000030
+ 040022
+ 040023
+ 020022
+ 040024
 100021
 222222
        </TestCaseRequestedList>
@@ -74,6 +80,12 @@
                <eNB_serverId>0</eNB_serverId>
        </testCase>

+        <testCase id="000030">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+        </testCase>
+
        <testCase id="000023">
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
@@ -149,9 +161,9 @@

        <testCase id="040021">
                <class>Custom_Command</class>
-                <desc>Simulate a disruption of DL radio channel (ploss 55)(5 sec)</desc>
+                <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
                <node>cacofonix</node>
-                <command>echo channelmod modify 0 ploss 55 | nc 192.168.71.181 8091 &amp;&amp; sleep 5</command>
+                <command>echo channelmod modify 0 ploss 55 | nc 192.168.71.181 8091</command>
                <command_fail>yes</command_fail>
        </testCase>

@@ -165,9 +177,9 @@

        <testCase id="040023">
                <class>Custom_Command</class>
-                <desc>Restoration of the original DL channel conditions (ploss 0)(5 sec)</desc>
+                <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
                <node>cacofonix</node>
-                <command>echo channelmod modify 0 ploss 0 | nc 192.168.71.181 8091 &amp;&amp; sleep 5</command>
+                <command>echo channelmod modify 0 ploss 20 | nc 192.168.71.181 8091</command>
                <command_fail>yes</command_fail>
        </testCase>

@@ -175,7 +187,7 @@
                <class>Custom_Command</class>
                <desc>Get UE sync state (UE ID 0)</desc>
                <node>cacofonix</node>
-                <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_CONNECTED &amp;&amp; sleep 10</command>
+                <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
                <command_fail>yes</command_fail>
        </testCase>

@@ -184,8 +196,8 @@
                <always_exec>true</always_exec>
                <desc>Undeploy all OAI 5G stack</desc>
                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-                <d_retx_th>30,30,100,100</d_retx_th>
-                <u_retx_th>30,30,100,100</u_retx_th>
+                <d_retx_th>30,100,100,100</d_retx_th>
+                <u_retx_th>30,100,100,100</u_retx_th>
                <eNB_instance>0</eNB_instance>
                <eNB_serverId>0</eNB_serverId>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
@@ -133,7 +133,7 @@
                <class>Ping</class>
                <desc>Ping ext-dn from both UEs</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>selfix selfix</nodes>
+                <nodes>carabe carabe</nodes>
                <ping_args>-c 20 192.168.70.135</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -142,14 +142,14 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE 1 and 2</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>selfix selfix</nodes>
+                <nodes>carabe carabe</nodes>
        </testCase>

        <testCase id="444444">
                <class>Detach_UE</class>
                <desc>Detach OAI UE 1 and 2</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>selfix selfix</nodes>
+                <nodes>carabe carabe</nodes>
        </testCase>

        <testCase id="100001">
--- a/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml
+++ b/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml
@@ -0,0 +1,171 @@
+<!--
+
+ 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>test-5g-fhi72-metanoia-2x2</htmlTabRef>
+  <htmlTabName>100 MHz TDD SA METANOIA</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <TestCaseRequestedList>
+    200000
+    110000
+    800813
+    120000
+    102000
+    102001
+    100100
+    100010
+    100020
+    100030
+    100040
+    103000
+    100002
+    130000
+    777777
+    888888
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+
+  <testCase id="200000">
+    <class>Custom_Script</class>
+    <desc>Setup sriov and network interfaces Metanoia</desc>
+    <node>cacofonix</node>
+    <script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_sriov_metanoia.sh</script>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+  <testCase id="110000">
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <svr_id>0</svr_id>
+    <images>oai-gnb-fhi72</images>
+  </testCase>
+
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for server 0</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
+
+  <testCase id="120000">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB (TDD/Band78/100MHz/Metanoia) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb</yaml_path>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
+
+  <testCase id="102001">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase id="100100">
+    <class>Ping</class>
+    <desc>Ping: 100 pings in 10 sec</desc>
+    <id>up2-fhi72</id>
+    <ping_args>-c 100 -i 0.1 172.21.6.104</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase id="100010">
+    <class>Iperf</class>
+    <desc>iperf (DL/570Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-u -b 570M -t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897</svr_id>
+  </testCase>
+
+  <testCase id="100030">
+    <class>Iperf</class>
+    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-t 30 -R</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897</svr_id>
+  </testCase>
+
+  <testCase id="100020">
+    <class>Iperf</class>
+    <desc>iperf (UL/100Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-u -b 100M -t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+    <iperf_profile>balanced</iperf_profile>
+    <svr_id>oc-cn5g-20897</svr_id>
+  </testCase>
+
+  <testCase id="100040">
+    <class>Iperf</class>
+    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-t 30</iperf_args>
+    <id>up2-fhi72</id>
+    <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
+    <svr_id>oc-cn5g-20897</svr_id>
+  </testCase>
+
+  <testCase id="103000">
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach UE</desc>
+    <id>up2-fhi72</id>
+  </testCase>
+
+  <testCase id="100002">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase id="130000">
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy gNB</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb</yaml_path>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
+
+  <testCase id="777777">
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <svr_id>0</svr_id>
+    <images>oai-gnb-fhi72</images>
+  </testCase>
+
+  <testCase id="888888">
+    <class>Custom_Script</class>
+    <always_exec>true</always_exec>
+    <desc>Set CPU to idle state, set kernel parameters to default values</desc>
+    <node>cacofonix</node>
+    <script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_cleanup.sh</script>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
@@ -89,6 +89,7 @@
    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz</yaml_path>
    <eNB_instance>0</eNB_instance>
    <eNB_serverId>0</eNB_serverId>
+    <num_attempts>3</num_attempts>
  </testCase>

  <testCase id="000001">
--- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
@@ -89,6 +89,7 @@
      <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
      <eNB_instance>0</eNB_instance>
      <eNB_serverId>0</eNB_serverId>
+      <num_attempts>3</num_attempts>
  </testCase>

  <testCase id="000001">
--- a/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml
@@ -89,6 +89,7 @@
      <yaml_path>ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz</yaml_path>
      <eNB_instance>0</eNB_instance>
      <eNB_serverId>0</eNB_serverId>
+      <num_attempts>3</num_attempts>
  </testCase>

  <testCase id="000001">
--- a/ci-scripts/xml_files/container_sa_n310_nrue.xml
+++ b/ci-scripts/xml_files/container_sa_n310_nrue.xml
@@ -80,6 +80,7 @@
    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
    <eNB_instance>0</eNB_instance>
    <eNB_serverId>0</eNB_serverId>
+    <num_attempts>3</num_attempts>
  </testCase>
  <testCase id="800814">
    <class>Create_Workspace</class>
@@ -93,6 +94,7 @@
    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
    <eNB_instance>1</eNB_instance>
    <eNB_serverId>1</eNB_serverId>
+    <num_attempts>3</num_attempts>
  </testCase>
 
  <testCase id="000001">
--- a/ci-scripts/xml_files/t2_offload_dec_nr_ulsim.xml
+++ b/ci-scripts/xml_files/t2_offload_dec_nr_ulsim.xml
@@ -24,19 +24,36 @@
 	<htmlTabName>Test T2 Offload Decoder</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
        <TestCaseRequestedList>
+                010204
                010111 010112 010121 010122 010131 010132
                010211 010212 010221 010222 010231 010232
                010311 010312 010321 010322 010331 010332
+                402010
        </TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>

+	<testCase id="010204">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>caracal</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+
+	<testCase id="402010">
+		<class>Custom_Command</class>
+		<always_exec>true</always_exec>
+		<desc>Enable Sleep States</desc>
+		<node>caracal</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="010111">
 		<class>Run_Physim</class>
 		<desc>Run nr_ulsim with CPU: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
 		<always_exec>true</always_exec>
 	        <physim_test>nr_ulsim</physim_test>
 	        <physim_time_threshold>300</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -S30.2 -m5 -r106 -R106 -C10 -P</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -m5 -r106 -R106 -C10 -P</physim_run_args>
 	</testCase>

 	<testCase id="010112">
@@ -45,7 +62,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_ulsim</physim_test>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -S30.2 -m5 -r106 -R106 -C10 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -m5 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>

 	<testCase id="010121">
@@ -54,7 +71,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_ulsim</physim_test>
 		<physim_time_threshold>300</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -S30.2 -m15 -r106 -R106 -C10 -P</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -m15 -r106 -R106 -C10 -P</physim_run_args>
 	</testCase>

 	<testCase id="010122">
@@ -63,7 +80,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_ulsim</physim_test>
 		<physim_time_threshold>150</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -S30.2 -m15 -r106 -R106 -C10 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -m15 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>

 	<testCase id="010131">
@@ -72,7 +89,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m25 -r106 -R106 -C10 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r106 -R106 -C10 -P</physim_run_args>
        </testCase>

        <testCase id="010132">
@@ -81,7 +98,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m25 -r106 -R106 -C10 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="010211">
@@ -90,7 +107,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>300</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m5 -r273 -R273 -C10 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -P</physim_run_args>
        </testCase>

        <testCase id="010212">
@@ -99,7 +116,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m5 -r273 -R273 -C10 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>

 	<testCase id="010221">
@@ -108,7 +125,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m15 -r273 -R273 -C10 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -P</physim_run_args>
        </testCase>

        <testCase id="010222">
@@ -117,7 +134,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>350</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m15 -r273 -R273 -C10 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="010231">
@@ -126,7 +143,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m25 -r273 -R273 -C10 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -P</physim_run_args>
        </testCase>

        <testCase id="010232">
@@ -135,7 +152,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>550</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m25 -r273 -R273 -C10 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="010311">
@@ -144,7 +161,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>300</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m5 -r273 -R273 -C10 -W2 -z2 -y2 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -W2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="010312">
@@ -153,7 +170,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m5 -r273 -R273 -C10 -o -W2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="010321">
@@ -162,7 +179,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>600</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m15 -r273 -R273 -C10 -W2 -z2 -y2 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -W2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="010322">
@@ -171,7 +188,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>650</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m15 -r273 -R273 -C10 -o -W2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="010331">
@@ -180,7 +197,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>650</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m25 -r273 -R273 -C10 -W2 -z2 -y2 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -W2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="010332">
@@ -189,7 +206,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_ulsim</physim_test>
                <physim_time_threshold>1100</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -m25 -r273 -R273 -C10 -o -W2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/t2_offload_enc_nr_dlsim.xml
+++ b/ci-scripts/xml_files/t2_offload_enc_nr_dlsim.xml
@@ -24,20 +24,37 @@
 	<htmlTabName>Test T2 Offload Encoder</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
        <TestCaseRequestedList>
+                102040
                000111 000112 000121 000122 000131 000132
                000211 000212 000221 000222 000231 000232
                000311 000312 000321 000322 000331 000332
                000411 000412 000421 000422 000431 000432
+                040201
        </TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>

+	<testCase id="102040">
+		<class>Custom_Command</class>
+		<desc>Disable Sleep States</desc>
+		<node>caracal</node>
+		<command>sudo cpupower idle-set -D 0</command>
+	</testCase>
+
+	<testCase id="040201">
+		<class>Custom_Command</class>
+		<always_exec>true</always_exec>
+		<desc>Enable Sleep States</desc>
+		<node>caracal</node>
+		<command>sudo cpupower idle-set -E</command>
+	</testCase>
+
 	<testCase id="000111">
 		<class>Run_Physim</class>
 		<desc>Run nr_dlsim with CPU: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
 		<always_exec>true</always_exec>
 		<physim_test>nr_dlsim</physim_test>
 		<physim_time_threshold>230</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -S30.2 -e5 -b106 -R106 -X 8,9,10,11,12 -P</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -e5 -b106 -R106 -X 8,9,10,11,12 -P</physim_run_args>
 	</testCase>

 	<testCase id="000112">
@@ -46,7 +63,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_dlsim</physim_test>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -S30.2 -e5 -b106 -R106 -c -X4,5,6,7,8,9 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -e5 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>

 	<testCase id="000121">
@@ -55,7 +72,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_dlsim</physim_test>
 		<physim_time_threshold>300</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -S30.2 -e15 -b106 -R106 -X 8,9,10,11,12 -P</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -e15 -b106 -R106 -X 8,9,10,11,12 -P</physim_run_args>
 	</testCase>

 	<testCase id="000122">
@@ -64,7 +81,7 @@
 		<always_exec>true</always_exec>
 		<physim_test>nr_dlsim</physim_test>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -S30.2 -e15 -b106 -R106 -c -X4,5,6,7,8,9 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n1000 -s30 -S30.2 -e15 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>

 	<testCase id="000131">
@@ -73,7 +90,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>350</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e25 -b106 -R106 -X 8,9,10,11,12 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b106 -R106 -X 8,9,10,11,12 -P</physim_run_args>
        </testCase>

        <testCase id="000132">
@@ -82,7 +99,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e25 -b106 -R106 -c -X4,5,6,7,8,9 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="000211">
@@ -91,7 +108,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>300</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e5 -b273 -R273 -X 8,9,10,11,12 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X 8,9,10,11,12 -P</physim_run_args>
        </testCase>

        <testCase id="000212">
@@ -100,7 +117,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e5 -b273 -R273 -c -X4,5,6,7,8,9 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
 	</testCase>

 	<testCase id="000221">
@@ -109,7 +126,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>350</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e15 -b273 -R273 -X 8,9,10,11,12 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X 8,9,10,11,12 -P</physim_run_args>
        </testCase>

        <testCase id="000222">
@@ -118,7 +135,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e15 -b273 -R273 -c -X4,5,6,7,8,9 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="000231">
@@ -127,7 +144,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e25 -b273 -R273 -X 8,9,10,11,12 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X 8,9,10,11,12 -P</physim_run_args>
        </testCase>

        <testCase id="000232">
@@ -136,7 +153,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e25 -b273 -R273 -c -X4,5,6,7,8,9 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="000311">
@@ -145,7 +162,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e5 -b273 -R273 -X 8,9,10,11,12 -x2 -z2 -y2 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X 8,9,10,11,12 -x2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="000312">
@@ -154,7 +171,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e5 -b273 -R273 -c -X4,5,6,7,8,9 -x2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="000321">
@@ -163,7 +180,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>450</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e15 -b273 -R273 -X 8,9,10,11,12 -x2 -z2 -y2 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X 8,9,10,11,12 -x2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="000322">
@@ -172,7 +189,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e15 -b273 -R273 -c -X4,5,6,7,8,9 -x2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="000331">
@@ -181,7 +198,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e25 -b273 -R273 -X 8,9,10,11,12 -x2 -z2 -y2 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X 8,9,10,11,12 -x2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="000332">
@@ -190,7 +207,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e25 -b273 -R273 -c -X4,5,6,7,8,9 -x2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="000411">
@@ -199,7 +216,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e5 -b273 -R273 -X8,9,10,11,12 -x2 -z4 -y4 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X8,9,10,11,12 -x2 -z4 -y4 -P</physim_run_args>
        </testCase>

        <testCase id="000412">
@@ -208,7 +225,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e5 -b273 -R273 -c -X4,5,6,7,8,9 -x2 -z4 -y4 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="000421">
@@ -217,7 +234,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e15 -b273 -R273 -X8,9,10,11,12 -x2 -z4 -y4 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X8,9,10,11,12 -x2 -z4 -y4 -P</physim_run_args>
        </testCase>

        <testCase id="000422">
@@ -226,7 +243,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>300</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e15 -b273 -R273 -c -X4,5,6,7,8,9 -x2 -z4 -y4 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>

        <testCase id="000431">
@@ -235,7 +252,7 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>450</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e25 -b273 -R273 -X8,9,10,11,12 -x2 -z4 -y4 -P</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X8,9,10,11,12 -x2 -z4 -y4 -P</physim_run_args>
        </testCase>

        <testCase id="000432">
@@ -244,6 +261,6 @@
                <always_exec>true</always_exec>
                <physim_test>nr_dlsim</physim_test>
                <physim_time_threshold>450</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -S30.2 -e25 -b273 -R273 -c -X4,5,6,7,8,9 -x2 -z4 -y4 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _t2 --nrLDPC_coding_t2.dpdk_dev d8:00.0 --nrLDPC_coding_t2.dpdk_core_list 11-12</physim_run_args>
        </testCase>
 </testCaseList>
--- a/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml
@@ -110,7 +110,7 @@ services:
            - NET_ADMIN  # for interface bringup
            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: --band 66 -C 2152680000 --CO -400000000 -r 25 --numerology 0 --ssb 48 --rfsim --rfsimulator.prop_delay 238.74 --ntn-koffset 478 --ntn-ta-common 477.48 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --band 66 -C 2152680000 --CO -400000000 -r 25 --numerology 0 --ssb 48 --rfsim --rfsimulator.prop_delay 238.74 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/README.md
+++ b/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/README.md
@@ -0,0 +1,87 @@
+<table style="border-collapse: collapse; border: none;">
+  <tr style="border-collapse: collapse; border: none;">
+    <td style="border-collapse: collapse; border: none;">
+      <a href="http://www.openairinterface.org/">
+         <img src="../../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
+         </img>
+      </a>
+    </td>
+    <td style="border-collapse: collapse; border: none; vertical-align: center;">
+      <b><font size = "5">OAI O-RAN 7.2 Front-haul Docker Compose</font></b>
+    </td>
+  </tr>
+</table>
+
+![Docker deploy 7.2](../../../doc/images/docker-deploy-oai-7-2.png)
+
+This docker-compose is designed to use `OAI-gNB` with a 7.2 compatible Radio Unit. Before using this docker compose you have to configure
+the host machine as per the [ORAN_FHI7.2_Tutorial](../../../doc/ORAN_FHI7.2_Tutorial.md). The container image used by the docker compose file is tested only on `Ubuntu 22.04` and `RHEL 9.4` docker host.
+
+## Build Image (Optional)
+
+Refer to [OAI Docker/Podman Build and Usage Procedures](../../../docker/README.md)
+
+## Configure Networking
+
+### SR-IOV Virtual Functions (VFs)
+
+In docker-compose environment there is no automated method
+to configure the VFs on the fly. The user will have to manually configure
+C/U plane VFs before starting the container `OAI-gNB`.
+
+You can follow the step
+[configure-network-interfaces-and-dpdk-vfs](../../../doc/ORAN_FHI7.2_Tutorial.md#configure-network-interfaces-and-dpdk-vfs).
+
+### Interface towards AMF (N2)
+
+For `N2` interface we are using `macvlan` driver of docker.
+
+You can use the `bridge` driver, in situation
+
+- When the core network is running on the same machine
+- or different machine but you have configured
+needed `ip route` and forwarding to access the core network from RAN host.
+
+To configure docker `macvlan` network
+you need to choose `ipam.config` and `driver_opts.parent` are per your environment
+
+```
+    oai-net:
+        driver: macvlan
+        name: oai-net
+        ipam:
+            config:
+                - subnet: "172.21.16.0/22"
+                  ip_range: "172.21.18.20/32"
+                  gateway: "172.21.19.254"
+        driver_opts:
+            com.docker.network.bridge.name: "oai-net"
+            parent: ens7f0
+```
+
+To configure `bridge` network you need to choose `ipam.config.subnet` as per your environment.
+
+```
+    oai-net:
+        driver: bridge
+        name: oai-net
+        ipam:
+            config:
+                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "oai-net"
+```
+
+## Deploy OAI-gNB Container
+
+The [configuration file](../../conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf) used by docker compose is configured for Metanoia RU.
+
+```bash
+docker-compose up -d
+```
+
+To check the logs
+
+```bash
+docker logs oai-gnb -f
+```
--- a/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/docker-compose.yml
@@ -0,0 +1,39 @@
+services:
+    oai-gnb:
+        image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-fhi72:${TAG:-develop}
+        cap_add:
+            - IPC_LOCK
+            - SYS_NICE
+        cap_drop:
+            - ALL
+        container_name: oai-gnb
+        environment:
+            TZ: Europe/Paris
+            USE_ADDITIONAL_OPTIONS: --sa --thread-pool 7,8,9,10,11,12
+        devices:
+            - /dev/vfio:/dev/vfio/
+        volumes:
+            - ../../conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf:/opt/oai-gnb/etc/gnb.conf
+            - /dev/hugepages:/dev/hugepages
+        # Please change these values based on your system
+        cpuset: "0,1,2,3,4,5,6,7,8,9,10,11,12"
+        networks:
+            oai-net:
+                ipv4_address: 172.21.18.20
+        healthcheck:
+           test: /bin/bash -c "pgrep nr-softmodem"
+           interval: 10s
+           timeout: 5s
+           retries: 5
+networks:
+    oai-net:
+        driver: macvlan
+        name: oai-net
+        ipam:
+            config:
+                - subnet: "172.21.16.0/22"
+                  ip_range: "172.21.18.20/32"
+                  gateway: "172.21.19.254"
+        driver_opts:
+            com.docker.network.bridge.name: "oai-net"
+            parent: ens7f0
--- a/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_cleanup.sh
+++ b/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_cleanup.sh
@@ -0,0 +1,5 @@
+set -e
+sudo cpupower idle-set -E > /dev/null
+sudo sysctl kernel.sched_rt_runtime_us=950000
+sudo sysctl kernel.timer_migration=1
+exit 0
--- a/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_sriov_metanoia.sh
+++ b/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_sriov_metanoia.sh
@@ -0,0 +1,20 @@
+set -e
+sudo cpupower idle-set -D 0 > /dev/null
+sudo sysctl kernel.sched_rt_runtime_us=-1
+sudo sysctl kernel.timer_migration=0
+sudo ethtool -G ens7f1 rx 8160 tx 8160
+sudo sh -c 'echo 0 > /sys/class/net/ens7f1/device/sriov_numvfs'
+sudo sh -c 'echo 3 > /sys/class/net/ens7f1/device/sriov_numvfs'
+sudo modprobe -r iavf
+sudo modprobe iavf
+# this next 2 lines is for C/U planes
+sudo ip link set ens7f1 vf 0 mac 00:11:22:33:44:55 vlan 3 spoofchk off mtu 9000
+sudo ip link set ens7f1 vf 1 mac 00:11:22:33:44:54 vlan 3 spoofchk off mtu 9000
+sleep 1
+# These are the DPDK bindings for C/U-planes on vlan 1
+sudo /usr/local/bin/dpdk-devbind.py --unbind c3:11.0
+sudo /usr/local/bin/dpdk-devbind.py --unbind c3:11.1
+sudo modprobe vfio-pci
+sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci c3:11.0
+sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci c3:11.1
+exit 0
--- a/cmake_targets/at_commands/CMakeLists.txt
+++ b/cmake_targets/at_commands/CMakeLists.txt
@@ -145,7 +145,6 @@ set(util_SRC
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/OctetString.c
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/parser.c
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/TLVDecoder.c
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/TLVEncoder.c
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/socket.c
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/stty.c
 )
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -318,7 +318,8 @@
                                    (Test25: Format 2 11-bit 2/273 PRB),
                                    (Test26: Format 2 12-bit 8/273 PRB),
                                    (Test27: Format 2 19-bit 8/273 PRB),
-                                    (Test28: Format 2 64-bit 16/273 PRB)</desc>
+                                    (Test28: Format 2 64-bit 16/273 PRB),
+                                    (Test29: Format 2 64-bit 16/273 PRB Delay 2us)</desc>
      <main_exec>nr_pucchsim</main_exec>
      <main_exec_args>-R 106 -i 1 -P 0 -b 1 -s-2 -n1000
                      -R 106 -i 1 -P 0 -b 2 -s-2 -n1000
@@ -347,8 +348,9 @@
                      -R 273 -z8 -i 1 -P 2 -b 11 -s6 -n1000
                      -R 273 -z8 -i 1 -P 2 -q8 -b 12 -s-3 -n1000
                      -R 273 -z8 -i 1 -P 2 -q8 -b 19 -s-3 -n1000
-                      -R 273 -z8 -i 1 -P 2 -q16 -b 64 -s-3 -n1000</main_exec_args>
-      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 test20 test21 test22 test23 test24 test25 test26 test27 test28</tags>
+                      -R 273 -z8 -i 1 -P 2 -q16 -b 64 -s-3 -n1000
+                      -R 273 -z8 -i 1 -P 2 -q16 -b 64 -s-3 -d 2 -n1000</main_exec_args>
+      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 test20 test21 test22 test23 test24 test25 test26 test27 test28 test29</tags>
      <search_expr_true>PUCCH test OK</search_expr_true>
      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
      <nruns>3</nruns>
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -46,8 +46,9 @@ BUILD_DOXYGEN=0
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_t2 websrv oai_iqplayer imscope"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_t2 ldpc_xdma websrv oai_iqplayer imscope"
 TARGET_LIST=""
+BUILD_TOOL_OPT="-j$(nproc)"

 function print_help() {
  echo_info "
@@ -56,6 +57,8 @@ for a number of distributions (Ubuntu 22-24, Fedora, RHEL9).
 Options:
 --arch-native
   Passes -march=native to the compiler.
+--build-tool-opt
+   Pass options to build tool (ninja/make), e.g. -k (\"keep going\")
 -c | --clean
   Erase all files to make a rebuild from start
 -C | --clean-all
@@ -160,6 +163,9 @@ function main() {
       --arch-native)
            echo_fatal "Error: specify --arch-native on the command line to cmake directly: ./build_oai --cmake-opt \"-DCMAKE_C_FLAGS=-march=native -DCMAKE_CXX_FLAGS=-march=native\""
            shift;;
+       --build-tool-opt)
+            BUILD_TOOL_OPT+=" $2"
+            shift 2;;
       -c | --clean)
            CLEAN=1
            shift;;
@@ -490,7 +496,7 @@ function main() {
    CMAKE_CMD="$CMAKE_CMD ../../.."
    echo_info "Running \"$CMAKE_CMD\""
    eval $CMAKE_CMD
-    compilations $BUILD_DIR all.txt $TARGET_LIST
+    compilations $BUILD_DIR all.txt "$TARGET_LIST" "${BUILD_TOOL_OPT}"
    ###################
    # Doxygen Support #
    ###################
@@ -513,9 +519,9 @@ function main() {
      cd $DIR/nas_sim_tools/build

      ${CMAKE_CMD% *} ..
-      compilations nas_sim_tools usim.txt usim
-      compilations nas_sim_tools nvram.txt nvram
-      compilations nas_sim_tools conf2uedata.txt conf2uedata
+      compilations nas_sim_tools usim.txt "usim" "${BUILD_TOOL_OPT}"
+      compilations nas_sim_tools nvram.txt "nvram" "${BUILD_TOOL_OPT}"
+      compilations nas_sim_tools conf2uedata.txt "conf2uedata" "${BUILD_TOOL_OPT}"

      # generate USIM data
      if [ -f conf2uedata ]; then
--- a/cmake_targets/nas_sim_tools/CMakeLists.txt
+++ b/cmake_targets/nas_sim_tools/CMakeLists.txt
@@ -31,7 +31,6 @@ set(CONF2UEDATA_LIB_SRC
    ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.c
    ${OPENAIR_DIR}/common/utils/mem/memory.c
    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.c
-    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.c
    ${OPENAIR_DIR}/common/utils/utils.c
 )

--- a/cmake_targets/tools/MODULES/Findxran.cmake
+++ b/cmake_targets/tools/MODULES/Findxran.cmake
@@ -83,12 +83,15 @@ find_path(xran_INCLUDE_DIR
    xran_pkt.h
    xran_pkt_up.h
    xran_sync_api.h
-  PATHS ${xran_LOCATION}
-  PATH_SUFFIXES api
+  HINTS ${xran_LOCATION}
+  PATH_SUFFIXES api include
+  NO_DEFAULT_PATH
 )
 find_library(xran_LIBRARY
  NAMES xran
-  PATHS ${xran_LOCATION}/build
+  HINTS ${xran_LOCATION}
+  PATH_SUFFIXES build api
+  NO_DEFAULT_PATH
 )
 if (NOT xran_LIBRARY)
  message(FATAL_ERROR "could not detect xran build artifacts at ${xran_LOCATION}/build")
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -131,6 +131,7 @@ check_supported_distribution() {
        "rocky9.2")    return 0 ;;
        "rocky9.3")    return 0 ;;
        "rocky9.4")    return 0 ;;
+        "rocky9.5")    return 0 ;;
    esac
    return 1
 }
@@ -208,24 +209,24 @@ check_errors() {
 }

 compilations() {
-  [[ $# -gt 2 ]] || echo_fatal "compilations needs more than three arguments"
+  [[ $# -eq 4 ]] || echo_fatal "compilations <dir> <logfile> <targets> <build-tool-opt>"
  local dir=$1
-  shift 1
-  local logfile=$1
-  shift 1
-  local targets=$@
+  local logfile=$2
+  local targets=$3
+  local build_tool_opt=$4
  local verbose=$([ "$VERBOSE_COMPILE" == "1" ] && echo "-v" || echo "")
  echo cd $OPENAIR_DIR/cmake_targets/$dir/build
  cd $OPENAIR_DIR/cmake_targets/$dir/build
-  echo_info "Running \"$CMAKE --build . $verbose --target $targets -- -j$(nproc)\"" $green
+  cmd="$CMAKE --build . ${verbose} --target ${targets} -- ${build_tool_opt}"
+  echo_info "Running \"${cmd}\"" $green
  echo "Log file for compilation is being written to: $dlog/$logfile"
  set +e
  {
-    $CMAKE --build . $verbose --target $targets -- -j$(nproc)
+    eval ${cmd}
    ret=$?
  } > $dlog/$logfile 2>&1
  # Print the errors and warnings for CI purposes
-  grep -E -A3 "warning:|error:" $dlog/$logfile || true
+  grep -E -A5 -B5 "warning:|error:| Error " $dlog/$logfile || true
  check_warnings "$dlog/$logfile"
  if [[ $ret -eq 0 ]]; then
     echo_success "$targets compiled"
--- a/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch
+++ b/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch
@@ -0,0 +1,493 @@
+diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h
+index ac5f471..bbd39fe 100644
+--- a/fhi_lib/app/src/common.h
+++ b/fhi_lib/app/src/common.h
+@@ -28,7 +28,7 @@
+ #include <rte_common.h>
+ #include <rte_mbuf.h>
+ 
+-#define VERSIONX                "oran_f_release_v1.0"
+#define VERSIONX                "oran_f_release_v1.1"
+ 
+ #define APP_O_DU  0
+ #define APP_O_RU  1
+diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile
+index eccc4ae..8ddb22e 100644
+--- a/fhi_lib/lib/Makefile
+++ b/fhi_lib/lib/Makefile
+@@ -23,12 +23,18 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
+ ##############################################################
+ #  Tools configuration
+ ##############################################################
+-ifeq ($(WIRELESS_SDK_TOOLCHAIN),icc)
+-CC  := icc
+-CPP := icpc
+-AS := as
+-AR := ar
+-LD := icc
+ifeq ($(WIRELESS_SDK_TOOLCHAIN),gcc)
+    CC  := gcc
+    CPP := g++
+    AS := as
+    AR := ar
+    LD := gcc
+else ifeq ($(WIRELESS_SDK_TOOLCHAIN),icc)
+    CC  := icc
+    CPP := icpc
+    AS := as
+    AR := ar
+    LD := icc
+ else ifeq ($(WIRELESS_SDK_TOOLCHAIN),icx)
+     CC  := icx
+     CPP := icpx
+@@ -72,7 +78,7 @@ ifeq ($(RTE_SDK),)
+ endif
+ 
+ RTE_TARGET ?= x86_64-native-linux-icc
+-RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
+RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
+ 
+ API_DIR := $(PROJECT_DIR)/api
+ SRC_DIR := $(PROJECT_DIR)/src
+@@ -110,8 +116,7 @@ CPP_SRC = $(SRC_DIR)/xran_compression.cpp \
+ 	$(SRC_DIR)/xran_bfp_cplane32.cpp \
+ 	$(SRC_DIR)/xran_bfp_cplane64.cpp \
+ 	$(SRC_DIR)/xran_bfp_uplane_9b16rb.cpp \
+-	$(SRC_DIR)/xran_bfp_uplane.cpp \
+-	$(SRC_DIR)/xran_mod_compression.cpp
+	$(SRC_DIR)/xran_bfp_uplane.cpp
+ 
+ CPP_SRC_SNC = $(SRC_DIR)/xran_compression_snc.cpp \
+ 	$(SRC_DIR)/xran_bfp_cplane8_snc.cpp \
+@@ -127,7 +132,7 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
+         -fPIC \
+ 	-Wall \
+ 	-Wimplicit-function-declaration \
+-	-g -O3 -mcmodel=large
+	-g -O -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512#--wd1786 -mcmodel=large
+ 
+ ifeq ($(WIRELESS_SDK_TOOLCHAIN),icc)
+ CC_FLAGS += -wd1786 -restrict
+@@ -138,8 +143,9 @@ CC_FLAGS += -march=icelake-server -mintrinsic-promote -Wno-unused-function -Wno-
+ endif
+ 
+ CPP_FLAGS := -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_GNU_SOURCE -D_REENTRANT -pipe \
+-                  -falign-functions=16 \
+-        -Werror -Wno-unused-variable -std=c++14 -mcmodel=large -fPIC
+                -fPIC \
+                -falign-functions=16  \
+        -Werror -Wno-unused-variable -std=c++14 -mcmodel=large -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512
+ 
+ ifeq ($(WIRELESS_SDK_TOOLCHAIN),icc)
+ CPP_FLAGS +=  -fp-model fast=2 -no-prec-div -no-prec-sqrt -fast-transcendentals -restrict
+@@ -186,8 +192,8 @@ CPP_SNC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS_SNC))
+ 
+ AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS))
+ #-qopt-report=5 -qopt-matmul -qopt-report-phase=all
+-CPP_COMP       := -O3 -DNDEBUG  -xcore-avx512 -fPIE -fasm-blocks
+-CPP_COMP_SNC   := -O3 -DNDEBUG -march=icelake-server -fPIE -fasm-blocks
+CPP_COMP       := -O3 -DNDEBUG  -fPIE
+CPP_COMP_SNC   := -O3 -DNDEBUG -march=icelake-server -fPIE
+ CC_FLAGS_FULL  := $(CC_FLAGS)  $(INC) $(DEF)
+ 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..90a42a2 100644
+--- a/fhi_lib/lib/api/xran_fh_o_du.h
+++ b/fhi_lib/lib/api/xran_fh_o_du.h
+@@ -1193,6 +1193,31 @@ int32_t xran_reg_physide_cb_by_dev_id(void *pHandle, xran_fh_tti_callback_fn Cb,
+  */
+ int32_t xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,  uint32_t *nSlotIdx, uint64_t *nSecond);
+ 
+/**
+ * @ingroup xran
+ *
+ *   Function returns Frame, Subframe, Slot Number based on rx_tti
+ *
+ * @param tti
+ *    tti for which to compute Frame, Subframe, Slot
+ *
+ * @param nFrameIdx
+ *    Pointer to Frame number [0-99]
+ *
+ * @param nSubframeIdx
+ *    Pointer to Subframe number [0-10]
+ *
+ * @param nSlotIdx
+ *    Pointer to Slot number [0-7]
+ *
+ * @param nSecond
+ *    Pointer to current UTC second
+ *
+ * @return
+ *   current TTI number [0-7999]
+ */
+int32_t xran_get_slot_idx_from_tti(uint32_t tti, uint32_t *nFrameIdx, uint32_t *nSubframeIdx, uint32_t *nSlotIdx, uint64_t *nSecond);
+
+ /**
+  * @ingroup xran
+  *
+diff --git a/fhi_lib/lib/api/xran_up_api.h b/fhi_lib/lib/api/xran_up_api.h
+index 46e0e1d..409ef4b 100644
+--- a/fhi_lib/lib/api/xran_up_api.h
+++ b/fhi_lib/lib/api/xran_up_api.h
+@@ -80,6 +80,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+     uint8_t *subframe_id,
+     uint8_t *slot_id,
+     uint8_t *symb_id,
+    uint8_t *filter_id,
+     union ecpri_seq_id *seq_id,
+     uint16_t *num_prbu,
+     uint16_t *start_prbu,
+@@ -89,7 +90,8 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+     int8_t   expect_comp,
+     enum xran_comp_hdr_type staticComp,
+     uint8_t *compMeth,
+-    uint8_t *iqWidth);
+    uint8_t *iqWidth,
+    uint8_t *is_prach);
+ 
+ int xran_prepare_iq_symbol_portion(
+                         struct rte_mbuf *mbuf,
+diff --git a/fhi_lib/lib/ethernet/ethdi.c b/fhi_lib/lib/ethernet/ethdi.c
+index f5b2fd6..e949fe7 100644
+--- a/fhi_lib/lib/ethernet/ethdi.c
+++ b/fhi_lib/lib/ethernet/ethdi.c
+@@ -325,8 +325,8 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+     char bbdev_wdev[32]   = "";
+     char bbdev_vdev[32]   = "";
+     char iova_mode[32]    = "--iova-mode=pa";
+-    char socket_mem[32]   = "--socket-mem=8192";
+-    char socket_limit[32] = "--socket-limit=8192";
+    char socket_mem[32]   = "--socket-mem=0";
+    char socket_limit[32] = "--socket-limit=0";
+     char ring_name[32]    = "";
+     int32_t xran_port = -1;
+     queueid_t qi = 0;
+@@ -336,7 +336,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+     cpu = sched_getcpu();
+     node = numa_node_of_cpu(cpu);
+ 
+-    char *argv[] = { name, core_mask, "-n2", iova_mode, socket_mem, socket_limit, "--proc-type=auto",
+    char *argv[] = { name, core_mask, "-n2", iova_mode, socket_mem, socket_limit, "--proc-type=auto", "--no-telemetry",
+         "--file-prefix", name, "-a0000:00:00.0", bbdev_wdev, bbdev_vdev};
+ 
+     if (io_cfg == NULL)
+@@ -481,11 +481,13 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+                     ctx->tx_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING_TRX,
+                     rte_lcore_to_socket_id(*lcore_id), RING_F_SC_DEQ);
+                     PANIC_ON(ctx->tx_ring[i] == NULL, "failed to allocate rx ring");
+                    printf("Created ring %s on core %d\n",ring_name,*lcore_id);
+                     for(qi = 0; qi < io_cfg->num_rxq; qi++) {
+                         snprintf(ring_name, RTE_DIM(ring_name), "%s_%d_%d", "rx_ring_cp", i, qi);
+                         ctx->rx_ring[i][qi] = rte_ring_create(ring_name, NUM_MBUFS_RING_TRX,
+                             rte_lcore_to_socket_id(*lcore_id), RING_F_SP_ENQ);
+                         PANIC_ON(ctx->rx_ring[i][qi] == NULL, "failed to allocate rx ring");
+                        printf("Created ring %s on core %d\n",ring_name,*lcore_id);
+                     }
+                 }
+             } else {
+@@ -555,7 +557,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+         ctx->up_dl_pkt_gen_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING,
+         rte_lcore_to_socket_id(*lcore_id), /*RING_F_SC_DEQ*/0);
+         PANIC_ON(ctx->up_dl_pkt_gen_ring[i] == NULL, "failed to allocate dl gen ring");
+-        printf("created %s\n", ring_name);
+        printf("created %s on core %d\n", ring_name, *lcore_id);
+     }
+ 
+     return 1;
+diff --git a/fhi_lib/lib/src/xran_bfp_ref.cpp b/fhi_lib/lib/src/xran_bfp_ref.cpp
+index e6d3067..8e0abee 100644
+--- a/fhi_lib/lib/src/xran_bfp_ref.cpp
+++ b/fhi_lib/lib/src/xran_bfp_ref.cpp
+@@ -29,6 +29,7 @@
+ #include <complex>
+ #include <algorithm>
+ #include <limits.h>
+#include <limits>
+ 
+ static int16_t saturateAbs(int16_t inVal)
+ {
+diff --git a/fhi_lib/lib/src/xran_bfp_uplane.cpp b/fhi_lib/lib/src/xran_bfp_uplane.cpp
+index 59b6850..322d238 100644
+--- a/fhi_lib/lib/src/xran_bfp_uplane.cpp
+++ b/fhi_lib/lib/src/xran_bfp_uplane.cpp
+@@ -90,7 +90,7 @@ namespace BFP_UPlane
+   {
+     const __m512i* rawData = reinterpret_cast<const __m512i*>(dataIn.dataExpanded);
+     /// Abs
+-    const auto rawDataAbs = _mm512_abs_epi16(rawData[0]);
+    const auto rawDataAbs = _mm512_abs_epi16(_mm512_loadu_epi16(rawData));
+     /// No need to do a full horizontal max operation here, just do a max IQ step,
+     /// compute the exponents and then use a reduce max over all exponent values. This
+     /// is the fastest way to handle a single RB.
+@@ -116,7 +116,7 @@ namespace BFP_UPlane
+     /// Get AVX512 pointer aligned to desired RB
+     const __m512i* rawDataIn = reinterpret_cast<const __m512i*>(dataIn.dataExpanded + numREOffset);
+     /// Apply the exponent shift
+-    const auto compData = _mm512_srai_epi16(*rawDataIn, thisExp);
+    const auto compData = _mm512_srai_epi16(_mm512_loadu_epi16(rawDataIn), thisExp);
+     /// Pack compressed data network byte order
+     const auto compDataBytePacked = networkBytePack(compData);
+     /// Store exponent first
+@@ -201,7 +201,7 @@ namespace BFP_UPlane
+     /// Get AVX512 pointer aligned to desired RB
+     const __m512i* rawDataIn = reinterpret_cast<const __m512i*>(dataIn.dataExpanded + numREOffset);
+     /// Apply the exponent shift
+-    const auto compData = _mm512_srai_epi16(*rawDataIn, thisExp);
+    const auto compData = _mm512_srai_epi16(_mm512_loadu_epi16(rawDataIn), thisExp);
+     /// Store exponent first
+     dataOut->dataCompressed[thisRBExpAddr] = thisExp;
+     /// Now have 1 RB worth of bytes separated into 3 chunks (1 per lane)
+@@ -432,4 +432,4 @@ BlockFloatCompander::BFPExpandUserPlaneAvx512(const CompressedData& dataIn, Expa
+     BFP_UPlane::expandByAllocN<BlockFloatCompander::networkByteUnpack12b>(dataIn, dataOut, k_totNumBytesPerRB12, k_maxExpShift12);
+     break;
+   }
+-}
+\ No newline at end of file
+}
+diff --git a/fhi_lib/lib/src/xran_common.c b/fhi_lib/lib/src/xran_common.c
+index dc40ad9..4ac1fbf 100644
+--- a/fhi_lib/lib/src/xran_common.c
+++ b/fhi_lib/lib/src/xran_common.c
+@@ -714,11 +714,14 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+     uint8_t compMeth = 0;
+     uint8_t iqWidth = 0;
+ 
+    uint8_t is_prach = 0;
+
+     int ret = MBUF_FREE;
+     uint32_t mb_free = 0;
+     int32_t valid_res = 0;
+     int expect_comp  = (p_dev_ctx->fh_cfg.ru_conf.compMeth != XRAN_COMPMETHOD_NONE);
+     enum xran_comp_hdr_type staticComp = p_dev_ctx->fh_cfg.ru_conf.xranCompHdrType;
+    uint8_t filter_id;
+ 
+     if(first_call == 0)
+         return ret;
+@@ -733,9 +736,9 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+         return MBUF_FREE;
+ 
+     num_bytes = xran_extract_iq_samples(pkt, &iq_samp_buf,
+-                                &CC_ID, &Ant_ID, &frame_id, &subframe_id, &slot_id, &symb_id, &seq,
+                                &CC_ID, &Ant_ID, &frame_id, &subframe_id, &slot_id, &symb_id, &filter_id, &seq,
+                                 &num_prbu, &start_prbu, &sym_inc, &rb, &sect_id,
+-                                expect_comp, staticComp, &compMeth, &iqWidth);
+                                expect_comp, staticComp, &compMeth, &iqWidth, &is_prach);
+     if (num_bytes <= 0)
+     {
+         print_err("num_bytes is wrong [%d]\n", num_bytes);
+@@ -781,10 +784,9 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+ 
+     else
+     {
+-        valid_res = xran_pkt_validate(p_dev_ctx,
+-                                pkt, iq_samp_buf, num_bytes,
+-                                CC_ID, Ant_ID, frame_id, subframe_id, slot_id, symb_id,
+-                                &seq, num_prbu, start_prbu, sym_inc, rb, sect_id);
+        pCnt->rx_counter++;
+        pCnt->Rx_on_time++;
+        pCnt->Total_msgs_rcvd++;
+ #ifndef FCN_ADAPT
+         if(valid_res != 0)
+         {
+@@ -807,8 +809,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+             PrachCfg = &(p_dev_ctx->PrachCPConfig);
+         }
+ 
+-        if (Ant_ID >= PrachCfg->eAxC_offset && p_dev_ctx->fh_cfg.prachEnable)
+-        {
+        if (/*Ant_ID >= PrachCfg->eAxC_offset &&*/p_dev_ctx->fh_cfg.prachEnable && is_prach) {
+         /* PRACH packet has ruportid = num_eAxc + ant_id */
+             Ant_ID -= PrachCfg->eAxC_offset;
+         symbol_total_bytes[p_dev_ctx->xran_port_id][CC_ID][Ant_ID] += num_bytes;
+@@ -1412,7 +1413,7 @@ int generate_cpmsg_prach(void *pHandle, struct xran_cp_gen_params *params, struc
+     if(XRAN_FILTERINDEX_PRACH_ABC == pPrachCPConfig->filterIdx)
+     {
+     timeOffset = timeOffset >> nNumerology; //original number is Tc, convert to Ts based on mu
+-    if ((slot_id == 0) || (slot_id == (SLOTNUM_PER_SUBFRAME(pxran_lib_ctx->interval_us_local) >> 1)))
+    if (startSymId > 0 && ((slot_id == 0) || (slot_id == (SLOTNUM_PER_SUBFRAME(pxran_lib_ctx->interval_us_local) >> 1))))
+         timeOffset += 16;
+     }
+     else
+@@ -1547,8 +1548,7 @@ int32_t ring_processing_func(void* args)
+ 
+     for (i = 0; i < ctx->io_cfg.num_vfs && i < XRAN_VF_MAX; i++){
+         for(qi = 0; qi < ctx->rxq_per_port[i]; qi++) {
+-            if (process_ring(ctx->rx_ring[i][qi], i, qi))
+-            return 0;
+            process_ring(ctx->rx_ring[i][qi],i,qi);
+         }
+     }
+ 
+diff --git a/fhi_lib/lib/src/xran_compression.cpp b/fhi_lib/lib/src/xran_compression.cpp
+index 112caae..7c74342 100644
+--- a/fhi_lib/lib/src/xran_compression.cpp
+++ b/fhi_lib/lib/src/xran_compression.cpp
+@@ -62,7 +62,7 @@ xranlib_compress(const struct xranlib_compress_request *request,
+         return xranlib_5gnr_mod_compression(&mod_request, &mod_response);
+   }
+     else{
+-        if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
+        if(false) {
+             return xranlib_compress_avxsnc(request,response);
+         } else {
+             return xranlib_compress_avx512(request,response);
+@@ -89,7 +89,7 @@ xranlib_decompress(const struct xranlib_decompress_request *request,
+         return xranlib_5gnr_mod_decompression(&mod_request, &mod_response);
+       }
+     else{
+-        if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
+        if(false) {
+             return xranlib_decompress_avxsnc(request,response);
+         } else {
+             return xranlib_decompress_avx512(request,response);
+@@ -101,7 +101,7 @@ int32_t
+ xranlib_compress_bfw(const struct xranlib_compress_request *request,
+                         struct xranlib_compress_response *response)
+     {
+-    if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
+    if(false) {
+         return xranlib_compress_avxsnc_bfw(request,response);
+     } else {
+         return xranlib_compress_avx512_bfw(request,response);
+@@ -112,7 +112,7 @@ int32_t
+ xranlib_decompress_bfw(const struct xranlib_decompress_request *request,
+     struct xranlib_decompress_response *response)
+   {
+-    if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
+    if(false) {
+         return xranlib_decompress_avxsnc_bfw(request,response);
+     } else {
+         return xranlib_decompress_avx512_bfw(request,response);
+diff --git a/fhi_lib/lib/src/xran_main.c b/fhi_lib/lib/src/xran_main.c
+index 7c472d7..7bab6a8 100644
+--- a/fhi_lib/lib/src/xran_main.c
+++ b/fhi_lib/lib/src/xran_main.c
+@@ -306,7 +306,7 @@ xran_init_prach(struct xran_fh_config* pConf, struct xran_device_ctx * p_xran_de
+         printf("PRACH start symbol %u lastsymbol %u\n", p_xran_dev_ctx->prach_start_symbol[0], p_xran_dev_ctx->prach_last_symbol[0]);
+     }
+ 
+-    pPrachCPConfig->eAxC_offset = xran_get_num_eAxc(p_xran_dev_ctx);
+    pPrachCPConfig->eAxC_offset = pPRACHConfig->eAxC_offset;
+     print_dbg("PRACH eAxC_offset %d\n",  pPrachCPConfig->eAxC_offset);
+ 
+     /* Save some configs for app */
+@@ -1570,6 +1570,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;
+            uint8_t *pkt_bytes=rte_pktmbuf_mtod(pkt,uint8_t*);
+             break;
+         // For RU emulation
+         case ECPRI_RT_CONTROL_DATA:
+@@ -1587,7 +1588,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) {
+-                    print_err("Invalid eCPRI message type - %d", ecpri_hdr->cmnhdr.bits.ecpri_mesg_type);
+                    rte_pktmbuf_free(pkt);
+         }
+                 break;
+     }
+@@ -2347,8 +2348,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++){
+-                if (process_ring(ctx->rx_ring[i][qi], i, qi))
+-                    return 0;
+                process_ring(ctx->rx_ring[i][qi],i,qi);
+             }
+         }
+     }
+@@ -2414,9 +2414,6 @@ xran_spawn_workers(void)
+         nWorkerCore = nWorkerCore << 1;
+     }
+ 
+-    extern int _may_i_use_cpu_feature(unsigned __int64);
+-    icx_cpu = _may_i_use_cpu_feature(_FEATURE_AVX512IFMA52);
+-
+     printf("O-XU      %d\n", eth_ctx->io_cfg.id);
+     printf("HW        %d\n", icx_cpu);
+     printf("Num cores %d\n", total_num_cores);
+@@ -4034,6 +4031,24 @@ xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,
+     return tti;
+ }
+ 
+int32_t
+xran_get_slot_idx_from_tti(uint32_t tti, uint32_t *nFrameIdx, uint32_t *nSubframeIdx, uint32_t *nSlotIdx, uint64_t *nSecond)
+{
+    struct xran_device_ctx * p_xran_dev_ctx = xran_dev_get_ctx_by_id(0);
+    if (!p_xran_dev_ctx)
+    {
+      print_err("Null xRAN context on port id %u!!\n", 0);
+      return 0;
+    }
+
+    *nSlotIdx     = (uint32_t)XranGetSlotNum(tti, SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local));
+    *nSubframeIdx = (uint32_t)XranGetSubFrameNum(tti,SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local),  SUBFRAMES_PER_SYSTEMFRAME);
+    *nFrameIdx    = (uint32_t)XranGetFrameNum(tti,0/*xran_getSfnSecStart()*/,SUBFRAMES_PER_SYSTEMFRAME, SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local));
+    *nSecond      = timing_get_current_second();
+
+    return tti;
+}
+
+ int32_t
+ xran_set_debug_stop(int32_t value, int32_t count)
+ {
+diff --git a/fhi_lib/lib/src/xran_mod_compression.cpp b/fhi_lib/lib/src/xran_mod_compression.cpp
+index 7d4a5d0..b9b44ac 100644
+--- a/fhi_lib/lib/src/xran_mod_compression.cpp
+++ b/fhi_lib/lib/src/xran_mod_compression.cpp
+@@ -747,9 +747,9 @@ int xranlib_5gnr_mod_compression(const struct xranlib_5gnr_mod_compression_reque
+ #ifdef C_Module_Used
+     return (xranlib_5gnr_mod_compression_c(request, response));
+ #else
+-    if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52))
+    if (false) {
+         return (xranlib_5gnr_mod_compression_snc(request, response));
+-    else
+    } else {
+         return (xranlib_5gnr_mod_compression_avx512(request, response));
+ #endif
+ }
+diff --git a/fhi_lib/lib/src/xran_up_api.c b/fhi_lib/lib/src/xran_up_api.c
+index fe22a1f..f6c4830 100644
+--- a/fhi_lib/lib/src/xran_up_api.c
+++ b/fhi_lib/lib/src/xran_up_api.c
+@@ -336,6 +336,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+     uint8_t *subframe_id,
+     uint8_t *slot_id,
+     uint8_t *symb_id,
+    uint8_t *filter_id,
+     union ecpri_seq_id *seq_id,
+     uint16_t *num_prbu,
+     uint16_t *start_prbu,
+@@ -345,7 +346,8 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+     int8_t   expect_comp,
+     enum xran_comp_hdr_type staticComp,
+     uint8_t *compMeth,
+-    uint8_t *iqWidth)
+    uint8_t *iqWidth,
+    uint8_t *is_prach)
+ {
+ #if XRAN_MLOG_VAR
+     uint32_t mlogVar[10];
+@@ -381,6 +383,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+         return 0;       /* packet too short */
+ 
+     radio_hdr->sf_slot_sym.value = rte_be_to_cpu_16(radio_hdr->sf_slot_sym.value);
+    *is_prach = (radio_hdr->data_feature.filter_id > 0);
+ 
+     if (frame_id)
+         *frame_id    = radio_hdr->frame_id;
+@@ -394,6 +397,9 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+     if (symb_id)
+         *symb_id = radio_hdr->sf_slot_sym.symb_id;
+ 
+    if (filter_id)
+	    *filter_id = radio_hdr->data_feature.filter_id;
+
+     /* Process data section hdr */
+     struct data_section_hdr *data_hdr =
+         (void *)rte_pktmbuf_adj(mbuf, sizeof(*radio_hdr));
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(config/yaml)

 configure_file(oai_version.h.in oai_version.h @ONLY)

-add_library(instrumentation INTERFACE instrumentation.h)
+add_library(instrumentation INTERFACE)
 target_include_directories(instrumentation INTERFACE .)
 if (TRACY_ENABLE)
  target_link_libraries(instrumentation INTERFACE Tracy::TracyClient)
--- a/Show More
+++ b/Show More