Export CIR via UDP (127.0.0.1:63140) instead of using file-based channel input

Signed-off-by: Tetsuya Iye <tetsuya-iye@kke.co.jp>

.gitignore

@@ -7,6 +7,7 @@ cmake_targets/*/build/
 cmake_targets/ran_build/
 log/
 lte_build_oai/
+build*
 
 # IDE files
 .vscode

CHANNELEMULATOR.md

@@ -0,0 +1,156 @@
+<script type="text/javascript" async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.2/es5/tex-mml-chtml.min.js">
+</script>
+<script type="text/x-mathjax-config">
+ MathJax.Hub.Config({
+ tex2jax: {
+ inlineMath: [['$', '$'] ],
+ displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
+ }
+ });
+</script>
+
+# Overview
+This document serves as a guide to loading a pre-generated dataset of Channel Impulse Responses (CIRs)—for example, computed using Sionna RT—and performing real-time 5G emulation using OpenAirInterface (OAI).
+
+For full system architecture details, please refer to: [https://arxiv.org/abs/2503.12177v2](https://arxiv.org/abs/2503.12177v2)
+
+As a sample scenario, this repository includes the Shibuya Scramble Crossing CIR dataset used in the paper, placed under `oai_cir/cir/output/binary/`.
+
+# Supported Environment
+
+|||
+|-|-|
+|CPU                    | AMD Ryzen 9 7900X 12-core processor (x24) |
+|RAM                    | 32 GB                                     |
+|Operating System       | Ubuntu 22.04.4 LTS                        |
+|Linux kernel version   | 6.8.1-060801-generic                      |
+|SDR                    | USRP B200                                 |
+|COTS UE                | Quectel RM500Q-GL                         |
+|||
+
+# Prerequisites (after setting up base OAI environment)
+
+## 1. Install AOCL-BLAS
+
+```bash
+# Install dependencies
+sudo apt install build-essential make g++ gfortran cmake
+
+# Build and install BLIS
+git clone https://github.com/amd/blis.git
+cd blis
+./configure --enable-cblas -t openmp auto
+make
+make check
+sudo make install
+sudo ldconfig
+```
+
+## 2. Configure pkg-config
+
+```bash
+# Copy the pkg-config file
+sudo cp /usr/local/share/pkgconfig/blis-mt.pc /usr/local/share/pkgconfig/cblis.pc
+```
+
+## 3. Configure AOCL-BLAS multithreading
+
+```bash
+echo "export BLIS_NUM_THREADS=6" >> ~/.bashrc
+source ~/.bashrc
+```
+
+For more details, see:
+[https://github.com/amd/blis/blob/master/docs/Multithreading.md](https://github.com/amd/blis/blob/master/docs/Multithreading.md)
+
+---
+
+## Configuration: `oai_cir/cir_conf.txt`
+
+The 2nd through 5th rows of the parameters in the `oai_cir/cir_conf.txt` as shown in below can be set freely (the 1st row is read-only).
+
+1. **Max path gain \[dB]** in the CIR dataset (read-only).
+2. **Offset \[dB]** added to compensate signal attenuation (typically around (–2)× the first-line value + 5), to fit within the gNB/UE receiver's dynamic range.
+3. **Noise level \[dB]**.
+4. **Number of delay taps** $N$ to apply in the convolution.
+5. **Number of CIR data files** to vary over time based on the mobility scenario.
+
+Notes:
+
+* Line 2: To maintain a continuous connection between the gNB and UE throughout the sample scenario, this **Offset** parameter must be finely tuned. If the Offset is set too low, the UE either fails to attach to the gNB or detaches almost immediately. If it is set too high, a COTS UE’s automatic-gain control will engage, complicating the link-budget calculation; with an OAI UE or RF-simulation-based nrUE, the signal will exceed the dynamic range and the UE will likewise fail to attach. In the test environment, a value of roughly **(Max path gain × –2) + 5 dB** seemed to be appropriate.
+
+* Line 4: After bandwidth filtering, delay taps are sorted by descending amplitude, and only the top $N$ taps are used.
+  With the sample CIR dataset, you can specify any value from 1 to 146.
+  In the test environment, real-time communication between gNB (USRP B200) and COTS UE (Quectel RM500Q-GL) was possible up to $N = 29$; for larger values the real-time processing could not keep up.
+
+* Line 5: Specifies how many files (maximum = number of files in `oai_cir/cir/output/binary/`, default 230; minimum = 1) to load in sequence.
+  Each file's CIR data is convolved with the baseband signal for 100 ms, then the emulator switches to the next file. 
+  Once the last file finishes, the cycle restarts at `delay{amp/index}list0000.b`.
+
+### Binary file formats
+
+#### `delayamplist****.b`
+$h^{\rm re}_{\rm sort,1}, h^{\rm im}_{\rm sort,1}, h^{\rm re}_{\rm sort,2}, h^{\rm im}_{\rm sort,2}, \cdots$
+
+Each $h^{\rm re/im}_{{\rm sort},n}$ is the real/imaginary part (float32) of the $n$-th highest-amplitude complex tap from the sorted CIR.
+
+#### `delayindexlist****.b`
+$i_{\rm sort,1}, i_{\rm sort,2}, i_{\rm sort,3}, \cdots$
+
+Each $i_{{\rm sort},n}$ is the original delay index (int32) before sorting.
+
+---
+
+# Build and Run Emulator
+
+## Option 1: gNB with USRP
+Build gNB with USRP mode.
+```bash
+cd ~/oai_cir/cmake_targets/
+sudo ./build_oai -w USRP --gNB
+```
+
+Run gNB with USRP mode.
+```bash
+cd ~/oai_cir/cmake_targets/ran_build/build
+./nr-softmodem \
+  -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.106PRB.usrpb210.chemu.yaml \
+  --sa --non-stop -E
+```
+
+## Option 2: RF Simulator with gNB and nrUE
+Build gNB and nrUE with RF simulation mode.
+```bash
+cd ~/oai_cir/cmake_targets/
+sudo ./build_oai -w SIMU --gNB --nrUE
+```
+
+Run gNB with RF simulation mode.
+```bash
+cd ~/oai_cir/cmake_targets/ran_build/build
+sudo ./nr-softmodem \
+  -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.106PRB.usrpb210.chemu.yaml \
+  --sa --non-stop --rfsim --rfsimulator.serveraddr server
+```
+
+Run nrUE with RF simulation mode.
+```bash
+cd ~/oai_cir/cmake_targets/ran_build/build
+sudo ./nr-uesoftmodem \
+  -C 4019160000 -r 106 --numerology 1 --ssb 144 \
+  --rfsim --non-stop --band 77 --rfsimulator.serveraddr 127.0.0.1
+```
+
+# Citation
+If you use this implementation, please cite it as:
+```bibtex
+@misc{OWDT,
+    title = {Open Wireless Digital Twin: End-to-End 5G Mobility Emulation in O-RAN Framework},
+    author = {Tetsuya Iye and Masaya Sakamoto and Shohei Takaya and Eisaku Sato and Yuki Susukida and Yu Nagaoka and Kazuki Maruta and Jin Nakazato},
+    year = {2025},
+    eprint={2503.12177},
+    archivePrefix={arXiv},
+    primaryClass={cs.NI},
+    url={https://arxiv.org/abs/2503.12177v2}, 
+}
+```

CMakeLists.txt

@@ -83,25 +83,40 @@ option(PACKAGING_COMMON "Will produce a package containing common target, config
 option(PACKAGING_USRP "Will produce a package containing usrp target, configuration files and docs" OFF)
 option(PACKAGING_PHYSIM "Will produce a package containing physim target, configuration files and docs" OFF)
 
-
 # Check if asn1c is installed, and check if it supports all options we need
 # a user can provide ASN1C_EXEC to override an asn1c to use (e.g., parallel
 # installation)
 find_program(ASN1C_EXEC_PATH asn1c HINTS /opt/asn1c/bin)
 set(ASN1C_EXEC ${ASN1C_EXEC_PATH} CACHE FILEPATH "path to asn1c executable")
-if(NOT ASN1C_EXEC)
-    message(FATAL_ERROR "No asn1c found!
-You might want to re-run ./build_oai -I
-Or provide a path to asn1c using
-./build_oai ... --cmake-opt -DASN1C_EXEC=/path/to/asn1c
-")
+option(AUTO_DOWNLOAD_ASN1C "Automatically download asn1c if not found" OFF)
+if (ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -gen-APER ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -no-gen-UPER ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -no-gen-JER ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -no-gen-BER ASN1C_EXEC)
+  check_option(${ASN1C_EXEC} -no-gen-OER ASN1C_EXEC)
+  add_custom_target(asn1c DEPENDS ${ASN1C_EXEC})
+else ()
+  if (NOT AUTO_DOWNLOAD_ASN1C)
+    message(FATAL_ERROR "asn1c not found. Install it globally or activate AUTO_DOWNLOAD_ASN1C")
+  endif()
+  message(STATUS "Downloading and compile asn1c local in this build tree")
+  include(ExternalProject)
+  ExternalProject_Add(
+    asn1c_gen
+    GIT_REPOSITORY https://github.com/mouse07410/asn1c
+    GIT_TAG 940dd5fa9f3917913fd487b13dfddfacd0ded06e
+    GIT_REMOTE_UPDATE_STRATEGY CHECKOUT
+    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/asn1c
+    BUILD_IN_SOURCE True
+    CONFIGURE_COMMAND autoreconf -i
+    BUILD_COMMAND ./configure --prefix ${CMAKE_BINARY_DIR}
+    COMMAND make -j8 CFLAGS=-fno-strict-aliasing -Wmisleading-indentation
+    STEP_TARGETS build
+  )
+  set(ASN1C_EXEC ${CMAKE_BINARY_DIR}/bin/asn1c)
+  add_custom_target(asn1c DEPENDS asn1c_gen)
 endif()
-check_option(${ASN1C_EXEC} -gen-APER ASN1C_EXEC)
-check_option(${ASN1C_EXEC} -no-gen-UPER ASN1C_EXEC)
-check_option(${ASN1C_EXEC} -no-gen-JER ASN1C_EXEC)
-check_option(${ASN1C_EXEC} -no-gen-BER ASN1C_EXEC)
-check_option(${ASN1C_EXEC} -no-gen-OER ASN1C_EXEC)
-
 #########################################################
 # Base directories, compatible with legacy OAI building #
 #########################################################
@@ -420,7 +435,6 @@ add_library(ngap
   ${NGAP_DIR}/ngap_gNB_pdu_session_management.c
   ${NGAP_DIR}/ngap_gNB_nnsf.c
   ${NGAP_DIR}/ngap_gNB_overload.c
-  ${NGAP_DIR}/ngap_gNB_trace.c
   ${NGAP_DIR}/ngap_gNB_ue_context.c
   ${NGAP_DIR}/ngap_gNB_NRPPa_transport_procedures.c
   )
@@ -868,7 +882,6 @@ set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
   ${OPENAIR1_DIR}/PHY/TOOLS/get_sin_cos.c
   ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
-  ${OPENAIR1_DIR}/PHY/log_tools.c
   )
 
 set(PHY_SRC
@@ -1067,9 +1080,17 @@ add_dependencies(PHY_COMMON dfts)
 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
+pkg_check_modules(blis REQUIRED blis)
+
 add_library(PHY_UE ${PHY_SRC_UE})
 target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
 
+# RHEL needs also cblis, but Ubuntu does not have it. So `cblis_LIBRARIES` will
+# be empty for Ubuntu, a no-op
+pkg_check_modules(cblis cblis)
+target_link_libraries(PHY_UE PRIVATE ${blis_LIBRARIES} ${cblis_LIBRARIES} ${lapacke_LIBRARIES})
+target_include_directories(PHY_UE PRIVATE ${blis_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
+
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
 
@@ -1123,12 +1144,20 @@ set(NR_PDCP_SRC
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia2.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia1.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/asn1_utils.c
+  )
+
+# gNB: PDCP + CU-CP/CU-UP interface
+set(NR_PDCP_SRC_GNB
+  ${NR_PDCP_SRC}
   openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c
   openair2/LAYER2/nr_pdcp/cuup_cucp_if.c
   openair2/LAYER2/nr_pdcp/cuup_cucp_direct.c
   openair2/LAYER2/nr_pdcp/cuup_cucp_e1ap.c
   )
 
+# UE build: PDCP only; CU-CP/CU-UP interface is gNB-only.
+set(NR_PDCP_SRC_UE ${NR_PDCP_SRC})
+
 set(NR_SDAP_SRC
   ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap.c
   ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap_entity.c
@@ -1172,7 +1201,7 @@ set(L2_LTE_SRC
   )
 
 set(L2_NR_SRC
-  ${NR_PDCP_SRC}
+  ${NR_PDCP_SRC_GNB}
   ${NR_SDAP_SRC}
   ${NR_RRC_DIR}/rrc_gNB.c
   ${NR_RRC_DIR}/mac_rrc_dl_direct.c
@@ -1208,7 +1237,7 @@ set(L2_RRC_SRC_UE
   )
 
 set(NR_L2_SRC_UE
-  ${NR_PDCP_SRC}
+  ${NR_PDCP_SRC_UE}
   ${NR_SDAP_SRC}
   ${NR_UE_RRC_DIR}/L2_interface_ue.c
   ${NR_UE_RRC_DIR}/main_ue.c
@@ -1352,6 +1381,7 @@ add_library(e1_if
 target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} e1ap GTPV1U)
 
 target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc nr_common)
+target_compile_definitions(L2_NR PRIVATE PDCP_CUCP_CUUP)
 if(OAI_AERIAL)
     target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
 endif()
@@ -1359,7 +1389,6 @@ endif()
 add_library(L2_LTE_NR
   # temporary solution until 4G/5G code completely untangled (as evidenced by deletion of the following file)
   ${MAC_DIR}/dummy_functions.c
-  ${ENB_APP_SRC}
 )
 
 target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap nr_rrc)
@@ -1755,6 +1784,7 @@ target_link_libraries(lte-softmodem PRIVATE
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt)
 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 ${blis_LIBRARIES} ${cblis_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})
 
 if(E2_AGENT)
   target_link_libraries(lte-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
@@ -1809,6 +1839,7 @@ target_link_libraries(lte-uesoftmodem PRIVATE
 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 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 ${blis_LIBRARIES} ${cblis_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
@@ -1860,6 +1891,7 @@ target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(nr-softmodem PRIVATE ${blis_LIBRARIES} ${cblis_LIBRARIES} ${lapacke_LIBRARIES})
 add_boolean_option(OAI_WLS OFF "Activate OAI's WLS driver" OFF)
 if (OAI_WLS)
     target_link_libraries(nr-softmodem PUBLIC wls_integration_lib)
@@ -1885,7 +1917,7 @@ add_executable(nr-cuup
   executables/nr-cuup.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${OPENAIR2_DIR}/E1AP/e1ap_setup.c
-  ${NR_PDCP_SRC}
+  ${NR_PDCP_SRC_GNB}
   ${NR_SDAP_SRC}
   )
 
@@ -1896,6 +1928,7 @@ target_link_libraries(nr-cuup PRIVATE
                       alg
                       dl pthread ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+target_compile_definitions(nr-cuup PRIVATE PDCP_CUCP_CUUP)
 if(E2_AGENT)
   target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
   target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 <!-- SPDX-License-Identifier: CC-BY-4.0 -->
 
-# Contributing to OpenAirInterface #
+# Contributing to OpenAirInterface
 
 We want to make contributing to this project as easy and transparent as possible.
 
@@ -11,10 +11,10 @@ Please refer to the steps described on our website: [How to contribute to OAI](h
    if you do not have any.
    - We recommend that you register with a professional or student email address.
    - If your email domain (`@domain.com`) is not whitelisted, please contact us
-     (mailto:contact@openairinterface.org).
+     (mailto:oaicicdteam@openairinterface.org).
    - Eurecom GitLab does NOT accept public email domains.
 3. Provide the OAI team with the **username** of this account to
-   (mailto:contact@openairinterface.org) ; we will give you the developer
+   (mailto:oaicicdteam@openairinterface.org) ; we will give you the developer
    rights on this repository.
 4. The contributing policies are described in the [corresponding documentation
    page](doc/code-style-contrib.md).
@@ -24,8 +24,43 @@ Please refer to the steps described on our website: [How to contribute to OAI](h
      request from a forked repository.
       * This decision was made for the license reasons.
       * The Continuous Integration will reject your merge request.
+5. Mandatory signing of all the commits using the email address used for CLA.
 
-# License #
+## Commit Guidelines
+
+### Signing Commits
+
+To sign commits:
+
+You can also get the verified label
+on your commits via using [SSH KEYS or GPG KEYS](https://docs.gitlab.com/user/project/repository/signed_commits/)
+
+```
+# Edit .git/config in the git repository you are working on
+# Add the user section
+[user]
+    name = YOUR NAME
+    email = YOUR EMAIL ADDRESS
+
+# If you use a signing key, use the below configuration instead
+[user]
+    name = YOUR NAME
+    email = YOUR EMAIL ADDRESS
+    signingkey = LOCATION OF SSH KEYS or GPG KEY
+
+[gpg]
+    format = ssh
+
+[commit]
+    gpgsign = true
+```
+
+> **NOTE:** If your commits are not signed the CI framework will not accept the MR.
+
+For more information regarding contribution guidelines
+please check [this document](doc/code-style-contrib.md)
+
+## License
 
 By contributing to OpenAirInterface, you agree that your contributions will be
 licensed under

NOTICE

@@ -84,3 +84,11 @@ Nuand: https://github.com/Nuand/bladeRF/tree/master?tab=License-1-ov-file
 
 Credits for https://github.com/pothosware/SoapySDR
 Pothosware: BSL 1.0 License
+
+Credits for https://github.com/zeromq/libzmq
+ZeroMQ authors: Mozilla Public License Version 2.0
+
+Credits for source code:
+  - radio/zmq/zmq_imported.cpp
+  - radio/zmq/zmq_imported.h
+Software Radio Systems Limited: BSD-3-Clause-Open-MPI

README.md

@@ -60,6 +60,7 @@ history:
  *  [System Requirements for Using OAI Stack](./doc/system_requirements.md)
  *  [How to build](./doc/BUILD.md)
  *  [How to run the modems](./doc/RUNMODEM.md)
+ *  [How to test channel emulation mode](CHANNELEMULATOR.md)
 
 Not all information is available in a central place, and information for
 specific sub-systems might be available in the corresponding sub-directories.

ci-scripts/Jenkinsfile-GitLab-Container

@@ -87,9 +87,20 @@ pipeline {
             // since a bit, in push events, gitlabUserEmail is not populated
             gitCommitAuthorEmailAddr = env.gitlabUserEmail
             echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
-            // GitLab-Jenkins plugin integration is lacking to perform the merge by itself
-            // Doing it manually --> it may have merge conflicts
-            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
+            // Validate MR commits: checks for missing Signed-off-by and merge commits
+            def mrValidationLog = "signedCommit_${env.BUILD_NUMBER}.log"
+            def mrValidationExitCode = sh(
+                script: "bash ./ci-scripts/pre-ci-check.sh -s origin/${env.gitlabSourceBranch} -t origin/${env.gitlabTargetBranch} > ${mrValidationLog} 2>&1",
+                returnStatus: true
+            )
+            def mrValidationMessage = readFile(mrValidationLog).trim()
+            sh "rm -f ${mrValidationLog}"
+            if (mrValidationExitCode >= 1) {
+              addGitLabMRComment comment: "${mrValidationMessage}"
+            }
+            if (mrValidationExitCode >= 2) {
+              error("${mrValidationMessage}")
+            }
           } else {
             echo "Git Branch    is ${GIT_BRANCH}"
             echo "Git Commit    is ${GIT_COMMIT}"
@@ -100,29 +111,19 @@ pipeline {
           }
         }
       }
-      post {
-        failure {
-          script {
-            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI"
-            addGitLabMRComment comment: message
-            currentBuild.result = 'FAILURE'
-          }
-        }
-      }
     }
     stage ("Local-Repo-Push") {
       steps {
         script {
-          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            triggerSlaveJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
-          }
+          triggerSlaveJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
         }
       }
       post {
         failure {
           script {
-            echo "Push to local repository KO"
-            failingStages += '\n * RAN-Local-Repo-Push'
+            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Cannot perform CI - merge validation failed (merge conflict, git operation failure, or internal CI error)."
+            addGitLabMRComment comment: message
+            currentBuild.result = 'FAILURE'
           }
         }
       }
@@ -748,6 +749,29 @@ pipeline {
             }
           }
         }
+        stage ("SA-FHI72-MPLANE-CN5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-SA-FHI72-MPLANE-CN5G', 'SA-FHI72-MPLANE-CN5G')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                saFHI72MplaneStatus = finalizeSlaveJob('RAN-SA-FHI72-MPLANE-CN5G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += saFHI72MplaneStatus
+              }
+            }
+          }
+        }
         stage ("SA-Handover-CN5G") {
           when { expression {do5Gtest} }
           steps {
@@ -876,14 +900,13 @@ def triggerSlaveJob (jobName, gitlabStatusName) {
 
 def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
   if ("MERGE".equals(env.gitlabActionType)) {
-    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
-    shortenShaOne = shortenShaOne.trim()
-    branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
+    shaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%H" ' + env.gitlabMergeRequestLastCommit
+    shaOne = shaOne.trim()
+    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shaOne
   } else {
-    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT
-    shortenShaOne = shortenShaOne.trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + shortenShaOne
+    shaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%H" ' + env.GIT_COMMIT
+    shaOne = shaOne.trim()
+    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + shaOne
   }
   // Workaround for the "cancelled" GitLab pipeline notification
   // The slave job is triggered with the propagate false so the following commands are executed

ci-scripts/Jenkinsfile-push-local-repo

@@ -67,8 +67,7 @@ pipeline {
     stage('Create temporary branch for CI') {
       steps {
         script {
-          def shortCommit = params.eNB_CommitID.take(8)
-          env.NEW_BRANCH = "${params.eNB_Branch}-${shortCommit}"
+          env.NEW_BRANCH = "${params.eNB_Branch}-${params.eNB_CommitID}"
           echo "New branch: ${env.NEW_BRANCH}"
         }
         sh """

ci-scripts/args_parse.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
 #---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
+# Python for CI testing
 #
 #   Required Python Version
 #     Python 3.x
@@ -44,74 +44,46 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
         elif re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
             mode = matchReg.group(1)
-        elif re.match(r'^\-\-eNBRepository=(.+)$|^\-\-ranRepository(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match(r'^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ranRepository = matchReg.group(1)
-            RAN.ranRepository=matchReg.group(1)
-            HTML.ranRepository=matchReg.group(1)
-            CONTAINERS.ranRepository=matchReg.group(1)
-            CLUSTER.ranRepository=matchReg.group(1)
-        elif re.match(r'^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match(r'^\-\-ranRepository(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
+            CiTestObj.repository = matchReg.group(1)
+            RAN.repository=matchReg.group(1)
+            HTML.repository=matchReg.group(1)
+            CONTAINERS.repository=matchReg.group(1)
+            CLUSTER.repository=matchReg.group(1)
+        elif re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
             doMerge = matchReg.group(1)
             if ((doMerge == 'true') or (doMerge == 'True')):
-                CiTestObj.ranAllowMerge = True
-                RAN.ranAllowMerge=True
-                HTML.ranAllowMerge=True
-                CONTAINERS.ranAllowMerge=True
-                CLUSTER.ranAllowMerge=True
-        elif re.match(r'^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match(r'^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.ranBranch = matchReg.group(1)
-            RAN.ranBranch=matchReg.group(1)
-            HTML.ranBranch=matchReg.group(1)
-            CONTAINERS.ranBranch=matchReg.group(1)
-            CLUSTER.ranBranch=matchReg.group(1)
-        elif re.match(r'^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match(r'^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
-            CiTestObj.ranCommitID = matchReg.group(1)
-            RAN.ranCommitID=matchReg.group(1)
-            HTML.ranCommitID=matchReg.group(1)
-            CONTAINERS.ranCommitID=matchReg.group(1)
-            CLUSTER.ranCommitID=matchReg.group(1)
-        elif re.match(r'^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
-            else:
-                matchReg = re.match(r'^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
-            CiTestObj.ranTargetBranch = matchReg.group(1)
-            RAN.ranTargetBranch=matchReg.group(1)
-            HTML.ranTargetBranch=matchReg.group(1)
-            CONTAINERS.ranTargetBranch=matchReg.group(1)
-            CLUSTER.ranTargetBranch=matchReg.group(1)
-        elif re.match(r'^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
-            print("parameters --eNB*IPAddress ignored")
-        elif re.match(r'^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
-            print("parameters --eNB*UserName ignored")
-        elif re.match(r'^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
-            print("parameter --eNB*Password ignored")
+                RAN.merge=True
+                HTML.merge=True
+                CONTAINERS.merge=True
+                CLUSTER.merge=True
+        elif re.match(r'^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
+            CiTestObj.branch = matchReg.group(1)
+            RAN.branch=matchReg.group(1)
+            HTML.branch=matchReg.group(1)
+            CONTAINERS.branch=matchReg.group(1)
+            CLUSTER.branch=matchReg.group(1)
+        elif re.match(r'^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
+            RAN.commitID=matchReg.group(1)
+            HTML.commitID=matchReg.group(1)
+            CONTAINERS.commitID=matchReg.group(1)
+            CLUSTER.commitID=matchReg.group(1)
+        elif re.match(r'^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
+            matchReg = re.match(r'^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
+            RAN.targetBranch=matchReg.group(1)
+            HTML.targetBranch=matchReg.group(1)
+            CONTAINERS.targetBranch=matchReg.group(1)
+            CLUSTER.targetBranch=matchReg.group(1)
         elif re.match(r'^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
             if re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
-                RAN.eNBSourceCodePath=matchReg.group(1)
-                CONTAINERS.eNBSourceCodePath=matchReg.group(1)
-                CLUSTER.eNBSourceCodePath=matchReg.group(1)
-            elif re.match(r'^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                print("parameter --eNB1SourceCodePath ignored")
-            elif re.match(r'^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-                print("parameter --eNB2SourceCodePath ignored")
+                RAN.workspace=matchReg.group(1)
+                CONTAINERS.workspace=matchReg.group(1)
+                CLUSTER.workspace=matchReg.group(1)
         elif re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.testXMLfiles.append(matchReg.group(1))

ci-scripts/ci_infra.yaml

@@ -79,11 +79,19 @@ oc-cn5g:
 
 oc-cn5g-20897:
   Host: cacofonix
-  NetworkScript: echo "inet 172.21.6.105"
+  NetworkScript: echo "inet 172.21.6.115"
   RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"
+  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72"
+  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72"
+  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72 %%log_dir%%"
+
+oc-cn5g-00105:
+  Host: cacofonix
+  NetworkScript: echo "inet 172.21.6.118"
+  RunIperf3Server: False
+  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2026-apr-00105 oaicicd-core-for-fhi72"
+  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2026-apr-00105 oaicicd-core-for-fhi72"
+  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2026-apr-00105 oaicicd-core-for-fhi72 %%log_dir%%"
 
 oc-cn5g-00103-ho:
   Host: groot
@@ -183,6 +191,16 @@ amarisoft_ue_2x2:
   InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz_2x2/aw2s-multi-00102-2x2-v2.cfg &
   TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
   NetworkScript: ip netns exec ue1 ip a show dev pdn0
+amarisoft_00105_40MHz:
+  Host: amariue
+  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_mplane_40MHz/multi-00105-40.cfg &
+  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+  NetworkScript: ip netns exec ue1 ip a show dev pdn0
+amarisoft_00105_100MHz:
+  Host: amariue
+  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_mplane_100MHz/multi-00105-100.cfg &
+  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+  NetworkScript: ip netns exec ue1 ip a show dev pdn0
 amarisoft_ue_1:
   Host: amariue
   AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'

ci-scripts/cls_cluster.py

@@ -50,17 +50,17 @@ def OC_logout(cmd):
 
 class Cluster:
 	def __init__(self):
-		self.eNBSourceCodePath = ""
+		self.workspace = ""
 		self.OCUserName = ""
 		self.OCPassword = ""
 		self.OCProjectName = ""
 		self.OCUrl = OCUrl
 		self.OCRegistry = OCRegistry
-		self.ranRepository = ""
-		self.ranBranch = ""
-		self.ranCommitID = ""
-		self.ranAllowMerge = False
-		self.ranTargetBranch = ""
+		self.repository = ""
+		self.branch = ""
+		self.commitID = ""
+		self.merge = False
+		self.targetBranch = ""
 		self.cmd = None
 
 	def _recreate_entitlements(self):
@@ -101,7 +101,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
+		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.workspace} --exclude=""')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -157,7 +157,7 @@ class Cluster:
 				OC_logout(cmd)
 				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 				return False
-			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			tag = cls_containerize.CreateTag(self.commitID, self.branch, self.merge)
 			registry = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
 			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, None, None)
 			OC_logout(cmd)
@@ -174,12 +174,12 @@ class Cluster:
 		return (image, archiveArtifact(self.cmd, ctx, fn))
 
 	def BuildClusterImage(self, ctx, node, HTML):
-		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+		if self.repository == '' or self.branch == '' or self.commitID == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
-		lSourcePath = self.eNBSourceCodePath
+			raise ValueError(f'Insufficient Parameter: repository {self.repository} branch {self.branch} commitID {self.commitID}')
+		lSourcePath = self.workspace
 		if node == '' or lSourcePath == '':
-			raise ValueError('Insufficient Parameter: eNBSourceCodePath missing')
+			raise ValueError('Insufficient Parameter: workspace missing')
 		ocUserName = self.OCUserName
 		ocPassword = self.OCPassword
 		ocProjectName = self.OCProjectName
@@ -200,22 +200,22 @@ class Cluster:
 
 		baseTag = 'develop'
 		forceBaseImageBuild = False
-		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
-			branchName = self.ranBranch.replace('/','-')
-			imageTag = f'{branchName}-{self.ranCommitID[0:8]}'
-			if self.ranTargetBranch == 'develop':
+		if self.merge: # merging MR branch into develop -> temporary image
+			branchName = self.branch.replace('/','-')
+			imageTag = f'{branchName}-{self.commitID}'
+			if self.targetBranch == 'develop':
 				ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel9 | grep --colour=never -i INDEX')
 				result = re.search('index', ret.stdout)
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
 			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.branch)
 			if not forceBaseImageBuild and result is not None:
 				forceBaseImageBuild = True
 				baseTag = 'ci-temp'
 		else:
-			imageTag = f'develop-{self.ranCommitID[0:8]}'
+			imageTag = f'develop-{self.commitID}'
 			forceBaseImageBuild = True
 
 		# logging to OC Cluster and then switch to corresponding project

ci-scripts/cls_containerize.py

@@ -32,33 +32,32 @@ from cls_ci_helper import archiveArtifact
 IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
 DEFAULT_REGISTRY = "gracehopper3-oai.sboai.cs.eurecom.fr"
 
-def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
-	if ranCommitID == '':
-		logging.error('need ranCommitID in CreateWorkspace()')
-		raise ValueError('Insufficient Parameter in CreateWorkspace(): need ranCommitID')
+def CreateWorkspace(host, sourcePath, repository, commitID, targetBranch, merge):
+	if commitID == '':
+		logging.error('need commitID in CreateWorkspace()')
+		raise ValueError('Insufficient Parameter in CreateWorkspace(): need commitID')
 
 	script = "scripts/create_workspace.sh"
-	options = f"{sourcePath} {ranRepository} {ranCommitID}"
-	if ranAllowMerge:
-		if ranTargetBranch == '':
-			ranTargetBranch = 'develop'
-		options += f" {ranTargetBranch}"
+	options = f"{sourcePath} {repository} {commitID}"
+	if merge:
+		if targetBranch == '':
+			targetBranch = 'develop'
+		options += f" {targetBranch}"
 	logging.info(f'execute "{script}" with options "{options}" on node {host}')
 	with cls_cmd.getConnection(host) as c:
 		ret = c.exec_script(script, 90, options)
 	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
 	return ret.returncode == 0
 
-def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
-	if ranCommitID == 'develop':
+def CreateTag(commitID, branch, merge):
+	if commitID == 'develop':
 		return 'develop'
-	shortCommit = ranCommitID[0:8]
-	if ranAllowMerge:
+	if merge:
 		# Allowing contributor to have a name/branchName format
-		branchName = ranBranch.replace('/','-')
-		tagToUse = f'{branchName}-{shortCommit}'
+		branchName = branch.replace('/','-')
+		tagToUse = f'{branchName}-{commitID}'
 	else:
-		tagToUse = f'develop-{shortCommit}'
+		tagToUse = f'develop-{commitID}'
 	return tagToUse
 
 def AnalyzeBuildLogs(image, lf):
@@ -172,14 +171,13 @@ class Containerize():
 
 	def __init__(self):
 		
-		self.ranRepository = ''
-		self.ranBranch = ''
-		self.ranAllowMerge = False
-		self.ranCommitID = ''
-		self.ranTargetBranch = ''
-		self.eNBSourceCodePath = ''
+		self.repository = ''
+		self.branch = ''
+		self.merge = False
+		self.commitID = ''
+		self.targetBranch = ''
+		self.workspace = ''
 		self.imageKind = ''
-		self.proxyCommit = None
 		self.yamlPath = ''
 		self.services = ''
 		self.deploymentTag = ''
@@ -193,7 +191,7 @@ class Containerize():
 #-----------------------------------------------------------
 
 	def BuildImage(self, ctx, node, HTML):
-		lSourcePath = self.eNBSourceCodePath
+		lSourcePath = self.workspace
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
 		log_files = []
@@ -249,16 +247,16 @@ class Containerize():
 		baseTag = 'develop'
 		forceBaseImageBuild = False
 		imageTag = 'develop'
-		if (self.ranAllowMerge):
+		if (self.merge):
 			imageTag = 'ci-temp'
-			if self.ranTargetBranch == 'develop':
+			if self.targetBranch == 'develop':
 				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{dockerfileprefix} | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
 			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.branch)
 			if not forceBaseImageBuild and result is not None:
 				forceBaseImageBuild = True
 				baseTag = 'ci-temp'
@@ -376,90 +374,8 @@ class Containerize():
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 		return status
 
-	def BuildProxy(self, ctx, node, HTML):
-		lSourcePath = self.eNBSourceCodePath
-		logging.debug('Building on server: ' + node)
-		ssh = cls_cmd.getConnection(node)
-
-		oldRanCommidID = self.ranCommitID
-		oldRanRepository = self.ranRepository
-		oldRanAllowMerge = self.ranAllowMerge
-		oldRanTargetBranch = self.ranTargetBranch
-		self.ranCommitID = self.proxyCommit
-		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
-		self.ranAllowMerge = False
-		self.ranTargetBranch = 'master'
-
-		# Let's remove any previous run artifacts if still there
-		ssh.run('docker image prune --force')
-		# Remove any previous proxy image
-		ssh.run('docker image rm oai-lte-multi-ue-proxy:latest')
-
-		tag = self.proxyCommit
-		logging.debug('building L2sim proxy image for tag ' + tag)
-		# check if the corresponding proxy image with tag exists. If not, build it
-		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-		buildProxy = ret.returncode != 0 # if no image, build new proxy
-		if buildProxy:
-			ssh.run(f'rm -Rf {lSourcePath}')
-			success = CreateWorkspace(node, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-			if not success:
-				raise Exception("could not clone proxy repository")
-
-			fullpath = f'{lSourcePath}/proxy_build.log'
-
-			ssh.run(f'docker build --target oai-lte-multi-ue-proxy --tag proxy:{tag} --file {lSourcePath}/docker/Dockerfile.ubuntu18.04 {lSourcePath} > {fullpath} 2>&1')
-			archiveArtifact(ssh, ctx, fullpath)
-
-			ssh.run('docker image prune --force')
-			ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-			if ret.returncode != 0:
-				logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
-				ssh.close()
-				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
-				return False
-		else:
-			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')
-
-		# retag the build images to that we pick it up later
-		ssh.run(f'docker image tag proxy:{tag} oai-lte-multi-ue-proxy:latest')
-
-		# we assume that the host on which this is built will also run the proxy. The proxy
-		# currently requires the following command, and the docker-compose up mechanism of
-		# the CI does not allow to run arbitrary commands. Note that the following actually
-		# belongs to the deployment, not the build of the proxy...
-		logging.warning('the following command belongs to deployment, but no mechanism exists to exec it there!')
-		ssh.run('sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up')
-
-		# to prevent accidentally overwriting data that might be used later
-		self.ranCommitID = oldRanCommidID
-		self.ranRepository = oldRanRepository
-		self.ranAllowMerge = oldRanAllowMerge
-		self.ranTargetBranch = oldRanTargetBranch
-
-		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-		result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
-		# Cleaning any created tmp volume
-		ssh.run('docker volume prune --force')
-		ssh.close()
-
-		allImagesSize = {}
-		if result is not None:
-			imageSize = float(result.group('size')) / 1000000
-			logging.debug('\u001B[1m   proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
-			allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes'
-			logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
-			HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
-			return True
-		else:
-			logging.error('proxy size is unknown')
-			allImagesSize['proxy'] = 'unknown'
-			logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
-			HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
-			return False
-
 	def BuildRunTests(self, ctx, node, dockerfile, runtime_opt, ctest_opt, HTML):
-		lSourcePath = self.eNBSourceCodePath
+		lSourcePath = self.workspace
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
 		cmd.cd(lSourcePath)
@@ -467,8 +383,8 @@ class Containerize():
 		# check that ran-base image exists as we expect it
 		baseImage = 'ran-base'
 		baseTag = 'develop'
-		if self.ranAllowMerge:
-			if self.ranTargetBranch == 'develop':
+		if self.merge:
+			if self.targetBranch == 'develop':
 				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.ubuntu | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
@@ -511,7 +427,7 @@ class Containerize():
 			return False
 
 	def Push_Image_to_Local_Registry(self, node, HTML, tag_prefix=""):
-		lSourcePath = self.eNBSourceCodePath
+		lSourcePath = self.workspace
 		logging.debug('Pushing images to server: ' + node)
 		ssh = cls_cmd.getConnection(node)
 		imagePrefix = DEFAULT_REGISTRY
@@ -524,10 +440,10 @@ class Containerize():
 			return False
 
 		orgTag = 'develop'
-		if self.ranAllowMerge:
+		if self.merge:
 			orgTag = 'ci-temp'
 		for image in IMAGES:
-			tagToUse = tag_prefix + CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			tagToUse = tag_prefix + CreateTag(self.commitID, self.branch, self.merge)
 			imageTag = f"{image}:{tagToUse}"
 			ret = ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}')
 			if ret.returncode != 0:
@@ -540,7 +456,7 @@ class Containerize():
 				HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 				return False
 			# Creating a develop tag on the local private registry
-			if not self.ranAllowMerge:
+			if not self.merge:
 				devTag = f"{tag_prefix}develop"
 				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:{devTag}')
 				ssh.run(f'docker push {imagePrefix}/{image}:{devTag}')
@@ -588,7 +504,7 @@ class Containerize():
 	def Pull_Image_from_Registry(self, HTML, node, images, tag=None, tag_prefix="", registry=DEFAULT_REGISTRY, username="oaicicd", password="oaicicd"):
 		logging.debug(f'\u001B[1m Pulling image(s) on server: {node}\u001B[0m')
 		if not tag:
-			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			tag = CreateTag(self.commitID, self.branch, self.merge)
 		with cls_cmd.getConnection(node) as cmd:
 			success, msg = Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, username, password)
 		param = f"on node {node}"
@@ -601,7 +517,7 @@ class Containerize():
 	def Clean_Test_Server_Images(self, HTML, node, images, tag=None):
 		logging.debug(f'\u001B[1m Cleaning image(s) from server: {node}\u001B[0m')
 		if not tag:
-			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			tag = CreateTag(self.commitID, self.branch, self.merge)
 
 		status = True
 		with cls_cmd.getConnection(node) as myCmd:
@@ -620,8 +536,8 @@ class Containerize():
 		return status
 
 	def Create_Workspace(self, node, HTML):
-		lSourcePath = self.eNBSourceCodePath
-		success = CreateWorkspace(node, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		lSourcePath = self.workspace
+		success = CreateWorkspace(node, lSourcePath, self.repository, self.commitID, self.targetBranch, self.merge)
 		if success:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [f"created workspace {lSourcePath}"])
 		else:
@@ -630,7 +546,7 @@ class Containerize():
 
 	def DeployObject(self, ctx, node, HTML):
 		num_attempts = self.num_attempts
-		lSourcePath = self.eNBSourceCodePath
+		lSourcePath = self.workspace
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'
@@ -648,7 +564,7 @@ class Containerize():
 				raise ValueError(f'Invalid value for num_attempts: {num_attempts}, must be greater than 0')
 			for attempt in range(num_attempts):
 				logging.info(f'will start services {services}')
-				status = ssh.run(f'docker compose -f {wd_yaml} up -d --wait --wait-timeout 60 -- {services}')
+				status = ssh.run(f'docker compose -f {wd_yaml} up -d --wait --wait-timeout 120 -- {services}')
 				info = ssh.run(f"docker compose -f {wd_yaml} ps --all --format=\'table {{{{.Service}}}} [{{{{.Image}}}}] {{{{.Status}}}}\' -- {services} | column -t")
 				deployed = status.returncode == 0
 				if not deployed:
@@ -674,7 +590,7 @@ class Containerize():
 		return deployed
 
 	def StopObject(self, ctx, node, HTML):
-		lSourcePath = self.eNBSourceCodePath
+		lSourcePath = self.workspace
 		if not self.services:
 			raise ValueError(f'no services provided')
 		logging.info(f'\u001B[1m Stopping objects "{self.services}" from server: {node}\u001B[0m')
@@ -703,7 +619,7 @@ class Containerize():
 		return success
 
 	def UndeployObject(self, ctx, node, HTML, to_analyze):
-		lSourcePath = self.eNBSourceCodePath
+		lSourcePath = self.workspace
 		logging.info(f'\u001B[1m Undeploying all objects from server {node}\u001B[0m')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
@@ -741,7 +657,7 @@ class Containerize():
 	def AnalyzeRTStatsObject(self, HTML, node, ctx, thresholds, service=None):
 		logging.info(f'Analyzing realtime stats from server: {node}')
 		yaml = self.yamlPath.strip('/')
-		wd = f'{self.eNBSourceCodePath}/{yaml}'
+		wd = f'{self.workspace}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'
 
 		with cls_cmd.getConnection(node) as cmd:

ci-scripts/cls_oai_html.py

@@ -33,11 +33,11 @@ class HTMLManagement():
 		self.htmlHeaderCreated = False
 		self.htmlFooterCreated = False
 
-		self.ranRepository = ''
-		self.ranBranch = ''
-		self.ranCommitID = ''
-		self.ranAllowMerge = False
-		self.ranTargetBranch = ''
+		self.repository = ''
+		self.branch = ''
+		self.commitID = ''
+		self.merge = False
+		self.targetBranch = ''
 
 		self.nbTestXMLfiles = 0
 		self.htmlTabRefs = []
@@ -96,46 +96,46 @@ class HTMLManagement():
 			self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('     <tr>\n')
 			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-cloud-upload"></span> GIT Repository </td>\n')
-			self.htmlFile.write('       <td><a href="' + self.ranRepository + '">' + self.ranRepository + '</a></td>\n')
+			self.htmlFile.write('       <td><a href="' + self.repository + '">' + self.repository + '</a></td>\n')
 			self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('     <tr>\n')
 			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-wrench"></span> Job Trigger </td>\n')
-			if (self.ranAllowMerge):
+			if (self.merge):
 				self.htmlFile.write('       <td>Merge-Request</td>\n')
 			else:
 				self.htmlFile.write('       <td>Push to Branch</td>\n')
 			self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('     <tr>\n')
-			if (self.ranAllowMerge):
+			if (self.merge):
 				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Source Branch </td>\n')
 			else:
 				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tree-deciduous"></span> Branch</td>\n')
-			self.htmlFile.write('       <td>' + self.ranBranch + '</td>\n')
+			self.htmlFile.write('       <td>' + self.branch + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('     <tr>\n')
-			if (self.ranAllowMerge):
+			if (self.merge):
 				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Source Commit ID </td>\n')
 			else:
 				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
-			self.htmlFile.write('       <td>' + self.ranCommitID + '</td>\n')
+			self.htmlFile.write('       <td>' + self.commitID + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
-			if self.ranAllowMerge != '' and self.ranCommitID != 'develop':
-				commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.ranCommitID, shell=True, universal_newlines=True)
+			if self.merge != '' and self.commitID != 'develop':
+				commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.commitID, shell=True, universal_newlines=True)
 				commit_message = commit_message.strip()
 				self.htmlFile.write('     <tr>\n')
-				if (self.ranAllowMerge):
+				if (self.merge):
 					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Source Commit Message </td>\n')
 				else:
 					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
 				self.htmlFile.write('       <td>' + commit_message + '</td>\n')
 				self.htmlFile.write('     </tr>\n')
-			if (self.ranAllowMerge):
+			if (self.merge):
 				self.htmlFile.write('     <tr>\n')
 				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-in"></span> Target Branch </td>\n')
-				if (self.ranTargetBranch == ''):
+				if (self.targetBranch == ''):
 					self.htmlFile.write('       <td>develop</td>\n')
 				else:
-					self.htmlFile.write('       <td>' + self.ranTargetBranch + '</td>\n')
+					self.htmlFile.write('       <td>' + self.targetBranch + '</td>\n')
 				self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('  </table>\n')
 

ci-scripts/cls_oaicitest.py

@@ -65,6 +65,23 @@ def Iperf_ComputeTime(args):
 		raise Exception('Iperf time not found!')
 	return int(result.group('iperf_time'))
 
+def Iperf_UpdateBindPort(opts, ueIP, idx):
+	# search if bind address present. Extract if yes, add if no.
+	bind_m = re.search(r'(-B|--bind)\s+(?P<ip>\d+\.\d+\.\d+\.\d+)', opts)
+	if bind_m:
+		bindIP = bind_m.group('ip')
+	else:
+		bindIP = ueIP
+		opts += f" -B {ueIP}"
+	# search if port present. Extract if yes, add if no.
+	port_m = re.search(r'(-p|--port)\s+(?P<port>\d+)', opts)
+	if port_m:
+		port = port_m.group('port')
+	else:
+		port = 5002 + idx
+		opts += f" -p {port}"
+	return bindIP, port, opts
+
 def convert_to_mbps(value, magnitude):
 	value = float(value)
 	if magnitude == 'K' or magnitude == 'k':
@@ -265,12 +282,8 @@ def Deploy_Physim(ctx, HTML, node, workdir, script, options):
 class OaiCiTest():
 	
 	def __init__(self):
-		self.ranRepository = ''
-		self.ranBranch = ''
-		self.ranCommitID = ''
-		self.ranAllowMerge = False
-		self.ranTargetBranch = ''
-
+		self.repository = ''
+		self.branch = ''
 		self.testXMLfiles = []
 		self.ping_args = ''
 		self.ping_packetloss_threshold = ''
@@ -457,7 +470,6 @@ class OaiCiTest():
 		svrIP = cn.getIP()
 		if not svrIP:
 			return (False, f"Iperf server {cn.getName()} has no IP address")
-
 		iperf_opt = self.iperf_args
 		jsonReport = "--json"
 		serverReport = ""
@@ -471,11 +483,11 @@ class OaiCiTest():
 			# note: enable server report collection on the UE side, no need to store and collect server report separately on the server side
 			serverReport = "--get-server-output"
 		iperf_time = Iperf_ComputeTime(self.iperf_args)
+		bindIP, port, iperf_opt = Iperf_UpdateBindPort(iperf_opt, ueIP, idx)
 		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
 		iperf_ue = '/data/local/tmp/iperf3' if re.search('adb', ue.getName()) else 'iperf3'
-		ue_header = f'UE {ue.getName()} ({ueIP})'
+		ue_header = f'UE {ue.getName()} ({bindIP})'
 		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(cn.getHost()) as cmd_svr:
-			port = 5002 + idx
 			# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
 			t = iperf_time * 2.5
 			cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
@@ -486,7 +498,7 @@ class OaiCiTest():
 				if ret.returncode == 0:
 					logging.warning(f'Iperf3 server on port {port} detected and terminated')
 				cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
-			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t)
+			client_ret = cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -c {svrIP} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t, reportNonZero=False)
 			dest_filename = archiveArtifact(cmd_ue, ctx, client_filename)
 		if udpIperf:
 			status, msg = Iperf_analyzeV3UDP(dest_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
@@ -495,6 +507,10 @@ class OaiCiTest():
 		else:
 			status, msg = Iperf_analyzeV3TCPJson(dest_filename, self.iperf_tcp_rate_target)
 
+		# add some diagnostic messages if the actual iperf command returned non-zero
+		if client_ret.returncode != 0:
+			msg = f'{msg}\nIperf client command failed on {bindIP} -> {svrIP}:{port} (return code: {client_ret.returncode})'
+
 		return (status, f'{ue_header}\n{msg}')
 
 	def Iperf(self, ctx, node, HTML, infra_file="ci_infra.yaml"):

ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf

@@ -215,6 +215,7 @@ L1s =
 (
   {
     num_cc = 1;
+    prach_dtx_threshold = 200;
     tr_n_preference = "local_mac";
   }
 );

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

@@ -186,10 +186,10 @@ MACRLCs = (
   local_s_portd    = 50011; // vnf p7 port [!]
   tr_s_preference             = "aerial";
   tr_n_preference             = "local_RRC";
-  pucch_RSSI_Threshold = -270;
-  pusch_RSSI_Threshold = -260;
-  pusch_TargetSNRx10          = 260; # 150;
-  pucch_TargetSNRx10          = 200; #200;
+  pucch_RSSI_Threshold        = -270;
+  pusch_RSSI_Threshold        = -260;
+  pusch_TargetSNRx10          = 290;
+  pucch_TargetSNRx10          = 200;
   dl_max_mcs = 28;
   ul_max_mcs = 28;
   ul_min_mcs = 9;

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

@@ -161,7 +161,7 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
+    amf_ip_address = ({ ipv4 = "172.21.6.113"; });
 
     NETWORK_INTERFACES :
     {

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

@@ -197,7 +197,7 @@ RUs = (
   nb_tx          = 2;
   nb_rx          = 2;
   att_tx         = 0;
-  att_rx         = 0;
+  att_rx         = 6;
   bands          = [77];
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 71;

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

@@ -0,0 +1,262 @@
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({ mcc = 001; mnc = 05; mnc_length = 2; snssaiList = ( { sst = 1; }); });
+
+    nr_cellid = 1;
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2;
+    pdsch_AntennaPorts_N1 = 2;
+    maxMIMO_layers        = 4;
+    pusch_AntennaPorts    = 4;
+    do_CSIRS              = 1;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # center frequency = 3350.01 MHz
+      # selected SSB frequency = 3349.92 MHz
+      absoluteFrequencySSB                                          = 623328;
+      dl_frequencyBand                                              = 78;
+      # frequency point A = 3330.93 MHz
+      dl_absoluteFrequencyPointA                                    = 622062;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 106;
+     #initialDownlinkBWP
+      #genericParameters
+       initialDLBWPlocationAndBandwidth                             = 28875; #38.101-1 Table 5.3.2-1
+       #
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                               = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                          = 11;
+        initialDLBWPsearchSpaceZero                                 = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
+      pMax                                                          = 23;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 152;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 0;
+          preambleReceivedTargetPower                               = -100;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 8;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 3;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
+        msg3_DeltaPreamble                                          = 2;
+        p0_NominalWithGrant                                         = -96;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 0;
+        p0_nominal                                                  = -96;
+
+      ssb_PositionsInBurst_Bitmap                                   = 0x1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 3;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 1;
+      nrofUplinkSymbols                                             = 4;
+
+  ssPBCH_BlockPower                                                 = -10;
+  }
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "172.21.6.116"; });
+
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.150";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.150";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+  }
+);
+
+MACRLCs = (
+{
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 250;
+  pucch_TargetSNRx10          = 200;
+  pusch_FailureThres          = 1000;
+}
+);
+
+L1s = (
+{
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 100;
+  pucch0_dtx_threshold = 10;
+  pusch_dtx_threshold = 10;
+  max_ldpc_iterations = 15;
+  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
+  L1_rx_thread_core = 3;
+  L1_tx_thread_core = 4;
+  phase_compensation = 0; # needs to match O-RU configuration
+}
+);
+
+RUs = (
+{
+  local_rf       = "no";
+  nb_tx          = 4;
+  nb_rx          = 4;
+  att_tx         = 24;
+  att_rx         = 0;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  ru_thread_core = 5;
+  sl_ahead       = 10;
+  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
+  do_precoding   = 0; # needs to match O-RU configuration
+}
+);
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level = "info";
+  hw_log_level     = "info";
+  phy_log_level    = "info";
+  mac_log_level    = "info";
+  rlc_log_level    = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+  ngap_log_level   = "info";
+  f1ap_log_level   = "info";
+};
+
+fhi_72 = {
+  dpdk_devices = ("0000:c3:11.0"); # one VF can be used as well
+  system_core = 0;
+  io_core = 1;
+  worker_cores = (2);
+  du_key_pair = ("/opt/oai-gnb/etc/id_rsa.pub", "/opt/oai-gnb/etc/id_rsa");
+  du_addr = ("00:11:22:33:44:66");
+  vlan_tag = (3); # only one needed if one VF configured
+  ru_username = ("oranbenetel");
+  ru_ip_addr = ("192.168.81.4");
+  fh_config = ({
+    T1a_cp_dl = (419, 470);
+    T1a_cp_ul = (285, 336);
+    T1a_up = (294, 345);
+    Ta4 = (0, 200);
+  });
+};

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

@@ -18,7 +18,7 @@ gNBs =
     nr_cellid = 12345678L;
 
     ////////// Physical parameters:
-
+    use_deltaMCS = 1;
 
     servingCellConfigCommon = (
     {
@@ -180,7 +180,7 @@ MACRLCs = (
 {
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
+  pusch_TargetSNRx10          = 100;
   pucch_TargetSNRx10          = 200;
   ul_prbblack_SNR_threshold   = 10;
 }

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

@@ -0,0 +1,260 @@
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({ mcc = 001; mnc = 05; mnc_length = 2; snssaiList = ( { sst = 1; }); });
+
+    nr_cellid = 1;
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2;
+    pusch_AntennaPorts    = 2;
+    do_CSIRS              = 1;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # center frequency = 3350.01 MHz
+      # selected SSB frequency = 3349.92 MHz
+      absoluteFrequencySSB                                          = 623328;
+      dl_frequencyBand                                              = 78;
+      # frequency point A = 3300.87 MHz
+      dl_absoluteFrequencyPointA                                    = 620058;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 273;
+     #initialDownlinkBWP
+      #genericParameters
+       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
+       #
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                               = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                          = 11;
+        initialDLBWPsearchSpaceZero                                 = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 273;
+      pMax                                                          = 23;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 1099;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 152;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 0;
+          preambleReceivedTargetPower                               = -100;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 8;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 3;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
+        msg3_DeltaPreamble                                          = 2;
+        p0_NominalWithGrant                                         = -96;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 0;
+        p0_nominal                                                  = -96;
+
+      ssb_PositionsInBurst_Bitmap                                   = 0x1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 3;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 1;
+      nrofUplinkSymbols                                             = 4;
+
+  ssPBCH_BlockPower                                                 = -11;
+  }
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "172.21.6.116"; });
+
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.150";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.150";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+  }
+);
+
+MACRLCs = (
+{
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 200;
+  pucch_TargetSNRx10          = 200;
+  pusch_FailureThres          = 1000;
+}
+);
+
+L1s = (
+{
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 100;
+  pucch0_dtx_threshold = 10;
+  pusch_dtx_threshold = 10;
+  max_ldpc_iterations = 15;
+  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
+  L1_rx_thread_core = 3;
+  L1_tx_thread_core = 4;
+  phase_compensation = 0; # needs to match O-RU configuration
+}
+);
+
+RUs = (
+{
+  local_rf       = "no";
+  nb_tx          = 2;
+  nb_rx          = 2;
+  att_tx         = 24;
+  att_rx         = 0;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 75;
+  sf_extension                  = 0;
+  eNB_instances  = [0];
+  ru_thread_core = 5;
+  sl_ahead       = 10;
+  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
+  do_precoding   = 0; # needs to match O-RU configuration
+}
+);
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level = "info";
+  hw_log_level     = "info";
+  phy_log_level    = "info";
+  mac_log_level    = "info";
+  rlc_log_level    = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+  ngap_log_level   = "info";
+  f1ap_log_level   = "info";
+};
+
+fhi_72 = {
+  dpdk_devices = ("0000:c3:11.0"); # one VF can be used as well
+  system_core = 0;
+  io_core = 1;
+  worker_cores = (2);
+  du_key_pair = ("/opt/oai-gnb/etc/id_rsa.pub", "/opt/oai-gnb/etc/id_rsa");
+  du_addr = ("00:11:22:33:44:66");
+  vlan_tag = (3); # only one needed if one VF configured
+  ru_username = ("oranbenetel");
+  ru_ip_addr = ("192.168.81.4");
+  fh_config = ({
+    T1a_cp_dl = (419, 470);
+    T1a_cp_ul = (285, 336);
+    T1a_up = (294, 345);
+    Ta4 = (0, 200);
+  });
+};

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

@@ -5,8 +5,8 @@ uicc0 = {
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
   pdu_sessions = (
-    { id = 1; dnn = "oai"; nssai_sst = 1; },
-    { id = 2; dnn = "oai"; nssai_sst = 1; }
+    { id = 1; dnn = "oai"; nssai_sst = 1; nssai_sd = 0xFFFFFF; },
+    { id = 2; dnn = "openairinterface"; nssai_sst = 1; nssai_sd = 0x123456; }
   )
 }
 

ci-scripts/conf_files/nrue.uicc.yaml

@@ -30,7 +30,7 @@ channelmod:
     - model_name: rfsimu_channel_ue0
       type: AWGN
       ploss_dB: 20
-      nose_power_dB: -2
+      noise_power_dB: -2
       forgetfact: 0
       offset: 0
       ds_tdl: 0

ci-scripts/docker/Dockerfile.unittest.ubuntu

@@ -13,11 +13,12 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
     DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libgtest-dev \
-        libyaml-cpp-dev
+        libyaml-cpp-dev \
+        libzmq3-dev
 
 RUN rm -Rf /oai-ran
 WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja tests
+RUN cmake -GNinja -DENABLE_TESTS=ON -DOAI_ZMQ=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja

ci-scripts/main.py

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

ci-scripts/pre-ci-check.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+function usage {
+    echo "OAI GitLab MR validation script (Signed-off-by and merge commits)"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo "    $0 -s <source-branch> -t <target-branch>"
+    echo ""
+    echo "Options:"
+    echo "--------"
+    echo "    -s"
+    echo "    The source branch of the merge request. Default value is current Git Branch (HEAD)"
+    echo ""
+    echo "    -t"
+    echo "    The target branch of the merge request. Default value is develop"
+    echo ""
+    echo "    -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+# Parse arguments properly
+SOURCE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+TARGET_BRANCH="origin/develop"
+
+git fetch --quiet
+
+while getopts ":s:t:h" opt; do
+    case "$opt" in
+        s)
+            SOURCE_BRANCH="$OPTARG"
+            ;;
+        t)
+            TARGET_BRANCH="$OPTARG"
+            ;;
+        h)
+            usage
+            exit 0
+            ;;
+        :)
+            echo "Error: Option -$OPTARG requires a value."
+            echo ""
+            usage
+            exit 2
+            ;;
+        \?)
+            echo "Error: Invalid option -$OPTARG"
+            echo ""
+            usage
+            exit 2
+            ;;
+    esac
+done
+
+# ----------------------------
+# Merged commits
+# ----------------------------
+mergeCommits=$(git rev-list --merges --abbrev-commit "$TARGET_BRANCH".."$SOURCE_BRANCH")
+if [[ ! "$SOURCE_BRANCH" =~ ^(origin/)?integration_[0-9]{4}_w[0-9]{2}$ ]]; then
+    if [[ -n "$mergeCommits" ]]; then
+        message="> ERROR: Following merge commits are found in the source branch history. Please rebase your branch.\n>\n"
+        message+="> $(echo "$mergeCommits" | paste -sd ',' -)\n"
+        echo -e "$message"
+        exit 3
+    fi
+fi
+
+# ----------------------------
+# Check unsigned commits
+# ----------------------------
+unsignedCommits=$(
+    for c in $(git rev-list "$TARGET_BRANCH".."$SOURCE_BRANCH" --no-merges); do
+        if ! git log -1 --format=%B "$c" | grep -q "Signed-off-by:"; then
+            git log -1 --format='%h' "$c"
+        fi
+    done | paste -sd ","
+)
+
+# ----------------------------
+# Report unsigned commits
+# ----------------------------
+message=""
+
+if [ -n "$unsignedCommits" ]; then
+    message="> WARNING: The following commit(s) are missing a Signed-off-by:\n>\n> $unsignedCommits\n>\n"
+    message+="> Please use 'git commit -s' to sign your commits.\n>\n"
+    message+="> For detailed instructions, refer to the CONTRIBUTING file at the root of this repository."
+    echo -e "$message"
+    exit 1
+else
+    message="> All commits are signed off using 'git commit -s'."
+    echo -e "$message"
+    exit 0
+fi

ci-scripts/ran.py

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

ci-scripts/scripts/vvdn-activate-carriers.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+# SPDX-License-Identifier: MIT
+
+set -e
+
+RU_IP="10.10.0.111"
+RU_HOST="root@10.10.0.111"
+
+ssh_exec() {
+    ssh $RU_HOST $@ </dev/null
+}
+
+echo "→ Checking for PTP fluctuations in the last 60 minutes..."
+
+logs=$(journalctl -u ptp4l.service --since "60 minutes ago")
+
+check_ptp=$(echo "$logs" | awk '
+/rms/ {
+    rms=$8
+    if (rms > 100) {
+        print "✗ PTP FLUCTUATION DETECTED → " $0
+        exit 0
+    }
+}
+')
+
+if [ -n "$check_ptp" ]; then
+    echo "$check_ptp"
+else
+    echo "✓ No PTP fluctuations detected."
+fi
+
+echo "→ Checking if VVDN LPRU is PTP synchronized (timeout 1 min)..."
+if ssh_exec 'timeout 1m sh -c "tail -F /var/log/synctimingptp2.log | grep -m 1 -F ,\ synchronized"'; then
+    echo "✓ VVDN LPRU synchronized"
+else
+    echo "✗ VVDN LPRU not synchronized"
+fi
+
+echo "→ Checking TX/RX carrier configuration..."
+if ssh_exec 'sysrepocfg -X -d running -f xml | grep -q "<active>INACTIVE</active>"'; then
+    echo "→ Some carriers are not active, activating via sysrepocfg..."
+    ssh_exec 'sysrepocfg -X -d running -f xml | sed "s/<active>INACTIVE<\/active>/<active>ACTIVE<\/active>/g" | sysrepocfg -I -d running -f xml'
+    echo "✓ All TX/RX carriers activated."
+else
+    echo "✓ All TX/RX carriers already activated."
+fi
+exit 0

ci-scripts/scripts/vvdn-inactivate-carriers.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# SPDX-License-Identifier: MIT
+
+set -e
+
+RU_HOST="root@10.10.0.111"
+
+ssh_exec() {
+    ssh $RU_HOST $@ </dev/null
+}
+
+echo "→ Inactivating TX/RX carriers on VVDN LPRU..."
+ssh_exec 'sysrepocfg -X -d running -f xml | sed "s/ACTIVE/INACTIVE/g" | sysrepocfg -I -d running -f xml'
+echo "✓ TX/RX carriers inactivated."

ci-scripts/tests/build.py

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

ci-scripts/tests/deployment.py

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

ci-scripts/tests/ping-iperf.py

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

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

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

ci-scripts/xml_class_list.yml

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

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

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

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

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

ci-scripts/xml_files/container_5g_zmq_2x2.xml

@@ -0,0 +1,109 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>zmq-5gnr-tdd-2x2</htmlTabRef>
+  <htmlTabName>Monolithic SA TDD 2x2 gNB with zmq radio</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2/</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2</yaml_path>
+    <services>oai-gnb oai-nr-ue</services>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 10M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2</yaml_path>
+    <analysis>
+      <services>oai-gnb=RetxCheck=1,0,0,0 oai-gnb=EndsWithBye oai-nr-ue</services>
+    </analysis>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_zmq_ocudu_1x1.xml

@@ -0,0 +1,109 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>ocudu-5gnr-tdd-1x1</htmlTabRef>
+  <htmlTabName>OCUDU gnb split8 with OAI UE</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OCUDU Split 8 gNB + OAI UE</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu</yaml_path>
+    <services>ocudu-gnb oai-nr-ue</services>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 3M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu</yaml_path>
+    <analysis>
+      <services>oai-nr-ue</services>
+    </analysis>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_zmq_ocudu_2x2.xml

@@ -0,0 +1,109 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>ocudu-5gnr-tdd-2x2</htmlTabRef>
+  <htmlTabName>OCUDU gnb split8 with OAI UE</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
+
+  <testCase>
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OAI 5G CoreNetwork</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu</yaml_path>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+  </testCase>
+
+  <testCase>
+    <class>Deploy_Object</class>
+    <desc>Deploy OCUDU Split 8 gNB + OAI UE</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu</yaml_path>
+    <services>ocudu-gnb oai-nr-ue</services>
+  </testCase>
+
+  <testCase>
+    <class>Attach_UE</class>
+    <desc>Attach OAI UE (Wait for IP)</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -t 20 -R</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Iperf</class>
+    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+    <iperf_args>-u -b 1M -t 20</iperf_args>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy all OAI 5G stack</desc>
+    <node>localhost</node>
+    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu</yaml_path>
+    <analysis>
+      <services>oai-nr-ue</services>
+    </analysis>
+  </testCase>
+
+  <testCase>
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>localhost</node>
+    <images>oai-gnb-asan oai-nr-ue-asan</images>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_l2sim_proxy.xml

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

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -122,7 +122,7 @@
     <node>gracehopper1-oai</node>
     <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
     <analysis>
-      <services>oai-gnb-aerial=RetxCheck=20,100,100,100 oai-gnb-aerial=EndsWithBye</services>
+      <services>oai-gnb-aerial=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

@@ -111,7 +111,7 @@
     <node>gracehopper1-oai</node>
     <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
     <analysis>
-      <services>oai-gnb-aerial=RetxCheck=20,100,100,100 oai-gnb-aerial=EndsWithBye</services>
+      <services>oai-gnb-aerial=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_fhi72_benetel_2x2_100MHz_9b_mplane_amariue.xml

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

ci-scripts/xml_files/container_sa_fhi72_benetel_4x4_40MHz_9b_mplane_amariue.xml

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

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -12,6 +12,13 @@
     <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_config.sh</script>
   </testCase>
 
+  <testCase>
+    <class>Custom_Script</class>
+    <desc>Activate carriers on VVDN RU</desc>
+    <node>cacofonix</node>
+    <script>scripts/vvdn-activate-carriers.sh</script>
+  </testCase>
+
   <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
@@ -134,9 +141,9 @@
   <testCase>
     <class>Custom_Script</class>
     <always_exec>true</always_exec>
-    <desc>Set CPU to idle state, set kernel parameters to default values</desc>
+    <desc>Inactivate carriers on VVDN RU</desc>
     <node>cacofonix</node>
-    <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh</script>
+    <script>scripts/vvdn-inactivate-carriers.sh</script>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml

@@ -104,7 +104,7 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz</yaml_path>
     <analysis>
-      <services>oai-gnb=RetxCheck=dl=10,100,100,100;ul=25,100,100,100 oai-gnb=EndsWithBye</services>
+      <services>oai-gnb=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

@@ -104,7 +104,7 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
     <analysis>
-      <services>oai-gnb=RetxCheck=dl=15,100,100,100;ul=20,100,100,100 oai-gnb=EndsWithBye</services>
+      <services>oai-gnb=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml

@@ -104,7 +104,7 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz</yaml_path>
     <analysis>
-      <services>oai-vnf=RetxCheck=10,100,100,100 oai-vnf=EndsWithBye oai-pnf=EndsWithBye</services>
+      <services>oai-vnf=EndsWithBye oai-pnf=EndsWithBye</services>
     </analysis>
   </testCase>
 

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,162 @@
+# SPDX-License-Identifier: MIT
+
+services:
+    mysql:
+        container_name: "rfsim5g-mysql"
+        image: mysql:9.6
+        init: true
+        volumes:
+            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+        environment:
+            - TZ=Europe/Paris
+            - MYSQL_DATABASE=oai_db
+            - MYSQL_USER=test
+            - MYSQL_PASSWORD=test
+            - MYSQL_ROOT_PASSWORD=linux
+        healthcheck:
+            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 30
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.131
+    oai-amf:
+        container_name: "rfsim5g-oai-amf"
+        image: oaisoftwarealliance/oai-amf:v2.2.1
+        environment:
+            - TZ=Europe/paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+        depends_on:
+            - mysql
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.132
+    oai-smf:
+        container_name: "rfsim5g-oai-smf"
+        image: oaisoftwarealliance/oai-smf:v2.2.1
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+        depends_on:
+            - oai-amf
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.133
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.2.1
+        init: true
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+        depends_on:
+            - oai-smf
+        cap_add:
+            - NET_ADMIN
+            - SYS_ADMIN
+        cap_drop:
+            - ALL
+        privileged: true
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.134
+                interface_name: eth0
+            traffic_net:
+                ipv4_address: 192.168.72.134
+                interface_name: eth1
+    oai-ext-dn:
+        privileged: true
+        container_name: rfsim5g-oai-ext-dn
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        init: true
+        entrypoint: /bin/bash -c \
+              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
+              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
+        depends_on:
+            - oai-upf
+        networks:
+            traffic_net:
+                ipv4_address: 192.168.72.135
+        healthcheck:
+            test: /bin/bash -c "ping -c 2 192.168.72.134"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    ocudu-gnb:
+        image: ghcr.io/bpodrygajlo/ocudu/ocudu-avx2:7cecca5
+        container_name: ocudu-gnb
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+        depends_on:
+            - oai-ext-dn
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ./ocudu.yml:/ocudu.yml
+        healthcheck:
+            test: /bin/bash -c "pgrep gnb_split_8"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+        command: ./usr/local/bin/gnb_split_8 -c /ocudu.yml
+
+    oai-nr-ue:
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        container_name: rfsim5g-oai-nr-ue
+        cap_drop:
+            - ALL
+        cap_add:
+            - NET_ADMIN  # for interface bringup
+            - NET_RAW    # for ping
+            - SYS_NICE
+        environment:
+            USE_ADDITIONAL_OPTIONS: -r 51 --numerology 1 --band 78 -C 3489420000 --ssb 0 -E --uicc0.imsi 208990100001100 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4556 --zmq.[0].rx_channels tcp://192.168.71.140:4558
+        depends_on:
+            - ocudu-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        devices:
+             - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports1.xml:/opt/oai-nr-ue/etc/uecap.xml
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+networks:
+    public_net:
+        driver: bridge
+        name: rfsim5g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.71.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-public"
+    traffic_net:
+        driver: bridge
+        name: rfsim5g-oai-traffic-net
+        ipam:
+            config:
+                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-traffic"

ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu/ocudu.yml

@@ -0,0 +1,52 @@
+# SPDX-FileCopyrightText: Copyright (C) 2021-2026 Software Radio Systems Limited
+# SPDX-License-Identifier: BSD-3-Clause-Open-MPI
+# Refer to https://gitlab.com/ocudu/ocudu/-/raw/dev/LICENSE?ref_type=heads
+
+cu_cp:
+  amf:
+    addrs: 192.168.71.132
+    port: 38412
+    bind_addrs: 192.168.71.140
+    supported_tracking_areas:
+      - tac: 1
+        plmn_list:
+          - plmn: "20899"
+            tai_slice_support_list:
+              - sst: 1
+
+ru_sdr:
+  device_driver: zmq
+  device_args: tx_port=tcp://0.0.0.0:4558,rx_port=tcp://192.168.71.150:4556
+  srate: 23.04
+  tx_gain: 25
+  rx_gain: 25
+
+cell_cfg:
+  dl_arfcn: 632628
+  band: 78
+  channel_bandwidth_MHz: 20
+  common_scs: 30
+  plmn: "20899"
+  tac: 1
+  pci: 1
+  tdd_ul_dl_cfg:
+    dl_ul_tx_period: 5
+    nof_dl_slots: 3
+    nof_dl_symbols: 10
+    nof_ul_slots: 1
+    nof_ul_symbols: 2
+  csi:
+    csi_rs_enabled: false
+  pucch:
+    formats: f0_and_f2
+    nof_cell_csi_res: 0
+
+log:
+  filename: gnb.log
+  all_level: debug
+
+pcap:
+  mac_enable: false
+  mac_filename: /tmp/gnb_mac.pcap
+  ngap_enable: false
+  ngap_filename: /tmp/gnb_ngap.pcap

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

@@ -0,0 +1,164 @@
+# SPDX-License-Identifier: MIT
+
+services:
+    mysql:
+        container_name: "rfsim5g-mysql"
+        image: mysql:9.6
+        init: true
+        volumes:
+            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+        environment:
+            - TZ=Europe/Paris
+            - MYSQL_DATABASE=oai_db
+            - MYSQL_USER=test
+            - MYSQL_PASSWORD=test
+            - MYSQL_ROOT_PASSWORD=linux
+        healthcheck:
+            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 30
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.131
+    oai-amf:
+        container_name: "rfsim5g-oai-amf"
+        image: oaisoftwarealliance/oai-amf:v2.2.1
+        environment:
+            - TZ=Europe/paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+        depends_on:
+            - mysql
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.132
+    oai-smf:
+        container_name: "rfsim5g-oai-smf"
+        image: oaisoftwarealliance/oai-smf:v2.2.1
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+        depends_on:
+            - oai-amf
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.133
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.2.1
+        init: true
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+        depends_on:
+            - oai-smf
+        cap_add:
+            - NET_ADMIN
+            - SYS_ADMIN
+        cap_drop:
+            - ALL
+        privileged: true
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.134
+                interface_name: eth0
+            traffic_net:
+                ipv4_address: 192.168.72.134
+                interface_name: eth1
+    oai-ext-dn:
+        privileged: true
+        container_name: rfsim5g-oai-ext-dn
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        init: true
+        entrypoint: /bin/bash -c \
+              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
+              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
+        depends_on:
+            - oai-upf
+        networks:
+            traffic_net:
+                ipv4_address: 192.168.72.135
+        healthcheck:
+            test: /bin/bash -c "ping -c 2 192.168.72.134"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    oai-gnb:
+        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: rfsim5g-oai-gnb
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+        environment:
+            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4558,tcp://0.0.0.0:4559 --zmq.[0].rx_channels tcp://oai-nr-ue:4556,tcp://oai-nr-ue:4557
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-ext-dn
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ../../conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-nr-ue:
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        container_name: rfsim5g-oai-nr-ue
+        cap_drop:
+            - ALL
+        cap_add:
+            - NET_ADMIN  # for interface bringup
+            - NET_RAW    # for ping
+            - SYS_NICE
+        environment:
+            USE_ADDITIONAL_OPTIONS: -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4556,tcp://0.0.0.0:4557 --zmq.[0].rx_channels tcp://oai-gnb:4558,tcp://oai-gnb:4559
+        depends_on:
+            - oai-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        devices:
+             - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+networks:
+    public_net:
+        driver: bridge
+        name: rfsim5g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.71.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-public"
+    traffic_net:
+        driver: bridge
+        name: rfsim5g-oai-traffic-net
+        ipam:
+            config:
+                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-traffic"

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

@@ -0,0 +1,162 @@
+# SPDX-License-Identifier: MIT
+
+services:
+    mysql:
+        container_name: "rfsim5g-mysql"
+        image: mysql:9.6
+        init: true
+        volumes:
+            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+        environment:
+            - TZ=Europe/Paris
+            - MYSQL_DATABASE=oai_db
+            - MYSQL_USER=test
+            - MYSQL_PASSWORD=test
+            - MYSQL_ROOT_PASSWORD=linux
+        healthcheck:
+            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 30
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.131
+    oai-amf:
+        container_name: "rfsim5g-oai-amf"
+        image: oaisoftwarealliance/oai-amf:v2.2.1
+        environment:
+            - TZ=Europe/paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+        depends_on:
+            - mysql
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.132
+    oai-smf:
+        container_name: "rfsim5g-oai-smf"
+        image: oaisoftwarealliance/oai-smf:v2.2.1
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+        depends_on:
+            - oai-amf
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.133
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.2.1
+        init: true
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+        depends_on:
+            - oai-smf
+        cap_add:
+            - NET_ADMIN
+            - SYS_ADMIN
+        cap_drop:
+            - ALL
+        privileged: true
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.134
+                interface_name: eth0
+            traffic_net:
+                ipv4_address: 192.168.72.134
+                interface_name: eth1
+    oai-ext-dn:
+        privileged: true
+        container_name: rfsim5g-oai-ext-dn
+        image: oaisoftwarealliance/trf-gen-cn5g:latest
+        init: true
+        entrypoint: /bin/bash -c \
+              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
+              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
+        depends_on:
+            - oai-upf
+        networks:
+            traffic_net:
+                ipv4_address: 192.168.72.135
+        healthcheck:
+            test: /bin/bash -c "ping -c 2 192.168.72.134"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    ocudu-gnb:
+        image: ghcr.io/bpodrygajlo/ocudu/ocudu-avx2:7cecca5
+        container_name: ocudu-gnb
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+        depends_on:
+            - oai-ext-dn
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ./ocudu.yml:/ocudu.yml
+        healthcheck:
+            test: /bin/bash -c "pgrep gnb_split_8"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+        command: ./usr/local/bin/gnb_split_8 -c /ocudu.yml
+
+    oai-nr-ue:
+        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        container_name: rfsim5g-oai-nr-ue
+        cap_drop:
+            - ALL
+        cap_add:
+            - NET_ADMIN  # for interface bringup
+            - NET_RAW    # for ping
+            - SYS_NICE
+        environment:
+            USE_ADDITIONAL_OPTIONS: -r 106 --numerology 1 --band 78 -C 3489420000 --ssb 42 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4556,tcp://0.0.0.0:4557 --zmq.[0].rx_channels tcp://192.168.71.140:4558,tcp://192.168.71.140:4559
+        depends_on:
+            - ocudu-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        devices:
+             - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+networks:
+    public_net:
+        driver: bridge
+        name: rfsim5g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.71.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-public"
+    traffic_net:
+        driver: bridge
+        name: rfsim5g-oai-traffic-net
+        ipam:
+            config:
+                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-traffic"

ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu/ocudu.yml

@@ -0,0 +1,54 @@
+# SPDX-FileCopyrightText: Copyright (C) 2021-2026 Software Radio Systems Limited
+# SPDX-License-Identifier: BSD-3-Clause-Open-MPI
+# Refer to https://gitlab.com/ocudu/ocudu/-/raw/dev/LICENSE?ref_type=heads
+
+cu_cp:
+  amf:
+    addrs: 192.168.71.132
+    port: 38412
+    bind_addrs: 192.168.71.140
+    supported_tracking_areas:
+      - tac: 1
+        plmn_list:
+          - plmn: "20899"
+            tai_slice_support_list:
+              - sst: 1
+
+ru_sdr:
+  device_driver: zmq
+  device_args: tx_port=tcp://0.0.0.0:4558,tx_port=tcp://0.0.0.0:4559,rx_port=tcp://192.168.71.150:4556,rx_port=tcp://192.168.71.150:4557
+  srate: 61.44
+  tx_gain: 25
+  rx_gain: 25
+
+cell_cfg:
+  dl_arfcn: 632628
+  band: 78
+  channel_bandwidth_MHz: 40
+  common_scs: 30
+  plmn: "20899"
+  tac: 1
+  pci: 1
+  nof_antennas_ul: 2
+  nof_antennas_dl: 2
+  tdd_ul_dl_cfg:
+    dl_ul_tx_period: 5
+    nof_dl_slots: 3
+    nof_dl_symbols: 10
+    nof_ul_slots: 1
+    nof_ul_symbols: 2
+  csi:
+    csi_rs_enabled: false
+  pucch:
+    formats: f0_and_f2
+    nof_cell_csi_res: 0
+
+log:
+  filename: gnb.log
+  all_level: debug
+
+pcap:
+  mac_enable: false
+  mac_filename: /tmp/gnb_mac.pcap
+  ngap_enable: false
+  ngap_filename: /tmp/gnb_ngap.pcap

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -17,7 +17,7 @@ services:
         devices:
             - /dev/bus/usb/:/dev/bus/usb/
         volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf:/opt/oai-gnb/etc/gnb.conf
         # for performance reasons, we use host mode: in bridge mode, we have
         # unacceptable DL TCP performance. However, the whole point of
         # containerization is to not be in host mode, so update this to macvlan

cir_conf.txt

@@ -0,0 +1,5 @@
+-79.1
+158.2
+-200.0
+2
+1

cmake_targets/build_oai

@@ -18,7 +18,7 @@ HWs=""
 BUILD_DIR=ran_build
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_aal ldpc_xdma websrv oai_iqplayer imscope imscope_record"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_aal websrv oai_iqplayer imscope imscope_record"
 TARGET_LIST=""
 BUILD_TOOL_OPT="-j$(nproc)"
 
@@ -68,7 +68,7 @@ Options:
 --UE-conf-nvram [configuration file]
    Specify conf_nvram_path (default \"$conf_nvram_path\")
 -w | --hardware
-   USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, None (Default)
+   USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, ZMQ, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
 -t | --transport
    Selects the transport protocol type, options: None, Ethernet, oran_fhlib_5g, oran_fhlib_5g_mplane, WLS
@@ -223,7 +223,7 @@ function main() {
             shift 2;;
        -w | --hardware)
             case "$2" in
-                "USRP" | "BLADERF" | "LMSSDR" | "IRIS")
+                "USRP" | "BLADERF" | "LMSSDR" | "IRIS" | "ZMQ")
                     HWs+=" OAI_"$2
                     TARGET_LIST="$TARGET_LIST oai_${2,,}devif" # ,, makes lowercase
                     CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON"

cmake_targets/macros.cmake

@@ -84,7 +84,7 @@ function(run_asn1c ASN1C_GRAMMAR ASN1C_PREFIX)
   set(LOGFILE "${CMAKE_CURRENT_BINARY_DIR}/${GRAMMAR_FILE}.log")
   add_custom_command(OUTPUT ${ASN1C_OUTPUT}
     COMMAND ASN1C_PREFIX=${ASN1C_PREFIX} ${ASN1C_EXEC} ${ASN1C_OPTIONS} -D ${CMAKE_CURRENT_BINARY_DIR} ${ASN1C_GRAMMAR} > ${LOGFILE} 2>&1 || ( cat ${LOGFILE} && false )
-    DEPENDS ${ASN1C_GRAMMAR}
+    DEPENDS ${ASN1C_GRAMMAR} asn1c
     COMMENT "Generating ${ASN1C_COMMENT} from ${GRAMMAR_FILE}"
   )
 endfunction()

cmake_targets/tools/MODULES/Findxran.cmake

@@ -4,9 +4,9 @@
 # -------
 # 
 # Finds the xran library. Note that the library number is as follows:
-# - oran_bronze_release_v1.1 -> 2.1.1 (B = second letter)
-# - oran_e_maintenance_release_v1.0 -> 5.1.0
-# the version is currently hardcoded to 5.1.0
+# - oran_e_maintenance_release_v1.5 -> 5.1.6
+# - oran_f_release_v1.3 -> 6.1.4
+# - oran_k_release_v1.1 -> 11.1.1
 #
 # Required options
 # ^^^^^^^^^^^^^^^^
@@ -46,13 +46,7 @@
 # ``xran_LIBRARY``
 #   The path to the xran library.
 
-option(xran_LOCATION "directory of XRAN library" "")
-if (NOT xran_LOCATION)
-  message(FATAL_ERROR "xran_LOCATION required")
-endif()
-if (NOT EXISTS ${xran_LOCATION})
-  message(FATAL_ERROR "no such directory: ${xran_LOCATION}")
-endif()
+set(CACHE{xran_LOCATION} TYPE PATH HELP "directory of XRAN library" VALUE "")
 
 find_path(xran_INCLUDE_DIR
   NAMES
@@ -73,27 +67,26 @@ find_library(xran_LIBRARY
   PATH_SUFFIXES build api
   NO_DEFAULT_PATH
 )
-if (NOT xran_LIBRARY)
-  message(FATAL_ERROR "could not detect xran build artifacts at ${xran_LOCATION}/build")
-endif()
 
 set(xran_VERSION_FILE "${xran_LOCATION}/../app/src/common.h")
-if(NOT EXISTS ${xran_VERSION_FILE})
-  message(FATAL_ERROR "could not find xran version file at ${xran_VERSION_FILE}")
+if(EXISTS ${xran_VERSION_FILE})
+  file(STRINGS ${xran_VERSION_FILE} xran_VERSION_LINE REGEX "^#define[ \t]+VERSIONX[ \t]+\"[a-z_.0-9]+\"$")
+else()
+  set(xran_VERSION_LINE "UNKNOWN")
 endif()
 
-file(STRINGS ${xran_VERSION_FILE} xran_VERSION_LINE REGEX "^#define[ \t]+VERSIONX[ \t]+\"[a-z_.0-9]+\"$")
 string(REGEX REPLACE "^#define[ \t]+VERSIONX[ \t]+\"([a-z_.0-9]+)\"$" "\\1" xran_VERSION_STRING "${xran_VERSION_LINE}")
 if (xran_VERSION_STRING MATCHES "^oran_e_maintenance_release_v")
   string(REGEX REPLACE "oran_e_maintenance_release_v([0-9]+).([0-9]+)" "5.\\1.\\2" xran_VERSION ${xran_VERSION_STRING})
 elseif(xran_VERSION_STRING MATCHES "^oran_f_release_v")
   string(REGEX REPLACE "oran_f_release_v([0-9]+).([0-9]+)" "6.\\1.\\2" xran_VERSION ${xran_VERSION_STRING})
+elseif(xran_VERSION_STRING MATCHES "^oran_k_release_v")
+  string(REGEX REPLACE "oran_k_release_v([0-9]+).([0-9]+)" "11.\\1.\\2" xran_VERSION ${xran_VERSION_STRING})
 elseif(xran_VERSION_STRING MATCHES "^oran_bronze_release_v")
   string(REGEX REPLACE "oran_bronze_release_v([0-9]+).([0-9]+)" "2.\\1.\\2" xran_VERSION ${xran_VERSION_STRING})
 else()
-  message(FATAL_ERROR "unrecognized xran version string: ${xran_VERSION_STRING}")
+  set(xran_VERSION "UNKNOWN")
 endif()
-message(STATUS "Found xran release ${xran_VERSION_STRING} (v${xran_VERSION})")
 unset(xran_VERSION_LINE)
 unset(xran_VERSION_STRING)
 unset(xran_VERSION_FILE)

cmake_targets/tools/build_helper

@@ -474,6 +474,7 @@ check_install_oai_software() {
 
     install_asn1c_from_source $1
     install_simde_from_source $1
+    install_blis_from_source $1
 }
 
 install_asn1c_from_source(){
@@ -519,6 +520,25 @@ install_simde_from_source(){
     $SUDO \cp -rv ../simde /usr/include
 }
 
+install_blis_from_source(){
+    echo_info "\nInstalling BLIS."
+    $SUDO $INSTALLER -y install build-essential make g++ gfortran cmake
+    $SUDO rm -rf /tmp/blis
+    git clone https://github.com/amd/blis.git /tmp/blis
+    cd /tmp/blis
+    ./configure --enable-cblas -t openmp auto
+    make -j`nproc`
+    make check
+    $SUDO make install
+    $SUDO ldconfig
+
+    $SUDO cp /usr/local/share/pkgconfig/blis-mt.pc /usr/local/share/pkgconfig/cblis.pc
+    $SUDO ln -s /usr/local/share/pkgconfig/blis-mt.pc /usr/local/share/pkgconfig/blis.pc
+
+    grep -qxF 'export BLIS_NUM_THREADS=6' ~/.bashrc || echo 'export BLIS_NUM_THREADS=6' >> ~/.bashrc
+    source ~/.bashrc
+}
+
 install_lttng() {
     if [[ "$OS_DISTRO" != "ubuntu" ]]; then
       echo_info "LTTng is supported only for ubuntu at the moment."

common/5g_platform_types.h

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

common/config/config_load_configmodule.c

@@ -282,12 +282,9 @@ configmodule_interface_t *load_configmodule(int argc,
       cfgmode = strdup(CONFIG_LIBCONFIGFILE);
     }
   }
-  static configmodule_interface_t *cfgptr = NULL;
-  if (cfgptr)
-    fprintf(stderr, "ERROR: Call load_configmodule more than one time\n");
 
   // The macros are not thread safe print_params and similar
-  cfgptr = calloc(sizeof(configmodule_interface_t), 1);
+  configmodule_interface_t *cfgptr = calloc(sizeof(configmodule_interface_t), 1);
   if (!cfgptr) {
     fprintf(stderr, "ERROR: cannot allocate a memory for configuration\n");
     return NULL;

common/config/config_load_configmodule.h

@@ -10,6 +10,9 @@
 #ifndef INCLUDE_CONFIG_LOADCONFIGMODULE_H
 #define INCLUDE_CONFIG_LOADCONFIGMODULE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include <string.h>
 #include <stdlib.h>
@@ -117,5 +120,8 @@ void write_parsedcfg(configmodule_interface_t *cfg);
 extern void free_configmodule(void);
 #define CONFIG_PRINTF_ERROR(f, x... ) if (isLogInitDone ()) { LOG_E(ENB_APP,f,x);} else {printf(f,x);}; if ( !CONFIG_ISFLAGSET(CONFIG_NOABORTONCHKF) ) exit_fun("exit because configuration failed\n");
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif  /* INCLUDE_CONFIG_LOADCONFIGMODULE_H */

common/config/config_paramdesc.h

@@ -181,6 +181,11 @@ typedef struct paramdef {
   {                                                                                                                          \
     OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .u64ptr = ptr, .defuintval = defval, PARAMTYPE(TYPE_UINT64), .numelt = 0 \
   }
+#define STRINGLISTPARAM(name, help, flags, ptr, defval)                                                                 \
+  {                                                                                                                     \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .strptr = ptr, .defstrlistval = defval, PARAMTYPE(TYPE_STRINGLIST), \
+        .numelt = 0                                                                                                     \
+  }
 
 typedef struct paramlist_def {
   char listname[MAX_OPTNAME_SIZE];

common/config/config_userapi.c

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

common/platform_constants.h

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

common/utils/CMakeLists.txt

@@ -16,7 +16,7 @@ add_subdirectory(nr)
 add_subdirectory(LOG)
 add_subdirectory(threadPool)
 add_subdirectory(time_manager)
-add_library(utils utils.c system.c time_meas.c time_stat.c tuntap_if.c reverse_bits.c fsn.c)
+add_library(utils utils.c system.c time_meas.c time_stat.c tuntap_if.c bits.c fsn.c)
 target_include_directories(utils PUBLIC .)
 target_link_libraries(utils PRIVATE ${T_LIB})
 add_subdirectory(barrier)

common/utils/T/CMakeLists.txt

@@ -55,7 +55,7 @@ add_dependencies(T_headers T_IDs.h generate_T)
 target_include_directories(T_headers INTERFACE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(T_TRACER)
-  add_library(T STATIC T.c local_tracer.c T_IDs.h T_messages.txt.h)
+  add_library(T STATIC T.c local_tracer.c T_messages_creator.c T_IDs.h T_messages.txt.h)
   target_link_libraries(T PUBLIC rt)
   target_link_libraries(T PRIVATE CONFIG_LIB T_headers)
 

common/utils/T/T.h

@@ -115,7 +115,7 @@ extern int T_stdout;
 
 /* type used to send arbitrary buffer data */
 typedef struct {
-  void *addr;
+  const void *addr;
   int length;
 } T_buffer;
 

common/utils/T/T_messages.txt

@@ -118,23 +118,23 @@ ID = GNB_PHY_PUCCH_PUSCH_IQ
 ID = GNB_PHY_UL_FD_PUSCH_IQ
     DESC = gNodeB UL PUSCH IQ Data in the frequency domain
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
 ID = GNB_PHY_UL_FD_DMRS
     DESC = gNodeB UL DMRS Signal in the frequency domain
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
 ID = GNB_PHY_UL_FD_CHAN_EST_DMRS_POS
     DESC = gNodeB channel estimation in the frequency domain based on DMRS and at DMRS pilots location without any further interploation.
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
 ID = GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL
     DESC = gNodeB channel estimation in the frequency domain based on DMRS and interploation.
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,dataI
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,dataI
 ID = GNB_PHY_UL_PAYLOAD_RX_BITS
     DESC = gNodeB slot payload after decoder
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
 ID = GNB_PHY_UL_FREQ_CHANNEL_ESTIMATE
     DESC = gNodeB channel estimation in the frequency domain
     GROUP = ALL:PHY:GRAPHIC:HEAVY:GNB
@@ -1454,7 +1454,7 @@ ID = UE_PHY_PDCCH_ENERGY
 ID = UE_PHY_PDSCH_IQ
     DESC = UE PDSCH received IQ data
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pdsch_comp
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_DL : int,symbols_per_tti : buffer,pdsch_comp
 ID = UE_PHY_PDSCH_ENERGY
     DESC = UE PDSCH 1 energy and threshold
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
@@ -1474,11 +1474,11 @@ ID = UE_PHY_MEAS
 ID = UE_PHY_UL_PAYLOAD_TX_BITS
     DESC = UE UL Tx bits in one slot before decoder and scrambler
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_tx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_tx : int,number_of_bits : buffer,data
 ID = UE_PHY_UL_SCRAMBLED_TX_BITS
     DESC = UE UL Tx bits in one slot after scrambler
     GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
-    FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_tx : int,number_of_bits : buffer,data
+    FORMAT = int,frame : int,slot : int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : int,Nid_cell : int,rnti : int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : int,dmrs_nscid : int,nb_antennas_tx : int,number_of_bits : buffer,data
 
 #for debug/test - not used
 ID = first

common/utils/T/T_messages_creator.c

@@ -0,0 +1,220 @@
+/*
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
+ */
+
+/*!
+ * \brief Helper functions for creating T-Tracer UL PHY trace messages, it is used by data recording application
+ */
+
+/*
+ * Each function logs one UL PHY trace message via the T() macro.
+ * All messages share the same field format (Data Collection Trace Messages Structure):
+ *   int,frame : int,slot :
+ *   int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot :
+ *   int,Nid_cell : int,rnti :
+ *   int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols :
+ *   int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers :
+ *   int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port :
+ *   int,dmrs_nscid : int,nb_antennas_rx : int,number_of_bits : buffer,data
+ */
+
+#include "T.h"
+#include "T_messages_creator.h"
+
+#if T_TRACER
+
+// Internal helper: emit the common UL metadata + buffer via T()
+// Note: The T() macro internally checks T_ACTIVE(trace_id) before sending,
+// so callers do not need an additional T_ACTIVE() guard.
+static inline void log_ul_common(int trace_id,
+                                 int frame,
+                                 int slot,
+                                 const NR_DL_FRAME_PARMS *frame_parms,
+                                 const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                 int number_dmrs_symbols,
+                                 int dmrs_port,
+                                 int number_of_bits,
+                                 const void *data,
+                                 int data_len)
+{
+  T(trace_id,
+    T_INT((int)frame),
+    T_INT((int)slot),
+    T_INT((int)frame_parms->frame_type),
+    T_INT((int)frame_parms->freq_range),
+    T_INT((int)rel15_ul->subcarrier_spacing),
+    T_INT((int)rel15_ul->cyclic_prefix),
+    T_INT((int)frame_parms->symbols_per_slot),
+    T_INT((int)frame_parms->Nid_cell),
+    T_INT((int)rel15_ul->rnti),
+    T_INT((int)rel15_ul->rb_size),
+    T_INT((int)rel15_ul->rb_start),
+    T_INT((int)rel15_ul->start_symbol_index),
+    T_INT((int)rel15_ul->nr_of_symbols),
+    T_INT((int)rel15_ul->qam_mod_order),
+    T_INT((int)rel15_ul->mcs_index),
+    T_INT((int)rel15_ul->mcs_table),
+    T_INT((int)rel15_ul->nrOfLayers),
+    T_INT((int)rel15_ul->transform_precoding),
+    T_INT((int)rel15_ul->dmrs_config_type),
+    T_INT((int)rel15_ul->ul_dmrs_symb_pos),
+    T_INT((int)number_dmrs_symbols),
+    T_INT((int)dmrs_port),
+    T_INT((int)rel15_ul->scid),
+    T_INT((int)frame_parms->nb_antennas_rx),
+    T_INT((int)number_of_bits),
+    T_BUFFER(data, data_len));
+}
+
+void log_ul_fd_dmrs(int frame,
+                    int slot,
+                    const NR_DL_FRAME_PARMS *frame_parms,
+                    const nfapi_nr_pusch_pdu_t *rel15_ul,
+                    int number_dmrs_symbols,
+                    int dmrs_port,
+                    const c16_t *data,
+                    int data_len)
+{
+  log_ul_common(T_GNB_PHY_UL_FD_DMRS,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port, 0, data, data_len);
+}
+
+void log_ul_fd_chan_est_dmrs_pos(int frame,
+                                int slot,
+                                const NR_DL_FRAME_PARMS *frame_parms,
+                                const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                int number_dmrs_symbols,
+                                int dmrs_port,
+                                const c16_t *data,
+                                int data_len)
+{
+  log_ul_common(T_GNB_PHY_UL_FD_CHAN_EST_DMRS_POS,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port, 0, data, data_len);
+}
+
+void log_ul_fd_pusch_iq(int frame,
+                        int slot,
+                        const NR_DL_FRAME_PARMS *frame_parms,
+                        const nfapi_nr_pusch_pdu_t *rel15_ul,
+                        int number_dmrs_symbols,
+                        int dmrs_port,
+                        const c16_t *data,
+                        int data_len)
+{
+  log_ul_common(T_GNB_PHY_UL_FD_PUSCH_IQ,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port, 0, data, data_len);
+}
+
+void log_ul_fd_chan_est_dmrs_interpl(int frame,
+                                    int slot,
+                                    const NR_DL_FRAME_PARMS *frame_parms,
+                                    const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                    int number_dmrs_symbols,
+                                    int dmrs_port,
+                                    const c16_t *data,
+                                    int data_len)
+{
+  log_ul_common(T_GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port, 0, data, data_len);
+}
+
+void log_ul_payload_rx_bits(int frame,
+                           int slot,
+                           const NR_DL_FRAME_PARMS *frame_parms,
+                           const nfapi_nr_pusch_pdu_t *rel15_ul,
+                           int number_dmrs_symbols,
+                           int dmrs_port,
+                           const uint8_t *data,
+                           int tb_size)
+{
+  log_ul_common(T_GNB_PHY_UL_PAYLOAD_RX_BITS,
+                frame, slot, frame_parms, rel15_ul,
+                number_dmrs_symbols, dmrs_port,
+                tb_size << 3, data, tb_size);
+}
+
+// UE-side: uses nfapi_nr_ue_pusch_pdu_t, derives subcarrier_spacing index
+// from frame_parms, and logs nb_antennas_tx instead of nb_antennas_rx.
+void log_ul_payload_tx_bits(int frame,
+                           int slot,
+                           const NR_DL_FRAME_PARMS *frame_parms,
+                           const nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
+                           int number_dmrs_symbols,
+                           int dmrs_port,
+                           const uint8_t *data,
+                           int tb_size)
+{
+  int subcarrier_spacing_index = frame_parms->subcarrier_spacing / 15000 - 1;
+  T(T_UE_PHY_UL_PAYLOAD_TX_BITS,
+    T_INT((int)frame),
+    T_INT((int)slot),
+    T_INT((int)frame_parms->frame_type),
+    T_INT((int)frame_parms->freq_range),
+    T_INT((int)subcarrier_spacing_index),
+    T_INT((int)pusch_pdu->cyclic_prefix),
+    T_INT((int)frame_parms->symbols_per_slot),
+    T_INT((int)frame_parms->Nid_cell),
+    T_INT((int)pusch_pdu->rnti),
+    T_INT((int)pusch_pdu->rb_size),
+    T_INT((int)pusch_pdu->rb_start),
+    T_INT((int)pusch_pdu->start_symbol_index),
+    T_INT((int)pusch_pdu->nr_of_symbols),
+    T_INT((int)pusch_pdu->qam_mod_order),
+    T_INT((int)pusch_pdu->mcs_index),
+    T_INT((int)pusch_pdu->mcs_table),
+    T_INT((int)pusch_pdu->nrOfLayers),
+    T_INT((int)pusch_pdu->transform_precoding),
+    T_INT((int)pusch_pdu->dmrs_config_type),
+    T_INT((int)pusch_pdu->ul_dmrs_symb_pos),
+    T_INT((int)number_dmrs_symbols),
+    T_INT((int)dmrs_port),
+    T_INT((int)pusch_pdu->scid),
+    T_INT((int)frame_parms->nb_antennas_tx),
+    T_INT((int)(tb_size << 3)),
+    T_BUFFER(data, tb_size));
+}
+
+void log_ul_scrambled_tx_bits(int frame,
+                             int slot,
+                             const NR_DL_FRAME_PARMS *frame_parms,
+                             const nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
+                             int number_dmrs_symbols,
+                             int dmrs_port,
+                             const uint8_t *data,
+                             int number_of_bits)
+{
+  int subcarrier_spacing_index = frame_parms->subcarrier_spacing / 15000 - 1;
+  T(T_UE_PHY_UL_SCRAMBLED_TX_BITS,
+    T_INT((int)frame),
+    T_INT((int)slot),
+    T_INT((int)frame_parms->frame_type),
+    T_INT((int)frame_parms->freq_range),
+    T_INT((int)subcarrier_spacing_index),
+    T_INT((int)pusch_pdu->cyclic_prefix),
+    T_INT((int)frame_parms->symbols_per_slot),
+    T_INT((int)frame_parms->Nid_cell),
+    T_INT((int)pusch_pdu->rnti),
+    T_INT((int)pusch_pdu->rb_size),
+    T_INT((int)pusch_pdu->rb_start),
+    T_INT((int)pusch_pdu->start_symbol_index),
+    T_INT((int)pusch_pdu->nr_of_symbols),
+    T_INT((int)pusch_pdu->qam_mod_order),
+    T_INT((int)pusch_pdu->mcs_index),
+    T_INT((int)pusch_pdu->mcs_table),
+    T_INT((int)pusch_pdu->nrOfLayers),
+    T_INT((int)pusch_pdu->transform_precoding),
+    T_INT((int)pusch_pdu->dmrs_config_type),
+    T_INT((int)pusch_pdu->ul_dmrs_symb_pos),
+    T_INT((int)number_dmrs_symbols),
+    T_INT((int)dmrs_port),
+    T_INT((int)pusch_pdu->scid),
+    T_INT((int)frame_parms->nb_antennas_tx),
+    T_INT((int)number_of_bits),
+    T_BUFFER(data, number_of_bits / 8));
+}
+
+#endif /* T_TRACER */

common/utils/T/T_messages_creator.h

@@ -0,0 +1,195 @@
+/*
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
+ */
+
+/*!
+ * \brief Helper functions for creating T-Tracer UL PHY trace messages, it is used by data recording application
+ */
+
+#ifndef T_MESSAGES_CREATOR_H
+#define T_MESSAGES_CREATOR_H
+
+#if T_TRACER
+
+#include <stdint.h>
+#include "common/platform_types.h"
+#include "common/utils/nr/nr_common.h"
+#include "PHY/defs_nr_common.h"
+#include "nfapi_nr_interface_scf.h"
+#include "fapi_nr_ue_interface.h"
+
+/**
+ * @brief Log PUSCH UL DMRS using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_FD_DMRS message containing
+ * PUSCH DMRS symbols in frequency domain.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to DMRS data buffer (c16_t complex samples)
+ * @param data_len Size of the data buffer in bytes
+ */
+void log_ul_fd_dmrs(int frame,
+                    int slot,
+                    const NR_DL_FRAME_PARMS *frame_parms,
+                    const nfapi_nr_pusch_pdu_t *rel15_ul,
+                    int number_dmrs_symbols,
+                    int dmrs_port,
+                    const c16_t *data,
+                    int data_len);
+
+/**
+ * @brief Log PUSCH UL channel estimates at DMRS positions using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_FD_CHAN_EST_DMRS_POS message
+ * containing channel estimates at DMRS positions in frequency domain.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to channel estimate data buffer (c16_t complex samples)
+ * @param data_len Size of the data buffer in bytes
+ */
+void log_ul_fd_chan_est_dmrs_pos(int frame,
+                                int slot,
+                                const NR_DL_FRAME_PARMS *frame_parms,
+                                const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                int number_dmrs_symbols,
+                                int dmrs_port,
+                                const c16_t *data,
+                                int data_len);
+
+/**
+ * @brief Log PUSCH UL IQ data using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_FD_PUSCH_IQ message
+ * containing PUSCH IQ samples in frequency domain.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to PUSCH IQ data buffer (c16_t complex samples)
+ * @param data_len Size of the data buffer in bytes
+ */
+void log_ul_fd_pusch_iq(int frame,
+                        int slot,
+                        const NR_DL_FRAME_PARMS *frame_parms,
+                        const nfapi_nr_pusch_pdu_t *rel15_ul,
+                        int number_dmrs_symbols,
+                        int dmrs_port,
+                        const c16_t *data,
+                        int data_len);
+
+/**
+ * @brief Log PUSCH UL interpolated channel estimates using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL message
+ * containing interpolated channel estimates across all subcarriers in frequency domain.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to interpolated channel estimate data buffer (c16_t complex samples)
+ * @param data_len Size of the data buffer in bytes
+ */
+void log_ul_fd_chan_est_dmrs_interpl(int frame,
+                                    int slot,
+                                    const NR_DL_FRAME_PARMS *frame_parms,
+                                    const nfapi_nr_pusch_pdu_t *rel15_ul,
+                                    int number_dmrs_symbols,
+                                    int dmrs_port,
+                                    const c16_t *data,
+                                    int data_len);
+
+/**
+ * @brief Log PUSCH UL received payload bits using T-Tracer
+ *
+ * This function creates and sends a T_GNB_PHY_UL_PAYLOAD_RX_BITS message
+ * containing the decoded transport block payload data.
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param rel15_ul Pointer to PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to decoded transport block data (uint8_t bytes)
+ * @param tb_size Transport block size in bytes
+ */
+void log_ul_payload_rx_bits(int frame,
+                           int slot,
+                           const NR_DL_FRAME_PARMS *frame_parms,
+                           const nfapi_nr_pusch_pdu_t *rel15_ul,
+                           int number_dmrs_symbols,
+                           int dmrs_port,
+                           const uint8_t *data,
+                           int tb_size);
+
+/**
+ * @brief Log UE PUSCH UL transmitted payload bits using T-Tracer
+ *
+ * This function creates and sends a T_UE_PHY_UL_PAYLOAD_TX_BITS message
+ * containing the transport block payload data before encoding.
+ * Note: subcarrier_spacing is derived from frame_parms->subcarrier_spacing
+ * and nb_antennas_tx is used (UE transmit side).
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param pusch_pdu Pointer to UE PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to transport block payload data (uint8_t bytes)
+ * @param tb_size Transport block size in bytes
+ */
+void log_ul_payload_tx_bits(int frame,
+                           int slot,
+                           const NR_DL_FRAME_PARMS *frame_parms,
+                           const nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
+                           int number_dmrs_symbols,
+                           int dmrs_port,
+                           const uint8_t *data,
+                           int tb_size);
+
+/**
+ * @brief Log UE PUSCH UL scrambled transmit bits using T-Tracer
+ *
+ * This function creates and sends a T_UE_PHY_UL_SCRAMBLED_TX_BITS message
+ * containing the scrambled codeword bits after scrambling.
+ * Note: subcarrier_spacing is derived from frame_parms->subcarrier_spacing
+ * and nb_antennas_tx is used (UE transmit side).
+ *
+ * @param frame Frame number
+ * @param slot Slot number
+ * @param frame_parms Pointer to frame parameters structure
+ * @param pusch_pdu Pointer to UE PUSCH PDU structure
+ * @param number_dmrs_symbols Number of DMRS symbols
+ * @param dmrs_port DMRS port number
+ * @param data Pointer to scrambled codeword data (uint8_t bytes)
+ * @param number_of_bits Number of scrambled bits
+ */
+void log_ul_scrambled_tx_bits(int frame,
+                             int slot,
+                             const NR_DL_FRAME_PARMS *frame_parms,
+                             const nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
+                             int number_dmrs_symbols,
+                             int dmrs_port,
+                             const uint8_t *data,
+                             int number_of_bits);
+
+#endif /* T_TRACER */
+
+#endif /* T_MESSAGES_CREATOR_H */

common/utils/T/tracer/shared_memory_config.h

@@ -18,10 +18,13 @@
 #ifndef _SHARED_MEMORY_CONFIG_H_
 #define _SHARED_MEMORY_CONFIG_H_
 
-#define SHMSIZE ((122.88e6 / (100 * 20)) * 1000 * 8) // Assume capture in 1000, each I+Q represented by 8 byts
-//  122.88e6: 10ms at 100 MHz BW of 5G NR
-// 20: 20 slots in 10ms
-// subcarrier spacing: 30 KHz
+#define NUM_MESSAGES_PER_SLOT 5
+#define SHMSIZE ((122.88e6 / (100 * 20)) * 100 * NUM_MESSAGES_PER_SLOT * 8) // ~229 MiB
+//  122.88e6: sample rate at 100 MHz BW of 5G NR
+//  100 * 20: 2000 slots/s (20 slots/frame, 100 frames/s) at SCS 30 kHz
+//  100: number of slots to capture
+//  NUM_MESSAGES_PER_SLOT: messages captured per slot
+//  8: bytes per complex I+Q sample
 
 // for gNB T Tracer App
 #define GETKEYDIR1_gNB ("/tmp/gnb_app1")

common/utils/T/tracer/t_tracer_app_gnb.c

@@ -3,7 +3,7 @@
  */
 
 /*!
- * \brief T-Tracer gnb service to capture tracee Messages from gNB, it is used by data recording application
+ * \brief T-Tracer gnb service to capture trace Messages from gNB, it is used by data recording application
  */
 
 #include <stdio.h>
@@ -34,6 +34,21 @@
 // the buffer in the stack from the previous record
 #define DISCARD_RECORD_DURATION_MS 10
 
+// Sentinel values for field_descriptor: source is e.sending_time
+#define FIELD_SENDING_TIME_SEC  -2
+#define FIELD_SENDING_TIME_NSEC -3
+
+// State machine constants for shared memory protocol
+#define STATE_WAIT   0
+#define STATE_CONFIG 1
+#define STATE_RECORD 2
+#define STATE_STOP   3
+
+// Visual separator for state machine transitions in console output
+#define STATE_SEPARATOR "========================================"
+#define PRINT_STATE_BANNER(state_name) \
+  printf("\n%s\n  [STATE: %s]\n%s\n", STATE_SEPARATOR, state_name, STATE_SEPARATOR)
+
 // Combine bytes in - little-endian format
 int combine_bytes(const uint8_t *bytes, size_t num_bytes)
 {
@@ -44,19 +59,11 @@ int combine_bytes(const uint8_t *bytes, size_t num_bytes)
   return result;
 }
 
-// Convert an integer to an array of bytes - little-endian format
-void int_to_bytes(int num, uint8_t *bytes, size_t num_bytes)
+// Check if a message ID is present in a given list of message IDs
+bool is_message_in_list(int msg_id_list[], int n_msgs, int msg_id)
 {
-  for (size_t i = 0; i < num_bytes; ++i) {
-    bytes[i] = (num >> (i * 8)) & 0xFF;
-  }
-}
-
-// Check if the message is in the list of bits messages
-bool is_bits_messages(int traces_bits_support_data_Collection_format_idx[], int n_bits_msgs, int msg_id)
-{
-  for (int i = 0; i < n_bits_msgs; i++) {
-    if (msg_id == traces_bits_support_data_Collection_format_idx[i]) {
+  for (int i = 0; i < n_msgs; i++) {
+    if (msg_id == msg_id_list[i]) {
       return true;
     }
   }
@@ -71,12 +78,6 @@ struct timespec get_current_time()
   return time;
 }
 
-// Function to convert timespec to microseconds
-long long timespec_to_microseconds(struct timespec time)
-{
-  return (time.tv_sec * 1000000LL) + (time.tv_nsec / 1000);
-}
-
 // Calculate the time difference in milliseconds
 double calculate_time_difference(struct timespec start, struct timespec end)
 {
@@ -88,7 +89,7 @@ double calculate_time_difference(struct timespec start, struct timespec end)
 // Get Time Stamp in microseconds in YYYYMMDDHHMMSSmmmuuu format
 char *get_time_stamp_usec(char time_stamp_str[])
 {
-  // initialization to measure time stamp --This part should be moved to inilization part
+  // initialization to measure time stamp
   time_t my_time;
   struct tm *timeinfo;
   time(&my_time);
@@ -104,31 +105,12 @@ char *get_time_stamp_usec(char time_stamp_str[])
   uint8_t hour = timeinfo->tm_hour;
   uint8_t min = timeinfo->tm_min;
   uint8_t sec = timeinfo->tm_sec;
-  uint16_t usec = (tv.tv_usec);
-  // printf ("Time stamp: %d_%d_%d_%d_%d_%d_%d \n",year,mon,mday,hour,min,sec,usec);
-  // sprintf(time_stamp_str, "%d_%d_%d_%d_%d_%d_%d",year,mon,mday,hour,min,sec,usec);
-  sprintf(time_stamp_str, "%04d%02d%02d%02d%02d%02d%06d", year, mon, mday, hour, min, sec, usec);
+  uint32_t usec = (tv.tv_usec);
+  sprintf(time_stamp_str, "%04d%02d%02d%02d%02d%02d%06u", year, mon, mday, hour, min, sec, usec);
 
   return time_stamp_str;
 }
 
-// Convert timestamp string to integer
-int convert_time_stamp_to_int(const char *timestamp)
-{
-  return atoi(timestamp);
-}
-
-// Split timestamp string and convert to integer
-int split_time_stamp_and_convert_to_int(char time_stamp_str[], int shift, int length)
-{
-  char time_part[length + 1]; // Buffer to hold the date part YYYYMMDD or HHMMSSmmm
-  // Copy the first 8 or 9 characters (YYYYMMDD) to HHMMSSmmm
-  strncpy(time_part, time_stamp_str + shift, length);
-  time_part[length] = '\0'; // Null-terminate the string
-  // Convert timestamp string to integer
-  return convert_time_stamp_to_int(time_part);
-}
-
 void err_exit(char *buf)
 {
   fprintf(stderr, "%s\n", buf);
@@ -153,7 +135,7 @@ int create_shm(char **addrN, const char *shm_path, int projectId)
   shm_id = shmget(key, SHMSIZE, IPC_CREAT | IPC_EXCL | 0664);
   if (shm_id == -1) {
     if (errno == EEXIST) {
-      printf("Error: shared memeory already exist\n");
+      printf("Error: shared memory already exists\n");
       shm_id = shmget(key, 0, 0);
       printf("reference shm_id = %d\n", shm_id);
     } else {
@@ -210,75 +192,28 @@ void usage(void)
   exit(1);
 }
 
-// class to store the message and the action to enable capture selected data
-// 0: do not record message
-// 1: record message
-struct trace_struct {
-  char on_off_name[100];
-  int on_off_action;
-};
-
 // struct for trace message based on Data Collection Trace Messages Structure
-// you need to define the vararibles of each message
+// you need to define the variables of each message
 typedef struct {
   /* Data Collection Trace Message Structure  */
   int frame;
   int slot;
-  int datetime_yyyymmdd;
-  int datetime_hhmmssmmm;
   int frame_type, freq_range, subcarrier_spacing, cyclic_prefix, symbols_per_slot;
   int Nid_cell, rnti;
   int rb_size, rb_start, start_symbol_index, nr_of_symbols;
   int qam_mod_order, mcs_index, mcs_table, nrOfLayers, transform_precoding;
   int dmrs_config_type, ul_dmrs_symb_pos, number_dmrs_symbols;
   int dmrs_port, dmrs_nscid, nb_antennas_rx, number_of_bits;
-  int data_size, data;
-} event_trace_msg_data;
+  int data;
+} event_trace_msg_ul_data;
 
-void setup_trace_msg_data(event_trace_msg_data *d, void *database)
+void setup_trace_msg_ul_data(event_trace_msg_ul_data *d, void *database)
 {
   database_event_format f;
   int i;
 
-  /* Data Collection Trace Message Structure */
-  // FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm :
-  // int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot :
-  // int,Nid_cell : int,rnti :
-  // int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols :
-  // int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers :
-  // int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos :  int,number_dmrs_symbols :
-  // int,dmrs_port : int,dmrs_nscid :
-  // int,nb_antennas_rx : int,number_of_bits : buffer,data
-
-  // Initialize the data structure
-  d->frame = -1;
-  d->slot = -1;
-  d->datetime_yyyymmdd = -1;
-  d->datetime_hhmmssmmm = -1;
-  d->frame_type = -1;
-  d->freq_range = -1;
-  d->subcarrier_spacing = -1;
-  d->cyclic_prefix = -1;
-  d->symbols_per_slot = -1;
-  d->Nid_cell = -1;
-  d->rnti = -1;
-  d->rb_size = -1;
-  d->rb_start = -1;
-  d->start_symbol_index = -1;
-  d->nr_of_symbols = -1;
-  d->qam_mod_order = -1;
-  d->mcs_index = -1;
-  d->mcs_table = -1;
-  d->nrOfLayers = -1;
-  d->transform_precoding = -1;
-  d->dmrs_config_type = -1;
-  d->ul_dmrs_symb_pos = -1;
-  d->number_dmrs_symbols = -1;
-  d->dmrs_port = -1;
-  d->dmrs_nscid = -1;
-  d->nb_antennas_rx = -1;
-  d->number_of_bits = -1;
-  d->data = -1;
+  // Initialize all fields to -1 (marks unset indices)
+  memset(d, -1, sizeof(*d));
 
 /* this macro looks for a particular element and checks its type */
 #define G(var_name, var_type, var)                                      \
@@ -291,35 +226,14 @@ void setup_trace_msg_data(event_trace_msg_data *d, void *database)
     continue;                                                           \
   }
 
-  /* ------------------------------*/
-  /* Create Macro for Data Collection Trace Message */
-  /* ------------------------------*/
-  // Data Collection Trace Message Structure
-  // Example: GNB_PHY_UL_FD_PUSCH_IQ,  GNB_PHY_UL_FD_DMRS_ID,
-  //          GNB_PHY_UL_FD_CHAN_EST_DMRS_POS, GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL
-  //          GNB_PHY_UL_PAYLOAD_RX_BITS
-  //          UE_PHY_UL_SCRAMBLED_TX_BITS
-  //          UE_PHY_UL_PAYLOAD_TX_BITS
-  // Get a template of any message based on Data Collection Trace Messages Structure
+  // Get a template of any UL message based on Data Collection Trace Messages Structure
   int Trace_MSG_ID = event_id_from_name(database, "GNB_PHY_UL_FD_PUSCH_IQ");
   f = get_format(database, Trace_MSG_ID);
 
-  /* get the elements of the trace
-   * the value is an index in the event, see below */
-  // FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm :
-  // int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot :
-  // int,Nid_cell : int,rnti :
-  // int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols :
-  // int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers :
-  // int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos :  int,number_dmrs_symbols :
-  // int,dmrs_port : int,dmrs_nscid :
-  // int,nb_antennas_rx : int,number_of_bits : buffer,data
-
+  // Map each field name to its index in the event structure
   for (i = 0; i < f.count; i++) {
     G("frame", "int", d->frame)
     G("slot", "int", d->slot)
-    G("datetime_yyyymmdd", "int", d->datetime_yyyymmdd)
-    G("datetime_hhmmssmmm", "int", d->datetime_hhmmssmmm)
     G("frame_type", "int", d->frame_type)
     G("freq_range", "int", d->freq_range)
     G("subcarrier_spacing", "int", d->subcarrier_spacing)
@@ -345,20 +259,106 @@ void setup_trace_msg_data(event_trace_msg_data *d, void *database)
     G("number_of_bits", "int", d->number_of_bits)
     G("data", "buffer", d->data)
   }
-  // if (d->frame == -1 || d->slot == -1) goto error;
 #undef G
-  return;
 }
 
-// Function to check if a value is in the array
-int isValueInArray(int value, int arr[], int size)
+// -------------------------------------------------------------------
+// Table-driven metadata shared memory writer and debug printer
+// -------------------------------------------------------------------
+
+// Descriptor for one metadata field to write to shared memory
+typedef struct {
+  int field_idx;     // index into event e.e[] array
+  size_t wire_size;  // number of bytes to write to shm
+} field_descriptor;
+
+// Number of UL metadata fields written to shared memory (excludes msg_id and buffer)
+#define N_UL_METADATA_FIELDS 27
+
+// Build UL field descriptor array from a populated event_trace_msg_ul_data struct.
+// Must be called after setup_trace_msg_ul_data() so that field indices are populated.
+void build_ul_field_descriptors(field_descriptor *fields, const event_trace_msg_ul_data *d)
 {
-  for (int i = 0; i < size; i++) {
-    if (arr[i] == value) {
-      return 1; // Value found
+  int i = 0;
+  fields[i++] = (field_descriptor){ d->frame, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->slot, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ FIELD_SENDING_TIME_SEC, sizeof(uint32_t) };
+  fields[i++] = (field_descriptor){ FIELD_SENDING_TIME_NSEC, sizeof(uint32_t) };
+  fields[i++] = (field_descriptor){ d->frame_type, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->freq_range, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->subcarrier_spacing, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->cyclic_prefix, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->symbols_per_slot, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->Nid_cell, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->rnti, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->rb_size, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->rb_start, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->start_symbol_index, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->nr_of_symbols, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->qam_mod_order, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->mcs_index, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->mcs_table, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->nrOfLayers, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->transform_precoding, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->dmrs_config_type, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->ul_dmrs_symb_pos, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->number_dmrs_symbols, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->dmrs_port, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->dmrs_nscid, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->nb_antennas_rx, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->number_of_bits, sizeof(uint32_t) };
+}
+
+// Print UL metadata fields for debug output
+void print_ul_metadata_debug(event e, const event_trace_msg_ul_data *d, void *database)
+{
+  printf("\nUnix TS: %ld.%09ld", e.sending_time.tv_sec, e.sending_time.tv_nsec);
+  printf("\nMessage Info: msg_id %s (%d) \n", event_name_from_id(database, e.type), e.type);
+  printf("frame %d, slot %d, unix_ts %ld.%09ld\n",
+         e.e[d->frame].i, e.e[d->slot].i,
+         e.sending_time.tv_sec, e.sending_time.tv_nsec);
+  printf("frame_type %d, freq_range %d, subcarrier_spacing %d, cyclic_prefix %d, symbols_per_slot %d\n",
+         e.e[d->frame_type].i, e.e[d->freq_range].i,
+         e.e[d->subcarrier_spacing].i, e.e[d->cyclic_prefix].i,
+         e.e[d->symbols_per_slot].i);
+  printf("Nid_cell %d, rnti %d, rb_size %d, rb_start %d, start_symbol_index %d, nr_of_symbols %d\n",
+         e.e[d->Nid_cell].i, e.e[d->rnti].i,
+         e.e[d->rb_size].i, e.e[d->rb_start].i,
+         e.e[d->start_symbol_index].i, e.e[d->nr_of_symbols].i);
+  printf("qam_mod_order %d, mcs_index %d, mcs_table %d, nrOfLayers %d, transform_precoding %d\n",
+         e.e[d->qam_mod_order].i, e.e[d->mcs_index].i,
+         e.e[d->mcs_table].i, e.e[d->nrOfLayers].i,
+         e.e[d->transform_precoding].i);
+  printf("dmrs_config_type %d, ul_dmrs_symb_pos %d, number_dmrs_symbols %d, dmrs_port %d, dmrs_nscid %d\n",
+         e.e[d->dmrs_config_type].i, e.e[d->ul_dmrs_symb_pos].i,
+         e.e[d->number_dmrs_symbols].i, e.e[d->dmrs_port].i,
+         e.e[d->dmrs_nscid].i);
+  printf("nb_antennas_rx %d, number_of_bits %d, data size %d\n",
+         e.e[d->nb_antennas_rx].i, e.e[d->number_of_bits].i,
+         e.e[d->data].bsize);
+}
+
+// Write metadata fields to shared memory using field descriptor table.
+// Writes msg_id first, then loops through all fields.
+void write_metadata_to_shm(char *addr_wr, unsigned int *bufIdx_wr, event e,
+                           const field_descriptor *fields, int n_fields)
+{
+  // Write message ID
+  memcpy(&addr_wr[*bufIdx_wr], &e.type, sizeof(uint16_t));
+  *bufIdx_wr += sizeof(uint16_t);
+  // Write all metadata fields
+  for (int i = 0; i < n_fields; i++) {
+    if (fields[i].field_idx == FIELD_SENDING_TIME_SEC) {
+      uint32_t ts_sec = (uint32_t)e.sending_time.tv_sec;
+      memcpy(&addr_wr[*bufIdx_wr], &ts_sec, fields[i].wire_size);
+    } else if (fields[i].field_idx == FIELD_SENDING_TIME_NSEC) {
+      uint32_t ts_nsec = (uint32_t)e.sending_time.tv_nsec;
+      memcpy(&addr_wr[*bufIdx_wr], &ts_nsec, fields[i].wire_size);
+    } else {
+      memcpy(&addr_wr[*bufIdx_wr], &e.e[fields[i].field_idx].i, fields[i].wire_size);
     }
+    *bufIdx_wr += fields[i].wire_size;
   }
-  return 0; // Value not found
 }
 
 void reestablish_connection(int *socket, char *ip, int port, int number_of_events, int *is_on)
@@ -386,40 +386,24 @@ int main(int n, char **v)
   // trace_msgs_support_data_Collection_format
   // it is used to parse the requested messages if it is based
   // on Data Collection Trace Messages Structure and supported tracer messages indices
-  char *traces_iq_support_data_Collection_format[] = {"GNB_PHY_UL_FD_PUSCH_IQ",
-                                                            "GNB_PHY_UL_FD_DMRS",
-                                                            "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS",
-                                                            "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL"};
-  char *traces_bits_support_data_Collection_format[] = {"GNB_PHY_UL_PAYLOAD_RX_BITS",
-                                                              "UE_PHY_UL_SCRAMBLED_TX_BITS",
-                                                              "UE_PHY_UL_PAYLOAD_TX_BITS"};
-  // extra number of records to simlify Sync between base station and UE synchronization records.
+  char *traces_ul_support_data_Collection_format[] = {"GNB_PHY_UL_FD_PUSCH_IQ",
+                                                      "GNB_PHY_UL_FD_DMRS",
+                                                      "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS",
+                                                      "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL",
+                                                      "GNB_PHY_UL_PAYLOAD_RX_BITS",
+                                                      "UE_PHY_UL_SCRAMBLED_TX_BITS",
+                                                      "UE_PHY_UL_PAYLOAD_TX_BITS"};
+  // extra number of records to simplify sync between base station and UE synchronization records.
   // if you have network delay, you can increase the number of records to capture
   int max_sync_offset = 6; // 6 frames ~ 60 ms
-  // all supported messages
-  // Calculate the size of the combined array
-  int n_iq_msgs = sizeof(traces_iq_support_data_Collection_format) / sizeof(traces_iq_support_data_Collection_format[0]);
-  int n_bits_msgs = sizeof(traces_bits_support_data_Collection_format) / sizeof(traces_bits_support_data_Collection_format[0]);
-  int n_msgs_based_data_Collection_format = n_iq_msgs + n_bits_msgs;
-
-  // Create the combined array
-  char *traces_support_data_Collection_format[n_msgs_based_data_Collection_format];
-  // Copy IQ messages to the combined array
-  for (int i = 0; i < n_iq_msgs; i++) {
-    traces_support_data_Collection_format[i] = traces_iq_support_data_Collection_format[i];
-  }
-
-  // Copy Bits messages to the combined array
-  for (int i = 0; i < n_bits_msgs; i++) {
-    traces_support_data_Collection_format[i + n_iq_msgs] = traces_bits_support_data_Collection_format[i];
-  }
+  // Calculate the size of the message array
+  int n_ul_msgs = sizeof(traces_ul_support_data_Collection_format) / sizeof(traces_ul_support_data_Collection_format[0]);
 
   uint16_t msg_id = 0;
   uint16_t start_frame_number = 0;
   uint32_t number_records = 0; // number of records to capture, it is number of slots
   // array to store the requested tracer messages indices
   int req_tracer_msgs_indices[100] = {0};
-  // define variables --> to do: add all of them to be class of pointers
   char *database_filename = NULL;
   void *database;
   char *ip = DEFAULT_REMOTE_IP;
@@ -432,18 +416,19 @@ int main(int n, char **v)
   char trace_time_stamp_str[30];
 
   // data structure for the trace messages based on Data Collection Trace Messages Structure
-  event_trace_msg_data trace_msg_data;
+  event_trace_msg_ul_data trace_msg_ul_data;
 
-  // initlization variables
+  // initialization variables
   unsigned int bufIdx_wr = 0;
   unsigned int bufIdx_rd = 0;
   uint8_t num_req_tracer_msgs = 0;
 
-  // initilaze shared memory
+  // initialize shared memory
   char *addr_wr, *addr_rd;
-  printf("\n Data Collection Service: Initializing shared memory ...");
-  printf("\n Directory 1: %s, Directory 2: %s", GETKEYDIR1_gNB, GETKEYDIR2_gNB);
-  printf("\n Project ID: %d\n", PROJECTID_gNB);
+  PRINT_STATE_BANNER("INIT");
+  printf("  Data Collection Service: Initializing shared memory ...\n");
+  printf("  Directory 1: %s, Directory 2: %s\n", GETKEYDIR1_gNB, GETKEYDIR2_gNB);
+  printf("  Project ID: %d\n", PROJECTID_gNB);
   int shm_id_wr = create_shm(&addr_wr, GETKEYDIR1_gNB, PROJECTID_gNB);
   int shm_id_rd = create_shm(&addr_rd, GETKEYDIR2_gNB, PROJECTID_gNB);
   del_shm(addr_wr, shm_id_wr);
@@ -500,20 +485,18 @@ int main(int n, char **v)
   addr_rd[0] = 0; // important to check if we have new requested messages
 
   // read requested tracer msg indices from memory
-  printf("\n Data Collection Service: Waiting for messages request ...\n");
-  // 0: Wait
-  // 1: config
-  // 2: record
-  // 3: stop
+  PRINT_STATE_BANNER("WAIT");
+  printf("  Data Collection Service: Waiting for config message ...\n");
   // Wait for Action Config
   while (1) {
-    if ((uint8_t)(addr_rd[0]) == 0) {
+    if ((uint8_t)(addr_rd[0]) == STATE_WAIT) {
       usleep(50); // sleep for 50 us: 0.5 ms slot duration
     }
     // config state
-    else if ((uint8_t)(addr_rd[0]) == 1) {
+    else if ((uint8_t)(addr_rd[0]) == STATE_CONFIG) {
       get_time_stamp_usec(trace_time_stamp_str);
-      printf("\n Received config message. Time Stamp: %s", trace_time_stamp_str);
+      PRINT_STATE_BANNER("CONFIG");
+      printf("  Received config message. Time Stamp: %s\n", trace_time_stamp_str);
 
       // get the IP address length in bytes
       bufIdx_rd = 1;
@@ -530,11 +513,11 @@ int main(int n, char **v)
 
       // get the array bytes of the port number : 2 bytes
       uint8_t port_number_bytes[2] = {addr_rd[bufIdx_rd], addr_rd[bufIdx_rd + 1]};
-      bufIdx_rd += 2; // + 2 bytes = start frame number
+      bufIdx_rd += 2; // + 2 bytes = port number
 
       port = combine_bytes(port_number_bytes, 2);
-      printf("\n Parameters: IP Address length: %d, IP Address: %s, Port Number: %d \n", ip_address_length, ip_address, port);
-      addr_rd[0] = 0; // reset memory : to wait for record action
+      printf("  Parameters: IP Address length: %d, IP Address: %s, Port Number: %d\n", ip_address_length, ip_address, port);
+      addr_rd[0] = STATE_WAIT; // reset memory : to wait for record action
       break;
     }
   }
@@ -545,37 +528,39 @@ int main(int n, char **v)
 
   /* connect to the nr-softmodem */
   socket = connect_to(ip, port);
-  printf("\n Connected to nr-softmodem");
+  printf("  Connected to nr-softmodem\n");
 
   // Read Action record or stop
-  printf("\n Data Collection Service: Waiting for record message ...\n");
+  PRINT_STATE_BANNER("WAIT");
+  printf("  Data Collection Service: Waiting for record/stop message ...\n");
   while (1) {
     // wait for Action record
-    if ((uint8_t)(addr_rd[0]) == 0) {
+    if ((uint8_t)(addr_rd[0]) == STATE_WAIT) {
       usleep(50); // sleep for 50 us: 0.5 ms slot duration
     }
 
     // quit state
-    else if ((uint8_t)(addr_rd[0]) == 3) {
-      printf("\n Received 'stop' command. Exiting...");
-      printf("\n ");
+    else if ((uint8_t)(addr_rd[0]) == STATE_STOP) {
+      PRINT_STATE_BANNER("STOP");
+      printf("  Received 'stop' command. Exiting...\n");
       // Clean up and exit
       break;
     }
     // record state
-    else if ((uint8_t)(addr_rd[0]) == 2) {
+    else if ((uint8_t)(addr_rd[0]) == STATE_RECORD) {
       // clear remote buffer if there is
       clear_remote_config();
       get_time_stamp_usec(trace_time_stamp_str);
-      printf("\n Received record message. Time Stamp: %s", trace_time_stamp_str);
+      PRINT_STATE_BANNER("RECORD");
+      printf("  Received record message. Time Stamp: %s\n", trace_time_stamp_str);
 
       // read number of requested messages
       bufIdx_rd = 1;
       num_req_tracer_msgs = addr_rd[bufIdx_rd];
       bufIdx_rd += 1;
-      printf("\n Number of requested tracer messages: %d,", num_req_tracer_msgs);
+      printf("  Number of requested tracer messages: %d\n", num_req_tracer_msgs);
       // reset memory : action to wait for next record action
-      addr_rd[0] = 0;
+      addr_rd[0] = STATE_WAIT;
 
       // read tracer msg IDs - every message ID has been stored in two bytes
       for (uint8_t msg_n = 0; msg_n < num_req_tracer_msgs; msg_n++) {
@@ -607,40 +592,36 @@ int main(int n, char **v)
       printf("start_frame: %d\n", start_frame_number);
 
       /* activate the trace in this array */
-      printf("\n Activate Tracer messages in on_off array: ");
+      printf("  Activating tracer messages:\n");
       for (i = 0; i < num_req_tracer_msgs; i++) {
         char *on_off_name = event_name_from_id(database, req_tracer_msgs_indices[i]);
         on_off(database, on_off_name, is_on, 1);
-        printf("%d, %s, ", req_tracer_msgs_indices[i], on_off_name);
-        // on_off(database, "GNB_PHY_DL_OUTPUT_SIGNAL", is_on, 1);
+        printf("    %d: %s\n", req_tracer_msgs_indices[i], on_off_name);
       }
 
-      // get the event IDs for the bit messages
-      int traces_bits_support_data_Collection_format_idx[n_bits_msgs];
-      for (int i = 0; i < n_bits_msgs; i++) {
-        traces_bits_support_data_Collection_format_idx[i] =
-            event_id_from_name(database, traces_bits_support_data_Collection_format[i]);
-      }
-
-      // all supported messages
-      int traces_support_data_Collection_format_idx[n_msgs_based_data_Collection_format];
-      for (int i = 0; i < n_msgs_based_data_Collection_format; i++) {
-        traces_support_data_Collection_format_idx[i] = event_id_from_name(database, traces_support_data_Collection_format[i]);
+      // Build UL message ID array for generic UL dispatch
+      int ul_msg_ids[n_ul_msgs];
+      for (int i = 0; i < n_ul_msgs; i++) {
+        ul_msg_ids[i] = event_id_from_name(database, traces_ul_support_data_Collection_format[i]);
       }
 
       // setup data for the trace messages
-      setup_trace_msg_data(&trace_msg_data, database);
-      printf("\n Setup Trace Data Done");
+      setup_trace_msg_ul_data(&trace_msg_ul_data, database);
+      printf("  Setup UL trace data done\n");
+
+      // Build field descriptor table for table-driven shared memory writes
+      field_descriptor ul_fields[N_UL_METADATA_FIELDS];
+      build_ul_field_descriptors(ul_fields, &trace_msg_ul_data);
 
       // Get the start time
       struct timespec start_time = get_current_time();
 
-      /* activate the tracee in the nr-softmodem */
+      /* activate the traces in the nr-softmodem */
       activate_traces(socket, number_of_events, is_on);
-      printf("\n Activated Traces in nr-softmodem");
+      printf("  Activated traces in nr-softmodem\n");
 
       /* a buffer needed to receive events from the nr-softmodem */
-      OBUF ebuf = {osize : 0, omaxsize : 0, obuf : NULL};
+      OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
 
       /* read events */
       int nrecord_idx = 0;
@@ -655,8 +636,8 @@ int main(int n, char **v)
       int current_frame = 0, prev_frame = 0, current_slot = 0, prev_slot = 0;
       // offset to sync between base station and UE synchronization records or power measurements
       int sync_offset_index = 0; // increase the index only if the index of frame changes after getting all records
-      // since we will use the frame differece to do extra records, we should be sure that the last slot is recorded completely
-      printf("\n\n Data Collection Service: Start reading messages ...");
+      // since we will use the frame difference to do extra records, we should be sure that the last slot is recorded completely
+      printf("\n  Data Collection Service: Start reading messages ...\n");
       struct pollfd event_poll_fd;
       event_poll_fd.fd = socket;
       event_poll_fd.events = POLLIN;
@@ -676,27 +657,24 @@ int main(int n, char **v)
             reestablish_connection(&socket, ip, port, number_of_events, is_on);
             continue; // Skip further processing and retry
           }
-          //-------------------------
-          // GNB_PHY_UL_FD_PUSCH_IQ,  GNB_PHY_UL_FD_DMRS_ID, GNB_PHY_UL_FD_CHAN_EST_DMRS_POS,
-          // UE_PHY_UL_SCRAMBLED_TX_BITS, GNB_PHY_UL_PAYLOAD_RX_BITS, UE_PHY_UL_PAYLOAD_TX_BITS
-          //-------------------------
+
           // is it a requested message
-          if (isValueInArray(e.type, req_tracer_msgs_indices, num_req_tracer_msgs)) {
+          if (is_message_in_list(req_tracer_msgs_indices, num_req_tracer_msgs, e.type)) {
             // is it based on Data Collection Trace Messages Structure
-            if (isValueInArray(e.type, traces_support_data_Collection_format_idx, n_msgs_based_data_Collection_format)) {
+            if (is_message_in_list(ul_msg_ids, n_ul_msgs, e.type)) {
               // Start recording from the next slot to mitigate capturing partial data
               // check if the current frame and slot are different from the previous frame and slot
               // Then, increase the record index
               if (start_recording == false) {
                 if (got_ref_frame_slot == false) {
-                  ref_frame = e.e[trace_msg_data.frame].i;
-                  ref_slot = e.e[trace_msg_data.slot].i;
+                  ref_frame = e.e[trace_msg_ul_data.frame].i;
+                  ref_slot = e.e[trace_msg_ul_data.slot].i;
                   printf("\nMessage Info: msg_id %s (%d) \n", event_name_from_id(database, e.type), e.type);
                   got_ref_frame_slot = true;
                 }
 
-                current_frame = e.e[trace_msg_data.frame].i;
-                current_slot = e.e[trace_msg_data.slot].i;
+                current_frame = e.e[trace_msg_ul_data.frame].i;
+                current_slot = e.e[trace_msg_ul_data.slot].i;
                 frame_difference = (current_frame - ref_frame + MAX_FRAME_INDEX + 1) % (MAX_FRAME_INDEX + 1);
                 slot_difference = (current_slot - ref_slot + MAX_SLOT_INDEX + 1) % (MAX_SLOT_INDEX + 1);
                 printf("\n First frame.slot: %d.%d, current frame.slot: %d.%d, diff frame.slot: %d.%d",
@@ -709,129 +687,30 @@ int main(int n, char **v)
 
                 if ((ref_frame != current_frame) || (ref_slot != current_slot)) {
                   start_recording = true;
-                  printf("\n Start recording from frame: %d, slot: %d ", e.e[trace_msg_data.frame].i, e.e[trace_msg_data.slot].i);
+                  printf("\n Start recording from frame: %d, slot: %d ", e.e[trace_msg_ul_data.frame].i, e.e[trace_msg_ul_data.slot].i);
                 }
               }
               // start recording from the next frame to mitigate capturing partial data
               if (start_recording == true) {
-                /* this is how to access the elements of the Data Collection trace messages.
-                 * we use e.e[<element>] and then the correct suffix, here
-                 * it's .i for the integer and .b for the buffer and .bsize for the buffer size
-                 * see in event.h the structure event_arg
-                 */
-                unsigned char *buf = e.e[trace_msg_data.data].b;
-
                 printf("\n\nRecord number: %d", nrecord_idx);
 #ifdef DEBUG_BUFFER
                 printf("\nBuffer index in bytes: %d", bufIdx_wr);
 #endif
-
-                // add general message header:  message ID,
-                // T-Tracer Message format
-                // FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm :
-                // int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot :
-                // int,Nid_cell : int,rnti :
-                // int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols :
-                // int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers :
-                // int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos :  int,number_dmrs_symbols :
-                // int,dmrs_port : int,dmrs_nscid :
-                // int,nb_antennas_rx : int,number_of_bits : buffer,data
-                memcpy(&addr_wr[bufIdx_wr], &e.type, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.frame].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.slot].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.datetime_yyyymmdd].i, sizeof(uint32_t));
+                // --- UL IQ/Bits handler ---
+                // Write metadata + buffer to shared memory
+                write_metadata_to_shm(addr_wr, &bufIdx_wr, e, ul_fields, N_UL_METADATA_FIELDS);
+                // Write buffer: size (uint32_t) + raw data
+                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_ul_data.data].bsize, sizeof(uint32_t));
                 bufIdx_wr += sizeof(uint32_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.datetime_hhmmssmmm].i, sizeof(uint32_t));
-                bufIdx_wr += sizeof(uint32_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.frame_type].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.freq_range].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.subcarrier_spacing].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.cyclic_prefix].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.symbols_per_slot].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.Nid_cell].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.rnti].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.rb_size].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.rb_start].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.start_symbol_index].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.nr_of_symbols].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.qam_mod_order].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.mcs_index].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.mcs_table].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.nrOfLayers].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.transform_precoding].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.dmrs_config_type].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.ul_dmrs_symb_pos].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.number_dmrs_symbols].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.dmrs_port].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.dmrs_nscid].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.nb_antennas_rx].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.number_of_bits].i, sizeof(uint32_t));
-                bufIdx_wr += sizeof(uint32_t);
-
-                printf("\nTime Stamp: %d_%d", e.e[trace_msg_data.datetime_yyyymmdd].i, e.e[trace_msg_data.datetime_hhmmssmmm].i);
-
-                // add message body: length in bytes + recorded data
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.data].bsize, sizeof(uint32_t));
-                bufIdx_wr += sizeof(uint32_t);
-
-                // read data from buffer and convert from unsigned char * array to int 16 using the right endianness
-                // T-tracer: Little Endian
-                // For BITS Messages, example: UE_PHY_UL_SCRAMBLED_TX_BITS: data in bytes
-
-                if (is_bits_messages(traces_bits_support_data_Collection_format_idx, n_bits_msgs, e.type)) {
-                  for (int byte_idx = 0; byte_idx < e.e[trace_msg_data.data].bsize; byte_idx += 1) {
-                    // printf("%d, ", buf[byte_idx]);
-                    memcpy(&addr_wr[bufIdx_wr], &buf[byte_idx], sizeof(uint8_t));
-                    bufIdx_wr += sizeof(uint8_t);
-                  }
-
-                } else {
-                  for (int byte_idx = 0; byte_idx < e.e[trace_msg_data.data].bsize; byte_idx += 2) {
-                    // For a little-endian system:
-                    memcpy(&addr_wr[bufIdx_wr], &buf[byte_idx], sizeof(uint8_t));
-                    bufIdx_wr += sizeof(uint8_t);
-                    memcpy(&addr_wr[bufIdx_wr], &buf[byte_idx + 1], sizeof(uint8_t));
-                    bufIdx_wr += sizeof(uint8_t);
-                  }
-                }
-                /*
-                for (int byte_idx_i = 0; byte_idx_i < e.e[d.nr_ul_fd_dmrs_data].bsize; byte_idx_i+=4) {
-                  int16_t I = buf[byte_idx_i] | (buf[byte_idx_i+1] << 8);
-                  int16_t Q = buf[byte_idx_i+2] | (buf[byte_idx_i+3] << 8);
-                  printf ("idx %d, ", byte_idx_i);
-                  printf ("\n%d", I);
-                  printf ("\n%d", Q);
-                }
-                */
+                memcpy(&addr_wr[bufIdx_wr], e.e[trace_msg_ul_data.data].b, e.e[trace_msg_ul_data.data].bsize);
+                bufIdx_wr += e.e[trace_msg_ul_data.data].bsize;
+#ifdef DEBUG_T_Tracer
+                print_ul_metadata_debug(e, &trace_msg_ul_data, database);
+#endif
                 // check if the current frame and slot are different from the previous frame and slot
                 // Then, increase the record index
-                current_frame = e.e[trace_msg_data.frame].i;
-                current_slot = e.e[trace_msg_data.slot].i;
+                current_frame = e.e[trace_msg_ul_data.frame].i;
+                current_slot = e.e[trace_msg_ul_data.slot].i;
 
                 // increase sync offset index if the current frame is different from the previous frame
                 if ((current_frame != prev_frame) && nrecord_idx >= number_records) {
@@ -844,43 +723,7 @@ int main(int n, char **v)
                   prev_frame = current_frame;
                   prev_slot = current_slot;
                 }
-#ifdef DEBUG_T_Tracer
-                printf("\nMessage Info: msg_id %s (%d) \n", event_name_from_id(database, e.type), e.type);
-                printf("frame %d, slot %d, datetime %d_%d\n",
-                       e.e[trace_msg_data.frame].i,
-                       e.e[trace_msg_data.slot].i,
-                       e.e[trace_msg_data.datetime_yyyymmdd].i,
-                       e.e[trace_msg_data.datetime_hhmmssmmm].i);
-                printf("frame_type %d, freq_range %d, subcarrier_spacing %d, cyclic_prefix %d, symbols_per_slot %d\n",
-                       e.e[trace_msg_data.frame_type].i,
-                       e.e[trace_msg_data.freq_range].i,
-                       e.e[trace_msg_data.subcarrier_spacing].i,
-                       e.e[trace_msg_data.cyclic_prefix].i,
-                       e.e[trace_msg_data.symbols_per_slot].i);
-                printf("Nid_cell %d, rnti %d, rb_size %d, rb_start %d, start_symbol_index %d, nr_of_symbols %d\n",
-                       e.e[trace_msg_data.Nid_cell].i,
-                       e.e[trace_msg_data.rnti].i,
-                       e.e[trace_msg_data.rb_size].i,
-                       e.e[trace_msg_data.rb_start].i,
-                       e.e[trace_msg_data.start_symbol_index].i,
-                       e.e[trace_msg_data.nr_of_symbols].i);
-                printf("qam_mod_order %d, mcs_index %d, mcs_table %d, nrOfLayers %d, transform_precoding %d\n",
-                       e.e[trace_msg_data.qam_mod_order].i,
-                       e.e[trace_msg_data.mcs_index].i,
-                       e.e[trace_msg_data.mcs_table].i,
-                       e.e[trace_msg_data.nrOfLayers].i,
-                       e.e[trace_msg_data.transform_precoding].i);
-                printf("dmrs_config_type %d, ul_dmrs_symb_pos %d, number_dmrs_symbols %d, dmrs_port %d, dmrs_nscid %d\n",
-                       e.e[trace_msg_data.dmrs_config_type].i,
-                       e.e[trace_msg_data.ul_dmrs_symb_pos].i,
-                       e.e[trace_msg_data.number_dmrs_symbols].i,
-                       e.e[trace_msg_data.dmrs_port].i,
-                       e.e[trace_msg_data.dmrs_nscid].i);
-                printf("nb_antennas_rx %d, number_of_bits %d, data size %d\n",
-                       e.e[trace_msg_data.nb_antennas_rx].i,
-                       e.e[trace_msg_data.number_of_bits].i,
-                       e.e[trace_msg_data.data].bsize);
-#endif
+
               } // End of start recording flag
             } // end of if statement for the supported messages based on Data Collection Trace Messages Structure
             else {
@@ -891,29 +734,28 @@ int main(int n, char **v)
         } // end while loop of reading events
         else {
           // No data, just loop and check time
-          usleep(100); // optional: avoid busy-waiting
+          usleep(50); // optional: avoid busy-waiting
         }
       } // End of while loop to read events
 
-      // de-activate the tracee in the nr-softmodem
-      printf("\n De-activated Tracer message:\n");
+      // de-activate the traces in the nr-softmodem
+      printf("\n  De-activating tracer messages\n");
       for (i = 0; i < num_req_tracer_msgs; i++) {
         char *on_off_name = event_name_from_id(database, req_tracer_msgs_indices[i]);
         on_off(database, on_off_name, is_on, 0);
-        // printf("\n %d, %s, ", req_tracer_msgs_indices[i], on_off_name);
-        // on_off(database, "GNB_PHY_DL_OUTPUT_SIGNAL", is_on, 1);
       }
-      // De-activate the tracee in the nr-softmodem
       activate_traces(socket, number_of_events, is_on);
-      printf("\n De-activated Traces");
+      printf("  De-activated traces\n");
       // Get the end time
       struct timespec end_time = get_current_time();
       // Calculate the time difference
       double time_diff = calculate_time_difference(start_time, end_time);
-      printf("Total Time difference: %.2f ms\n", time_diff);
-      printf("Time difference per record: %.2f ms\n", time_diff / (number_records + max_sync_offset));
+      printf("  Total time: %.2f ms\n", time_diff);
+      printf("  Time per record: %.2f ms\n", time_diff / (number_records + max_sync_offset));
 
+      //-----------------------------
       // discard stale or previous record data for the first DISCARD_RECORD_DURATION_MS
+      //-----------------------------
       struct timespec record_start, record_now;
       clock_gettime(CLOCK_MONOTONIC, &record_start);
 
@@ -934,12 +776,11 @@ int main(int n, char **v)
           }
         } else {
           // No data, just loop and check time
-          usleep(100); // optional: avoid busy-waiting
+          usleep(50); // optional: avoid busy-waiting
         }
       } // End of while loop to discard stale records
     }
-  } // End a while loop to check for the "stop" command
-  // de-activate the tracee in the nr-softmodem
+  } // End of while loop for record/stop
 
   free_database(database);
   free(is_on);

common/utils/T/tracer/t_tracer_app_ue.c

@@ -3,7 +3,7 @@
  */
 
 /*!
- * \brief T-Tracer UE service to capture tracee Messages from UE, it is used by data recording application
+ * \brief T-Tracer UE service to capture trace Messages from UE, it is used by data recording application
  */
 
 #include <stdio.h>
@@ -32,7 +32,21 @@
 #define DEBUG_BUFFER
 // Duration to discard recording in milliseconds to mitigate stale or previous record data
 #define DISCARD_RECORD_DURATION_MS 10
-// #include <linux/time.h>
+
+// Sentinel values for field_descriptor: source is e.sending_time
+#define FIELD_SENDING_TIME_SEC  -2
+#define FIELD_SENDING_TIME_NSEC -3
+
+// State machine constants for shared memory protocol
+#define STATE_WAIT   0
+#define STATE_CONFIG 1
+#define STATE_RECORD 2
+#define STATE_STOP   3
+
+// Visual separator for state machine transitions in console output
+#define STATE_SEPARATOR "========================================"
+#define PRINT_STATE_BANNER(state_name) \
+  printf("\n%s\n  [STATE: %s]\n%s\n", STATE_SEPARATOR, state_name, STATE_SEPARATOR)
 
 // Combine bytes in little-endian format
 int combine_bytes(const uint8_t *bytes, size_t num_bytes)
@@ -44,19 +58,11 @@ int combine_bytes(const uint8_t *bytes, size_t num_bytes)
   return result;
 }
 
-// Convert an integer to an array of bytes in little-endian format
-void int_to_bytes(int num, uint8_t *bytes, size_t num_bytes)
+// Check if a message ID is present in an array of message IDs (generic array lookup)
+bool is_message_in_list(int msg_id_list[], int list_size, int msg_id)
 {
-  for (size_t i = 0; i < num_bytes; ++i) {
-    bytes[i] = (num >> (i * 8)) & 0xFF;
-  }
-}
-
-// Check if the message is in the list of bits messages
-bool is_bits_messages(int traces_bits_support_data_Collection_format_idx[], int n_bits_msgs, int msg_id)
-{
-  for (int i = 0; i < n_bits_msgs; i++) {
-    if (msg_id == traces_bits_support_data_Collection_format_idx[i]) {
+  for (int i = 0; i < list_size; i++) {
+    if (msg_id == msg_id_list[i]) {
       return true;
     }
   }
@@ -71,12 +77,6 @@ struct timespec get_current_time()
   return time;
 }
 
-// Function to convert timespec to microseconds
-long long timespec_to_microseconds(struct timespec time)
-{
-  return (time.tv_sec * 1000000LL) + (time.tv_nsec / 1000);
-}
-
 // Calculate the time difference in milliseconds
 double calculate_time_difference(struct timespec start, struct timespec end)
 {
@@ -88,7 +88,7 @@ double calculate_time_difference(struct timespec start, struct timespec end)
 // Get Time Stamp in microseconds in YYYYMMDDHHMMSSmmmuuu format
 char *get_time_stamp_usec(char time_stamp_str[])
 {
-  // initialization to measure time stamp --This part should be moved to inilization part
+  // initialization to measure time stamp
   time_t my_time;
   struct tm *timeinfo;
   time(&my_time);
@@ -104,31 +104,12 @@ char *get_time_stamp_usec(char time_stamp_str[])
   uint8_t hour = timeinfo->tm_hour;
   uint8_t min = timeinfo->tm_min;
   uint8_t sec = timeinfo->tm_sec;
-  uint16_t usec = (tv.tv_usec);
-  // printf ("Time stamp: %d_%d_%d_%d_%d_%d_%d \n",year,mon,mday,hour,min,sec,usec);
-  // sprintf(time_stamp_str, "%d_%d_%d_%d_%d_%d_%d",year,mon,mday,hour,min,sec,usec);
-  sprintf(time_stamp_str, "%04d%02d%02d%02d%02d%02d%06d", year, mon, mday, hour, min, sec, usec);
+  uint32_t usec = (tv.tv_usec);
+  sprintf(time_stamp_str, "%04d%02d%02d%02d%02d%02d%06u", year, mon, mday, hour, min, sec, usec);
 
   return time_stamp_str;
 }
 
-// Convert timestamp string to integer
-int convert_time_stamp_to_int(const char *timestamp)
-{
-  return atoi(timestamp);
-}
-
-// Split timestamp string and convert to integer
-int split_time_stamp_and_convert_to_int(char time_stamp_str[], int shift, int length)
-{
-  char time_part[length + 1]; // Buffer to hold the date part YYYYMMDD or HHMMSSmmm
-  // Copy the first 8 or 9 characters (YYYYMMDD) to HHMMSSmmm
-  strncpy(time_part, time_stamp_str + shift, length);
-  time_part[length] = '\0'; // Null-terminate the string
-  // Convert timestamp string to integer
-  return convert_time_stamp_to_int(time_part);
-}
-
 void err_exit(char *buf)
 {
   fprintf(stderr, "%s\n", buf);
@@ -153,7 +134,7 @@ int create_shm(char **addrN, const char *shm_path, int projectId)
   shm_id = shmget(key, SHMSIZE, IPC_CREAT | IPC_EXCL | 0664);
   if (shm_id == -1) {
     if (errno == EEXIST) {
-      printf("Error: shared memeory already exist\n");
+      printf("Error: shared memory already exists\n");
       shm_id = shmget(key, 0, 0);
       printf("reference shm_id = %d\n", shm_id);
     } else {
@@ -210,75 +191,28 @@ void usage(void)
   exit(1);
 }
 
-// class to store the message and the action to enable capture selected data
-// 0: do not record message
-// 1: record message
-struct trace_struct {
-  char on_off_name[100];
-  int on_off_action;
-};
-
 // struct for trace message based on Data Collection Trace Messages Structure
-// you need to define the vararibles of each message
+// you need to define the variables of each message
 typedef struct {
   /* Data Collection Trace Message Structure  */
   int frame;
   int slot;
-  int datetime_yyyymmdd;
-  int datetime_hhmmssmmm;
   int frame_type, freq_range, subcarrier_spacing, cyclic_prefix, symbols_per_slot;
   int Nid_cell, rnti;
   int rb_size, rb_start, start_symbol_index, nr_of_symbols;
   int qam_mod_order, mcs_index, mcs_table, nrOfLayers, transform_precoding;
   int dmrs_config_type, ul_dmrs_symb_pos, number_dmrs_symbols;
   int dmrs_port, dmrs_nscid, nb_antennas_tx, number_of_bits;
-  int data_size, data;
-} event_trace_msg_data;
+  int data;
+} event_trace_msg_ul_data;
 
-void setup_trace_msg_data(event_trace_msg_data *d, void *database)
+void setup_trace_msg_ul_data(event_trace_msg_ul_data *d, void *database)
 {
   database_event_format f;
   int i;
 
-  /* Data Collection Trace Message Structure */
-  // FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm :
-  // int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot :
-  // int,Nid_cell : int,rnti :
-  // int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols :
-  // int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers :
-  // int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos :  int,number_dmrs_symbols :
-  // int,dmrs_port : int,dmrs_nscid :
-  // int,nb_antennas_tx : int,number_of_bits : buffer,data
-
-  // Initialize the data structure
-  d->frame = -1;
-  d->slot = -1;
-  d->datetime_yyyymmdd = -1;
-  d->datetime_hhmmssmmm = -1;
-  d->frame_type = -1;
-  d->freq_range = -1;
-  d->subcarrier_spacing = -1;
-  d->cyclic_prefix = -1;
-  d->symbols_per_slot = -1;
-  d->Nid_cell = -1;
-  d->rnti = -1;
-  d->rb_size = -1;
-  d->rb_start = -1;
-  d->start_symbol_index = -1;
-  d->nr_of_symbols = -1;
-  d->qam_mod_order = -1;
-  d->mcs_index = -1;
-  d->mcs_table = -1;
-  d->nrOfLayers = -1;
-  d->transform_precoding = -1;
-  d->dmrs_config_type = -1;
-  d->ul_dmrs_symb_pos = -1;
-  d->number_dmrs_symbols = -1;
-  d->dmrs_port = -1;
-  d->dmrs_nscid = -1;
-  d->nb_antennas_tx = -1;
-  d->number_of_bits = -1;
-  d->data = -1;
+  // Initialize all fields to -1 (marks unset indices)
+  memset(d, -1, sizeof(*d));
 
 /* this macro looks for a particular element and checks its type */
 #define G(var_name, var_type, var)                                      \
@@ -291,35 +225,14 @@ void setup_trace_msg_data(event_trace_msg_data *d, void *database)
     continue;                                                           \
   }
 
-  /* ------------------------------*/
-  /* Create Macro for Data Collection Trace Message */
-  /* ------------------------------*/
-  // Data Collection Trace Message Structure
-  // Example: GNB_PHY_UL_FD_PUSCH_IQ,  GNB_PHY_UL_FD_DMRS_ID,
-  //          GNB_PHY_UL_FD_CHAN_EST_DMRS_POS, GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL
-  //          GNB_PHY_UL_PAYLOAD_RX_BITS
-  //          UE_PHY_UL_SCRAMBLED_TX_BITS
-  //          UE_PHY_UL_PAYLOAD_TX_BITS
-  // Get a template of any message based on Data Collection Trace Messages Structure
+  // Get a template of any UL message based on Data Collection Trace Messages Structure
   int Trace_MSG_ID = event_id_from_name(database, "GNB_PHY_UL_FD_PUSCH_IQ");
   f = get_format(database, Trace_MSG_ID);
 
-  /* get the elements of the trace
-   * the value is an index in the event, see below */
-  // FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm :
-  // int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot :
-  // int,Nid_cell : int,rnti :
-  // int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols :
-  // int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers :
-  // int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos :  int,number_dmrs_symbols :
-  // int,dmrs_port : int,dmrs_nscid :
-  // int,nb_antennas_tx : int,number_of_bits : buffer,data
-
+  // Map each field name to its index in the event structure
   for (i = 0; i < f.count; i++) {
     G("frame", "int", d->frame)
     G("slot", "int", d->slot)
-    G("datetime_yyyymmdd", "int", d->datetime_yyyymmdd)
-    G("datetime_hhmmssmmm", "int", d->datetime_hhmmssmmm)
     G("frame_type", "int", d->frame_type)
     G("freq_range", "int", d->freq_range)
     G("subcarrier_spacing", "int", d->subcarrier_spacing)
@@ -347,20 +260,108 @@ void setup_trace_msg_data(event_trace_msg_data *d, void *database)
     G("number_of_bits", "int", d->number_of_bits)
     G("data", "buffer", d->data)
   }
-  // if (d->frame == -1 || d->slot == -1) goto error;
 #undef G
-  return;
 }
 
-// Function to check if a value is in the array
-int isValueInArray(int value, int arr[], int size)
+// -------------------------------------------------------------------
+// Table-driven UL metadata shared memory writer and debug printer
+// -------------------------------------------------------------------
+
+// Number of UL metadata fields written to shared memory (excludes msg_id and buffer)
+#define N_UL_METADATA_FIELDS 27
+
+// Descriptor for one metadata field to write to shared memory
+typedef struct {
+  int field_idx;     // index into event e.e[] array
+  size_t wire_size;  // number of bytes to write to shm
+} field_descriptor;
+
+// Build UL field descriptor array from a populated event_trace_msg_ul_data struct.
+// Must be called after setup_trace_msg_ul_data() so that field indices are populated.
+// Note: nb_antennas_tx maps to database field "nb_antennas_rx" (see G macro workaround above)
+void build_ul_field_descriptors(field_descriptor *fields, const event_trace_msg_ul_data *d)
 {
-  for (int i = 0; i < size; i++) {
-    if (arr[i] == value) {
-      return 1; // Value found
+  int i = 0;
+  fields[i++] = (field_descriptor){ d->frame, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->slot, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ FIELD_SENDING_TIME_SEC, sizeof(uint32_t) };
+  fields[i++] = (field_descriptor){ FIELD_SENDING_TIME_NSEC, sizeof(uint32_t) };
+  fields[i++] = (field_descriptor){ d->frame_type, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->freq_range, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->subcarrier_spacing, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->cyclic_prefix, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->symbols_per_slot, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->Nid_cell, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->rnti, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->rb_size, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->rb_start, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->start_symbol_index, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->nr_of_symbols, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->qam_mod_order, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->mcs_index, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->mcs_table, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->nrOfLayers, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->transform_precoding, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->dmrs_config_type, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->ul_dmrs_symb_pos, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->number_dmrs_symbols, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->dmrs_port, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->dmrs_nscid, sizeof(uint16_t) };
+  fields[i++] = (field_descriptor){ d->nb_antennas_tx, sizeof(uint8_t) };
+  fields[i++] = (field_descriptor){ d->number_of_bits, sizeof(uint32_t) };
+}
+
+// Print UL metadata fields for debug output
+// Note: nb_antennas_tx is the UE transmit antenna count (maps to database field "nb_antennas_rx")
+void print_ul_metadata_debug(event e, const event_trace_msg_ul_data *d, void *database)
+{
+  printf("\nUnix TS: %ld.%09ld", e.sending_time.tv_sec, e.sending_time.tv_nsec);
+  printf("\nMessage Info: msg_id %s (%d) \n", event_name_from_id(database, e.type), e.type);
+  printf("frame %d, slot %d, unix_ts %ld.%09ld\n",
+         e.e[d->frame].i, e.e[d->slot].i,
+         e.sending_time.tv_sec, e.sending_time.tv_nsec);
+  printf("frame_type %d, freq_range %d, subcarrier_spacing %d, cyclic_prefix %d, symbols_per_slot %d\n",
+         e.e[d->frame_type].i, e.e[d->freq_range].i,
+         e.e[d->subcarrier_spacing].i, e.e[d->cyclic_prefix].i,
+         e.e[d->symbols_per_slot].i);
+  printf("Nid_cell %d, rnti %d, rb_size %d, rb_start %d, start_symbol_index %d, nr_of_symbols %d\n",
+         e.e[d->Nid_cell].i, e.e[d->rnti].i,
+         e.e[d->rb_size].i, e.e[d->rb_start].i,
+         e.e[d->start_symbol_index].i, e.e[d->nr_of_symbols].i);
+  printf("qam_mod_order %d, mcs_index %d, mcs_table %d, nrOfLayers %d, transform_precoding %d\n",
+         e.e[d->qam_mod_order].i, e.e[d->mcs_index].i,
+         e.e[d->mcs_table].i, e.e[d->nrOfLayers].i,
+         e.e[d->transform_precoding].i);
+  printf("dmrs_config_type %d, ul_dmrs_symb_pos %d, number_dmrs_symbols %d, dmrs_port %d, dmrs_nscid %d\n",
+         e.e[d->dmrs_config_type].i, e.e[d->ul_dmrs_symb_pos].i,
+         e.e[d->number_dmrs_symbols].i, e.e[d->dmrs_port].i,
+         e.e[d->dmrs_nscid].i);
+  printf("nb_antennas_tx %d, number_of_bits %d, data size %d\n",
+         e.e[d->nb_antennas_tx].i, e.e[d->number_of_bits].i,
+         e.e[d->data].bsize);
+}
+
+// Write metadata fields to shared memory using field descriptor table.
+// Writes msg_id first, then loops through all fields.
+void write_metadata_to_shm(char *addr_wr, unsigned int *bufIdx_wr, event e,
+                           const field_descriptor *fields, int n_fields)
+{
+  // Write message ID
+  memcpy(&addr_wr[*bufIdx_wr], &e.type, sizeof(uint16_t));
+  *bufIdx_wr += sizeof(uint16_t);
+  // Write all metadata fields
+  for (int i = 0; i < n_fields; i++) {
+    if (fields[i].field_idx == FIELD_SENDING_TIME_SEC) {
+      uint32_t ts_sec = (uint32_t)e.sending_time.tv_sec;
+      memcpy(&addr_wr[*bufIdx_wr], &ts_sec, fields[i].wire_size);
+    } else if (fields[i].field_idx == FIELD_SENDING_TIME_NSEC) {
+      uint32_t ts_nsec = (uint32_t)e.sending_time.tv_nsec;
+      memcpy(&addr_wr[*bufIdx_wr], &ts_nsec, fields[i].wire_size);
+    } else {
+      memcpy(&addr_wr[*bufIdx_wr], &e.e[fields[i].field_idx].i, fields[i].wire_size);
     }
+    *bufIdx_wr += fields[i].wire_size;
   }
-  return 0; // Value not found
 }
 
 void reestablish_connection(int *socket, char *ip, int port, int number_of_events, int *is_on)
@@ -388,40 +389,24 @@ int main(int n, char **v)
   // trace_msgs_support_data_Collection_format
   // it is used to parse the requested messages if it is based
   // on Data Collection Trace Messages Structure and supported tracer messages indices
-  char *traces_iq_support_data_Collection_format[] = {"GNB_PHY_UL_FD_PUSCH_IQ",
-                                                            "GNB_PHY_UL_FD_DMRS",
-                                                            "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS",
-                                                            "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL"};
-  char *traces_bits_support_data_Collection_format[] = {"GNB_PHY_UL_PAYLOAD_RX_BITS",
-                                                              "UE_PHY_UL_SCRAMBLED_TX_BITS",
-                                                              "UE_PHY_UL_PAYLOAD_TX_BITS"};
-  // extra number of records to simlify Sync between base station and UE synchronization records.
+  char *traces_ul_support_data_Collection_format[] = {"GNB_PHY_UL_FD_PUSCH_IQ",
+                                                      "GNB_PHY_UL_FD_DMRS",
+                                                      "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS",
+                                                      "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL",
+                                                      "GNB_PHY_UL_PAYLOAD_RX_BITS",
+                                                      "UE_PHY_UL_SCRAMBLED_TX_BITS",
+                                                      "UE_PHY_UL_PAYLOAD_TX_BITS"};
+  // extra number of records to simplify sync between base station and UE synchronization records.
   // if you have network delay, you can increase the number of records to capture
   int max_sync_offset = 6; // 6 frames ~ 60 ms
-  // all supported messages
-  // Calculate the size of the combined array
-  int n_iq_msgs = sizeof(traces_iq_support_data_Collection_format) / sizeof(traces_iq_support_data_Collection_format[0]);
-  int n_bits_msgs = sizeof(traces_bits_support_data_Collection_format) / sizeof(traces_bits_support_data_Collection_format[0]);
-  int n_msgs_based_data_Collection_format = n_iq_msgs + n_bits_msgs;
-
-  // Create the combined array
-  char *traces_support_data_Collection_format[n_msgs_based_data_Collection_format];
-  // Copy IQ messages to the combined array
-  for (int i = 0; i < n_iq_msgs; i++) {
-    traces_support_data_Collection_format[i] = traces_iq_support_data_Collection_format[i];
-  }
-
-  // Copy Bits messages to the combined array
-  for (int i = 0; i < n_bits_msgs; i++) {
-    traces_support_data_Collection_format[i + n_iq_msgs] = traces_bits_support_data_Collection_format[i];
-  }
+  // Calculate the size of the UL message array
+  int n_ul_msgs = sizeof(traces_ul_support_data_Collection_format) / sizeof(traces_ul_support_data_Collection_format[0]);
 
   uint16_t msg_id = 0;
   uint16_t start_frame_number = 0;
   uint32_t number_records = 0; // number of records to capture, it is number of slots
   // array to store the requested tracer messages indices
   int req_tracer_msgs_indices[100] = {0};
-  // define variables --> to do: add all of them to be class of pointers
   char *database_filename = NULL;
   void *database;
   char *ip = DEFAULT_REMOTE_IP;
@@ -434,18 +419,19 @@ int main(int n, char **v)
   char trace_time_stamp_str[30];
 
   // data structure for the trace messages based on Data Collection Trace Messages Structure
-  event_trace_msg_data trace_msg_data;
+  event_trace_msg_ul_data trace_msg_ul_data;
 
-  // initlization variables
+  // initialization variables
   unsigned int bufIdx_wr = 0;
   unsigned int bufIdx_rd = 0;
   uint8_t num_req_tracer_msgs = 0;
 
-  // initilaze shared memory
+  // initialize shared memory
   char *addr_wr, *addr_rd;
-  printf("\n Data Collection Service: Initializing shared memory ...");
-  printf("\n Directory 1: %s, Directory 2: %s", GETKEYDIR1_UE, GETKEYDIR2_UE);
-  printf("\n Project ID: %d\n", PROJECTID_UE);
+  PRINT_STATE_BANNER("INIT");
+  printf("  Data Collection Service: Initializing shared memory ...\n");
+  printf("  Directory 1: %s, Directory 2: %s\n", GETKEYDIR1_UE, GETKEYDIR2_UE);
+  printf("  Project ID: %d\n", PROJECTID_UE);
   int shm_id_wr = create_shm(&addr_wr, GETKEYDIR1_UE, PROJECTID_UE);
   int shm_id_rd = create_shm(&addr_rd, GETKEYDIR2_UE, PROJECTID_UE);
   del_shm(addr_wr, shm_id_wr);
@@ -502,20 +488,18 @@ int main(int n, char **v)
   addr_rd[0] = 0; // important to check if we have new requested messages
 
   // read requested tracer msg indices from memory
-  printf("\n Data Collection Service: Waiting for messages request ...\n");
-  // 0: Wait
-  // 1: config
-  // 2: record
-  // 3: stop
+  PRINT_STATE_BANNER("WAIT");
+  printf("  Data Collection Service: Waiting for config message ...\n");
   // Wait for Action Config
   while (1) {
-    if ((uint8_t)(addr_rd[0]) == 0) {
+    if ((uint8_t)(addr_rd[0]) == STATE_WAIT) {
       usleep(50); // sleep for 50 us: 0.5 ms slot duration
     }
     // config state
-    else if ((uint8_t)(addr_rd[0]) == 1) {
+    else if ((uint8_t)(addr_rd[0]) == STATE_CONFIG) {
       get_time_stamp_usec(trace_time_stamp_str);
-      printf("\n Received config message. Time Stamp: %s", trace_time_stamp_str);
+      PRINT_STATE_BANNER("CONFIG");
+      printf("  Received config message. Time Stamp: %s\n", trace_time_stamp_str);
 
       // get the IP address length in bytes
       bufIdx_rd = 1;
@@ -532,11 +516,11 @@ int main(int n, char **v)
 
       // get the array bytes of the port number : 2 bytes
       uint8_t port_number_bytes[2] = {addr_rd[bufIdx_rd], addr_rd[bufIdx_rd + 1]};
-      bufIdx_rd += 2; // + 2 bytes = start frame number
+      bufIdx_rd += 2; // + 2 bytes = port number
 
       port = combine_bytes(port_number_bytes, 2);
-      printf("\n Parameters: IP Address length: %d, IP Address: %s, Port Number: %d \n", ip_address_length, ip_address, port);
-      addr_rd[0] = 0; // reset memory : to wait for record action
+      printf("  Parameters: IP Address length: %d, IP Address: %s, Port Number: %d\n", ip_address_length, ip_address, port);
+      addr_rd[0] = STATE_WAIT; // reset memory : to wait for record action
       break;
     }
   }
@@ -547,37 +531,39 @@ int main(int n, char **v)
 
   /* connect to the nr-softmodem */
   socket = connect_to(ip, port);
-  printf("\n Connected to nr-UEsoftmodem");
+  printf("  Connected to nr-uesoftmodem\n");
 
   // Read Action record or stop
-  printf("\n Data Collection Service: Waiting for record message ...\n");
+  PRINT_STATE_BANNER("WAIT");
+  printf("  Data Collection Service: Waiting for record/stop message ...\n");
   while (1) {
     // wait for Action record
-    if ((uint8_t)(addr_rd[0]) == 0) {
+    if ((uint8_t)(addr_rd[0]) == STATE_WAIT) {
       usleep(50); // sleep for 50 us: 0.5 ms slot duration
     }
 
     // quit state
-    else if ((uint8_t)(addr_rd[0]) == 3) {
-      printf("\n Received 'stop' command. Exiting...");
-      printf("\n ");
+    else if ((uint8_t)(addr_rd[0]) == STATE_STOP) {
+      PRINT_STATE_BANNER("STOP");
+      printf("  Received 'stop' command. Exiting...\n");
       // Clean up and exit
       break;
     }
     // record state
-    else if ((uint8_t)(addr_rd[0]) == 2) {
+    else if ((uint8_t)(addr_rd[0]) == STATE_RECORD) {
       // clear remote buffer if there is
       clear_remote_config();
       get_time_stamp_usec(trace_time_stamp_str);
-      printf("\n Received record message. Time Stamp: %s", trace_time_stamp_str);
+      PRINT_STATE_BANNER("RECORD");
+      printf("  Received record message. Time Stamp: %s\n", trace_time_stamp_str);
 
       // read number of requested messages
       bufIdx_rd = 1;
       num_req_tracer_msgs = addr_rd[bufIdx_rd];
       bufIdx_rd += 1;
-      printf("\n Number of requested tracer messages: %d,", num_req_tracer_msgs);
+      printf("  Number of requested tracer messages: %d\n", num_req_tracer_msgs);
       // reset memory : action to wait for next record action
-      addr_rd[0] = 0;
+      addr_rd[0] = STATE_WAIT;
 
       // read tracer msg IDs - every message ID has been stored in two bytes
       for (uint8_t msg_n = 0; msg_n < num_req_tracer_msgs; msg_n++) {
@@ -609,40 +595,36 @@ int main(int n, char **v)
       printf("start_frame: %d\n", start_frame_number);
 
       /* activate the trace in this array */
-      printf("\n Activate Tracer messages in on_off array: \n");
+      printf("  Activating tracer messages:\n");
       for (i = 0; i < num_req_tracer_msgs; i++) {
         char *on_off_name = event_name_from_id(database, req_tracer_msgs_indices[i]);
         on_off(database, on_off_name, is_on, 1);
-        printf("%d, %s, ", req_tracer_msgs_indices[i], on_off_name);
-        // on_off(database, "GNB_PHY_DL_OUTPUT_SIGNAL", is_on, 1);
+        printf("    %d: %s\n", req_tracer_msgs_indices[i], on_off_name);
       }
 
-      // get the event IDs for the bit messages
-      int traces_bits_support_data_Collection_format_idx[n_bits_msgs];
-      for (int i = 0; i < n_bits_msgs; i++) {
-        traces_bits_support_data_Collection_format_idx[i] =
-            event_id_from_name(database, traces_bits_support_data_Collection_format[i]);
-      }
-
-      // all supported messages
-      int traces_support_data_Collection_format_idx[n_msgs_based_data_Collection_format];
-      for (int i = 0; i < n_msgs_based_data_Collection_format; i++) {
-        traces_support_data_Collection_format_idx[i] = event_id_from_name(database, traces_support_data_Collection_format[i]);
+      // Build UL message ID array for generic UL dispatch
+      int ul_msg_ids[n_ul_msgs];
+      for (int i = 0; i < n_ul_msgs; i++) {
+        ul_msg_ids[i] = event_id_from_name(database, traces_ul_support_data_Collection_format[i]);
       }
 
       // setup data for the trace messages
-      setup_trace_msg_data(&trace_msg_data, database);
-      printf("\n Setup Trace Data Done");
+      setup_trace_msg_ul_data(&trace_msg_ul_data, database);
+      printf("  Setup UL trace data done\n");
+
+      // Build field descriptor table for table-driven shared memory writes
+      field_descriptor ul_fields[N_UL_METADATA_FIELDS];
+      build_ul_field_descriptors(ul_fields, &trace_msg_ul_data);
 
       // Get the start time
       struct timespec start_time = get_current_time();
 
-      /* activate the tracee in the nr-softmodem */
+      /* activate the traces in the nr-uesoftmodem */
       activate_traces(socket, number_of_events, is_on);
-      printf("\n Activated Traces in nr-UEsoftmodem");
+      printf("  Activated traces in nr-uesoftmodem\n");
 
       /* a buffer needed to receive events from the nr-softmodem */
-      OBUF ebuf = {osize : 0, omaxsize : 0, obuf : NULL};
+      OBUF ebuf = {.osize = 0, .omaxsize = 0, .obuf = NULL};
       /* read events */
       int nrecord_idx = 0;
       bufIdx_wr = 0;
@@ -656,8 +638,8 @@ int main(int n, char **v)
       int current_frame = 0, prev_frame = 0, current_slot = 0, prev_slot = 0;
       // offset to sync between base station and UE synchronization records or power measurements
       int sync_offset_index = 0; // increase the index only if the index of frame changes after getting all records
-      // since we will use the frame differece to do extra records, we should be sure that the last slot is recorded completely
-      printf("\n\n Data Collection Service: Start reading messages ...");
+      // since we will use the frame difference to do extra records, we should be sure that the last slot is recorded completely
+      printf("\n  Data Collection Service: Start reading messages ...\n");
       struct pollfd event_poll_fd;
       event_poll_fd.fd = socket;
       event_poll_fd.events = POLLIN;
@@ -677,27 +659,23 @@ int main(int n, char **v)
             continue; // Skip further processing and retry
           }
 
-          //-------------------------
-          // GNB_PHY_UL_FD_PUSCH_IQ,  GNB_PHY_UL_FD_DMRS_ID, GNB_PHY_UL_FD_CHAN_EST_DMRS_POS,
-          // UE_PHY_UL_SCRAMBLED_TX_BITS, GNB_PHY_UL_PAYLOAD_RX_BITS, UE_PHY_UL_PAYLOAD_TX_BITS
-          //-------------------------
           // is it a requested message
-          if (isValueInArray(e.type, req_tracer_msgs_indices, num_req_tracer_msgs)) {
+          if (is_message_in_list(req_tracer_msgs_indices, num_req_tracer_msgs, e.type)) {
             // is it based on Data Collection Trace Messages Structure
-            if (isValueInArray(e.type, traces_support_data_Collection_format_idx, n_msgs_based_data_Collection_format)) {
+            if (is_message_in_list(ul_msg_ids, n_ul_msgs, e.type)) {
               // Start recording from the next slot to mitigate capturing partial data
               // check if the current frame and slot are different from the previous frame and slot
               // Then, increase the record index
               if (start_recording == false) {
                 if (got_ref_frame_slot == false) {
-                  ref_frame = e.e[trace_msg_data.frame].i;
-                  ref_slot = e.e[trace_msg_data.slot].i;
+                  ref_frame = e.e[trace_msg_ul_data.frame].i;
+                  ref_slot = e.e[trace_msg_ul_data.slot].i;
                   printf("\nMessage Info: msg_id %s (%d) \n", event_name_from_id(database, e.type), e.type);
                   got_ref_frame_slot = true;
                 }
 
-                current_frame = e.e[trace_msg_data.frame].i;
-                current_slot = e.e[trace_msg_data.slot].i;
+                current_frame = e.e[trace_msg_ul_data.frame].i;
+                current_slot = e.e[trace_msg_ul_data.slot].i;
                 frame_difference = (current_frame - ref_frame + MAX_FRAME_INDEX + 1) % (MAX_FRAME_INDEX + 1);
                 slot_difference = (current_slot - ref_slot + MAX_SLOT_INDEX + 1) % (MAX_SLOT_INDEX + 1);
                 printf("\n First frame.slot: %d.%d, current frame.slot: %d.%d, diff frame.slot: %d.%d",
@@ -710,130 +688,30 @@ int main(int n, char **v)
 
                 if ((ref_frame != current_frame) || (ref_slot != current_slot)) {
                   start_recording = true;
-                  printf("\n Start recording from frame: %d, slot: %d ", e.e[trace_msg_data.frame].i, e.e[trace_msg_data.slot].i);
+                  printf("\n Start recording from frame: %d, slot: %d ", e.e[trace_msg_ul_data.frame].i, e.e[trace_msg_ul_data.slot].i);
                 }
               }
               // start recording from the next frame to mitigate capturing partial data
               if (start_recording == true) {
-                /* this is how to access the elements of the Data Collection trace messages.
-                 * we use e.e[<element>] and then the correct suffix, here
-                 * it's .i for the integer and .b for the buffer and .bsize for the buffer size
-                 * see in event.h the structure event_arg
-                 */
-                unsigned char *buf = e.e[trace_msg_data.data].b;
-
                 printf("\n\nRecord number: %d", nrecord_idx);
 #ifdef DEBUG_BUFFER
                 printf("\nBuffer index in bytes: %d", bufIdx_wr);
 #endif
-
-                // add general message header:  message ID,
-                // T-Tracer Message format
-                // FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm :
-                // int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot :
-                // int,Nid_cell : int,rnti :
-                // int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols :
-                // int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers :
-                // int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos :  int,number_dmrs_symbols :
-                // int,dmrs_port : int,dmrs_nscid :
-                // int,nb_antennas_tx : int,number_of_bits : buffer,data
-                // printf("\nTX : %d", e.e[trace_msg_data.nb_antennas_tx].i);
-                memcpy(&addr_wr[bufIdx_wr], &e.type, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.frame].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.slot].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.datetime_yyyymmdd].i, sizeof(uint32_t));
+                // --- UL IQ/Bits handler ---
+                // Write metadata + buffer to shared memory
+                write_metadata_to_shm(addr_wr, &bufIdx_wr, e, ul_fields, N_UL_METADATA_FIELDS);
+                // Write buffer: size (uint32_t) + raw data
+                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_ul_data.data].bsize, sizeof(uint32_t));
                 bufIdx_wr += sizeof(uint32_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.datetime_hhmmssmmm].i, sizeof(uint32_t));
-                bufIdx_wr += sizeof(uint32_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.frame_type].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.freq_range].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.subcarrier_spacing].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.cyclic_prefix].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.symbols_per_slot].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.Nid_cell].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.rnti].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.rb_size].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.rb_start].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.start_symbol_index].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.nr_of_symbols].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.qam_mod_order].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.mcs_index].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.mcs_table].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.nrOfLayers].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.transform_precoding].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.dmrs_config_type].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.ul_dmrs_symb_pos].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.number_dmrs_symbols].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.dmrs_port].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.dmrs_nscid].i, sizeof(uint16_t));
-                bufIdx_wr += sizeof(uint16_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.nb_antennas_tx].i, sizeof(uint8_t));
-                bufIdx_wr += sizeof(uint8_t);
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.number_of_bits].i, sizeof(uint32_t));
-                bufIdx_wr += sizeof(uint32_t);
-
-                printf("\nTime Stamp: %d_%d", e.e[trace_msg_data.datetime_yyyymmdd].i, e.e[trace_msg_data.datetime_hhmmssmmm].i);
-
-                // add message body: length in bytes + recorded data
-                memcpy(&addr_wr[bufIdx_wr], &e.e[trace_msg_data.data].bsize, sizeof(uint32_t));
-                bufIdx_wr += sizeof(uint32_t);
-
-                // read data from buffer and convert from unsigned char * array to int 16 using the right endianness
-                // T-tracer: Little Endian
-                // For BITS Messages, example: UE_PHY_UL_SCRAMBLED_TX_BITS: data in bytes
-
-                if (is_bits_messages(traces_bits_support_data_Collection_format_idx, n_bits_msgs, e.type)) {
-                  for (int byte_idx = 0; byte_idx < e.e[trace_msg_data.data].bsize; byte_idx += 1) {
-                    // printf("%d, ", buf[byte_idx]);
-                    memcpy(&addr_wr[bufIdx_wr], &buf[byte_idx], sizeof(uint8_t));
-                    bufIdx_wr += sizeof(uint8_t);
-                  }
-
-                } else {
-                  for (int byte_idx = 0; byte_idx < e.e[trace_msg_data.data].bsize; byte_idx += 2) {
-                    // For a little-endian system:
-                    memcpy(&addr_wr[bufIdx_wr], &buf[byte_idx], sizeof(uint8_t));
-                    bufIdx_wr += sizeof(uint8_t);
-                    memcpy(&addr_wr[bufIdx_wr], &buf[byte_idx + 1], sizeof(uint8_t));
-                    bufIdx_wr += sizeof(uint8_t);
-                  }
-                }
-                /*
-                for (int byte_idx_i = 0; byte_idx_i < e.e[d.nr_ul_fd_dmrs_data].bsize; byte_idx_i+=4) {
-                  int16_t I = buf[byte_idx_i] | (buf[byte_idx_i+1] << 8);
-                  int16_t Q = buf[byte_idx_i+2] | (buf[byte_idx_i+3] << 8);
-                  printf ("idx %d, ", byte_idx_i);
-                  printf ("\n%d", I);
-                  printf ("\n%d", Q);
-                }
-                */
+                memcpy(&addr_wr[bufIdx_wr], e.e[trace_msg_ul_data.data].b, e.e[trace_msg_ul_data.data].bsize);
+                bufIdx_wr += e.e[trace_msg_ul_data.data].bsize;
+#ifdef DEBUG_T_Tracer
+                print_ul_metadata_debug(e, &trace_msg_ul_data, database);
+#endif
                 // check if the current frame and slot are different from the previous frame and slot
                 // Then, increase the record index
-                current_frame = e.e[trace_msg_data.frame].i;
-                current_slot = e.e[trace_msg_data.slot].i;
+                current_frame = e.e[trace_msg_ul_data.frame].i;
+                current_slot = e.e[trace_msg_ul_data.slot].i;
 
                 // increase sync offset index if the current frame is different from the previous frame
                 if ((current_frame != prev_frame) && nrecord_idx >= number_records) {
@@ -846,43 +724,6 @@ int main(int n, char **v)
                   prev_frame = current_frame;
                   prev_slot = current_slot;
                 }
-#ifdef DEBUG_T_Tracer
-                printf("\nMessage Info: msg_id %s (%d) \n", event_name_from_id(database, e.type), e.type);
-                printf("frame %d, slot %d, datetime %d_%d\n",
-                       e.e[trace_msg_data.frame].i,
-                       e.e[trace_msg_data.slot].i,
-                       e.e[trace_msg_data.datetime_yyyymmdd].i,
-                       e.e[trace_msg_data.datetime_hhmmssmmm].i);
-                printf("frame_type %d, freq_range %d, subcarrier_spacing %d, cyclic_prefix %d, symbols_per_slot %d\n",
-                       e.e[trace_msg_data.frame_type].i,
-                       e.e[trace_msg_data.freq_range].i,
-                       e.e[trace_msg_data.subcarrier_spacing].i,
-                       e.e[trace_msg_data.cyclic_prefix].i,
-                       e.e[trace_msg_data.symbols_per_slot].i);
-                printf("Nid_cell %d, rnti %d, rb_size %d, rb_start %d, start_symbol_index %d, nr_of_symbols %d\n",
-                       e.e[trace_msg_data.Nid_cell].i,
-                       e.e[trace_msg_data.rnti].i,
-                       e.e[trace_msg_data.rb_size].i,
-                       e.e[trace_msg_data.rb_start].i,
-                       e.e[trace_msg_data.start_symbol_index].i,
-                       e.e[trace_msg_data.nr_of_symbols].i);
-                printf("qam_mod_order %d, mcs_index %d, mcs_table %d, nrOfLayers %d, transform_precoding %d\n",
-                       e.e[trace_msg_data.qam_mod_order].i,
-                       e.e[trace_msg_data.mcs_index].i,
-                       e.e[trace_msg_data.mcs_table].i,
-                       e.e[trace_msg_data.nrOfLayers].i,
-                       e.e[trace_msg_data.transform_precoding].i);
-                printf("dmrs_config_type %d, ul_dmrs_symb_pos %d, number_dmrs_symbols %d, dmrs_port %d, dmrs_nscid %d\n",
-                       e.e[trace_msg_data.dmrs_config_type].i,
-                       e.e[trace_msg_data.ul_dmrs_symb_pos].i,
-                       e.e[trace_msg_data.number_dmrs_symbols].i,
-                       e.e[trace_msg_data.dmrs_port].i,
-                       e.e[trace_msg_data.dmrs_nscid].i);
-                printf("nb_antennas_tx %d, number_of_bits %d, data size %d\n",
-                       e.e[trace_msg_data.nb_antennas_tx].i,
-                       e.e[trace_msg_data.number_of_bits].i,
-                       e.e[trace_msg_data.data].bsize);
-#endif
               } // End of start recording flag
             } // end of if statement for the supported messages based on Data Collection Trace Messages Structure
             else {
@@ -893,28 +734,25 @@ int main(int n, char **v)
         } // end while loop of reading events
         else {
           // No data, just loop and check time
-          usleep(100); // optional: avoid busy-waiting
+          usleep(50); // optional: avoid busy-waiting
         }
       } // End of while loop to read messages
 
-      // de-activate the tracee in the nr-softmodem
-      printf("\n De-activated Tracer message:\n");
+      // de-activate the traces in the nr-uesoftmodem
+      printf("\n  De-activating tracer messages\n");
       for (i = 0; i < num_req_tracer_msgs; i++) {
         char *on_off_name = event_name_from_id(database, req_tracer_msgs_indices[i]);
         on_off(database, on_off_name, is_on, 0);
-        // printf("\n %d, %s, ", req_tracer_msgs_indices[i], on_off_name);
-        // on_off(database, "GNB_PHY_DL_OUTPUT_SIGNAL", is_on, 1);
       }
-      // De-activate the tracee in the nr-softmodem
       activate_traces(socket, number_of_events, is_on);
-      printf("\n De-activated Traces");
+      printf("  De-activated traces\n");
 
       // Get the end time
       struct timespec end_time = get_current_time();
       // Calculate the time difference
       double time_diff = calculate_time_difference(start_time, end_time);
-      printf("Total Time difference: %.2f ms\n", time_diff);
-      printf("Time difference per record: %.2f ms\n", time_diff / (number_records + max_sync_offset));
+      printf("  Total time: %.2f ms\n", time_diff);
+      printf("  Time per record: %.2f ms\n", time_diff / (number_records + max_sync_offset));
 
       // discard stale or previous record data for the first DISCARD_RECORD_DURATION_MS
       struct timespec record_start, record_now;
@@ -941,10 +779,9 @@ int main(int n, char **v)
         }
       } // End of while loop to discard stale records
     }
-  } // End a while loop to check for the "stop" command
-  // de-activate the tracee in the nr-softmodem
+  } // End of while loop for record/stop
 
-  // free_database(database); //Do on one app, for example on gNB App
+  // free_database(database); // Done on gNB App only
   free(is_on);
   close(socket);
 

common/utils/T/tracer/ue.c

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

common/utils/bits.c

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LicenseRef-CSSL-1.0
  */
 
-#include "reverse_bits.h"
+#include "bits.h"
 // we avoid assertions.h as it necessitates othe dependencies (e.g., exit_function)
 #include <assert.h>
 #include <simde/x86/gfni.h>

common/utils/bits.h

@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
+ */
+
+#ifndef BITS_H_
+#define BITS_H_
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include "assertions.h"
+
+uint64_t reverse_bits(uint64_t in, int n_bits);
+void reverse_bits_u8(uint8_t const* in, size_t sz, uint8_t* out);
+
+static inline int get_last_bit_index(const uint32_t *arr, int sz)
+{
+  AssertFatal(sz > 0, "Invalid size %d to get the first bit of array\n", sz);
+  for (int i = sz - 1; i >= 0; i--) {
+    if (arr[i] != 0) {
+      // 31 - clz gives the index of the highest bit (0-31)
+      return (i * 32) + (31 - __builtin_clz(arr[i]));
+    }
+  }
+  return -1;
+}
+
+static uint32_t bit_mask(int from_bit, int num_bits)
+{
+  int total = from_bit + num_bits;
+  uint32_t right_mask = total < 32 ? (0xFFFFFFFF >> (32 - total)) : 0xFFFFFFFF;
+  return (0xFFFFFFFF << from_bit) & right_mask;
+}
+
+static inline int get_first_bit_index_mask(const uint32_t *arr, int sz, int from_bit, int num_bits)
+{
+  // start i from first_bit
+  int i = from_bit / 32;
+  from_bit %= 32;
+  for (; i < sz && num_bits > 0; i++) {
+    uint32_t a = arr[i] & bit_mask(from_bit, num_bits);
+    if (a != 0) {
+      // Find the first set bit in this 32-bit word
+      return (i * 32) + __builtin_ctz(a);
+    }
+    num_bits -= 32 - from_bit;
+    from_bit = 0;
+  }
+  return -1;
+}
+
+static inline int get_first_bit_index(const uint32_t *arr, int sz)
+{
+  return get_first_bit_index_mask(arr, sz, 0, sz * 32);
+}
+
+static inline int count_bits(const uint32_t *arr, int sz)
+{
+  int ret = 0;
+  // sz is the number of uint32_t elements
+  for (int i = 0; i < sz; i++)
+    ret += __builtin_popcount(arr[i]);
+  return ret;
+}
+
+static __attribute__((always_inline)) inline int count_bits64(uint64_t v)
+{
+  return __builtin_popcountll(v);
+}
+
+static __attribute__((always_inline)) inline int count_bits64_with_mask(uint64_t v, int start, int num)
+{
+  uint64_t mask = ((1LL << num) - 1) << start;
+  return count_bits64(v & mask);
+}
+#endif /* BITS_H_ */

common/utils/data_recording/config/config_data_recording.json

@@ -42,43 +42,59 @@
         "t_tracer_message_definition_file": "../T/T_messages.txt",
         "parameter_map_file": "config/wireless_link_parameter_map.yaml",
         "start_frame_number": 5,
-        "base_station": {
-            "requested_tracer_messages": [
-                "GNB_PHY_UL_FD_PUSCH_IQ",
-                "GNB_PHY_UL_FD_DMRS",
-                "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS",
-                "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL",
-                "GNB_PHY_UL_PAYLOAD_RX_BITS"
-            ],
-            "meta_data":{
-                "num_rx_antennas": 1,
-                "tx_gain": 48.0,
-                "rx_gain": 30.0,
-                "hw_type": "USRP X410",
-                "hw_subtype": "ZBX",
-                "seid": "328AB35"
-            }
-        },
-        "user_equipment": {
-            "requested_tracer_messages": [
-                "UE_PHY_UL_SCRAMBLED_TX_BITS",
-                "UE_PHY_UL_PAYLOAD_TX_BITS"
-            ],
-            "meta_data":{
-                "num_tx_antennas": 1,
-                "tx_gain": 48.0,
-                "rx_gain": 40.0,
-                "hw_type": "USRP X410",
-                "hw_subtype": "ZBX",
-                "seid": "323F75F"
-            }
-        },
         "common_meta_data": {
             "sample_rate": 61440000.0,
             "bandwidth": 40000000.0,
             "clock_reference": "external"
         },
-        "tracer_service_baseStation_address": "127.0.0.1:2021",
-        "tracer_service_userEquipment_address": "127.0.0.1:2023"
+        "nodes": [
+            {
+                "id": "gnb_0",
+                "type": "gnb",
+                "requested_tracer_messages": [
+                    "GNB_PHY_UL_FD_PUSCH_IQ",
+                    "GNB_PHY_UL_FD_DMRS",
+                    "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS",
+                    "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL",
+                    "GNB_PHY_UL_PAYLOAD_RX_BITS"],
+                "tracer_service_address": "127.0.0.1:2021",
+                "meta_data": {
+                    "num_tx_antennas": 1,
+                    "num_rx_antennas": 1,
+                    "tx_gain": 48.0,
+                    "rx_gain": 30.0,
+                    "hw_type": "USRP X410",
+                    "hw_subtype": "ZBX",
+                    "seid": "328AB35"
+                },
+                "shared_mem_config": {
+                    "read_path": "/tmp/gnb_app1",
+                    "write_path": "/tmp/gnb_app2",
+                    "project_id": 2335
+                }
+            },
+            {
+                "id": "ue_0",
+                "type": "ue",
+                "requested_tracer_messages": [
+                    "UE_PHY_UL_SCRAMBLED_TX_BITS",
+                    "UE_PHY_UL_PAYLOAD_TX_BITS"],
+                "tracer_service_address": "127.0.0.1:2023",
+                "meta_data": {
+                    "num_tx_antennas": 1,
+                    "num_rx_antennas": 1,
+                    "tx_gain": 48.0,
+                    "rx_gain": 30.0,
+                    "hw_type": "USRP X410",
+                    "hw_subtype": "ZBX",
+                    "seid": "323F75F"
+                },
+                "shared_mem_config": {
+                    "read_path": "/tmp/ue_app1",
+                    "write_path": "/tmp/ue_app2",
+                    "project_id": 2336
+                }
+            }
+        ]
     }
-}
+}

common/utils/data_recording/data_recording_app_v1.0.py

@@ -1,803 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-# ---------------------------------------------------------------------
-# brief main application of synchronized real-time data recording
-
-import sysv_ipc as ipc
-import struct
-import time
-from datetime import datetime
-from termcolor import colored
-import numpy as np
-import json
-import concurrent.futures
-# from concurrent import futures
-import threading
-# import related functions
-from lib import sigmf_interface
-# import library functions
-from lib import sync_service
-from lib import data_recording_messages_def
-from lib import common_utils
-from lib import config_interface
-
-DEBUG_WIRELESS_RECORDED_DATA = True
-DEBUG_BUFFER_READING = False
-
-# globally applicable metadata
-global_info = {
-    "author": "Abdo Gaber",
-    "description": "Synchronized Real-Time Data Recording",
-    "timestamp": 0,
-    "collection_file_prefix": "data-collection",  # collection file name prefix "deap-rx + str(...)"
-    "collection_file": "",  # Reserved to be created in the code: “data-collection_rec-0_TIME-STAMP”
-    "datetime_offset": "",  # datetime offset between current location and UTC/Zulu timezone
-    # Example: "+01:00" for Berlin, Germany
-    "save_config_data_recording_app_json": True,
-    "waveform_generator": "5gnr_oai",
-    "extensions": {},
-}
-
-# Supported OAI Trace messages
-# UL receiver messages
-# gNB IQ Msgs: "GNB_PHY_UL_FD_PUSCH_IQ", "GNB_PHY_UL_FD_DMRS", "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS",
-#               "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL"
-# gNB BITS Msgs: "GNB_PHY_UL_PAYLOAD_RX_BITS"
-# UE BITS Msgs: "UE_PHY_UL_SCRAMBLED_TX_BITS", "UE_PHY_UL_PAYLOAD_TX_BITS"
-
-supported_oai_tracer_messages = {
-    # gNB messages
-    "GNB_PHY_UL_FD_PUSCH_IQ": {
-        "file_name_prefix": "rx-fd-data",
-        "scope": "gNB",
-        "description": "Frequency-domain RX data",
-        "serialization_scheme": ["subcarriers", "ofdm_symbols"],
-    },
-    "GNB_PHY_UL_FD_DMRS": {
-        "file_name_prefix": "tx-pilots-fd-data",
-        "scope": "gNB",
-        "description": "Frequency-domain TX PUSCH DMRS data",
-        "serialization_scheme": ["subcarriers", "ofdm_symbols"],
-    },
-    "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS": {
-        "file_name_prefix": "raw-ce-fd-data",
-        "scope": "gNB",
-        "description": "Frequency-domain raw channel estimates (at DMRS positions)",
-        "serialization_scheme": ["subcarriers", "ofdm_symbols"],
-    },
-    "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL": {
-        "file_name_prefix": "raw-inter-ce-fd-data",
-        "scope": "gNB",
-        "description": "Interpolcated Frequency-domain raw channel estimates",
-        "serialization_scheme": ["subcarriers", "ofdm_symbols"],
-    },
-    "GNB_PHY_UL_PAYLOAD_RX_BITS": {
-        "file_name_prefix": "rx-payload-bits",
-        "scope": "gNB",
-        "description": "Received PUSCH payload bits",
-        "serialization_scheme": ["bits", "subcarriers", "ofdm_symbols"],
-    },
-    # UE messages
-    "UE_PHY_UL_SCRAMBLED_TX_BITS": {
-        "file_name_prefix": "tx-scrambled-bits",
-        "scope": "UE",
-        "description": "Transmitted scrambled PUSCH bits",
-        "serialization_scheme": ["bits", "subcarriers", "ofdm_symbols"],
-    },
-    "UE_PHY_UL_PAYLOAD_TX_BITS": {
-        "file_name_prefix": "tx-payload-bits",
-        "scope": "UE",
-        "description": "Transmitted PUSCH payload bits",
-        "serialization_scheme": ["bits", "subcarriers", "ofdm_symbols"],
-    },
-}
-# -------------------------------------------
-# System configuration: gNB
-project_id_gnb = 2335
-read_shm_path_gnb = "/tmp/gnb_app1"
-write_shm_path_gnb = "/tmp/gnb_app2"
-
-# System configuration: UE
-project_id_ue = 2336
-read_shm_path_ue = "/tmp/ue_app1"
-write_shm_path_ue = "/tmp/ue_app2"
-
-
-# initialize shared memory
-def attach_shm(shm_path, project_id):
-    key = ipc.ftok(shm_path, project_id)
-    shm = ipc.SharedMemory(key, 0, 0)
-    # I found if we do not attach ourselves
-    # it will attach as ReadOnly.
-    shm.attach(0, 0)
-    return shm
-
-
-def detach_shm(shm):
-    try:
-        shm.detach()
-        print("Shared memory detached successfully.")
-    except ipc.ExistentialError:
-        print("Shared memory segment does not exist.")
-
-
-def remove_shm(shm):
-    try:
-        shm.remove()
-        print("Shared memory removed successfully.")
-    except ipc.ExistentialError:
-        print("Shared memory segment does not exist.")
-
-
-# check data if avalible in the shared memory
-def is_data_available_in_memory(shm, bufIdx, general_message_header_length, timeout=20):
-    start_time = time.time()
-    while True:
-        buf = shm.read(bufIdx + general_message_header_length)
-        n_bytes = sum(buf)
-        print("Data Recording App: Waiting for Measurements!")
-        if n_bytes > 0:
-            print("There is data in memory, n_bytes: ", n_bytes)
-            return True
-        if (time.time() - start_time) > timeout:
-            break
-        time.sleep(1)
-    return False
-
-
-# Read data from Shared memory based Data Conversion Service message structure
-def read_data_from_shm(shm, bufIdx, tracer_msgs_identities):
-    # print buffer index
-    if DEBUG_BUFFER_READING:
-        print("Buffer Index: ", bufIdx)
-    # get general message header list
-    general_msg_header_list, general_message_header_length = data_recording_messages_def.get_general_msg_header_list()
-    buf = shm.read(bufIdx + general_message_header_length)
-    n_bytes = sum(buf)
-    if n_bytes == 0:
-        raise Exception('ERROR: No data available in memory')
-    msg_id = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("msg_id")])[0]
-    bufIdx += general_msg_header_list.get("msg_id")
-    frame = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("frame")])[0]
-    bufIdx += general_msg_header_list.get("frame")
-    slot = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("slot")])[0]
-    bufIdx += general_msg_header_list.get("slot")
-    # get time stamp:  yyyy mm dd hh mm ss msec
-    nr_trace_time_stamp_yyymmdd = \
-        struct.unpack('<i', buf[bufIdx:bufIdx+general_msg_header_list.get("datetime_yyyymmdd")])[0]
-    bufIdx += general_msg_header_list.get("datetime_yyyymmdd")
-    nr_trace_time_stamp_hhmmssmmm = \
-        struct.unpack('<i', buf[bufIdx:bufIdx+general_msg_header_list.get("datetime_hhmmssmmm")])[0]
-    bufIdx += general_msg_header_list.get("datetime_hhmmssmmm")
-    time_stamp_milli_sec = str(nr_trace_time_stamp_yyymmdd)+"_"+str(nr_trace_time_stamp_hhmmssmmm)
-    # get frame type
-    frame_type = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("frame_type")])[0]
-    bufIdx += general_msg_header_list.get("frame_type")
-    # get frequency range
-    freq_range = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("freq_range")])[0]
-    bufIdx += general_msg_header_list.get("freq_range")
-    # get subcarrier spacing
-    subcarrier_spacing = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("subcarrier_spacing")])[0]
-    bufIdx += general_msg_header_list.get("subcarrier_spacing")
-    # get cyclic prefix
-    cyclic_prefix = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("cyclic_prefix")])[0]
-    bufIdx += general_msg_header_list.get("cyclic_prefix")
-    # get symbols per slot
-    symbols_per_slot = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("symbols_per_slot")])[0]
-    bufIdx += general_msg_header_list.get("symbols_per_slot")
-    # get Nid cell
-    Nid_cell = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("Nid_cell")])[0]
-    bufIdx += general_msg_header_list.get("Nid_cell")
-    # get rnti
-    rnti = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("rnti")])[0]
-    bufIdx += general_msg_header_list.get("rnti")
-    # get rb size
-    rb_size = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("rb_size")])[0]
-    bufIdx += general_msg_header_list.get("rb_size")
-    # get rb start
-    rb_start = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("rb_start")])[0]
-    bufIdx += general_msg_header_list.get("rb_start")
-    # get start symbol index
-    start_symbol_index = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("start_symbol_index")])[0]
-    bufIdx += general_msg_header_list.get("start_symbol_index")
-    # get number of symbols
-    nr_of_symbols = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("nr_of_symbols")])[0]
-    bufIdx += general_msg_header_list.get("nr_of_symbols")
-    # get qam modulation order
-    qam_mod_order = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("qam_mod_order")])[0]
-    bufIdx += general_msg_header_list.get("qam_mod_order")
-    # get mcs index
-    mcs_index = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("mcs_index")])[0]
-    bufIdx += general_msg_header_list.get("mcs_index")
-    # get mcs table
-    mcs_table = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("mcs_table")])[0]
-    bufIdx += general_msg_header_list.get("mcs_table")
-    # get number of layers
-    nrOfLayers = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("nrOfLayers")])[0]
-    bufIdx += general_msg_header_list.get("nrOfLayers")
-    # get transform precoding
-    transform_precoding = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("transform_precoding")])[0]
-    bufIdx += general_msg_header_list.get("transform_precoding")
-    # get dmrs config type
-    dmrs_config_type = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("dmrs_config_type")])[0]
-    bufIdx += general_msg_header_list.get("dmrs_config_type")
-    # get ul dmrs symb pos
-    ul_dmrs_symb_pos = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("ul_dmrs_symb_pos")])[0]
-    bufIdx += general_msg_header_list.get("ul_dmrs_symb_pos")
-    # get number dmrs symbols
-    number_dmrs_symbols = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("number_dmrs_symbols")])[0]
-    bufIdx += general_msg_header_list.get("number_dmrs_symbols")
-    # get dmrs port
-    dmrs_port = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("dmrs_port")])[0]
-    bufIdx += general_msg_header_list.get("dmrs_port")
-    # get dmrs scid
-    dmrs_scid = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("dmrs_scid")])[0]
-    bufIdx += general_msg_header_list.get("dmrs_scid")
-    # get nb antennas rx for gNB or nb antennas tx for UE
-    nb_antennas = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("nb_antennas")])[0]
-    bufIdx += general_msg_header_list.get("nb_antennas")
-    # get number of bits
-    number_of_bits = struct.unpack('<I', buf[bufIdx:bufIdx+general_msg_header_list.get("number_of_bits")])[0]
-    bufIdx += general_msg_header_list.get("number_of_bits")
-    # get length of bytes
-    length_bytes = struct.unpack('<I', buf[bufIdx:bufIdx+general_msg_header_list.get("length_bytes")])[0]
-    bufIdx += general_msg_header_list.get("length_bytes")
-
-    # print all captured data
-    if DEBUG_WIRELESS_RECORDED_DATA:
-        print(" ")
-        print(f"Time stamp: {time_stamp_milli_sec}")
-        print(f"MSG ID: {msg_id:<5} MSG Name: {tracer_msgs_identities[msg_id]}")
-        print(f"Frame: {frame:<5} Slot: {slot:<5}")
-        print(f"Frame Type: {frame_type:<5} Frequency Range: {freq_range:<5}"
-              f"Subcarrier Spacing: {subcarrier_spacing:<5} Cyclic Prefix: {cyclic_prefix:<5} "
-              f"Symbols per Slot: {symbols_per_slot:<5}")
-        print(f"Nid Cell: {Nid_cell:<5} RNTI: {rnti:<5}")
-        print(f"RB Size: {rb_size:<5} RB Start: {rb_start:<5} Start Symbol Index: {start_symbol_index:<5} "
-              f"Number of Symbols: {nr_of_symbols:<5}")
-        print(f"QAM Modulation Order: {qam_mod_order:<5} MCS Index: {mcs_index:<5} "
-              f"MCS Table: {mcs_table:<5}")
-        print(f"Number of Layers: {nrOfLayers:<5} Transform Precoding: {transform_precoding:<5}")
-        print(f"DMRS Config Type: {dmrs_config_type:<5} UL DMRS Symbol Position: {ul_dmrs_symb_pos:<5} "
-              f"Number of DMRS Symbols: {number_dmrs_symbols:<5}")
-        print(f"DMRS Port: {dmrs_port:<5} DMRS SCID: {dmrs_scid:<5} "
-              f"Number of Antennas: {nb_antennas:<5}")
-        print(f"Number of bits: {number_of_bits:<5} Length of bytes: {length_bytes:<5}")
-    # raise exception if time stamp is zero, it means that the data is not recorded yet
-    if nr_trace_time_stamp_yyymmdd == 0 and nr_trace_time_stamp_hhmmssmmm == 0:
-        raise Exception("ERROR: Time stamp is zero, data is not recorded yet or something wrong, check logs!")
-    # get recorded data
-    buf = shm.read(bufIdx + length_bytes)
-    # bit_msg_index = get_index_of_id(tracer_msgs_identities, "GNB_PHY_UL_PAYLOAD_RX_BITS")
-    captured_data = {}
-    # If message is bit message, store data in bytes
-    # then the field number_of_bits should be not zero
-    if "_BITS" in tracer_msgs_identities[msg_id]:
-        # recorded_data = buf[bufIdx:bufIdx + length_bytes]
-        recorded_data = struct.unpack("<" + int(length_bytes) * 'B', buf[bufIdx:bufIdx + length_bytes])
-        bufIdx += length_bytes
-        # convert data in bytes to bits
-        bits_vector = []
-        for byte in recorded_data:
-            bits_vector.extend([int(bit) for bit in format(int(byte), '08b')])
-        captured_data["sigmf_data_type"] = "ri8_le"
-        # convert to uint8
-        captured_data["recorded_data"] = np.asarray(bits_vector).astype(np.uint8)
-        # recorded_data_formated = recorded_data.astype(np.complex64) # convert to complex64
-    else:
-        recorded_data = struct.unpack("<" + int(length_bytes/2) * 'h', buf[bufIdx:bufIdx + length_bytes])
-        bufIdx += length_bytes
-        # print("IQ data I/Q: ", recorded_data)
-        # Convert real data to complext data
-        # converting list to array
-        recorded_data = np.asarray(recorded_data)
-        # recorded_data_complex = recorded_data
-        recorded_data_complex = common_utils.real_to_complex(recorded_data)
-        captured_data["sigmf_data_type"] = "cf32_le"
-        # convert to complex64
-        captured_data["recorded_data"] = recorded_data_complex.astype(np.complex64)
-    # print("Recorded Data: ", captured_data["recorded_data"])
-    # store data in dictonary
-    captured_data["message_id"] = msg_id
-    captured_data["message_type"] = tracer_msgs_identities[msg_id]
-    captured_data["frame"] = frame
-    captured_data["slot"] = slot
-    captured_data["time_stamp"] = time_stamp_milli_sec
-    captured_data["frame_type"] = frame_type
-    captured_data["freq_range"] = freq_range
-    captured_data["subcarrier_spacing"] = subcarrier_spacing
-    captured_data["cyclic_prefix"] = cyclic_prefix
-    # captured_data["symbols_per_slot"] = symbols_per_slot  ... not used
-    captured_data["Nid_cell"] = Nid_cell
-    captured_data["rnti"] = rnti
-    captured_data["rb_size"] = rb_size
-    captured_data["rb_start"] = rb_start
-    captured_data["start_symbol_index"] = start_symbol_index
-    captured_data["nr_of_symbols"] = nr_of_symbols
-    captured_data["qam_mod_order"] = qam_mod_order
-    captured_data["mcs_index"] = mcs_index
-    captured_data["mcs_table"] = mcs_table
-    captured_data["nrOfLayers"] = nrOfLayers
-    captured_data["transform_precoding"] = transform_precoding
-    captured_data["dmrs_config_type"] = dmrs_config_type
-    captured_data["ul_dmrs_symb_pos"] = ul_dmrs_symb_pos
-    captured_data["number_dmrs_symbols"] = number_dmrs_symbols
-    captured_data["dmrs_port"] = dmrs_port
-    captured_data["dmrs_scid"] = dmrs_scid
-    captured_data["nb_antennas"] = nb_antennas
-    captured_data["number_of_bits"] = number_of_bits
-    return captured_data, bufIdx
-
-
-# Synchronize data between gNB and UE
-def sync_data_conversion_service(
-        shm_reading_gnb, shm_reading_ue, sync_info, config_meta_data, gnb_args, ue_args):
-    # Initialize variables
-    record_idx = 0
-    prev_frame = -1
-    prev_slot = -1
-    ue_bufIdx = 0
-    gnb_bufIdx = 0
-
-    gnb_args.num_requested_tracer_msgs = len(
-        config_meta_data["data_recording_config"]["base_station"][
-            "requested_tracer_messages"])
-    ue_args.num_requested_tracer_msgs = len(
-        config_meta_data["data_recording_config"]["user_equipment"][
-            "requested_tracer_messages"])
-    tracer_msgs_identities = config_meta_data["data_recording_config"][
-        "tracer_msgs_identities"]
-
-    global_info = config_meta_data["data_recording_config"]["global_info"]
-
-    # Get UE data based on the sync data
-    bufIdx = 0
-    timeout_sync = time.time() + 5  # 5 seconds if no sync data found, stop the process
-    while True:
-        # wait for the next record
-        # To do: check if we need to add exta waiting times between different events in case of
-        # data streaming via network such as on UE side or gNB side
-        time.sleep(0.0035)  # 2.3 ms = latency of T tracer to capture data from the RAN
-        ue_bufIdx = bufIdx
-        captured_data, bufIdx = read_data_from_shm(shm_reading_ue, bufIdx, tracer_msgs_identities)
-        if (captured_data["frame"] == sync_info["frame"]
-                and captured_data["slot"] == sync_info["slot"]):
-            break
-        if time.time() > timeout_sync:
-            raise Exception(
-                "ERROR: Data Recording NO Sync Found, check Tracer Services if they are connected!")
-
-    # Get gNB data based on the sync data
-    bufIdx = 0
-    while True:
-        time.sleep(0.0035)
-        gnb_bufIdx = bufIdx
-        captured_data, bufIdx = read_data_from_shm(
-            shm_reading_gnb, bufIdx, tracer_msgs_identities)
-        if (captured_data["frame"] == sync_info["frame"]
-                and captured_data["slot"] == sync_info["slot"]):
-            break
-
-    # Read Synchronized data between gNB and UE
-    while True:  # read all records
-        print("\nRecord number: ", record_idx)
-        if DEBUG_BUFFER_READING:
-            print(f"Buffer Index gNB: {gnb_bufIdx}, Buffer Index UE: {ue_bufIdx}")
-        # wait for the next record
-        # To do: check if we need to add exta waiting times between different events in case of
-        # data streaming via network such as on UE side or gNB side
-        time.sleep(0.0035)  # 2.3 ms = latency of T tracer to capture data from the RAN
-
-        collected_metafiles = []
-        # Read data from gNB T-tracer Application
-        for idx in range(gnb_args.num_requested_tracer_msgs):
-            time.sleep(0.0015)
-            if DEBUG_WIRELESS_RECORDED_DATA:
-                print(f"\nRecord number: {record_idx}, Reading MSG data ", idx)
-            captured_data, gnb_bufIdx = read_data_from_shm(
-                shm_reading_gnb, gnb_bufIdx, tracer_msgs_identities)
-            # drive the collection file time stamp from the first message per record
-            if idx == 0:
-                # Get time stamp
-                time_stamp_ms, time_stamp_ms_file_name = (
-                    sigmf_interface.time_stamp_formating(
-                        captured_data["time_stamp"], global_info["datetime_offset"]))
-                global_info["collection_file"] = (
-                    global_info["collection_file_prefix"]
-                    + "-rec-"
-                    + str(record_idx)
-                    + "-"
-                    + str(time_stamp_ms_file_name)
-                )
-                global_info["timestamp"] = time_stamp_ms
-
-            # Write data into files with the given format
-            if config_meta_data["data_recording_config"]["enable_saving_tracer_messages_sigmf"]:
-                collected_metafiles.append(
-                    sigmf_interface.write_recorded_data_to_sigmf(
-                        captured_data, config_meta_data, global_info, record_idx))
-
-        # Read data from UE T-tracer Application
-        for idx in range(ue_args.num_requested_tracer_msgs):
-            time.sleep(0.0015)
-            if DEBUG_WIRELESS_RECORDED_DATA:
-                print(f"\nRecord number: {record_idx}, Reading MSG data ", idx)
-            captured_data, ue_bufIdx = read_data_from_shm(
-                shm_reading_ue, ue_bufIdx, tracer_msgs_identities)
-
-            # Write data into files with the given format
-            if config_meta_data["data_recording_config"]["enable_saving_tracer_messages_sigmf"]:
-                collected_metafiles.append(
-                    sigmf_interface.write_recorded_data_to_sigmf(
-                        captured_data, config_meta_data, global_info, record_idx))
-
-        # generate SigMF collection file
-        if config_meta_data["data_recording_config"]["enable_saving_tracer_messages_sigmf"]:
-            data_storage_path = config_meta_data["data_recording_config"][
-                "data_storage_path"]
-            description = global_info["description"]
-            sigmf_interface.save_sigmf_collection(
-                collected_metafiles, global_info, description, data_storage_path)
-
-        frame = captured_data["frame"]
-        slot = captured_data["slot"]
-
-        # Check for changes in frame or slot
-        if frame != prev_frame or slot != prev_slot:
-            record_idx += 1
-            # We have reached the end of the data. Break the loop
-            if record_idx >= config_meta_data["data_recording_config"]["num_records"]:
-                break
-        # Update previous frame and slot
-        prev_frame = frame
-        prev_slot = slot
-
-
-# data conversion service
-def data_conversion_service(shm_reading, config_meta_data, args, sync_info, do_sync):
-    # Initialize variables
-    record_idx = 0
-    prev_frame = -1
-    prev_slot = -1
-    bufIdx = 0
-    # Read data from T-tracer Application
-    print("Data Conversion Service: Reading data from T-tracer Application")
-    print("Requested Tracer Messages: ", args.num_requested_tracer_msgs)
-    if args.num_requested_tracer_msgs > 0:
-        num_requested_tracer_msgs = args.num_requested_tracer_msgs
-    else:
-        raise Exception("ERROR: No requested tracer messages found!")
-
-    tracer_msgs_identities = config_meta_data["data_recording_config"][
-        "tracer_msgs_identities"]
-    global_info = config_meta_data["data_recording_config"]["global_info"]
-
-    if do_sync:
-        print(" Find Memory Index of NR MSGs based on Sync info")
-        while True:
-            time.sleep(0.0035)
-            station_bufIdx = bufIdx
-            captured_data, bufIdx = read_data_from_shm(
-                shm_reading, bufIdx, tracer_msgs_identities)
-            print("*Sync Status: NR Captured Data (Frame, slot): (", captured_data["frame"],
-                  ", ", captured_data["slot"], "), Sync Info (Frame, slot): (", sync_info["frame"],
-                  ", ", sync_info["slot"]," )")
-            if (captured_data["frame"] == sync_info["frame"]
-                    and captured_data["slot"] == sync_info["slot"]):
-                print("*sync Pass")
-                break
-            print("*sync Fail")
-        bufIdx = station_bufIdx
-
-    # Read data from T-tracer Application
-    while True:  # read all records
-        print("\nRecord number: ", record_idx)
-        if DEBUG_BUFFER_READING:
-            print(f"Buffer Index: {bufIdx}")
-        # wait for the next record
-        # To do: check if we need to add exta waiting times between different events in case of
-        # data streaming via network such as on UE side or gNB side
-        time.sleep(0.0035)  # 2.3 ms = latency of T tracer to capture data from the RAN
-
-        collected_metafiles = []
-        for idx in range(num_requested_tracer_msgs):
-            time.sleep(0.0015)
-            if DEBUG_WIRELESS_RECORDED_DATA:
-                print(f"\nRecord number: {record_idx}, Reading MSG data ", idx)
-            captured_data, bufIdx = read_data_from_shm(
-                shm_reading, bufIdx, tracer_msgs_identities)
-            # derive the collection file time stamp from the first message per record
-            if idx == 0:
-                # Get time stamp
-                time_stamp_ms, time_stamp_ms_file_name = (
-                    sigmf_interface.time_stamp_formating(
-                        captured_data["time_stamp"], global_info["datetime_offset"]))
-                global_info["collection_file"] = (
-                    global_info["collection_file_prefix"]
-                    + "-rec-"
-                    + str(record_idx)
-                    + "-"
-                    + str(time_stamp_ms_file_name))
-                global_info["timestamp"] = time_stamp_ms
-            # Write data into files with the given format
-            if config_meta_data["data_recording_config"]["enable_saving_tracer_messages_sigmf"]:
-                collected_metafiles.append(
-                    sigmf_interface.write_recorded_data_to_sigmf(
-                        captured_data, config_meta_data, global_info, record_idx))
-
-        frame = captured_data["frame"]
-        slot = captured_data["slot"]
-
-        # generate SigMF collection file
-        if config_meta_data["data_recording_config"]["enable_saving_tracer_messages_sigmf"]:
-            data_storage_path = config_meta_data["data_recording_config"][
-                "data_storage_path"]
-            description = global_info["description"]
-            sigmf_interface.save_sigmf_collection(
-                collected_metafiles, global_info, description, data_storage_path)
-
-        # Check for changes in frame or slot
-        if frame != prev_frame or slot != prev_slot:
-            record_idx += 1
-            # We have reached the end of the data. Break the loop
-            if record_idx >= config_meta_data["data_recording_config"]["num_records"]:
-                break
-        # Update previous frame and slot
-        prev_frame = frame
-        prev_slot = slot
-
-
-# Write Tracer Control Message
-def write_shm(shm, args):
-    # Note: Big Endian >, Little Endian <
-    # Note: unsigned char B, signed char b, short h, int I, long long q
-    # Note: float f, double d, string s,  char c, bool ?
-    # 1: config
-    # 2: record
-    # 3: quit
-    print("Write Shared Memory: ", args.action)
-    if args.action == "config":
-        # Determine the length of the IP address
-        ip_length = len(args.bytes_IPaddress) + 1  # String terminator
-        # Construct the format string dynamically
-        format_string = f"{ip_length}s"
-        shm.write(
-            # Config action
-            struct.pack("<B", 1) +
-            struct.pack("<B", ip_length) +
-            struct.pack(format_string, args.bytes_IPaddress) +
-            struct.pack("<h", int(args.port))
-        )
-        print("T-Tracer Config IP: ", args.bytes_IPaddress, " port: ", args.port)
-    elif args.action == "record":
-        shm.write(
-                # Record action
-                struct.pack("<B", int(2)) +
-                struct.pack("<B", args.num_requested_tracer_msgs) +
-                struct.pack(
-                    "<{}h".format(len(args.req_tracer_msgs_indices)),
-                    *args.req_tracer_msgs_indices,) +
-                struct.pack("<I", args.num_records) +
-                struct.pack("<h", args.start_frame_number)
-        )
-        print("T-Tracer Record: N Messags: ", args.num_requested_tracer_msgs,
-              ", Msg IDs: ", args.req_tracer_msgs_indices,
-              ", Num records: ", args.num_records,
-              ", Start Frame: ", args.start_frame_number,
-              )
-    elif args.action == "quit":
-        shm.write(struct.pack("<B", int(3)))  # Quit action
-        print("T-Tracer Quit")
-    else:
-        print("Unknown action for data recording system!")
-
-
-# write shared memory task
-def write_shm_task(barrier, shm_id, args):
-    # Wait for threads to be ready
-    barrier.wait()
-    # send request to related T-Tracer Application
-    write_shm(shm_id, args)
-
-
-if __name__ == "__main__":
-    # -------------------------------------------
-    # ------------- Configuration --------------
-    # ------------------------------------------
-    # Data Recording Configuration
-    data_recording_config_file = "config/config_data_recording.json"
-    # -------------------------------------------
-    # Configuration
-    # -------------------------------------------
-    # First: get the configuration mode either local or remote
-    # Second: get data recording configuration
-    # Read and parse the JSON file
-    with open(data_recording_config_file, "r") as file:
-        config_meta_data = json.load(file)
-
-    # get Configuration parameters
-    config_meta_data, gnb_args, ue_args = config_interface.get_data_recording_config(config_meta_data)
-
-    # check if lists of requested tracer messages IDs are not empty
-    if not gnb_args.requested_tracer_messages and \
-            not ue_args.requested_tracer_messages:
-        raise Exception("ERROR: No requested tracer messages are provided")
-
-    # check if gnb_requested_tracer_messages is not empty, attach to the shared memory
-    if gnb_args.requested_tracer_messages:
-        # attach to the shared memory
-        shm_writing_gnb = attach_shm(write_shm_path_gnb, project_id_gnb)
-        shm_reading_gnb = attach_shm(read_shm_path_gnb, project_id_gnb)
-
-    # check if ue_requested_tracer_messages is not empty, attach to the shared memory
-    if ue_args.requested_tracer_messages:
-        # attach to the shared memory
-        shm_writing_ue = attach_shm(write_shm_path_ue, project_id_ue)
-        shm_reading_ue = attach_shm(read_shm_path_ue, project_id_ue)
-
-    # get general message header list
-    general_msg_header_list, general_message_header_length = \
-        data_recording_messages_def.get_general_msg_header_list()
-
-    # Add supported OAI Tracer Messages
-    config_meta_data["data_recording_config"]["supported_oai_tracer_messages"] = supported_oai_tracer_messages
-    # Add global info
-    config_meta_data["data_recording_config"]["global_info"] = global_info
-
-    # -------------------------------------------
-    # Initialization
-    # -------------------------------------------
-    # -------------------------------------------
-    # send Tracer Control Message request to T-Tracers Apps
-    # -------------------------------------------
-    #   It consists of the following fields:
-    #       Config action
-    #       IP address length
-    #       IP address
-    #       Port Number
-    # check if gnb_requested_tracer_messages is not empty, config T-Tracer gNB via shared memory
-    if gnb_args.requested_tracer_messages:
-        # Config T-Tracer via shared memory
-        gnb_args.action = "config"
-        write_shm(shm_writing_gnb, gnb_args)
-
-    # check if ue_requested_tracer_messages is not empty, config T-Tracer UE via shared memory
-    if ue_args.requested_tracer_messages:
-        # Config T-Tracer via shared memory
-        ue_args.action = "config"
-        write_shm(shm_writing_ue, ue_args)
-
-    time.sleep(0.5)  # wait for the config to be applied
-
-    # -------------------------------------------
-    # Execution
-    # -------------------------------------------
-    # send Tracer Control Message request to T-Tracers Apps
-    # -------------------------------------------
-    #   It consists of the following fields:
-    #       Record action
-    #       Number of requested Tracer Messages
-    #       Requested Tracer Messages ID 1, …, ID N
-    #       Number of records to be recorded in slots
-    #       Start SFN: Frame Index to start data collection from it, useful for future
-    #       data sync between gNB and UE but not yet used
-    print("Args:")
-    if gnb_args.requested_tracer_messages:
-        gnb_args.action = "record"
-        print("gnb_args: ", gnb_args)
-    if ue_args.requested_tracer_messages:
-        ue_args.action = "record"
-        print("ue_args: ", ue_args)
-
-    start_time = time.time()
-    print("Send data logging request us:", datetime.now().strftime("%Y%m%d-%H%M%S%f"))
-
-    # if requested: gNB and UE Tracer Messages
-    # gNB + UE Tracer Messages
-    if gnb_args.requested_tracer_messages and ue_args.requested_tracer_messages:
-        # Create a barrier to synchronize the threads
-        barrier = threading.Barrier(2)
-        with concurrent.futures.ThreadPoolExecutor() as executor:
-            tracer_ue = executor.submit(write_shm_task, barrier, shm_writing_ue, ue_args)
-            tracer_gnb = executor.submit(write_shm_task, barrier, shm_writing_gnb, gnb_args)
-            # Wait for both functions to complete
-            concurrent.futures.wait([tracer_ue, tracer_gnb])
-
-    # gNB Tracer Messages
-    elif gnb_args.requested_tracer_messages:
-        write_shm(shm_writing_gnb, gnb_args)
-
-    # UE Tracer Messages
-    elif ue_args.requested_tracer_messages:
-        write_shm(shm_writing_ue, ue_args)
-    else:
-        raise Exception("ERROR: No requested tracer messages IDs are provided")
-
-    # -------------------------------------------
-    # Read data from gNB and UE T-tracer Application
-    # -------------------------------------------
-    # Check if data is available in memory
-    # Initialize variables
-    bufIdx = 0
-    timeout = 10  # 10 seconds from now
-
-    # If gNB MSGs are requested
-    if gnb_args.requested_tracer_messages:
-        # Check if data is available in gNB memory
-        is_gnb_data_in_memory = is_data_available_in_memory(
-            shm_reading_gnb, bufIdx, general_message_header_length, timeout)
-        # Report the status of gNB T-Tracer APP locally
-        if not is_gnb_data_in_memory:
-            print("Error: gNB: Check t-Tracer APP of gNB, check IPs and Ports")
-            print("Error: gNB: If IPs and Ports are correct, re-run the hanging app.")
-            print("It seems the socket was not closed properly")
-            raise Exception("ERROR: Time out, check if gNB T-Tracer APP connected to stack")
-    # If UE MSGs are requested
-    if ue_args.requested_tracer_messages:
-        # Check if data is available in UE memory
-        is_ue_data_in_memory = is_data_available_in_memory(
-            shm_reading_ue, bufIdx, general_message_header_length, timeout)
-        # Report the status of UE T-Tracer APP locally
-        if not is_ue_data_in_memory:
-            print("Error: UE: Check t-Tracer APP of UE, check IPs and Ports")
-            print("Error: UE: If IPs and Ports are correct, re-run the hanging app.")
-            print("It seems the socket was not closed properly")
-            raise Exception("ERROR: Time out, check if UE T-Tracer APP connected to stack")
-
-    # -------------------------------------------
-    # Sync data between gNB and UE
-    # -------------------------------------------
-    # write JSON file
-    common_utils.write_config_data_recording_app_json(config_meta_data)
-    sync_info = {}
-    if gnb_args.requested_tracer_messages and ue_args.requested_tracer_messages:
-        # Sync data between gNB and UE
-        sync_info = sync_service.sync_gnb_ue_captured_data(shm_reading_gnb, shm_reading_ue)
-        print("\n***Sync data between gNB and UE: ", sync_info)
-        # Read data from gNB and UE T-tracer Applications
-        sync_data_conversion_service(
-            shm_reading_gnb, shm_reading_ue, sync_info, config_meta_data, gnb_args, ue_args)
-    elif gnb_args.requested_tracer_messages:
-        # Read data from gNB T-tracer Application
-        data_conversion_service(
-            shm_reading_gnb, config_meta_data, gnb_args, sync_info, do_sync=False)
-    elif ue_args.requested_tracer_messages:
-        # Read data from UE T-tracer Application
-        data_conversion_service(
-            shm_reading_ue, config_meta_data, ue_args, sync_info, do_sync=False)
-    else:
-        raise Exception("ERROR: No requested tracer messages IDs are provided")
-
-    # measure Elapsed time
-    time_elapsed = time.time() - start_time
-    time_elapsed_ms = int(time_elapsed * 1000)
-    print(
-        "Elapsed time of getting Requested Messages and writing data and meta data files:",
-        colored(time_elapsed_ms, "yellow"), "ms",)
-
-    # Stop T-Tracer Application function
-    if gnb_args.requested_tracer_messages:
-        gnb_args.action = "quit"
-        write_shm(shm_writing_gnb, gnb_args)
-        # Add Sleep time to ensure that the message sent to the UE T-tracer application is received
-        # before the shared memory is detached
-        time.sleep(0.5)
-        # Clean shared memory
-        detach_shm(shm_reading_gnb)
-        detach_shm(shm_writing_gnb)
-        remove_shm(shm_reading_gnb)
-        remove_shm(shm_writing_gnb)
-    if ue_args.requested_tracer_messages:
-        ue_args.action = "quit"
-        write_shm(shm_writing_ue, ue_args)
-        # Add Sleep time to ensure that the message sent to the UE T-tracer application is received
-        # before the shared memory is detached
-        time.sleep(0.5)
-        # Clean shared memory
-        detach_shm(shm_reading_ue)
-        detach_shm(shm_writing_ue)
-        remove_shm(shm_reading_ue)
-        remove_shm(shm_writing_ue)
-
-    print("End of the RF Data Recording API")
-    pass

common/utils/data_recording/data_recording_app_v1.1.py

@@ -0,0 +1,523 @@
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+# ---------------------------------------------------------------------
+# brief main application of synchronized real-time data recording
+
+import atexit
+import signal
+import sys
+import time
+from datetime import datetime
+import json
+import concurrent.futures
+from termcolor import colored
+import threading
+# import library functions
+from lib import sigmf_interface
+from lib import sync_service
+from lib import data_recording_messages_def
+from lib import common_utils
+from lib import config_interface
+from lib import shared_memory_interface as shm_interface
+
+DEBUG_WIRELESS_RECORDED_DATA = True
+DEBUG_BUFFER_READING = False 
+
+# globally applicable metadata
+global_info = {
+    "author": "Abdo Gaber",
+    "description": "Synchronized Real-Time Data Recording",
+    "timestamp": 0,
+    "collection_file_prefix": "data-collection",  # collection file name prefix
+    "collection_file": "",  # Reserved to be created in the code: “data-collection_rec-0_TIME-STAMP”
+    "datetime_offset": "",  # datetime offset between current location and UTC/Zulu timezone
+    # Example: "+01:00" for Berlin, Germany
+    "save_config_data_recording_app_json": True,
+    "waveform_generator": "5gnr_oai",
+    "extensions": {},
+}
+
+# Supported OAI Trace messages
+# UL receiver messages
+# gNB IQ Msgs: "GNB_PHY_UL_FD_PUSCH_IQ", "GNB_PHY_UL_FD_DMRS", "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS", 
+#               "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL"
+# gNB BITS Msgs: "GNB_PHY_UL_PAYLOAD_RX_BITS"
+# UE BITS Msgs: "UE_PHY_UL_SCRAMBLED_TX_BITS", "UE_PHY_UL_PAYLOAD_TX_BITS"
+
+supported_oai_tracer_messages = {
+    # gNB messages
+    "GNB_PHY_UL_FD_PUSCH_IQ": {
+        "file_name_prefix": "rx-fd-data",
+        "scope": "gNB",
+        "description": "Frequency-domain RX data",
+        "serialization_scheme": ["subcarriers", "ofdm_symbols"],
+    },
+    "GNB_PHY_UL_FD_DMRS": {
+        "file_name_prefix": "tx-pilots-fd-data",
+        "scope": "gNB",
+        "description": "Frequency-domain TX PUSCH DMRS data",
+        "serialization_scheme": ["subcarriers", "ofdm_symbols"],
+    },
+    "GNB_PHY_UL_FD_CHAN_EST_DMRS_POS": {
+        "file_name_prefix": "raw-ce-fd-data",
+        "scope": "gNB",
+        "description": "Frequency-domain raw channel estimates (at DMRS positions)",
+        "serialization_scheme": ["subcarriers", "ofdm_symbols"],
+    },
+    "GNB_PHY_UL_FD_CHAN_EST_DMRS_INTERPL": {
+        "file_name_prefix": "raw-inter-ce-fd-data",
+        "scope": "gNB",
+        "description": "Interpolcated Frequency-domain raw channel estimates",
+        "serialization_scheme": ["subcarriers", "ofdm_symbols"],
+    },
+    "GNB_PHY_UL_PAYLOAD_RX_BITS": {
+        "file_name_prefix": "rx-payload-bits",
+        "scope": "gNB",
+        "description": "Received PUSCH payload bits",
+        "serialization_scheme": ["bits", "subcarriers", "ofdm_symbols"],
+    },
+    # UE messages
+    "UE_PHY_UL_SCRAMBLED_TX_BITS": {
+        "file_name_prefix": "tx-scrambled-bits",
+        "scope": "UE",
+        "description": "Transmitted scrambled PUSCH bits",
+        "serialization_scheme": ["bits", "subcarriers", "ofdm_symbols"],
+    },
+    "UE_PHY_UL_PAYLOAD_TX_BITS": {
+        "file_name_prefix": "tx-payload-bits",
+        "scope": "UE",
+        "description": "Transmitted PUSCH payload bits",
+        "serialization_scheme": ["bits", "subcarriers", "ofdm_symbols"],
+    },
+}    
+       
+def read_and_store_tracer_messages(shm_reading, bufIdx, num_messages, config_meta_data, 
+                         global_info, update_timestamp=False):
+    """
+    Read tracer messages from shared memory while they belong to the same frame and slot.
+    Continuously reads messages until a different frame/slot is encountered.
+    
+    Args:
+        shm_reading: Shared memory reading handle
+        bufIdx: Current buffer index
+        num_messages: Maximum number of messages to read (used as safeguard)
+        config_meta_data: Configuration metadata
+        global_info: Global information dict (for timestamp on first message)
+        update_timestamp: If True, update global_info timestamp from first message
+    
+    Returns:
+        tuple: (updated_bufIdx, collected_metafiles, last_captured_data)
+    """
+    tracer_msgs_identities = config_meta_data["data_recording_config"]["tracer_msgs_identities"]
+    collected_metafiles = []
+    captured_data = None
+    
+    # Get sync header to check frame and slot
+    sync_header_msg, sync_header_msg_length = data_recording_messages_def.get_sync_header_msg_list()
+    
+    # Read first message to establish the reference frame and slot
+    timeout = 10  # 10 seconds timeout
+    is_data_in_memory = shm_interface.is_data_available_in_memory(
+        shm_reading, bufIdx, sync_header_msg_length, timeout)
+    
+    if not is_data_in_memory:
+        if DEBUG_WIRELESS_RECORDED_DATA:
+            print("Warning: No data available in shared memory")
+        return bufIdx, collected_metafiles, global_info
+    
+    # Get reference frame and slot from first message
+    ref_frame, ref_slot = shm_interface.get_frame_slot_start(
+        shm_reading, bufIdx, sync_header_msg, sync_header_msg_length)
+    
+    if DEBUG_WIRELESS_RECORDED_DATA:
+        print(f"\nRecord number: {global_info['record_idx']}, Reference Frame: {ref_frame}, Slot: {ref_slot}")
+    
+    idx = 0
+    while idx < num_messages:
+        time.sleep(0.0015)
+        
+        # Check if data is available
+        is_data_in_memory = shm_interface.is_data_available_in_memory(
+            shm_reading, bufIdx, sync_header_msg_length, timeout)
+        
+        if not is_data_in_memory:
+            break
+        
+        # Get frame and slot of current message before reading
+        current_frame, current_slot = shm_interface.get_frame_slot_start(
+            shm_reading, bufIdx, sync_header_msg, sync_header_msg_length)
+        
+        # Check if we're still on the same frame and slot
+        if current_frame != ref_frame or current_slot != ref_slot:
+            if DEBUG_WIRELESS_RECORDED_DATA:
+                print(f"Frame/Slot changed: ({ref_frame}, {ref_slot}) -> ({current_frame}, {current_slot}). Stopping at message {idx}")
+            # Keep buffer index pointing to this new frame/slot message (don't increment)
+            break
+        
+        if DEBUG_WIRELESS_RECORDED_DATA:
+            print(f"Reading MSG {idx}: Frame={current_frame}, Slot={current_slot}")
+        
+        # Read the message
+        captured_data, bufIdx = shm_interface.read_data_from_shm(
+            shm_reading, bufIdx, tracer_msgs_identities)
+        
+        # Update timestamp from the first message if requested
+        if idx == 0 and update_timestamp:
+            time_stamp, time_stamp_file_name = (
+                sigmf_interface.time_stamp_formating(
+                    captured_data["unix_capture_ts_sec"],
+                    captured_data["unix_capture_ts_nsec"],
+                    global_info["datetime_offset"]))
+            global_info["collection_file"] = (
+                f"{global_info['collection_file_prefix']}-rec-{global_info['record_idx']}-{time_stamp_file_name}")
+            global_info["timestamp"] = time_stamp
+            global_info["frame"] = captured_data["frame"]
+            global_info["slot"]= captured_data["slot"]
+        
+        # Write data into files with the given format
+        if config_meta_data["data_recording_config"]["enable_saving_tracer_messages_sigmf"]:
+            collected_metafiles.append(sigmf_interface.write_recorded_data_to_sigmf(
+                                        captured_data, config_meta_data, global_info, global_info['record_idx']))
+        
+        idx += 1
+    
+    if DEBUG_WIRELESS_RECORDED_DATA:
+        print(f"Total messages read: {idx} for Frame {ref_frame}, Slot {ref_slot}")
+    
+    return bufIdx, collected_metafiles, global_info
+
+def find_sync_buffer_index(shm_reading, sync_info, tracer_msgs_identities, timeout_sec=None):
+    """
+    Find buffer index that matches sync frame and slot.
+    
+    Args:
+        shm_reading: Shared memory reading handle
+        sync_info: Dictionary with 'frame' and 'slot' keys
+        tracer_msgs_identities: Tracer message identities
+        timeout_sec: Timeout in seconds (None for no timeout)
+    
+    Returns:
+        bufIdx: Buffer index where sync match was found (points to the matching message)
+    
+    Raises:
+        Exception if timeout occurs before sync is found
+    """
+    bufIdx = 0
+    timeout_sync = time.time() + timeout_sec if timeout_sec else None
+    
+    while True:
+        time.sleep(0.0035)  # 2.3 ms = latency of T tracer to capture data from the RAN
+        saved_bufIdx = bufIdx  # Save index BEFORE read
+        captured_data, bufIdx = shm_interface.read_data_from_shm(
+            shm_reading, bufIdx, tracer_msgs_identities)
+        print(f"  [NR Data Sync] NR Data (Frame:{captured_data['frame']}, Slot:{captured_data['slot']}) | "
+              f"Target (Frame:{sync_info['frame']}, Slot:{sync_info['slot']})")
+        
+        if (captured_data["frame"] == sync_info["frame"] and 
+            captured_data["slot"] == sync_info["slot"]):
+            print("  [NR Data Sync] Sync pass")
+            return saved_bufIdx  # Return index pointing to the matching message
+        
+        if timeout_sync and time.time() > timeout_sync:
+            raise Exception(
+                "ERROR: Data Recording NO Sync Found, check Tracer Services if they are connected!")
+
+def send_5g_nr_msgs_request(barrier, shm_writing, shm_reading, args):
+    # send Tracer Control Message request to T-Tracers Apps
+    # -------------------------------------------
+    #   It consists of the following fields:
+    #       Record action
+    #       Number of requested Tracer Messages
+    #       Requested Tracer Messages ID 1, …, ID N
+    #       Number of records to be recorded in slots
+    #       Start SFN: Frame Index to start data collection from it, but not yet used
+    shm_interface.write_shm_task(barrier,shm_writing, args)
+
+def generic_data_conversion_service(node_shm, config_meta_data, tracer_nodes, sync_info=None):
+    """Generic data conversion service for N tracer nodes.
+
+    Args:
+        node_shm: dict {node_id: {"reading": shm, "writing": shm}}
+        config_meta_data: Config metadata dict
+        tracer_nodes: dict {node_id: args} for nodes with tracer messages
+        sync_info: Optional sync info dict with 'frame' and 'slot'. If provided,
+                   each node's buffer index is synced to this frame/slot.
+    """
+    record_idx = 0
+    prev_frame = -1
+    prev_slot = -1
+
+    tracer_msgs_identities = config_meta_data["data_recording_config"]["tracer_msgs_identities"]
+    global_info = config_meta_data["data_recording_config"]["global_info"]
+
+    # Find sync buffer indices for each node if sync_info provided
+    node_buf_idx = {}
+    for node_id in tracer_nodes:
+        if sync_info:
+            print(f"  [NR Data Sync] Finding memory index for node {node_id}")
+            node_buf_idx[node_id] = find_sync_buffer_index(
+                node_shm[node_id]["reading"], sync_info, tracer_msgs_identities, timeout_sec=5)
+        else:
+            node_buf_idx[node_id] = 0
+
+    # Determine num_records from first tracer node
+    num_records = next(iter(tracer_nodes.values())).num_records
+
+    print("\n--- Data Conversion: Reading data from T-tracer Applications ---")
+    for node_id, args in tracer_nodes.items():
+        print(f"  [Data Conversion] {node_id}: Requested tracer messages: {args.num_requested_tracer_msgs}")
+
+    # Read data from all tracer nodes
+    while True:
+        if DEBUG_WIRELESS_RECORDED_DATA:
+            print("\nRecord number: ", record_idx)
+        if DEBUG_BUFFER_READING:
+            for nid in tracer_nodes:
+                print(f"  Buffer Index {nid}: {node_buf_idx[nid]}")
+        time.sleep(0.0035)
+
+        global_info["record_idx"] = record_idx
+        all_metafiles = []
+
+        for i, (node_id, args) in enumerate(tracer_nodes.items()):
+            buf_idx, metafiles, global_info = read_and_store_tracer_messages(
+                node_shm[node_id]["reading"], node_buf_idx[node_id],
+                args.num_requested_tracer_msgs, config_meta_data, global_info,
+                update_timestamp=(i == 0))
+            node_buf_idx[node_id] = buf_idx
+            all_metafiles.extend(metafiles)
+
+        # Generate SigMF collection file
+        if config_meta_data["data_recording_config"]["enable_saving_tracer_messages_sigmf"]:
+            data_storage_path = config_meta_data["data_recording_config"]["data_storage_path"]
+            description = global_info["description"]
+            sigmf_interface.save_sigmf_collection(
+                all_metafiles, global_info, description, data_storage_path)
+
+        frame = global_info["frame"]
+        slot = global_info["slot"]
+
+        if frame != prev_frame or slot != prev_slot:
+            record_idx += 1
+            if record_idx >= num_records:
+                break
+        prev_frame = frame
+        prev_slot = slot
+
+# -------------------------------------------
+# Cleanup — ensures shared memory and resources are released even on Ctrl+C
+# -------------------------------------------
+# Module-level dict populated at runtime with resources that need cleanup.
+# Each key is optional; the cleanup function checks before acting.
+_cleanup_state = {"done": False}
+
+
+def cleanup_resources():
+    """Release T-tracer shared memory resources."""
+    if _cleanup_state["done"]:
+        return
+    _cleanup_state["done"] = True
+    print("\nCleaning up resources...")
+
+    tracer_nodes = _cleanup_state.get("tracer_nodes", {})
+    node_shm = _cleanup_state.get("node_shm", {})
+    for node_id in tracer_nodes:
+        try:
+            tracer_nodes[node_id].action = "quit"
+            shm_interface.write_shm(node_shm[node_id]["writing"], tracer_nodes[node_id])
+            time.sleep(0.5)
+            shm_interface.detach_shm(node_shm[node_id]["reading"])
+            shm_interface.detach_shm(node_shm[node_id]["writing"])
+            shm_interface.remove_shm(node_shm[node_id]["reading"])
+            shm_interface.remove_shm(node_shm[node_id]["writing"])
+        except Exception as e:
+            print(f"Warning: {node_id} shared memory cleanup error: {e}")
+
+
+def register_cleanup():
+    """Register cleanup_resources with atexit and signal handlers."""
+    atexit.register(cleanup_resources)
+
+    def _signal_handler(signum, frame):
+        print(f"\nSignal {signum} received, shutting down...")
+        cleanup_resources()
+        sys.exit(130)
+
+    signal.signal(signal.SIGINT, _signal_handler)
+    signal.signal(signal.SIGTERM, _signal_handler)
+
+
+if __name__ == "__main__":
+    # -------------------------------------------
+    # Data Control Service
+    ## -------------------------------------------
+    # ------------- Configuration --------------
+    # ------------------------------------------
+    # Data Recording Configuration
+    data_recording_config_file = "config/config_data_recording.json"
+    # -------------------------------------------
+    # Configuration
+    # -------------------------------------------
+    # Read and parse the JSON file
+    with open(data_recording_config_file, "r") as file:
+        config_meta_data = json.load(file)
+    # -------------------------------------------
+    # Generic node-based configuration
+    # -------------------------------------------
+    config_meta_data, all_node_args = config_interface.get_data_recording_config(config_meta_data)
+    _nodes_cfg = config_meta_data["data_recording_config"]["nodes"]
+
+    # Build tracer_nodes: only nodes with requested tracer messages
+    tracer_nodes = {nid: args for nid, args in all_node_args.items()
+                    if args.requested_tracer_messages}
+    
+    # Validate: at least one node must have tracer messages
+    any_tracer = bool(tracer_nodes)
+    if not any_tracer:
+        raise Exception("ERROR: No requested tracer messages IDs are provided")
+
+    # -------------------------------------------
+    # Attach shared memory for each tracer node
+    # -------------------------------------------
+    node_shm = {}  # {node_id: {"reading": shm, "writing": shm}}
+    for node_id, args in tracer_nodes.items():
+        node_cfg = next(n for n in _nodes_cfg if n["id"] == node_id)
+        shm_cfg = node_cfg.get("shared_mem_config", {})
+        read_path = shm_cfg.get("read_path")
+        write_path = shm_cfg.get("write_path")
+        proj_id = shm_cfg.get("project_id")
+        if not read_path or not write_path or proj_id is None:
+            raise Exception(
+                f"ERROR: Node '{node_id}' has tracer messages but missing 'shared_mem_config' "
+                f"(read_path, write_path, project_id) in config.")
+        shm_writing = shm_interface.attach_shm(write_path, proj_id)
+        shm_reading = shm_interface.attach_shm(read_path, proj_id)
+        node_shm[node_id] = {"reading": shm_reading, "writing": shm_writing}
+
+    # get general message header list
+    general_msg_header_list, general_message_header_length = \
+        data_recording_messages_def.get_general_msg_header_list()
+
+    # Add supported OAI Tracer Messages
+    config_meta_data["data_recording_config"]["supported_oai_tracer_messages"] = supported_oai_tracer_messages
+    # Add global info
+    config_meta_data["data_recording_config"]["global_info"] = global_info
+
+    # -------------------------------------------
+    # Initialization
+    # -------------------------------------------  
+    # send Tracer Control Message request to T-Tracers Apps
+    #   It consists of the following fields:
+    #       Config action
+    #       IP address length
+    #       IP address
+    #       Port Number
+    # Configure T-Tracers via shared memory for each tracer node
+    for node_id, args in tracer_nodes.items():
+        args.action = "config"
+        shm_interface.write_shm(node_shm[node_id]["writing"], args)
+
+    time.sleep(0.5)  # wait for the config to be applied
+
+    # -------------------------------------------
+    # Execution
+    # -------------------------------------------
+    # send Tracer Control Message request to T-Tracers Apps
+    # -------------------------------------------
+    #   It consists of the following fields:
+    #       Record action
+    #       Number of requested Tracer Messages
+    #       Requested Tracer Messages ID 1, …, ID N
+    #       Number of records to be recorded in slots
+    #       Start SFN: Frame Index to start data collection from it, useful for future
+    #       data sync between gNB and UE but not yet used
+    # -------------------------------------------
+    # -------- Data Collection Service ----------
+    # -------------------------------------------
+    print("Args:")
+    for node_id, args in tracer_nodes.items():
+        args.action = "record"
+        print(f"  {node_id} args: ", args)
+    
+    # Pre-create thread pool if user would like to create a for loop for N iterations 
+    # Outside the loop to avoid initialization overhead.
+    # max_workers and barrier_parties are kept identical: every thread that
+    # enters the pool must also call barrier.wait(), so pool size == barrier size.
+    total_thread_count = len(tracer_nodes)
+    thread_pool = concurrent.futures.ThreadPoolExecutor(max_workers=total_thread_count)
+    barrier = threading.Barrier(total_thread_count) if total_thread_count > 0 else None
+    
+    # Populate cleanup state and register signal handlers
+    _cleanup_state.update({
+        "tracer_nodes": tracer_nodes,
+        "node_shm": node_shm,
+    })
+    register_cleanup()
+
+    # Start data recording iterations
+    start_time = time.time()
+    print("Send data logging request us:", datetime.now().strftime("%Y%m%d-%H%M%S%f"))
+
+    # -------------------------------------------
+    # Submit NR tracer threads for all tracer nodes
+    # -------------------------------------------
+    futures = []
+    for node_id, args in tracer_nodes.items():
+        shm = node_shm[node_id]
+        tracer_thread = thread_pool.submit(
+            send_5g_nr_msgs_request, barrier, shm["writing"], shm["reading"], args)
+        futures.append(tracer_thread)
+
+    # Wait for all threads to complete
+    concurrent.futures.wait(futures)
+
+    # -------------------------------------------
+    # Check data availability for each tracer node
+    # -------------------------------------------
+    bufIdx = 0
+    timeout = 10  # 10 seconds from now
+
+    for node_id in tracer_nodes:
+        is_data_in_memory = shm_interface.is_data_available_in_memory(
+            node_shm[node_id]["reading"], bufIdx, general_message_header_length, timeout)
+
+        if not is_data_in_memory:
+            print(f"Error: {node_id}: Check T-Tracer APP, check IPs and Ports")
+            print(f"Error: {node_id}: If IPs and Ports are correct, re-run the hanging app. "
+                    "It seems the socket was not closed properly")
+            raise Exception(
+                f"ERROR: Time out, check if {node_id} T-Tracer APP connected to stack")
+
+    # -------------------------------------------
+    # Sync and convert data
+    # -------------------------------------------
+    common_utils.write_config_data_recording_app_json(config_meta_data)
+    sync_info = {}
+
+    # Step 1: Sync NR tracer nodes (find latest common frame/slot across all NR sources)
+    if len(tracer_nodes) > 1:
+        node_shm_readings = {nid: node_shm[nid]["reading"] for nid in tracer_nodes}
+        sync_info = sync_service.sync_multiple_nr_nodes(node_shm_readings)
+        print(f"\n--- NR Node Sync: Sync point: frame={sync_info['frame']}, slot={sync_info['slot']} ---")
+
+    # Step 2: Read and store NR tracer data
+    if tracer_nodes:
+        do_sync = bool(sync_info)
+        generic_data_conversion_service(
+            node_shm, config_meta_data, tracer_nodes, sync_info if do_sync else None)
+
+    # measure Elapsed time
+    time_elapsed = time.time() - start_time
+    time_elapsed_ms = int(time_elapsed * 1000)
+    print(
+        "Elapsed time of getting Requested Messages and writing data and meta data files:",
+        colored(time_elapsed_ms, "yellow"),
+        "ms",)
+
+    # Shutdown thread pool after all iterations complete
+    thread_pool.shutdown(wait=True)
+
+    # Run cleanup (also registered with atexit and signal handlers for abnormal exits)
+    cleanup_resources()
+        
+    print("End of the RF Data Recording API")

common/utils/data_recording/lib/common_utils.py

@@ -1,12 +1,11 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
 # ---------------------------------------------------------------------
-# brief Data Recording common utilities
+# brief Common utilities of Data Recording App
 
 import os
 import json
 
-
 def real_to_complex(real_vector):
     # Ensure the length of the real vector is even
     if len(real_vector) % 2 != 0:
@@ -34,7 +33,7 @@ def write_config_data_recording_app_json(config_meta_data):
         # Specify the file name
         output_file = (
             config_meta_data["data_recording_config"]["data_storage_path"]
-            + "config_data_recording_app.json"
+            + "config_data_recording_app_extended.json"
         )
         # Ensure the directory exists
         os.makedirs(os.path.dirname(output_file), exist_ok=True)
@@ -43,6 +42,6 @@ def write_config_data_recording_app_json(config_meta_data):
         with open(output_file, "w") as file:
             try:
                 json.dump(config_meta_data, file, indent=4)
-                print(f"JSON file created successfully at {output_file}")
+                print(f"  [Config] JSON file saved: {output_file}")
             except Exception as e:
-                print(f"Failed to create JSON file: {e}")
+                print(f"  [Config] Failed to create JSON file: {e}")   

common/utils/data_recording/lib/config_interface.py

@@ -1,18 +1,17 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
 # ---------------------------------------------------------------------
-# brief Data Recording App Configuration Interface
+# brief Configuration Interface of Data Recording App
 
-import yaml
 import json
 import argparse
 
-
 # Function to read the main configuration file in JSON format
 def read_main_config_file_json(main_config_file: str) -> dict:
     """
     Reads main config file.
     """
+
     # read general parameter set from yaml config file
     with open(main_config_file, "r") as file:
         main_config = json.load(file)
@@ -20,22 +19,11 @@ def read_main_config_file_json(main_config_file: str) -> dict:
     return main_config
 
 
-# Function to read the main configuration file in YAML format
-def read_main_config_file(main_config_file: str) -> dict:
-    """
-    Reads main config file.
-    """
-    # read general parameter set from yaml config file
-    with open(main_config_file, "r") as file:
-        main_config = yaml.load(file, Loader=yaml.Loader)
-
-    return main_config
-
-
 # Function to parse the OAI T_messages file and get the index of a given string
 def parse_message_file(file_path):
     with open(file_path, "r") as file:
         content = file.readlines()
+
     # Extract lines that start with 'ID' and remove the 'ID = ' prefix
     tracer_msgs_identities = [
         line.strip().replace("ID = ", "")
@@ -65,12 +53,18 @@ def get_requested_tracer_msgs_indices(requested_tracer_messages, tracer_msgs_ide
     return req_tracer_msgs_indices
 
 
-# Function to get the data recording configuration
-def get_data_recording_config(config_meta_data):
-    parser = argparse.ArgumentParser(description="request messages IDs")
-    ue_args = parser.parse_args()
-    gnb_args = parser.parse_args()
+# Helper: return the first node in the nodes list whose type matches the given type string
+def get_node_by_type(nodes, node_type):
+    for node in nodes:
+        if node.get("type") == node_type:
+            return node
+    return None
 
+
+# Function to get the data recording configuration.
+# Returns (config_meta_data, node_args_dict) where node_args_dict is
+# { node_id: Namespace } with one entry per node defined in the config.
+def get_data_recording_config(config_meta_data):
     # get Tracer Messages IDs from the T-Tracer Messages file
     #   MSG list order should be similar to the T-Tracer Messages txt file
     #   Be sure that you are using the same T_messages file that is used in the OAI project
@@ -81,44 +75,33 @@ def get_data_recording_config(config_meta_data):
         config_meta_data["data_recording_config"]["t_tracer_message_definition_file"])
     config_meta_data["data_recording_config"]["tracer_msgs_identities"] = tracer_msgs_identities
 
-    # get requested tracer messages indices for gNB
-    gnb_args.requested_tracer_messages = \
-        config_meta_data["data_recording_config"]["base_station"]["requested_tracer_messages"]
-    # get requested tracer messages indices for UE
-    ue_args.requested_tracer_messages = \
-        config_meta_data["data_recording_config"]["user_equipment"]["requested_tracer_messages"]
+    nodes = config_meta_data["data_recording_config"]["nodes"]
 
-    # check if gnb_requested_tracer_messages is not empty
-    if gnb_args.requested_tracer_messages:
-        config_meta_data["data_recording_config"]["base_station"][
-            "req_tracer_msgs_indices"] = get_requested_tracer_msgs_indices(
-            gnb_args.requested_tracer_messages, tracer_msgs_identities)
+    # Build per-node args generically
+    node_args_dict = {}
+    for node in nodes:
+        parser = argparse.ArgumentParser(description="request messages IDs")
+        node_args = parser.parse_args()
 
-        # get gNB Trace Messages
-        gnb_args.num_records = config_meta_data["data_recording_config"]["num_records"]
-        gnb_args.start_frame_number = config_meta_data["data_recording_config"]["start_frame_number"]
-        gnb_args.req_tracer_msgs_indices = \
-            config_meta_data["data_recording_config"]["base_station"]["req_tracer_msgs_indices"]
-        gnb_args.num_requested_tracer_msgs = len(gnb_args.req_tracer_msgs_indices)
-        # Split the string into IP and port
-        gnb_args.IPaddress, gnb_args.port = config_meta_data["data_recording_config"][
-            "tracer_service_baseStation_address"].split(":")
-        gnb_args.bytes_IPaddress = bytes(gnb_args.IPaddress, "utf-8")
+        node_id = node.get("id")
+        node_args.node_id = node_id
+        node_args.type = node.get("type")
+        node_args.requested_tracer_messages = node.get("requested_tracer_messages", [])
 
-    # check if ue_requested_tracer_messages is not empty
-    if ue_args.requested_tracer_messages:
-        config_meta_data["data_recording_config"]["user_equipment"][
-            "req_tracer_msgs_indices"] = get_requested_tracer_msgs_indices(
-            ue_args.requested_tracer_messages, tracer_msgs_identities)
+        if node_args.requested_tracer_messages:
+            node["req_tracer_msgs_indices"] = get_requested_tracer_msgs_indices(
+                node_args.requested_tracer_messages, tracer_msgs_identities)
 
-        # get UE Trace Messages
-        ue_args.num_records = config_meta_data["data_recording_config"]["num_records"]
-        ue_args.start_frame_number = config_meta_data["data_recording_config"]["start_frame_number"]
-        ue_args.req_tracer_msgs_indices = \
-            config_meta_data["data_recording_config"]["user_equipment"]["req_tracer_msgs_indices"]
-        ue_args.num_requested_tracer_msgs = len(ue_args.req_tracer_msgs_indices)
-        ue_args.IPaddress, ue_args.port = config_meta_data["data_recording_config"][
-            "tracer_service_userEquipment_address"].split(":")
-        ue_args.bytes_IPaddress = bytes(ue_args.IPaddress, "utf-8")
+            node_args.num_records = config_meta_data["data_recording_config"]["num_records"]
+            node_args.start_frame_number = config_meta_data["data_recording_config"]["start_frame_number"]
+            node_args.req_tracer_msgs_indices = node["req_tracer_msgs_indices"]
+            node_args.num_requested_tracer_msgs = len(node_args.req_tracer_msgs_indices)
+            # Split the string into IP and port
+            tracer_addr = node.get("tracer_service_address", "")
+            if tracer_addr:
+                node_args.IPaddress, node_args.port = tracer_addr.split(":")
+                node_args.bytes_IPaddress = bytes(node_args.IPaddress, "utf-8")
 
-    return config_meta_data, gnb_args, ue_args
+        node_args_dict[node_id] = node_args
+
+    return config_meta_data, node_args_dict

common/utils/data_recording/lib/data_recording_messages_def.py

@@ -3,6 +3,32 @@
 # ---------------------------------------------------------------------
 # brief defination of captured data recording messages
 
+# Get Common Sync Header - number of bytes
+def get_sync_header_msg_list():
+    """
+    shared memory layout written from the app:
+    =================================
+    msg_id                  (uint8)  message type ID
+    frame                   (uint16)
+    slot                    (uint8)
+    unix_capture_ts_sec       (uint32)  Unix epoch seconds
+    unix_capture_ts_nsec      (uint32)  nanoseconds [0, 999999999]
+
+    """
+    # Get Common Sync Header - number of bytes
+    sync_header_msg = {
+        "msg_id": 2,
+        "frame": 2,
+        "slot": 1,
+        "unix_capture_ts_sec": 4,
+        "unix_capture_ts_nsec": 4,
+    }
+    # initial number of bytes to read to get data
+    sync_header_msg_length = 0
+    for key, value in sync_header_msg.items():
+        sync_header_msg_length = sync_header_msg_length + value
+    return sync_header_msg, sync_header_msg_length
+
 # Data Collection Trace Messages - General message structure - number of bytes
 def get_general_msg_header_list():
     """
@@ -11,8 +37,8 @@ def get_general_msg_header_list():
     msg_id                  (uint8)  message type ID
     frame                   (uint16)
     slot                    (uint8)
-    datetime_yyyymmdd       (uint32)
-    datetime_hhmmssmmm      (uint32)
+    unix_capture_ts_sec     (uint32)  Unix epoch seconds
+    unix_capture_ts_nsec    (uint32)  nanoseconds [0, 999999999]
     frame_type              (uint8)
     freq_range              (uint8)
     subcarrier_spacing      (uint8)
@@ -46,8 +72,8 @@ def get_general_msg_header_list():
         "msg_id": 2,
         "frame": 2,
         "slot": 1,
-        "datetime_yyyymmdd": 4,
-        "datetime_hhmmssmmm": 4,
+        "unix_capture_ts_sec": 4,
+        "unix_capture_ts_nsec": 4,
         "frame_type": 1,
         "freq_range": 1,
         "subcarrier_spacing": 1,

common/utils/data_recording/lib/shared_memory_interface.py

@@ -0,0 +1,348 @@
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+# ---------------------------------------------------------------------
+# brief Shared Memory Interface for Data Recording App
+
+import sysv_ipc as ipc
+import time
+import struct
+from lib import data_recording_messages_def
+import numpy as np
+from lib import common_utils
+
+DEBUG_WIRELESS_RECORDED_DATA = True
+DEBUG_BUFFER_READING = False
+
+# initialize shared memory
+def attach_shm(shm_path, project_id):
+    key = ipc.ftok(shm_path, project_id)
+    shm = ipc.SharedMemory(key, 0, 0)
+    shm.attach(0, 0)
+    return shm
+
+
+def detach_shm(shm):
+    try:
+        shm.detach()
+        print("Shared memory detached successfully.")
+    except ipc.ExistentialError:
+        print("Shared memory segment does not exist.")
+
+def remove_shm(shm):
+    try:
+        shm.remove()
+        print("Shared memory removed successfully.")
+    except ipc.ExistentialError:
+        print("Shared memory segment does not exist.")
+
+
+# Write Tracer Control Message
+def write_shm(shm, args):
+    # Note: Big Endian >, Little Endian <
+    # Note: unsigned char B, signed char b, short h, int I, long long q
+    # Note: float f, double d, string s,  char c, bool ?
+    # 1: config
+    # 2: record
+    # 3: quit
+    print(f"  [Shared Memory] Write action: {args.action}")
+    if args.action == "config":
+        # Determine the length of the IP address
+        ip_length = len(args.bytes_IPaddress) + 1  # String terminator
+        # Construct the format string dynamically
+        format_string = f"{ip_length}s"
+        shm.write(
+            # Config action
+            struct.pack("<B", 1) +
+            struct.pack("<B", ip_length) +
+            struct.pack(format_string, args.bytes_IPaddress) +
+            struct.pack("<h", int(args.port))
+        )
+        print(f"  [T-Tracer] Config: IP={args.bytes_IPaddress}, port={args.port}")
+    elif args.action == "record":
+        shm.write(
+                # Record action
+                struct.pack("<B", int(2)) +
+                struct.pack("<B", args.num_requested_tracer_msgs) +
+                struct.pack("<{}h".format(len(args.req_tracer_msgs_indices)),
+                            *args.req_tracer_msgs_indices,) +
+                struct.pack("<I", args.num_records) +
+                struct.pack("<h", args.start_frame_number)
+        )
+        print(f"  [T-Tracer] Record: num_msgs={args.num_requested_tracer_msgs}, "
+              f"msg_ids={args.req_tracer_msgs_indices}, "
+              f"num_records={args.num_records}, "
+              f"start_frame={args.start_frame_number}")
+    elif args.action == "quit":
+        shm.write(struct.pack("<B", int(3)))  # Quit action
+        print("  [T-Tracer] Quit")
+    else:
+        print("Unknown action for data recording system!")
+
+
+# write shared memory task
+def write_shm_task(barrier, shm_id, args):
+    # Wait for threads to be ready
+    barrier.wait()
+    # send request to related T-Tracer Application
+    write_shm(shm_id, args)
+
+# check data if avalible in the shared memory
+def is_data_available_in_memory(shm, bufIdx, general_message_header_length, timeout=10):
+    start_time = time.time()
+    while True:
+        buf = shm.read(bufIdx + general_message_header_length)
+                # Only check bytes in the range [bufIdx, bufIdx + header_length),
+        # not the entire buffer from 0 — earlier records would make sum > 0
+        n_bytes = sum(buf[bufIdx:bufIdx + general_message_header_length])
+        if n_bytes > 0:
+            if DEBUG_BUFFER_READING:
+                print("Data in memory: ", n_bytes, " bytes")
+            return True
+        if (time.time() - start_time) > timeout:
+            break
+        print("Data Recording App: Waiting for Measurements!")
+        time.sleep(1)
+    return False
+
+# Read data from gNB T-tracer Application
+def get_frame_slot_start(shm_reading, bufIdx, general_msg_header_list,
+                         general_message_header_length):
+    buf = shm_reading.read(bufIdx + general_message_header_length)
+    msg_id = struct.unpack("<H", buf[bufIdx: bufIdx + general_msg_header_list.get("msg_id")])[0]
+    bufIdx += general_msg_header_list.get("msg_id")
+    frame = struct.unpack("<H", buf[bufIdx: bufIdx + general_msg_header_list.get("frame")])[0]
+    bufIdx += general_msg_header_list.get("frame")
+    slot = struct.unpack("B", buf[bufIdx: bufIdx + general_msg_header_list.get("slot")])[0]
+    return frame, slot
+
+# get MSG header Info
+def get_msg_header(shm_reading, bufIdx, sync_header_msg, sync_header_length):
+    """Read the sync header from shared memory and return msg_id, frame, slot, and timestamp.
+
+    Args:
+        shm_reading: Shared memory handle.
+        bufIdx: Current buffer index.
+        sync_header_msg: Dict with field names and byte sizes (from get_sync_header_msg_list).
+        sync_header_length: Total byte length of the sync header.
+
+    Returns:
+        tuple: (msg_id, frame, slot, unix_capture_ts_sec, unix_capture_ts_nsec)
+    """
+    buf = shm_reading.read(bufIdx + sync_header_length)
+    offset = bufIdx
+    msg_id    = struct.unpack('<H', buf[offset:offset + sync_header_msg["msg_id"]])[0]
+    offset += sync_header_msg["msg_id"]
+    frame     = struct.unpack('<H', buf[offset:offset + sync_header_msg["frame"]])[0]
+    offset += sync_header_msg["frame"]
+    slot      = struct.unpack('B',  buf[offset:offset + sync_header_msg["slot"]])[0]
+    offset += sync_header_msg["slot"]
+    unix_capture_ts_sec  = struct.unpack('<I', buf[offset:offset + sync_header_msg["unix_capture_ts_sec"]])[0]
+    offset += sync_header_msg["unix_capture_ts_sec"]
+    unix_capture_ts_nsec = struct.unpack('<I', buf[offset:offset + sync_header_msg["unix_capture_ts_nsec"]])[0]
+    return msg_id, frame, slot, unix_capture_ts_sec, unix_capture_ts_nsec
+
+
+# Get MSG ID from Shared memory
+def get_msg_id_from_shm(shm_reading, bufIdx, msg_id_length):
+    buf = shm_reading.read(bufIdx + msg_id_length)
+    msg_id = struct.unpack("<H", buf[bufIdx: bufIdx + msg_id_length])[0]
+    return msg_id
+
+# Read data from Shared memory based Data Conversion Service message structure
+def read_msg_data_from_shm(shm, bufIdx, tracer_msgs_identities):
+    # read sync header to move buffer index
+    # get general message header list
+    general_msg_header_list, general_message_header_length = \
+        data_recording_messages_def.get_general_msg_header_list()
+    buf = shm.read(bufIdx + general_message_header_length)
+    n_bytes = sum(buf)
+    if n_bytes == 0:
+        raise Exception('ERROR: No data available in memory')
+    msg_id = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("msg_id")])[0]
+    bufIdx += general_msg_header_list.get("msg_id")
+    frame = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("frame")])[0]
+    bufIdx += general_msg_header_list.get("frame")
+    slot = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("slot")])[0]
+    bufIdx += general_msg_header_list.get("slot")
+    # get Unix capture timestamp (sec, nsec) — Unix epoch 1970
+    unix_capture_ts_sec = \
+        struct.unpack('<I', buf[bufIdx:bufIdx+general_msg_header_list.get("unix_capture_ts_sec")])[0]
+    bufIdx += general_msg_header_list.get("unix_capture_ts_sec")
+    unix_capture_ts_nsec = \
+        struct.unpack('<I', buf[bufIdx:bufIdx+general_msg_header_list.get("unix_capture_ts_nsec")])[0]
+    bufIdx += general_msg_header_list.get("unix_capture_ts_nsec")
+    # Derive timestamp in seconds and nanoseconds (already in Unix epoch)
+    timestamp_seconds = unix_capture_ts_sec
+    timestamp_nseconds = unix_capture_ts_nsec
+    # get frame type
+    frame_type = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("frame_type")])[0]
+    bufIdx += general_msg_header_list.get("frame_type")
+    # get frequency range
+    freq_range = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("freq_range")])[0]
+    bufIdx += general_msg_header_list.get("freq_range")
+    # get subcarrier spacing
+    subcarrier_spacing = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("subcarrier_spacing")])[0]
+    bufIdx += general_msg_header_list.get("subcarrier_spacing")
+    # get cyclic prefix
+    cyclic_prefix = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("cyclic_prefix")])[0]
+    bufIdx += general_msg_header_list.get("cyclic_prefix")
+    # get symbols per slot
+    symbols_per_slot = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("symbols_per_slot")])[0]
+    bufIdx += general_msg_header_list.get("symbols_per_slot")
+    # get Nid cell
+    Nid_cell = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("Nid_cell")])[0]
+    bufIdx += general_msg_header_list.get("Nid_cell")
+    # get rnti
+    rnti = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("rnti")])[0]
+    bufIdx += general_msg_header_list.get("rnti")
+    # get rb size
+    rb_size = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("rb_size")])[0]
+    bufIdx += general_msg_header_list.get("rb_size")
+    # get rb start
+    rb_start = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("rb_start")])[0]
+    bufIdx += general_msg_header_list.get("rb_start")
+    # get start symbol index    
+    start_symbol_index = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("start_symbol_index")])[0]
+    bufIdx += general_msg_header_list.get("start_symbol_index")
+    # get number of symbols
+    nr_of_symbols = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("nr_of_symbols")])[0]
+    bufIdx += general_msg_header_list.get("nr_of_symbols")
+    # get qam modulation order
+    qam_mod_order = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("qam_mod_order")])[0]
+    bufIdx += general_msg_header_list.get("qam_mod_order")
+    # get mcs index
+    mcs_index = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("mcs_index")])[0]
+    bufIdx += general_msg_header_list.get("mcs_index")
+    # get mcs table
+    mcs_table = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("mcs_table")])[0]
+    bufIdx += general_msg_header_list.get("mcs_table")
+    # get number of layers
+    nrOfLayers = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("nrOfLayers")])[0]
+    bufIdx += general_msg_header_list.get("nrOfLayers")
+    # get transform precoding
+    transform_precoding = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("transform_precoding")])[0]
+    bufIdx += general_msg_header_list.get("transform_precoding")
+    # get dmrs config type
+    dmrs_config_type = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("dmrs_config_type")])[0]
+    bufIdx += general_msg_header_list.get("dmrs_config_type")
+    # get ul dmrs symb pos
+    ul_dmrs_symb_pos = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("ul_dmrs_symb_pos")])[0]
+    bufIdx += general_msg_header_list.get("ul_dmrs_symb_pos")
+    # get number dmrs symbols
+    number_dmrs_symbols = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("number_dmrs_symbols")])[0]
+    bufIdx += general_msg_header_list.get("number_dmrs_symbols")
+    # get dmrs port
+    dmrs_port = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("dmrs_port")])[0]
+    bufIdx += general_msg_header_list.get("dmrs_port")
+    # get dmrs scid
+    dmrs_scid = struct.unpack('<H', buf[bufIdx:bufIdx+general_msg_header_list.get("dmrs_scid")])[0]
+    bufIdx += general_msg_header_list.get("dmrs_scid")
+    # get nb antennas rx for gNB or nb antennas tx for UE
+    nb_antennas = struct.unpack('B', buf[bufIdx:bufIdx+general_msg_header_list.get("nb_antennas")])[0]
+    bufIdx += general_msg_header_list.get("nb_antennas")
+    # get number of bits
+    number_of_bits = struct.unpack('<I', buf[bufIdx:bufIdx+general_msg_header_list.get("number_of_bits")])[0]
+    bufIdx += general_msg_header_list.get("number_of_bits")
+    # get length of bytes
+    length_bytes = struct.unpack('<I', buf[bufIdx:bufIdx+general_msg_header_list.get("length_bytes")])[0]
+    bufIdx += general_msg_header_list.get("length_bytes")
+    # print all captured data
+    if DEBUG_WIRELESS_RECORDED_DATA:
+        print("\n" + "="*80)
+        print(f"UL CONFIG METADATA - {tracer_msgs_identities[msg_id]}")
+        print(f"Unix TS: {unix_capture_ts_sec}.{unix_capture_ts_nsec:09d}  |  MSG ID: {msg_id}")
+        print("-"*80)
+        print(f"Frame: {frame:<5} Slot: {slot:<5} Nid Cell: {Nid_cell:<5} RNTI: {rnti:<5}")
+        print(f"Frame Type: {frame_type}  Freq Range: {freq_range}  |  SCS: {subcarrier_spacing} Hz  Cyclic Prefix: {cyclic_prefix}  Symbols/Slot: {symbols_per_slot}")
+        print("-"*80)
+        print(f"RB: Start={rb_start:<4} Size={rb_size:<4}  |  Symbol Allocation: Start={start_symbol_index:<3} Count={nr_of_symbols:<3}")
+        print(f"MCS: Index={mcs_index:<3} Table={mcs_table}  |  QAM Order: {qam_mod_order}  Layers: {nrOfLayers}  Transform Precoding: {transform_precoding}")
+        print("-"*80)
+        print(f"DMRS: Config Type={dmrs_config_type}  Symb Pos={ul_dmrs_symb_pos} ({number_dmrs_symbols} symbols)")
+        print(f"      Port={dmrs_port}  SCID={dmrs_scid}  |  Antennas: {nb_antennas}")
+        print("-"*80)
+        print(f"Data: {number_of_bits} bits  ({length_bytes} bytes)")
+        print("="*80)
+    # raise exception if time stamp is zero, it means that the data is not recorded yet
+    if unix_capture_ts_sec == 0 and unix_capture_ts_nsec == 0:
+        raise Exception("ERROR: Time stamp is zero, data is not recorded yet or something wrong, check logs!")
+    # get recorded data
+    buf = shm.read(bufIdx + length_bytes)
+    captured_data = {}
+    # If message is bit message, store data in bytes
+    # then the field number_of_bits should be not zero
+    if "_BITS" in tracer_msgs_identities[msg_id]:
+        recorded_data = struct.unpack("<" + int(length_bytes) * 'B', buf[bufIdx:bufIdx + length_bytes])
+        bufIdx += length_bytes
+        # convert data in bytes to bits
+        bits_vector = []
+        for byte in recorded_data:
+            bits_vector.extend([int(bit) for bit in format(int(byte), '08b')])
+        captured_data["sigmf_data_type"] = "ri8_le"
+        # convert to uint8
+        captured_data["recorded_data"] = np.asarray(bits_vector).astype(np.uint8) 
+    else:
+        recorded_data = struct.unpack("<" + int(length_bytes/2) * 'h', buf[bufIdx:bufIdx + length_bytes])
+        bufIdx += length_bytes
+        # Convert real data to complext data
+        # converting list to array
+        recorded_data = np.asarray(recorded_data)
+        recorded_data_complex = common_utils.real_to_complex(recorded_data)
+        captured_data["sigmf_data_type"] = "cf32_le"
+        # convert to complex64
+        captured_data["recorded_data"] = recorded_data_complex.astype(np.complex64)
+    # store data in dictonary
+    captured_data["message_id"] = msg_id
+    captured_data["message_type"] = tracer_msgs_identities[msg_id]
+    captured_data["frame"] = frame
+    captured_data["slot"] = slot
+    captured_data["unix_capture_ts_sec"] = unix_capture_ts_sec
+    captured_data["unix_capture_ts_nsec"] = unix_capture_ts_nsec
+    captured_data["timestamp_seconds"] = timestamp_seconds
+    captured_data["timestamp_nseconds"] = timestamp_nseconds
+    captured_data["frame_type"] = frame_type
+    captured_data["freq_range"] = freq_range
+    captured_data["subcarrier_spacing"] = subcarrier_spacing
+    captured_data["cyclic_prefix"] = cyclic_prefix
+    # captured_data["symbols_per_slot"] = symbols_per_slot  ... not used
+    captured_data["Nid_cell"] = Nid_cell
+    captured_data["rnti"] = rnti
+    captured_data["rb_size"] = rb_size
+    captured_data["rb_start"] = rb_start
+    captured_data["start_symbol_index"] = start_symbol_index
+    captured_data["nr_of_symbols"] = nr_of_symbols
+    captured_data["qam_mod_order"] = qam_mod_order
+    captured_data["mcs_index"] = mcs_index
+    captured_data["mcs_table"] = mcs_table
+    captured_data["nrOfLayers"] = nrOfLayers
+    captured_data["transform_precoding"] = transform_precoding
+    captured_data["dmrs_config_type"] = dmrs_config_type
+    captured_data["ul_dmrs_symb_pos"] = ul_dmrs_symb_pos
+    captured_data["number_dmrs_symbols"] = number_dmrs_symbols
+    captured_data["dmrs_port"] = dmrs_port
+    captured_data["dmrs_scid"] = dmrs_scid
+    captured_data["nb_antennas"] = nb_antennas
+    captured_data["number_of_bits"] = number_of_bits
+    return captured_data, bufIdx
+
+# Read data from Shared memory based Data Conversion Service message structure
+def read_data_from_shm(shm, bufIdx, tracer_msgs_identities):
+    # print buffer index
+    if DEBUG_BUFFER_READING:
+        print("Buffer Index: ", bufIdx)
+    # Get MSG ID by reading Sync Header
+    sync_header_msg_list, sync_header_message_length = \
+        data_recording_messages_def.get_sync_header_msg_list()
+    msg_id_length = sync_header_msg_list.get("msg_id")
+    
+    msg_id = get_msg_id_from_shm(shm, bufIdx, msg_id_length) 
+    
+    if DEBUG_WIRELESS_RECORDED_DATA:
+        print(f"  [T-Tracer] Reading MSG ID: {msg_id} - {tracer_msgs_identities[msg_id]}")
+        # Get MSG data based on Data Conversion Service message structure
+        # UL IQ/bits messages (default UL data format)
+        
+    captured_data, bufIdx = read_msg_data_from_shm(shm, bufIdx, tracer_msgs_identities)
+    
+    return captured_data, bufIdx
+    

common/utils/data_recording/lib/sigmf_interface.py

@@ -6,11 +6,12 @@
 import os
 import sigmf
 from sigmf import SigMFFile
-# from sigmf.utils import get_data_type_str
-import numpy as np
-from datetime import datetime
-import yaml
+from datetime import datetime, timezone
 from sigmf import SigMFCollection
+from .wireless_parameters_mapper import map_waveform_metadata_to_wireless_dic, derive_remaining_5gnr_metadata, STANDARDS
+from .config_interface import get_node_by_type
+
+DEBUG_WIRELESS_RECORDED_DATA = True
 
 """
 SERIALIZATION_SCHEMES = {
@@ -24,21 +25,29 @@ SERIALIZATION_SCHEMES = {
     "tx-payload-bits": ["bits", "subcarriers", "ofdm_symbols"],
 }
 """
-STANDARDS = {"5gnr_oai": "5gnr"}
 
 
-def time_stamp_formating(time_stamp, datetime_offset):
-    # Parse the input string into a datetime object
-    time_stamp_ms_obj = datetime.strptime(time_stamp, "%Y%m%d_%H%M%S%f")
+def time_stamp_formating(unix_capture_ts_sec, unix_capture_ts_nsec, datetime_offset):
+    # Convert Unix epoch (sec, nsec) to a datetime object (UTC).
+    # Python datetime only supports µs, so we format the nanosecond
+    # fractional part manually to preserve the full 9-digit resolution.
+    dt_obj = datetime.fromtimestamp(unix_capture_ts_sec, tz=timezone.utc)
 
-    # Format the datetime object into the desired output format with milliseconds
-    time_stamp_ms_iso = (
-        time_stamp_ms_obj.strftime("%Y_%m_%dT%H:%M:%S.%f")[:-3] + datetime_offset
+    # Format with nanosecond fractional seconds (9 digits)
+    time_stamp_ns_iso = (
+        dt_obj.strftime("%Y_%m_%dT%H:%M:%S")
+        + f".{unix_capture_ts_nsec:09d}"
+        + datetime_offset
     )
-    time_stamp_ms = time_stamp_ms_iso
-    time_stamp_ms_file_name = time_stamp_ms_iso.replace(":", "_").replace(".", "_")
+    time_stamp_ns_file_name = time_stamp_ns_iso.replace(":", "_").replace(".", "_")
 
-    return time_stamp_ms, time_stamp_ms_file_name
+    return time_stamp_ns_iso, time_stamp_ns_file_name
+
+
+def _get_node_meta_data(config_meta_data, role):
+    """Return the meta_data dict for the first node whose type matches the given type string."""
+    node = get_node_by_type(config_meta_data["data_recording_config"]["nodes"], role)
+    return node["meta_data"] if node else {}
 
 
 def create_serialization_metadata(serialization_scheme, data_source: str,
@@ -46,6 +55,10 @@ def create_serialization_metadata(serialization_scheme, data_source: str,
     """Creates dict that specifies the serialization metadata."""
 
     # retrieve parameter from LinkSimulator config
+    # if serialization_scheme empty, return empty dict, It is a meta-data only message
+    if not serialization_scheme:
+        return {}
+
     if data_source == "5gnr_oai":
         num_ofdm_symbol = link_sim_parameters["nr_of_symbols"]
         num_subcarriers = link_sim_parameters["rb_size"] * 12
@@ -72,131 +85,73 @@ def create_serialization_metadata(serialization_scheme, data_source: str,
 
     return serialization_dict
 
-
-def map_metadata_to_sigmf_format(scope, waveform_generator, parameter_map_file, captured_data):
-    """
-    Maps metadata from Waveform creator to API and SigMF format.
-    The used parameters and the mapping pairs are specified in a separate YAML file
-    that must be provided as well.
-    """
-    # read waveform parameter map from yaml file
-    dir_path = os.path.dirname(__file__)
-    src_path = os.path.split(dir_path)[0]
-
-    with open(os.path.join(src_path, parameter_map_file), "r") as file:
-        parameter_map_dic = yaml.load(file, Loader=yaml.Loader)
-    # preallocate target dict
-    sigmf_metadata_dict = {}
-
-    #  get standard and name of generator
-    standard_key = parameter_map_dic["waveform_generator"][waveform_generator]
-    generator = standard_key["generator"]
-
-    if scope == "tx":
-        parameter_map_dic = parameter_map_dic["transmitter"][
-            STANDARDS[waveform_generator]
-        ]
-    elif scope == "channel":
-        parameter_map_dic = parameter_map_dic["channel"]
-    elif scope == "rx":
-        parameter_map_dic = parameter_map_dic["receiver"]
-    else:
-        raise Exception(
-            f"Invalid mapping scope '{scope}'! Only 'tx', 'channel' and 'rx' are valid!"
-        )
-
-    # check if standard key is given
-    if parameter_map_dic is None:
-        raise Exception(
-            "Invalid standard key: "
-            "Name should be corrected or added to wireless_link_parameter_map.yaml, given: "
-            f"{waveform_generator}"
-        )
-
-    for parameter_pair in parameter_map_dic:
-        # check if key for chosen simulator even exists
-        if waveform_generator + "_parameter" in parameter_pair.keys():
-            # only continue with mapping from file if direct equivalent exists
-            if parameter_pair[waveform_generator + "_parameter"]["name"]:
-                # It is not necessary to get all parameters from wireless_link_parameter_map.yaml
-                # in captured_data since some parameters related to DL or UL only
-                if (parameter_pair[waveform_generator + "_parameter"]["name"] in captured_data.keys()):
-                    # extract value from waveform config source
-                    value = captured_data[
-                        parameter_pair[waveform_generator + "_parameter"]["name"]]
-                    # additional mapping if parameter values should come from a discrete set of values
-                    if ("value_map" in parameter_pair[waveform_generator + "_parameter"].keys()):
-                        value = parameter_pair[waveform_generator + "_parameter"]["value_map"][value]
-                    # write to target dictionary for SigMF
-                    sigmf_metadata_dict[parameter_pair["sigmf_parameter_name"]] = value
-            else:
-                raise Exception(
-                    f"Incomplete specification in field '{waveform_generator}_parameter'!")
-        # else:  # fill_non_explicit_fields
-        #     waveform_config[parameter_pair["sigmf_parameter_name"]] = "none"
-    if not sigmf_metadata_dict:
-        raise Exception(
-            """ERROR: Check captured meta-data or provided config and meta data """)
-
-    # check for non-JSON-serializable data types
-    def isfloat(NumberString):
-        try:
-            float(NumberString)
-            return True
-        except ValueError:
-            return False
-
-    for key, value in sigmf_metadata_dict.items():
-        if isinstance(value, np.integer):
-            sigmf_metadata_dict[key] = int(value)
-        elif isinstance(value, (np.float16, np.float32, np.float64)):
-            sigmf_metadata_dict[key] = np.format_float_positional(value, trim="-")
-        elif isinstance(value, int):
-            sigmf_metadata_dict[key] = int(value)
-        elif isinstance(value, float):
-            # store value in decimal and not in scientific notation
-            sigmf_metadata_dict[key] = float(value)
-        elif isinstance(value, str) and key != "standard":
-            # convert string to lower case
-            sigmf_metadata_dict[key] = value.lower()
-            if isfloat(value):
-                if value.isdigit():
-                    sigmf_metadata_dict[key] = int(float(value))
-                elif value.replace(".", "", 1).isdigit() and value.count(".") < 2:
-                    sigmf_metadata_dict[key] = float(value)
-
-    return sigmf_metadata_dict, generator
-
-
-def create_system_components_metadata(waveform_generator, parameter_map_file, captured_data):
+# map OAI config data to Wireless Dictionary Parameter Map - SigMF metadata
+def create_system_components_metadata(captured_data, config_meta_data):
     """Creates system components (TX, channel, RX) metadata that will reside in the annotations."""
-    # map metadata of waveform generator to SigMF format
-    signal_info, generator = map_metadata_to_sigmf_format(
-        "tx", waveform_generator, parameter_map_file, captured_data
-    )
+
+    # map OAI config data to Wireless Dictionary Parameter Map - SigMF metadata
+    waveform_generator = config_meta_data["data_recording_config"]["global_info"][
+        "waveform_generator"]
+    parameter_map_file = config_meta_data["data_recording_config"]["parameter_map_file"]
+
+    # map metadata of waveform generator to Wireless Dictionary Parameter Map - SigMF metadata
+    signal_metadata, generator = map_waveform_metadata_to_wireless_dic(
+        "tx", waveform_generator, parameter_map_file, captured_data)
+
+    # derive remaining Signal metadata
+    signal_metadata = derive_remaining_5gnr_metadata(captured_data, signal_metadata)
+
     tx_metadata = {
         "signal:detail": {
             "standard": STANDARDS[waveform_generator],
             "generator": generator,
-            STANDARDS[waveform_generator]: signal_info,
+            STANDARDS[waveform_generator]: signal_metadata,
         }
     }
 
     channel_metadata = {}   # will be filled later
     rx_metadata = {}        # will be filled later
 
-    return tx_metadata, channel_metadata, rx_metadata
+    # get meta data from config file
+    base_station_meta_data    = _get_node_meta_data(config_meta_data, "gnb")
+    user_equipment_meta_data  = _get_node_meta_data(config_meta_data, "ue")
 
+    # Set number of antennas based on link direction and captured side
+    # Find number of antennas from global info on other side of the link
+    if "UL" in captured_data["message_type"]:
+        # On UE side, It is TX antennas
+        # On gNB side, It is RX antennas
+        if "UE" in captured_data["message_type"]:
+            tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
+                "num_tx_antennas"] = captured_data["nb_antennas"]
+            rx_metadata.update({"num_rx_antennas": base_station_meta_data["num_rx_antennas"]})
+        else:
+            tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
+                "num_tx_antennas"] = user_equipment_meta_data["num_tx_antennas"]
+            rx_metadata.update({"num_rx_antennas": captured_data["nb_antennas"]})
+
+    if "DL" in captured_data["message_type"]:
+        tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
+            "link_direction"] = "downlink"
+        # On UE side, It is RX antennas
+        # On gNB side, It is TX antennasr
+        if "UE" in captured_data["message_type"]:
+            rx_metadata["signal:detail"][STANDARDS[waveform_generator]]["num_rx_antennas"] = \
+                captured_data["nb_antennas"]  ## TO DO check key name: no DL message from UE yet
+            tx_metadata.update({"num_tx_antennas": base_station_meta_data["num_tx_antennas"]})
+        else:
+            tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
+                "num_tx_antennas"] = captured_data["nrOfLayers"]  
+            rx_metadata.update({"num_rx_antennas": user_equipment_meta_data["num_rx_antennas"]})
+    return tx_metadata, channel_metadata, rx_metadata
 
 def write_recorded_data_to_sigmf(captured_data, config_meta_data, global_info, idx):
     """
     Compiles and saves provided data and metadata into SigMF file format.
     """
     # get meta data from config file
-    base_station_meta_data = config_meta_data["data_recording_config"]["base_station"][
-        "meta_data"]
-    user_equipment_meta_data = config_meta_data["data_recording_config"][
-        "user_equipment"]["meta_data"]
+    base_station_meta_data    = _get_node_meta_data(config_meta_data, "gnb")
+    user_equipment_meta_data  = _get_node_meta_data(config_meta_data, "ue")
 
     # Check the receive target path is valid, else create folder
     data_storage_path = config_meta_data["data_recording_config"]["data_storage_path"]
@@ -206,111 +161,34 @@ def write_recorded_data_to_sigmf(captured_data, config_meta_data, global_info, i
 
     # Write recorded data to file
     # Get time stamp
-    time_stamp_ms, time_stamp_ms_file_name = time_stamp_formating(
-        captured_data["time_stamp"], global_info["datetime_offset"])
+    time_stamp, time_stamp_file_name = time_stamp_formating(
+        captured_data["unix_capture_ts_sec"], captured_data["unix_capture_ts_nsec"],
+        global_info["datetime_offset"])
     # Map OAI Message Name to SigMF Message Name
     file_name_prefix = config_meta_data["data_recording_config"][
         "supported_oai_tracer_messages"][captured_data["message_type"]]["file_name_prefix"]
     recorded_data_file_name = (
-        file_name_prefix + "-rec-" + str(idx) + "-" + time_stamp_ms_file_name)
+        file_name_prefix + "-rec-" + str(idx) + "-" + time_stamp_file_name)
 
     dataset_filename = recorded_data_file_name + ".sigmf-data"
     dataset_file_path = os.path.join(data_storage_path, dataset_filename)
-    print(dataset_file_path)
+    if DEBUG_WIRELESS_RECORDED_DATA:
+        print(dataset_file_path)
     captured_data["recorded_data"].tofile(dataset_file_path)
 
-    # map OAI config data to SigMF metadata
+    # ----------------------------------------------------
+    # map OAI config data to Wireless Dictionary Parameter Map - SigMF metadata
     waveform_generator = config_meta_data["data_recording_config"]["global_info"][
         "waveform_generator"]
-    parameter_map_file = config_meta_data["data_recording_config"]["parameter_map_file"]
-    tx_metadata, channel_metadata, rx_metadata = create_system_components_metadata(
-        waveform_generator, parameter_map_file, captured_data)
-
-    # Add other OAI metadata to SigMF metadata
-    # ----------------------------------------------------
-    # Set 1: Parameters needs to be derived from OAI message
-    # ----------------------------------------------------
-    # PUSCH DMRS: OFDM symbol start index within slot
-    get_pusch_dmrs_start_ofdm_symbol = 0
-    tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-        "pusch_dmrs:ofdm_symbol_idx"] = []
-
-    for symbol in range(captured_data["start_symbol_index"],
-                        captured_data["start_symbol_index"] + captured_data["nr_of_symbols"]):
-
-        dmrs_symbol_flag = (captured_data["ul_dmrs_symb_pos"] >> symbol) & 0x01
-        if dmrs_symbol_flag and not get_pusch_dmrs_start_ofdm_symbol:
-            get_pusch_dmrs_start_ofdm_symbol = 1
-            tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-                "pusch_dmrs:start_ofdm_symbol"] = symbol
-        if dmrs_symbol_flag:
-            tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-                "pusch_dmrs:ofdm_symbol_idx"].append(symbol)  # Append symbol to the list
-
-    tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-        "pusch_dmrs:duration_num_ofdm_symbols"] = 1
-    tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-        "pusch_dmrs:num_add_positions"] = (captured_data["number_dmrs_symbols"] - 1)
-
-    # If the message is a BIT message, add number of bits to the signal info
-    # "UE_PHY_UL_SCRAMBLED_TX_BITS", "GNB_PHY_UL_PAYLOAD_RX_BITS", "UE_PHY_UL_PAYLOAD_TX_BITS"
-    if "_BITS" in captured_data["message_type"]:
-        # if "BIT" in captured_data["message_type"]:
-        tx_metadata["signal:detail"][STANDARDS[waveform_generator]]["num_bits"] = (
-            captured_data["number_of_bits"])
-
-    # If the message is captured from UE, it is UPLink message,
-    # so number of antennas is num of Tx antennas
-    # number of antennas on Rx side should be read from global_info given by user
-    if "UE" in captured_data["message_type"]:
-        tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-            "num_tx_antennas"
-        ] = captured_data["nb_antennas"]
-        rx_metadata.update(
-            {"num_rx_antennas": base_station_meta_data["num_rx_antennas"]}
-        )
-    # If the message is captured from gNB, it is UPLink message,
-    # so number of antennas is num of Rx antennas
-    # number of antennas on Tx side should be read from global_info given by user
-    else:
-        tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-            "num_tx_antennas"] = user_equipment_meta_data["num_tx_antennas"]
-        rx_metadata.update({"num_rx_antennas": captured_data["nb_antennas"]})
-
-    # Check if the message type contains "UL"
-    if "UL" in captured_data["message_type"]:
-        tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-            "link_direction"] = "uplink"
-    else:
-        tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-            "link_direction"] = "downlink"
-    # ----------------------------------------------------
-    # Set 2: Parameters that is hardcoded
-    # ----------------------------------------------------
-    tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-        "pusch:content"] = "compliant"
-    tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-        "pusch:mapping_type"] = "B"
-    tx_metadata["signal:detail"][STANDARDS[waveform_generator]]["num_slots"] = 1
-    if config_meta_data["test_config"]["test_mode"] == "rf_simulation":
-        tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-            "pusch:payload_bit_pattern"] = "random"
-    elif config_meta_data["test_config"]["test_mode"] == "rf_real_time":
-        tx_metadata["signal:detail"][STANDARDS[waveform_generator]][
-            "pusch:payload_bit_pattern"] = "zeros"
-    else:
-        raise Exception("ERROR: Test mode is not supported in SigMF formatting")
+    tx_metadata, channel_metadata, rx_metadata = create_system_components_metadata(captured_data, config_meta_data)
+    
     # ----------------------------------------------------
     # Read mean parameters
     freq = config_meta_data["environment_emulation"]["target_link_config"][
         "wireless_channel"]["carrierFreqValueList_hz"][0]
     bandwidth = config_meta_data["data_recording_config"]["common_meta_data"][
         "bandwidth"]
-    # used_signal_bandwidth = (
-    #    pow(10, 6) * config_meta_data["environment_emulation"]["target_link_config"]["ran_config"][
-    #        "uplink"]["ul_used_signal_BW_MHz"])
-    sample_rate = config_meta_data["data_recording_config"]["common_meta_data"][
-        "sample_rate"]
+    sample_rate = config_meta_data["data_recording_config"]["common_meta_data"]["sample_rate"]
 
     # get signal emitter info
     signal_emitter = {
@@ -322,23 +200,14 @@ def write_recorded_data_to_sigmf(captured_data, config_meta_data, global_info, i
         "sample_rate": sample_rate,
         "bandwidth": bandwidth,
         "gain_tx": user_equipment_meta_data["tx_gain"],
-        "clock_reference": config_meta_data["data_recording_config"][
-            "common_meta_data"
-        ]["clock_reference"],
+        "clock_reference": config_meta_data["data_recording_config"]["common_meta_data"]["clock_reference"],
         }
 
     # ----------------------------------------------------
     # get channel metadata
     # ----------------------------------------------------
-    # get downlink channel info
-    # ch_downlink_config = config_meta_data["environment_emulation"]["target_link_config"]["wireless_channel"]["downlink"]
-    # ch_downlink ={"channel_model": ch_downlink_config["type"]}
-
-    # ch_downlink_model = {"channel_model": "AWGN"}
     # get uplink channel info
-    ch_uplink_config = config_meta_data["environment_emulation"]["target_link_config"][
-        "wireless_channel"
-    ]["uplink"]
+    ch_uplink_config = config_meta_data["environment_emulation"]["target_link_config"]["wireless_channel"]["uplink"]
     # Real Time RF Emulation
     if config_meta_data["test_config"]["test_mode"] == "rf_real_time":
         channel_metadata.update({"emulation_mode": "ni rf real time"})
@@ -346,7 +215,7 @@ def write_recorded_data_to_sigmf(captured_data, config_meta_data, global_info, i
             channel_metadata.update(
                 {
                     "channel_model": ch_uplink_config["statistical"]["predef_channel_profile"],
-                    "snr_esn0_db": ch_uplink_config["statistical"]["snr_db"],
+                    "snr_esn0_db": ch_uplink_config["statistical"]["snr_db"], 
                     }
             )
 
@@ -361,6 +230,7 @@ def write_recorded_data_to_sigmf(captured_data, config_meta_data, global_info, i
             )
         else:
             raise Exception("ERROR: channel type is not supported in SigMF formatting")
+        
     # RF Simulation
     elif config_meta_data["test_config"]["test_mode"] == "rf_simulation":
         channel_metadata.update({"emulation_mode": "oai rf simulation"})
@@ -397,16 +267,6 @@ def write_recorded_data_to_sigmf(captured_data, config_meta_data, global_info, i
             ],
         }
     )
-    # ----------------------------------------------------
-    # get test config
-    # ----------------------------------------------------
-    """
-    test_config = {
-        "test_name": config_meta_data["test_config"]["test_name"],
-        "test_mode": config_meta_data["test_config"]["test_mode"],
-        "dut_type": config_meta_data["test_config"]["dut_type"],
-        }
-    """
     # Create sigmf metadata
     # ----------------------
     # Add global parameters to SigMF metadata
@@ -439,10 +299,9 @@ def write_recorded_data_to_sigmf(captured_data, config_meta_data, global_info, i
     # Add capture parameters to SigMF metadata
     # ----------------------
     serialization_scheme = config_meta_data["data_recording_config"][
-        "supported_oai_tracer_messages"
-    ][captured_data["message_type"]]["serialization_scheme"]
+        "supported_oai_tracer_messages"][captured_data["message_type"]]["serialization_scheme"]
     capture_metadata = {
-        sigmf.SigMFFile.DATETIME_KEY: time_stamp_ms,
+        sigmf.SigMFFile.DATETIME_KEY: time_stamp,
         SigMFFile.FREQUENCY_KEY: freq,
         **create_serialization_metadata(
             serialization_scheme, waveform_generator, captured_data
@@ -486,7 +345,8 @@ def write_recorded_data_to_sigmf(captured_data, config_meta_data, global_info, i
     dataset_meta_file_path = os.path.join(data_storage_path, dataset_meta_filename)
     meta.tofile(dataset_meta_file_path)  # extension is optional
 
-    print(dataset_meta_file_path)
+    if DEBUG_WIRELESS_RECORDED_DATA:
+        print(dataset_meta_file_path)
 
     return dataset_meta_file_path
 
@@ -513,8 +373,9 @@ def save_sigmf_collection(streams: list, global_info: dict, description: str, st
 
     # save collection file
     collection.tofile(collection_filepath)
-    print("")
-    print(collection_filepath + ".sigmf-collection")
+    if DEBUG_WIRELESS_RECORDED_DATA:
+        print("")
+        print(collection_filepath + ".sigmf-collection")
 
 
 def load_sigmf(filename: str, storage_path: str, scope: str):
@@ -536,7 +397,7 @@ def load_sigmf(filename: str, storage_path: str, scope: str):
     annotation_length = annotations_metadata[0][sigmf.SigMFFile.LENGTH_INDEX_KEY]
 
     # get capture metadata
-    capture_metadata = signal.get_capture_info(annotation_start_idx)
+    #capture_metadata = signal.get_capture_info(annotation_start_idx)
 
     # from source code: sigmffile.py
     # "autoscale : bool, default True
@@ -551,4 +412,4 @@ def load_sigmf(filename: str, storage_path: str, scope: str):
     data = signal.read_samples(
         annotation_start_idx, annotation_length, autoscale=False, raw_components=True)
 
-    return data, global_metadata, annotations_metadata
+    return data, global_metadata, annotations_metadata