remove debug trace

Allow arbitrary order of beam ids in set_beams2 function. This
allows the application to select any arbitrary order of beam ids.
The underlying transport mechanism still uses beam_map so the beam_ids
are ordered before sending.

Also replaced tx_beam_map/rx_beam_map into beam_map.

Also fixed an issue where --rfsimulator.enable_beams required an argument.

.clang-format

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

CHANGELOG.md

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

CMakeLists.txt

@@ -464,6 +464,9 @@ target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
+if(E2_AGENT)
+  target_compile_definitions(f1ap PRIVATE E2_AGENT)
+endif()
 
 # LPP
 ##############
@@ -652,7 +655,6 @@ add_library(SCHED_LIB ${SCHED_SRC})
 target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)
 
 set(SCHED_NR_SRC
-  ${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
   ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
   ${OPENAIR1_DIR}/SCHED_NR/nr_prach_procedures.c
   ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
@@ -939,7 +941,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
@@ -1215,7 +1216,6 @@ set (MAC_SRC
 
 set (MAC_NR_SRC
   ${NR_PHY_INTERFACE_DIR}/NR_IF_Module.c
-  ${NR_PHY_INTERFACE_DIR}/nr_sched_response.c
   ${NR_GNB_MAC_DIR}/main.c
   ${NR_GNB_MAC_DIR}/config.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler.c
@@ -1283,12 +1283,6 @@ set (MISC_NFAPI_LTE
 
 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})
 
-set (MISC_NFAPI_NR
- ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
- )
-
-add_library(MISC_NFAPI_NR_LIB ${MISC_NFAPI_NR})
-
 add_library(L2
   ${L2_SRC}
   ${MAC_SRC}
@@ -1297,6 +1291,9 @@ add_library(L2
   )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+if(E2_AGENT)
+  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
 
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
 target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)
@@ -1312,6 +1309,9 @@ add_library(L2_NR
 target_link_libraries(L2_NR PRIVATE ds alg)
 target_link_libraries(L2_NR PRIVATE f1ap_lib)
 target_include_directories(L2_NR PRIVATE ${F1AP_DIR}/lib)
+if(E2_AGENT)
+  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
 
 add_library(e1_if
   ${NR_RRC_DIR}/cucp_cuup_direct.c
@@ -2091,7 +2091,7 @@ if (${T_TRACER})
         oai_eth_transpro HASHTABLE UTIL
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
         NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
-        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
+        MISC_NFAPI_LTE_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
         GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE SIMU

ci-scripts/Jenkinsfile

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

ci-scripts/args_parse.py

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

ci-scripts/cls_cluster.py

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

ci-scripts/cls_containerize.py

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

ci-scripts/cls_module.py

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

ci-scripts/cls_oaicitest.py

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

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

@@ -53,7 +53,7 @@ security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
   # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
+  ciphering_algorithms = ( "nea2", "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -63,7 +63,7 @@ security = {
   # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
   # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
   drb_ciphering = "yes";
-  drb_integrity = "no";
+  drb_integrity = "yes";
 };
 
 log_config :

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

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

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

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

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

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

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

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

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

@@ -19,7 +19,7 @@ gNBs =
 
     ////////// Physical parameters:
 
-    sib1_tda                                                  = 15;
+    sib1_tda                                                  = 9;
     min_rxtxtime                                              = 6;
 
     servingCellConfigCommon = (
@@ -31,46 +31,46 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is pointA + 16 PRBs@120kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 2071387;
-      dl_frequencyBand                                                 = 261;
+      absoluteFrequencySSB                                             = 2078299;
+      dl_frequencyBand                                                 = 257;
       # this is 27.900 GHz
-      dl_absoluteFrequencyPointA                                       = 2071001;
+      dl_absoluteFrequencyPointA                                       = 2077963;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         dl_subcarrierSpacing                                           = 3;
-        dl_carrierBandwidth                                            = 32;
+        dl_carrierBandwidth                                            = 66;
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=0,L=32 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 8525;
+        initialDLBWPlocationAndBandwidth                                        = 6349;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 3;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 1;
+        initialDLBWPcontrolResourceSetZero                                      = 4;
         initialDLBWPsearchSpaceZero                                             = 0;
 
   #uplinkConfigCommon 
      #frequencyInfoUL
-      ul_frequencyBand                                                 = 261;
+      ul_frequencyBand                                                 = 257;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
       ul_subcarrierSpacing                                           = 3;
-      ul_carrierBandwidth                                            = 32;
+      ul_carrierBandwidth                                            = 66;
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 8525;
+        initialULBWPlocationAndBandwidth                                        = 6349;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 3;
       #rach-ConfigCommon
         #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 52;
+          prach_ConfigurationIndex                                  = 70;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
           prach_msg1_FDM                                            = 0;
@@ -112,7 +112,7 @@ gNBs =
         hoppingId                                                   = 40;
         p0_nominal                                                  = -90;
 
-      ssb_PositionsInBurst_Bitmap                                   = 1;
+      ssb_PositionsInBurst_Bitmap                                   = 85;
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
@@ -145,6 +145,11 @@ gNBs =
 
   );
 
+    first_active_bwp = 1;
+    bwp_list = (
+      { scs = 3; bwpStart = 0; bwpSize = 66;}
+    );
+
     # ------- SCTP definitions
     SCTP :
     {
@@ -175,7 +180,7 @@ MACRLCs = ({
   set_analog_beamforming      = 1;
   beam_duration               = 1;
   beams_per_period            = 1;
-  beam_weights = [0]; // single SSB -> one analog beam
+  beam_weights = [0, 1, 2, 3]; // single SSB -> one analog beam
 });
 
 L1s = (

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

@@ -209,7 +209,7 @@ security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
   # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
+  ciphering_algorithms = ( "nea2", "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -219,7 +219,7 @@ security = {
   # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
   # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
   drb_ciphering = "yes";
-  drb_integrity = "no";
+  drb_integrity = "yes";
 };
 
 log_config :

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

@@ -0,0 +1,256 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID = 0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+
+    plmn_list = ({mcc = 208; mnc = 97; mnc_length = 2;});
+
+    ////////// Physical parameters:
+
+    min_rxtxtime                                              = 6;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+# downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
+      absoluteFrequencySSB                                           = 621312;
+      # this is 3300.60 MHz
+      dl_absoluteFrequencyPointA                                     = 620040;
+      #scs-SpecificCarrierList
+      dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                         = 1;
+        dl_carrierBandwidth                                          = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=0,L=106 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                             = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                = 1;
+      #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                                                           = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                             = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                                = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                   = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                             = 0;
+          prach_msg1_FrequencyStart                                  = 0;
+          zeroCorrelationZoneConfig                                  = 12;
+          preambleReceivedTargetPower                                = -104;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                           = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                             = 1;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen 
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                 = 4;
+#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                    = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                 = 7;
+        rsrp_ThresholdSSB                                            = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                   = 2;
+        prach_RootSequenceIndex                                      = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                       = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                          = 0,
+
+        msg3_DeltaPreamble                                           = 1;
+        p0_NominalWithGrant                                          =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                            = 0;
+        hoppingId                                                    = 40;
+        p0_nominal                                                   = -90;
+
+      ssb_PositionsInBurst_Bitmap                                    = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spar e1
+      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                                  = 6;
+      nrofDownlinkSlots                                              = 7;
+      nrofDownlinkSymbols                                            = 6;
+      nrofUplinkSlots                                                = 2;
+      nrofUplinkSymbols                                              = 4;
+
+      ssPBCH_BlockPower                                              = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+
+        NETWORK_INTERFACES :
+        {
+
+           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
+           GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc           = 1;
+  tr_s_preference  = "local_L1";
+  tr_n_preference  = "local_RRC";
+  pusch_TargetSNRx10 = 200;
+  pucch_TargetSNRx10 = 200;
+}
+);
+
+prs_config = (
+{
+  NumPRSResources       = 1;
+  PRSResourceSetPeriod  = [20, 2];
+  SymbolStart           = [7];
+  NumPRSSymbols         = [6];
+  NumRB                 = 106;
+  RBOffset              = 0;
+  CombSize              = 4;
+  REOffset              = [0];
+  PRSResourceOffset     = [0];
+  PRSResourceRepetition = 1;
+  PRSResourceTimeGap    = 1;
+  NPRS_ID               = [0];
+  MutingPattern1        = [];
+  MutingPattern2        = [];
+  MutingBitRepetition   = 1;
+}
+);
+
+L1s = (
+{
+  num_cc              = 1;
+  tr_n_preference     = "local_mac";
+  prach_dtx_threshold = 120;
+}
+);
+
+RUs = (
+{
+  local_rf       = "yes"
+  nb_tx          = 1
+  nb_rx          = 1
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain     = 75;
+  sf_extension   = 0;
+  eNB_instances  = [0];
+}
+);
+
+
+rfsimulator :
+{
+  serveraddr = "server";
+  serverport = 4043;
+  options    = (); #("saviq"); or/and "chanmod"
+  modelname  = "AWGN";
+  IQfile     = "/tmp/rfsimulator.iqs";
+};
+
+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";
+  f1ap_log_level   = "debug";
+};

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

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

ci-scripts/datalog_rt_stats.100.2x2.yaml

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

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

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

ci-scripts/datalog_rt_stats.2x2.yaml

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

ci-scripts/datalog_rt_stats.60.2x2.yaml

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

ci-scripts/datalog_rt_stats.default.yaml

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

ci-scripts/main.py

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

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

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

ci-scripts/tests/deployment.py

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

ci-scripts/tests/ping-iperf.py

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

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

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

ci-scripts/xml_class_list.yml

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

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

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

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

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

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

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

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

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

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

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

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

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

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

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

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

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

ci-scripts/xml_files/container_5g_e1_rfsim.xml

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

ci-scripts/xml_files/container_5g_f1_rfsim.xml

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

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

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

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

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

ci-scripts/xml_files/container_5g_rfsim.xml

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

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

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

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

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

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

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

ci-scripts/xml_files/container_5g_rfsim_fr2_66prb.xml

@@ -21,7 +21,7 @@
 
 -->
 <testCaseList>
-        <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
+        <htmlTabRef>rfsim-fr2-66prb-5gnr-tdd</htmlTabRef>
         <htmlTabName>Monolithic FR2 gNB</htmlTabName>
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
@@ -54,7 +54,7 @@
                 <class>Deploy_Object</class>
                 <desc>Deploy OAI gNB</desc>
                 <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
                 <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
         </testCase>
 
@@ -62,7 +62,7 @@
                 <class>Deploy_Object</class>
                 <desc>Deploy OAI NR-UE</desc>
                 <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
                 <services>oai-gnb oai-nr-ue</services>
         </testCase>
 
@@ -70,14 +70,14 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <node>localhost</node>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ext_dn</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
@@ -88,7 +88,7 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <node>localhost</node>
                 <svr_id>rfsim5g_ue</svr_id>
                 <svr_node>localhost</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
@@ -100,7 +100,7 @@
                 <always_exec>true</always_exec>
                 <desc>Undeploy all OAI 5G stack</desc>
                 <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb</yaml_path>
                 <d_retx_th>10,0,0,0</d_retx_th>
                 <u_retx_th>10,0,0,0</u_retx_th>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_multiue.xml

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

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

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

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

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

ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml

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

ci-scripts/xml_files/container_5g_rfsim_prs.xml

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

ci-scripts/xml_files/container_5g_rfsim_simple.xml

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

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

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

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

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

ci-scripts/xml_files/container_nsa_b200_quectel.xml

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

ci-scripts/xml_files/container_sa_aerial_quectel.xml

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

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

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

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

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

ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml

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

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

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

ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml

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

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

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

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

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

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

@@ -123,7 +123,7 @@ services:
                 --rfsim --rfsimulator.prop_delay 20 --rfsimulator.options chanmod
                 --rfsimulator.serveraddr 192.168.71.140
                 --time-sync-I 0.1 --ntn-initial-time-drift -46
-                --autonomous-ta --initial-fo 57340 --cont-fo-comp 2
+                --initial-fo 57340 --cont-fo-comp 2
                 --log_config.global_log_options level,nocolor,time
                 --num-ul-actors 1
         depends_on:

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

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

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

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

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

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

cmake_targets/tools/install_wls_lib.patch

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

cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch

@@ -173,18 +173,20 @@ index eccc4ae..a97fdc6 100644
  CPP_FLAGS_FULL := $(CPP_FLAGS) $(CPP_COMP) $(INC) $(DEF)
  CPP_FLAGS_FULL_SNC := $(CPP_FLAGS) $(CPP_COMP_SNC) $(INC) $(DEF)
 diff --git a/fhi_lib/lib/api/xran_fh_o_du.h b/fhi_lib/lib/api/xran_fh_o_du.h
-index bacf597..1dd6d66 100644
+index bacf597..2aeaaae 100644
 --- a/fhi_lib/lib/api/xran_fh_o_du.h
 +++ b/fhi_lib/lib/api/xran_fh_o_du.h
-@@ -141,7 +141,7 @@ extern "C" {
+@@ -141,8 +141,8 @@ extern "C" {
  #define XRAN_MAX_SECTIONS_PER_SYM    (XRAN_MAX_SECTIONS_PER_SLOT)  /**< Max number of different sections in single slot (section may be equal to RB allocation for UE) */
  #define XRAN_MIN_SECTIONS_PER_SYM    (XRAN_MIN_SECTIONS_PER_SLOT)  /**< Min number of different sections in single slot (section may be equal to RB allocation for UE) */
  
 -#define XRAN_MAX_FRAGMENT            (4)   /**< Max number of fragmentations in single symbol */
+-#define XRAN_MAX_SET_BFWS            (64)  /**< Assumed 64Ant, BFP 9bit with 9K jumbo frame */
 +#define XRAN_MAX_FRAGMENT            (6)   /**< Max number of fragmentations in single symbol */
- #define XRAN_MAX_SET_BFWS            (64)  /**< Assumed 64Ant, BFP 9bit with 9K jumbo frame */
++#define XRAN_MAX_SET_BFWS            (1) //(64)  /**< Assumed 64Ant, BFP 9bit with 9K jumbo frame */
  
  #define XRAN_MAX_PKT_BURST (448+4) /**< 4x14x8 symbols per ms */
+ #define XRAN_N_MAX_BUFFER_SEGMENT XRAN_MAX_PKT_BURST /**< Max number of segments per ms */
 @@ -419,6 +419,7 @@ struct xran_io_cfg {
      uint16_t num_rxq;             /**< number of RX queues per VF */
      char *dpdk_dev[XRAN_VF_MAX]; /**< VFs devices  */
@@ -193,7 +195,15 @@ index bacf597..1dd6d66 100644
      int32_t bbdev_mode;      /**< DPDK for BBDev */
      uint32_t dpdkIoVaMode;   /**< IOVA Mode */
      uint32_t dpdkMemorySize; /**< DPDK max memory allocation */
-@@ -1193,6 +1194,31 @@ int32_t xran_reg_physide_cb_by_dev_id(void *pHandle, xran_fh_tti_callback_fn Cb,
+@@ -713,6 +714,7 @@ struct xran_fh_config {
+     uint16_t max_sections_per_slot; /**< M-Plane settings for section */
+     uint16_t max_sections_per_symbol; /**< M-Plane settings for section */
+     int32_t RunSlotPrbMapBySymbolEnable; /**< enable prb mapping by symbol with multisection*/
++    uint8_t LiteOnIgnoreUPSectionIdEnable; /**< handle LiteOn issue where section id on UP packet is wrongly set to 13. */
+ 
+     uint8_t dssEnable;  /**< enable DSS (extension-9) */
+     uint8_t dssPeriod;  /**< DSS pattern period for LTE/NR */
+@@ -1193,6 +1195,31 @@ int32_t xran_reg_physide_cb_by_dev_id(void *pHandle, xran_fh_tti_callback_fn Cb,
   */
  int32_t xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,  uint32_t *nSlotIdx, uint64_t *nSecond);
  
@@ -535,7 +545,7 @@ index 08660f3..2bb5187 100644
  #include <rte_eal.h>
  #include <rte_errno.h>
 diff --git a/fhi_lib/lib/src/xran_common.c b/fhi_lib/lib/src/xran_common.c
-index dc40ad9..5968d01 100644
+index dc40ad9..2208cd1 100644
 --- a/fhi_lib/lib/src/xran_common.c
 +++ b/fhi_lib/lib/src/xran_common.c
 @@ -31,7 +31,10 @@
@@ -549,7 +559,114 @@ index dc40ad9..5968d01 100644
  #include <rte_mbuf.h>
  #include <stdio.h>
  #include <stdbool.h>
-@@ -714,11 +717,14 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+@@ -49,6 +52,8 @@
+ #include "xran_printf.h"
+ #include "xran_mlog_lnx.h"
+ 
++#include "xran_frame_struct.h"
++
+ static struct timespec sleeptime = {.tv_nsec = 1E3 }; /* 1 us */
+ 
+ extern int32_t first_call;
+@@ -529,13 +534,32 @@ int process_mbuf_batch(struct rte_mbuf* pkt_q[], void* handle, int16_t num, stru
+             if (pRbMap)
+             {
+                 /** Get the prb_elem_id */
++                u_int8_t section_id_tmp;    // hack for LiteON FR2 : receive UP section ID = 13
++                u_int8_t prb_elem_id_tmp;   // hack for LiteON FR2 : receive UP section ID = 13
++                if(0 == p_dev_ctx->LiteOnIgnoreUPSectionIdEnable) {
++                    section_id_tmp = prb_elem_id_tmp = sect_id;
++                } else {
++                    //u_int8_t section_id_tmp = pRbMap->nPrbElm < 20 ? symb_id[i] - 10: symb_id[i]; // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    //u_int8_t prb_elem_id_tmp = 2*section_id_tmp;                                  // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    //u_int8_t section_id_tmp = pRbMap->nPrbElm < 10 ? symb_id[i] - 10: symb_id[i]; // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    //u_int8_t prb_elem_id_tmp = section_id_tmp;                                    // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    //if (start_prbu !=0)                                                           // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    //    prb_elem_id_tmp++;                                                        // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    u_int8_t mixed_ul_sym_start = 0;
++                    if (xran_fs_get_slot_type(xran_port, CC_ID[i], tti, XRAN_SLOT_TYPE_SP)) {
++                        mixed_ul_sym_start = XRAN_NUM_OF_SYMBOL_PER_SLOT - xran_fs_get_num_ul_sym_sp(xran_port, CC_ID[i], tti);
++                    }
++                    u_int8_t section_id_tmp = symb_id[i] - mixed_ul_sym_start;  // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    u_int8_t prb_elem_id_tmp = section_id_tmp;                  // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                }
++
+                 total_sections=0;
+                 if(pRbMap->prbMap[0].bf_weight.extType == 1)
+                 {
+                     for(idxElm=0 ; idxElm < pRbMap->nPrbElm ; idxElm++)
+                     {
+                         total_sections += pRbMap->prbMap[idxElm].bf_weight.numSetBFWs;
+-                        if(total_sections >= (sect_id[i] + 1))
++                        if(total_sections >= (/*sect_id[i]*/ prb_elem_id_tmp + 1))
+                 {
+                             prb_elem_id[i] = idxElm;
+                             break;
+@@ -544,12 +568,12 @@ int process_mbuf_batch(struct rte_mbuf* pkt_q[], void* handle, int16_t num, stru
+                 }
+                 else
+                 {
+-                    prb_elem_id[i] = sect_id[i];
++                    prb_elem_id[i] = prb_elem_id_tmp; /*sect_id[i];*/
+                 }
+ 
+                 if (prb_elem_id[i] >= pRbMap->nPrbElm)
+                 {
+-                    print_err("sect_id %d, prb_elem_id %d !=pRbMap->nPrbElm %d\n", sect_id[i], prb_elem_id[i], pRbMap->nPrbElm);
++                    print_err("sect_id %d, prb_elem_id %d !=pRbMap->nPrbElm %d\n", /*sect_id[i]*/ section_id_tmp, prb_elem_id[i], pRbMap->nPrbElm);
+                     ret_data[i] = MBUF_FREE;
+                     continue;
+                 }
+@@ -615,13 +639,32 @@ int process_mbuf_batch(struct rte_mbuf* pkt_q[], void* handle, int16_t num, stru
+             if (pRbMap)
+             {
+                 /** Get the prb_elem_id */
++                u_int8_t section_id_tmp;    // hack for LiteON FR2 : receive UP section ID = 13
++                u_int8_t prb_elem_id_tmp;   // hack for LiteON FR2 : receive UP section ID = 13
++                if(0 == p_dev_ctx->LiteOnIgnoreUPSectionIdEnable) {
++                    section_id_tmp = prb_elem_id_tmp = sect_id;
++                } else {
++                    //u_int8_t section_id_tmp = pRbMap->nPrbElm < 20 ? symb_id[i] - 10: symb_id[i]; // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    //u_int8_t prb_elem_id_tmp = 2*section_id_tmp;                                  // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    //u_int8_t section_id_tmp = pRbMap->nPrbElm < 10 ? symb_id[i] - 10: symb_id[i]; // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    //u_int8_t prb_elem_id_tmp = section_id_tmp;                                    // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    //if (start_prbu !=0)                                                           // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    //    prb_elem_id_tmp++;                                                        // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    u_int8_t mixed_ul_sym_start = 0;
++                    if (xran_fs_get_slot_type(xran_port, CC_ID[i], tti, XRAN_SLOT_TYPE_SP)) {
++                        mixed_ul_sym_start = XRAN_NUM_OF_SYMBOL_PER_SLOT - xran_fs_get_num_ul_sym_sp(xran_port, CC_ID[i], tti);
++                    }
++                    u_int8_t section_id_tmp = symb_id[i] - mixed_ul_sym_start;  // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    u_int8_t prb_elem_id_tmp = section_id_tmp;                  // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                }
++
+                 total_sections=0;
+                 if(pRbMap->prbMap[0].bf_weight.extType == 1)
+                 {
+                     for(idxElm=0 ; idxElm < pRbMap->nPrbElm ; idxElm++)
+                     {
+                         total_sections += pRbMap->prbMap[idxElm].bf_weight.numSetBFWs;
+-                        if(total_sections >= (sect_id[i] + 1))
++                        if(total_sections >= (/*sect_id[i]*/ prb_elem_id_tmp + 1))
+                         {
+                             prb_elem_id[i] = idxElm;
+                             break;
+@@ -630,12 +673,12 @@ int process_mbuf_batch(struct rte_mbuf* pkt_q[], void* handle, int16_t num, stru
+                 }
+                 else
+                 {
+-                    prb_elem_id[i] = sect_id[i];
++                    prb_elem_id[i] = prb_elem_id_tmp; /*sect_id[i];*/
+                 }
+ 
+                 if (prb_elem_id[i] >= pRbMap->nPrbElm)
+                 {
+-                    print_err("sect_id %d, prb_elem_id %d !=pRbMap->nPrbElm %d\n", sect_id[i], prb_elem_id[i], pRbMap->nPrbElm);
++                    print_err("sect_id %d, prb_elem_id %d !=pRbMap->nPrbElm %d\n", /*sect_id[i]*/ section_id_tmp, prb_elem_id[i], pRbMap->nPrbElm);
+                     ret_data[i] = MBUF_FREE;
+                     continue;
+                 }
+@@ -714,11 +757,14 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
      uint8_t compMeth = 0;
      uint8_t iqWidth = 0;
  
@@ -564,7 +681,7 @@ index dc40ad9..5968d01 100644
  
      if(first_call == 0)
          return ret;
-@@ -733,9 +739,9 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+@@ -733,9 +779,9 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
          return MBUF_FREE;
  
      num_bytes = xran_extract_iq_samples(pkt, &iq_samp_buf,
@@ -576,7 +693,7 @@ index dc40ad9..5968d01 100644
      if (num_bytes <= 0)
      {
          print_err("num_bytes is wrong [%d]\n", num_bytes);
-@@ -781,10 +787,9 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+@@ -781,10 +827,9 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
  
      else
      {
@@ -590,7 +707,7 @@ index dc40ad9..5968d01 100644
  #ifndef FCN_ADAPT
          if(valid_res != 0)
          {
-@@ -807,8 +812,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+@@ -807,8 +852,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
              PrachCfg = &(p_dev_ctx->PrachCPConfig);
          }
  
@@ -600,7 +717,7 @@ index dc40ad9..5968d01 100644
          /* PRACH packet has ruportid = num_eAxc + ant_id */
              Ant_ID -= PrachCfg->eAxC_offset;
          symbol_total_bytes[p_dev_ctx->xran_port_id][CC_ID][Ant_ID] += num_bytes;
-@@ -1412,7 +1416,7 @@ int generate_cpmsg_prach(void *pHandle, struct xran_cp_gen_params *params, struc
+@@ -1412,7 +1456,7 @@ int generate_cpmsg_prach(void *pHandle, struct xran_cp_gen_params *params, struc
      if(XRAN_FILTERINDEX_PRACH_ABC == pPrachCPConfig->filterIdx)
      {
      timeOffset = timeOffset >> nNumerology; //original number is Tc, convert to Ts based on mu
@@ -609,7 +726,7 @@ index dc40ad9..5968d01 100644
          timeOffset += 16;
      }
      else
-@@ -1547,8 +1551,7 @@ int32_t ring_processing_func(void* args)
+@@ -1547,8 +1591,7 @@ int32_t ring_processing_func(void* args)
  
      for (i = 0; i < ctx->io_cfg.num_vfs && i < XRAN_VF_MAX; i++){
          for(qi = 0; qi < ctx->rxq_per_port[i]; qi++) {
@@ -918,8 +1035,58 @@ index 4acade1..c939edc 100644
      if(pCtx){
          for(i = 0; i < xran_ports_num; i++){
              g_xran_dev_ctx[i] = pCtx;
+diff --git a/fhi_lib/lib/src/xran_dev.h b/fhi_lib/lib/src/xran_dev.h
+index 0371a53..dd76b49 100644
+--- a/fhi_lib/lib/src/xran_dev.h
++++ b/fhi_lib/lib/src/xran_dev.h
+@@ -201,6 +201,7 @@ struct __rte_cache_aligned xran_device_ctx
+ 
+     int32_t DynamicSectionEna;
+     int32_t RunSlotPrbMapBySymbolEnable;
++    uint8_t LiteOnIgnoreUPSectionIdEnable; /**< handle LiteOn issue where section id on UP packet is wrongly set to 13. */
+     int64_t offset_sec;
+     int64_t offset_nsec;    //offset to GPS time calcuated based on alpha and beta
+     uint32_t interval_us_local;
+diff --git a/fhi_lib/lib/src/xran_frame_struct.c b/fhi_lib/lib/src/xran_frame_struct.c
+index fbb1298..44aaf92 100644
+--- a/fhi_lib/lib/src/xran_frame_struct.c
++++ b/fhi_lib/lib/src/xran_frame_struct.c
+@@ -519,4 +519,20 @@ int32_t xran_fs_get_symbol_type(uint32_t PortId, int32_t nCellIdx, int32_t nSlot
+     return xran_fs_slot_symb_type[PortId][nCellIdx][nSfIdxMod][nSymbIdx];
+ }
+ 
++uint32_t xran_fs_get_num_dl_sym_sp(uint32_t PortId, int32_t nCellIdx, int32_t nSlotdx)
++{
++    int32_t nSfIdxMod;
++
++    nSfIdxMod = xran_fs_slot_limit(PortId, nSlotdx) % ((xran_fs_num_slot_tdd_loop[PortId][nCellIdx] > 0) ? xran_fs_num_slot_tdd_loop[PortId][nCellIdx]: 1);
++
++    return xran_fs_num_dl_sym_sp[PortId][nCellIdx][nSfIdxMod];
++}
+ 
++uint32_t xran_fs_get_num_ul_sym_sp(uint32_t PortId, int32_t nCellIdx, int32_t nSlotdx)
++{
++    int32_t nSfIdxMod;
++
++    nSfIdxMod = xran_fs_slot_limit(PortId, nSlotdx) % ((xran_fs_num_slot_tdd_loop[PortId][nCellIdx] > 0) ? xran_fs_num_slot_tdd_loop[PortId][nCellIdx]: 1);
++
++    return xran_fs_num_ul_sym_sp[PortId][nCellIdx][nSfIdxMod];
++}
+diff --git a/fhi_lib/lib/src/xran_frame_struct.h b/fhi_lib/lib/src/xran_frame_struct.h
+index 7ed0a3a..8e66945 100644
+--- a/fhi_lib/lib/src/xran_frame_struct.h
++++ b/fhi_lib/lib/src/xran_frame_struct.h
+@@ -75,6 +75,8 @@ uint32_t xran_fs_slot_limit_init(uint32_t PortId, int32_t tti_interval_us);
+ uint32_t xran_fs_get_max_slot(uint32_t PortId);
+ uint32_t xran_fs_get_max_slot_SFN(uint32_t PortId);
+ int32_t xran_fs_get_symbol_type(uint32_t PortId, int32_t nCellIdx, int32_t nSlotdx,  int32_t nSymbIdx);
++uint32_t xran_fs_get_num_dl_sym_sp(uint32_t PortId, int32_t nCellIdx, int32_t nSlotdx);
++uint32_t xran_fs_get_num_ul_sym_sp(uint32_t PortId, int32_t nCellIdx, int32_t nSlotdx);
+ 
+ #ifdef __cplusplus
+ }
 diff --git a/fhi_lib/lib/src/xran_main.c b/fhi_lib/lib/src/xran_main.c
-index 7c472d7..9da3621 100644
+index 7c472d7..6866521 100644
 --- a/fhi_lib/lib/src/xran_main.c
 +++ b/fhi_lib/lib/src/xran_main.c
 @@ -35,7 +35,11 @@
@@ -1550,7 +1717,15 @@ index 7c472d7..9da3621 100644
                  if(pThCtx == NULL){
                      print_err("pThCtx allocation error\n");
                      return XRAN_STATUS_FAIL;
-@@ -4034,6 +4062,24 @@ xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,
+@@ -3754,6 +3782,7 @@ xran_open(void *pHandle, struct xran_fh_config* pConf)
+     p_xran_dev_ctx->puschMaskSlot = pConf->puschMaskSlot;
+     p_xran_dev_ctx->DynamicSectionEna = pConf->DynamicSectionEna;
+     p_xran_dev_ctx->RunSlotPrbMapBySymbolEnable = pConf->RunSlotPrbMapBySymbolEnable;
++    p_xran_dev_ctx->LiteOnIgnoreUPSectionIdEnable = pConf->LiteOnIgnoreUPSectionIdEnable;
+     p_xran_dev_ctx->dssEnable = pConf->dssEnable;
+     p_xran_dev_ctx->dssPeriod = pConf->dssPeriod;
+     for(i=0; i<pConf->dssPeriod; i++) {
+@@ -4034,6 +4063,24 @@ xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,
      return tti;
  }
  
@@ -1575,6 +1750,73 @@ index 7c472d7..9da3621 100644
  int32_t
  xran_set_debug_stop(int32_t value, int32_t count)
  {
+@@ -4208,7 +4255,7 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
+     int32_t i = 0, j = 0, nPrbElm = 0;
+     int16_t iqwidth = p_PrbMapIn->prbMap[0].iqWidth;
+     struct xran_prb_elm *p_prb_elm_src, *p_prb_elm_dst;
+-    struct xran_prb_elm prbMapTemp[XRAN_NUM_OF_SYMBOL_PER_SLOT];
++    struct xran_prb_elm prbMapTemp[XRAN_NUM_OF_SYMBOL_PER_SLOT] = {0} ;  // Need to initialize to zero for field sec_desc.
+     int32_t nRBStart_tmp, nRBremain, nStartSymb, nEndSymb, nRBStart, nRBEnd, nRBSize;
+     // int32_t eth_xran_up_headers_sz = sizeof(struct eth_xran_up_pkt_hdr);
+     // int32_t nmaxRB = (mtu - eth_xran_up_headers_sz - RTE_PKTMBUF_HEADROOM)/XRAN_PAYLOAD_1_RB_SZ(iqwidth);
+@@ -4217,7 +4264,6 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
+     if (mtu==9600)
+         nmaxRB--;   //for some reason when mtu is 9600, only 195 RB can be sent, not 196
+ 
+-
+     memcpy(p_PrbMapOut, p_PrbMapIn, sizeof(struct xran_prb_map));
+     for(i = 0; i < XRAN_NUM_OF_SYMBOL_PER_SLOT; i++)
+     {
+@@ -4292,26 +4338,30 @@ int32_t xran_init_PrbMap_by_symbol_from_cfg(struct xran_prb_map* p_PrbMapIn, str
+ 
+     for(; i < XRAN_NUM_OF_SYMBOL_PER_SLOT; i++)
+     {
+-        if((nRBStart == prbMapTemp[i].nRBStart) && (nRBSize == prbMapTemp[i].nRBSize))
+-        {
+-                prbMapTemp[nPrbElm].numSymb++;
+-        }
+-        else
++        if((prbMapTemp[i].nRBSize != 0))
+         {
+-            nPrbElm++;
+-            prbMapTemp[nPrbElm].nStartSymb = prbMapTemp[i].nStartSymb;
+-            prbMapTemp[nPrbElm].nRBStart = prbMapTemp[i].nRBStart;
+-            prbMapTemp[nPrbElm].nRBSize = prbMapTemp[i].nRBSize;
+-            prbMapTemp[nPrbElm].nBeamIndex = prbMapTemp[i].nBeamIndex;
+-            prbMapTemp[nPrbElm].bf_weight_update = prbMapTemp[i].bf_weight_update;
+-            prbMapTemp[nPrbElm].compMethod = prbMapTemp[i].compMethod;
+-            prbMapTemp[nPrbElm].iqWidth = prbMapTemp[i].iqWidth;
+-            prbMapTemp[nPrbElm].ScaleFactor = prbMapTemp[i].ScaleFactor;
+-            prbMapTemp[nPrbElm].reMask = prbMapTemp[i].reMask;
+-            prbMapTemp[nPrbElm].BeamFormingType = prbMapTemp[i].BeamFormingType;
+-
+-            nRBStart = prbMapTemp[i].nRBStart;
+-            nRBSize = prbMapTemp[i].nRBSize;
++            if (false) // Force it to generate multiple prbMapElm, one for each symbol even if they are of the same RBs
++            //if((nRBStart == prbMapTemp[i].nRBStart) && (nRBSize == prbMapTemp[i].nRBSize))
++            {
++                    prbMapTemp[nPrbElm].numSymb++;
++            }
++            else
++            {
++                nPrbElm++;
++                prbMapTemp[nPrbElm].nStartSymb = prbMapTemp[i].nStartSymb;
++                prbMapTemp[nPrbElm].nRBStart = prbMapTemp[i].nRBStart;
++                prbMapTemp[nPrbElm].nRBSize = prbMapTemp[i].nRBSize;
++                prbMapTemp[nPrbElm].nBeamIndex = prbMapTemp[i].nBeamIndex;
++                prbMapTemp[nPrbElm].bf_weight_update = prbMapTemp[i].bf_weight_update;
++                prbMapTemp[nPrbElm].compMethod = prbMapTemp[i].compMethod;
++                prbMapTemp[nPrbElm].iqWidth = prbMapTemp[i].iqWidth;
++                prbMapTemp[nPrbElm].ScaleFactor = prbMapTemp[i].ScaleFactor;
++                prbMapTemp[nPrbElm].reMask = prbMapTemp[i].reMask;
++                prbMapTemp[nPrbElm].BeamFormingType = prbMapTemp[i].BeamFormingType;
++
++                nRBStart = prbMapTemp[i].nRBStart;
++                nRBSize = prbMapTemp[i].nRBSize;
++            }
+         }
+     }
+ 
 diff --git a/fhi_lib/lib/src/xran_mem_mgr.c b/fhi_lib/lib/src/xran_mem_mgr.c
 index e1dcb6c..b3c3fae 100644
 --- a/fhi_lib/lib/src/xran_mem_mgr.c
@@ -1608,7 +1850,7 @@ index 7d4a5d0..b9b44ac 100644
  #endif
  }
 diff --git a/fhi_lib/lib/src/xran_rx_proc.c b/fhi_lib/lib/src/xran_rx_proc.c
-index e7056f4..0d3d8ac 100644
+index e7056f4..81216bf 100644
 --- a/fhi_lib/lib/src/xran_rx_proc.c
 +++ b/fhi_lib/lib/src/xran_rx_proc.c
 @@ -35,7 +35,11 @@
@@ -1623,6 +1865,133 @@ index e7056f4..0d3d8ac 100644
  
  #include <rte_common.h>
  #include <rte_eal.h>
+@@ -339,13 +343,35 @@ int32_t xran_process_srs_sym(void *arg,
+             pRbMap = (struct xran_prb_map *) p_xran_dev_ctx->sFHSrsRxPrbMapBbuIoBufCtrl[tti % XRAN_N_FE_BUF_LEN][CC_ID][Ant_ID].sBufferList.pBuffers->pData;
+             if(pRbMap)
+             {
+-            prbMapElm = &pRbMap->prbMap[sect_id];
+-                if(sect_id >= pRbMap->nPrbElm)
++                u_int8_t section_id_tmp;    // hack for LiteON FR2 : receive UP section ID = 13
++                u_int8_t prb_elem_id_tmp;   // hack for LiteON FR2 : receive UP section ID = 13
++                if(0 == p_xran_dev_ctx->LiteOnIgnoreUPSectionIdEnable) {
++                    section_id_tmp = prb_elem_id_tmp = sect_id;
++                } else {
++                    /** Get the prb_elem_id */
++                    //u_int8_tsection_id_tmp = pRbMap->nPrbElm < 20 ? symb_id - 10: symb_id;    // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    //u_int8_tprb_elem_id_tmp = 2*section_id_tmp;                               // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    //u_int8_t section_id_tmp = pRbMap->nPrbElm < 10 ? symb_id - 10: symb_id;   // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    //u_int8_t prb_elem_id_tmp = section_id_tmp;                                // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    //if (start_prbu !=0)                                                       // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    //    prb_elem_id_tmp++;                                                    // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                    int8_t xran_port = xran_dev_ctx_get_port_id(p_xran_dev_ctx);
++                    u_int8_t mixed_ul_sym_start = 0;
++                    if (xran_fs_get_slot_type(xran_port, CC_ID, tti, XRAN_SLOT_TYPE_SP)) {
++                        mixed_ul_sym_start = XRAN_NUM_OF_SYMBOL_PER_SLOT - xran_fs_get_num_ul_sym_sp(xran_port, CC_ID, tti);
++                    }
++
++                    section_id_tmp = symb_id - mixed_ul_sym_start;     // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    prb_elem_id_tmp = section_id_tmp;                  // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                }
++
++                prbMapElm = &pRbMap->prbMap[prb_elem_id_tmp /*sect_id*/];
++                if(/*sect_id*/ prb_elem_id_tmp >= pRbMap->nPrbElm)
+                 {
+-                print_err("sect_id %d !=pRbMap->nPrbElm %d\n", sect_id,pRbMap->nPrbElm);
+-                *mb_free = MBUF_FREE;
+-                return size;
+-            }
++                    print_err("sect_id %d !=pRbMap->nPrbElm %d\n", sect_id,pRbMap->nPrbElm);
++                    *mb_free = MBUF_FREE;
++                    return size;
++                }
+             }
+             else
+             {
+@@ -397,7 +423,27 @@ int32_t xran_process_srs_sym(void *arg,
+                     else */
+                     {
+                     struct xran_section_desc *p_sec_desc = NULL;
+-                    prbMapElm = &pRbMap->prbMap[sect_id];
++                    u_int8_t section_id_tmp;    // hack for LiteON FR2 : receive UP section ID = 13
++                    u_int8_t prb_elem_id_tmp;   // hack for LiteON FR2 : receive UP section ID = 13
++                    if(0 == p_xran_dev_ctx->LiteOnIgnoreUPSectionIdEnable) {
++                        section_id_tmp = prb_elem_id_tmp = sect_id;
++                    } else {
++                        //u_int8_t section_id_tmp = pRbMap->nPrbElm < 20 ? symb_id - 10: symb_id;   // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                        //u_int8_t prb_elem_id_tmp = 2*section_id_tmp;                              // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                        //u_int8_t section_id_tmp = pRbMap->nPrbElm < 10 ? symb_id - 10: symb_id;   // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                        //u_int8_t prb_elem_id_tmp = section_id_tmp;                                // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                        //if (start_prbu !=0)                                                       // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                        //    prb_elem_id_tmp++;                                                    // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                        int8_t xran_port = xran_dev_ctx_get_port_id(p_xran_dev_ctx);
++                        u_int8_t mixed_ul_sym_start = 0;
++                        if (xran_fs_get_slot_type(xran_port, CC_ID, tti, XRAN_SLOT_TYPE_SP)) {
++                            mixed_ul_sym_start = XRAN_NUM_OF_SYMBOL_PER_SLOT - xran_fs_get_num_ul_sym_sp(xran_port, CC_ID, tti);
++                        }
++                        u_int8_t section_id_tmp = symb_id - mixed_ul_sym_start;     // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                        u_int8_t prb_elem_id_tmp = section_id_tmp;                  // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                    }
++
++                    prbMapElm = &pRbMap->prbMap[prb_elem_id_tmp /*sect_id*/];
+     //                    sec_desc_idx = 0;//prbMapElm->nSecDesc[symb_id];
+                         sec_desc_idx = prbMapElm->nSecDesc[symb_id];
+ 
+@@ -537,14 +583,35 @@ int32_t xran_process_rx_sym(void *arg,
+         pos = (char*) p_xran_dev_ctx->sFrontHaulRxBbuIoBufCtrl[tti % XRAN_N_FE_BUF_LEN][CC_ID][Ant_ID].sBufferList.pBuffers[symb_id].pData;
+         pRbMap = (struct xran_prb_map *) p_xran_dev_ctx->sFrontHaulRxPrbMapBbuIoBufCtrl[tti % XRAN_N_FE_BUF_LEN][CC_ID][Ant_ID].sBufferList.pBuffers->pData;
+         if(pRbMap){
+-            /** Get the prb_elem_id */
++            u_int8_t section_id_tmp;    // hack for LiteON FR2 : receive UP section ID = 13
++            u_int8_t prb_elem_id_tmp;   // hack for LiteON FR2 : receive UP section ID = 13
++            if(0 == p_xran_dev_ctx->LiteOnIgnoreUPSectionIdEnable) {
++                section_id_tmp = prb_elem_id_tmp = sect_id;
++            } else {
++                /** Get the prb_elem_id */
++                //u_int8_tsection_id_tmp = pRbMap->nPrbElm < 20 ? symb_id - 10: symb_id;    // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                //u_int8_tprb_elem_id_tmp = 2*section_id_tmp;                               // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                //u_int8_t section_id_tmp = pRbMap->nPrbElm < 10 ? symb_id - 10: symb_id;   // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                //u_int8_t prb_elem_id_tmp = section_id_tmp;                                // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                //if (start_prbu !=0)                                                       // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                //    prb_elem_id_tmp++;                                                    // Temporary hack for LiteON FR2 : receive UP section ID = 13, MTU 1500
++                int8_t xran_port = xran_dev_ctx_get_port_id(p_xran_dev_ctx);
++                u_int8_t mixed_ul_sym_start = 0;
++                if (xran_fs_get_slot_type(xran_port, CC_ID, tti, XRAN_SLOT_TYPE_SP)) {
++                    mixed_ul_sym_start = XRAN_NUM_OF_SYMBOL_PER_SLOT - xran_fs_get_num_ul_sym_sp(xran_port, CC_ID, tti);
++                }
++
++                section_id_tmp = symb_id - mixed_ul_sym_start;     // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++                prb_elem_id_tmp = section_id_tmp;                  // hack for LiteON FR2 : receive UP section ID = 13, MTU 9000
++            }
++
+             total_sections=0;
+             if(pRbMap->prbMap[0].bf_weight.extType == 1)
+             {
+                 for(i=0 ; i < pRbMap->nPrbElm ; i++)
+                 {
+                     total_sections += pRbMap->prbMap[i].bf_weight.numSetBFWs;
+-                    if(total_sections >= (sect_id + 1))
++                    if(total_sections >= (/*sect_id*/ section_id_tmp + 1))
+                     {
+                         prb_elem_id = i;
+                         break;
+@@ -553,7 +620,7 @@ int32_t xran_process_rx_sym(void *arg,
+             }
+             else
+             {
+-                prb_elem_id = sect_id;
++                prb_elem_id = prb_elem_id_tmp; /*sect_id*/;
+             }
+ 
+             prbMapElm = &pRbMap->prbMap[prb_elem_id];
+@@ -597,7 +664,7 @@ int32_t xran_process_rx_sym(void *arg,
+                     if(p_sec_desc){
+                         mb = p_sec_desc->pCtrl;
+                         if(mb){
+-                           rte_pktmbuf_free(mb);
++                            rte_pktmbuf_free(mb);
+                         }
+                         p_sec_desc->pData         = iq_data_start;
+                         p_sec_desc->pCtrl         = mbuf;
 diff --git a/fhi_lib/lib/src/xran_timer.c b/fhi_lib/lib/src/xran_timer.c
 index 14a6a41..55182d8 100644
 --- a/fhi_lib/lib/src/xran_timer.c

common/config/config_cmdline.c

@@ -213,7 +213,7 @@ int config_check_unknown_cmdlineopt(configmodule_interface_t *cfg, char *prefix)
   return unknowndetected;
 } /* config_check_unknown_cmdlineopt */
 
-int config_process_cmdline(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, char *prefix)
+int config_process_cmdline(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, const char *prefix)
 {
   int c = cfg->argc;
   int i,j;

common/config/config_common.c

@@ -118,7 +118,7 @@ void *config_allocate_new(configmodule_interface_t *cfg, int sz, bool autoFree)
   return ptr;
 }
 
-int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->iptr), 1);
@@ -132,7 +132,7 @@ int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
   return status;
 }
 
-int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->i64ptr), 1);
@@ -150,7 +150,7 @@ int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoption
   return status;
 }
 
-int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
 
@@ -167,7 +167,7 @@ int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgopti
   return status;
 }
 
-int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
 
@@ -190,7 +190,7 @@ int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptio
   return status;
 }
 
-int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
 
@@ -210,7 +210,7 @@ int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgo
   return status;
 }
 
-int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->dblptr), 1);
@@ -224,7 +224,7 @@ int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptio
   return status;
 }
 
-int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *ipv4addr)
+int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *ipv4addr)
 {
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->uptr), 1);
   int rst=inet_pton(AF_INET, ipv4addr,cfgoptions->uptr );
@@ -246,7 +246,7 @@ int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions
   return 0;
 }
 
-int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
 
@@ -322,7 +322,7 @@ void config_assign_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, ch
  * @param[in]  prefix    Optional prefix for the parameter name (can be NULL).
  * @return 1 if the default value was set, 0 if ignored, or -1 on error/unsupported type.
  */
-int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, char *prefix)
+int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, const char *prefix)
 {
   if( (cfgoption->paramflags & PARAMFLAG_DONOTREAD) != 0) {
     return 0;

common/config/config_common.h

@@ -41,16 +41,16 @@ extern "C"
 #endif
 void config_check_valptr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int elt_sz, int nb_elt);
 /* functions to set a parameter to its default value */
-int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
+int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
 void *config_allocate_new(configmodule_interface_t *cfg, int sz, bool autoFree);
 void config_assign_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *fullname, int val);
-int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, char *prefix);
+int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, const char *prefix);
 
 #ifdef __cplusplus
 }

common/config/config_load_configmodule.c

@@ -150,7 +150,7 @@ int config_cmdlineonly_getlist(configmodule_interface_t *cfg,
   return 0;
 }
 
-int config_cmdlineonly_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, char *prefix)
+int config_cmdlineonly_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, const char *prefix)
 {
   int defval;
   int fatalerror=0;

common/config/config_load_configmodule.h

@@ -59,10 +59,10 @@
 #define CONFIG_ABORT          (1<<21)           // config failed,abort execution 
 #define CONFIG_NOOOPT         (1<<22)           // no -O option found when parsing command line
 struct configmodule_interface;
-typedef int (*configmodule_getfunc_t)(struct configmodule_interface *, paramdef_t *, int numparams, char *prefix);
+typedef int (*configmodule_getfunc_t)(struct configmodule_interface *, paramdef_t *, int numparams, const char *prefix);
 typedef int (
     *configmodule_getlistfunc_t)(struct configmodule_interface *, paramlist_def_t *, paramdef_t *, int numparams, char *prefix);
-typedef int (*configmodule_setfunc_t)(paramdef_t *cfgoptions, int numoptions, char *prefix);
+typedef int (*configmodule_setfunc_t)(paramdef_t *cfgoptions, int numoptions, const char *prefix);
 typedef void (*configmodule_endfunc_t)(struct configmodule_interface *cfg);
 
 typedef int (*configmodule_initfunc_t)(struct configmodule_interface *cfg);

common/config/config_paramdesc.h

@@ -105,7 +105,7 @@ typedef union checkedparam {
 #define DEFAULT_EXTRA_SZ 256
 typedef struct paramdef {
   char         optname[MAX_OPTNAME_SIZE]; /* parameter name, can be used as long command line option */
-  char         *helpstr;                  /* help string */
+  const char         *helpstr;                  /* help string */
   unsigned int paramflags;                /* value is a "ored" combination of above PARAMFLAG_XXXX values */
   union { /* pointer to the parameter value, completed by the config module */
     char      **strptr;
@@ -122,7 +122,7 @@ typedef struct paramdef {
     void      *voidptr;
   } ;
   union {                                /* default parameter value, to be used when PARAMFLAG_MANDATORY is not specified */
-    char      *defstrval;
+    const char      *defstrval;
     char      **defstrlistval;
     uint32_t  defuintval;
     int       defintval;
@@ -161,6 +161,50 @@ typedef struct paramdef {
 #define TYPE_LIST       55
 
 #define ANY_IPV4ADDR_STRING "0.0.0.0"
+
+// Macros to simplify defining parameters in paramdef_t arrays in C++ source code
+#define OPTNAME(x) .optname = x
+#define HELPSTR(x) .helpstr = x
+#define PARAMFLAG(x) .paramflags = x
+#define PARAMTYPE(x) .type = x
+#define STRINGPARAM(name, help, flags, ptr, defval)                                                                         \
+  {                                                                                                                         \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .strptr = ptr, .defstrval = defval, PARAMTYPE(TYPE_STRING), .numelt = 0 \
+  }
+#define DOUBLEPARAM(name, help, flags, ptr, defval)                                                                         \
+  {                                                                                                                         \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .dblptr = ptr, .defdblval = defval, PARAMTYPE(TYPE_DOUBLE), .numelt = 0 \
+  }
+#define INTPARAM(name, help, flags, ptr, defval)                                                                       \
+  {                                                                                                                    \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .iptr = ptr, .defintval = defval, PARAMTYPE(TYPE_INT), .numelt = 0 \
+  }
+#define UINT16PARAM(name, help, flags, ptr, defval)                                                                          \
+  {                                                                                                                          \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .u16ptr = ptr, .defuintval = defval, PARAMTYPE(TYPE_UINT16), .numelt = 0 \
+  }
+#define STRLISTPARAM(name, help, flags, ptr, defval)                                                                        \
+  {                                                                                                                         \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .strlistptr = ptr, .defstrlistval = defval, PARAMTYPE(TYPE_STRINGLIST), \
+        .numelt = 0                                                                                                         \
+  }
+#define INT64PARAM(name, help, flags, ptr, defval)                                                                           \
+  {                                                                                                                          \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .i64ptr = ptr, .defint64val = defval, PARAMTYPE(TYPE_INT64), .numelt = 0 \
+  }
+#define INTPARAM(name, help, flags, ptr, defval)                                                                       \
+  {                                                                                                                    \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .iptr = ptr, .defintval = defval, PARAMTYPE(TYPE_INT), .numelt = 0 \
+  }
+#define BOOLPARAM(name, help, flags, ptr, defval)                                                                      \
+  {                                                                                                                    \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .iptr = ptr, .defintval = defval, PARAMTYPE(TYPE_INT), .numelt = 0 \
+  }
+#define UINT64PARAM(name, help, flags, ptr, defval)                                                                          \
+  {                                                                                                                          \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .u64ptr = ptr, .defuintval = defval, PARAMTYPE(TYPE_UINT64), .numelt = 0 \
+  }
+
 typedef struct paramlist_def {
   char listname[MAX_OPTNAME_SIZE];
   paramdef_t **paramarray;

common/config/config_userapi.c

@@ -71,7 +71,7 @@ int config_get_processedint(configmodule_interface_t *cfg, paramdef_t *cfgoption
 
   return ret;
 }
-void config_printhelp(paramdef_t *params,int numparams, char *prefix) {
+void config_printhelp(paramdef_t *params,int numparams, const char *prefix) {
   printf("\n-----Help for section %-26s: %03i entries------\n",(prefix==NULL)?"(root section)":prefix,numparams);
 
   for (int i=0 ; i<numparams ; i++) {
@@ -84,7 +84,7 @@ void config_printhelp(paramdef_t *params,int numparams, char *prefix) {
   printf("--------------------------------------------------------------------\n\n");
 }
 
-int config_execcheck(configmodule_interface_t *cfg, paramdef_t *params, int numparams, char *prefix)
+int config_execcheck(configmodule_interface_t *cfg, paramdef_t *params, int numparams, const char *prefix)
 {
   int st=0;
 
@@ -105,7 +105,7 @@ int config_execcheck(configmodule_interface_t *cfg, paramdef_t *params, int nump
   return st;
 }
 
-int config_paramidx_fromname(paramdef_t *params, int numparams, char *name) {
+int config_paramidx_fromname(paramdef_t *params, int numparams, const char *name) {
   for (int i=0; i<numparams ; i++) {
     if (strcmp(name,params[i].optname) == 0)
       return i;
@@ -115,7 +115,7 @@ int config_paramidx_fromname(paramdef_t *params, int numparams, char *name) {
   return -1;
 }
 
-int config_get(configmodule_interface_t *cfgif, paramdef_t *params, int numparams, char *prefix)
+int config_get(configmodule_interface_t *cfgif, paramdef_t *params, int numparams, const char *prefix)
 {
   int ret= -1;
 

common/config/config_userapi.h

@@ -49,17 +49,17 @@ extern configmodule_interface_t *uniqCfg;
 #define CONFIG_SETRTFLAG(P)   if (config_get_if()) { config_get_if()->rtflags |= P; }
 #define CONFIG_CLEARRTFLAG(P) if (config_get_if()) { config_get_if()->rtflags &= (~P); }
 #define CONFIG_ISPARAMFLAGSET(P,F) ( !!(P.paramflags & F))
-int config_paramidx_fromname(paramdef_t *params, int numparams, char *name);
+int config_paramidx_fromname(paramdef_t *params, int numparams, const char *name);
 
 /* utility functions, to be used by configuration module and/or configuration libraries */
-void config_printhelp(paramdef_t *, int numparams, char *prefix);
-int config_process_cmdline(configmodule_interface_t *cfg, paramdef_t *params, int numparams, char *prefix);
-int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *ipv4addr);
+void config_printhelp(paramdef_t *, int numparams, const char *prefix);
+int config_process_cmdline(configmodule_interface_t *cfg, paramdef_t *params, int numparams, const char *prefix);
+int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *ipv4addr);
 
 /* apis to get/check parameters, to be used by oai modules, at configuration time */
 #define CONFIG_CHECKALLSECTIONS "ALLSECTIONS"
 int config_check_unknown_cmdlineopt(configmodule_interface_t *cfg, char *prefix);
-int config_get(configmodule_interface_t *cfg, paramdef_t *params, int numparams, char *prefix);
+int config_get(configmodule_interface_t *cfg, paramdef_t *params, int numparams, const char *prefix);
 int config_getlist(configmodule_interface_t *cfg, paramlist_def_t *ParamList, paramdef_t *params, int numparams, char *prefix);
 
 /* apis to set some of the paramdef_t fields before using the get/getlist api's */

common/config/yaml/tests/test_yaml_config.cpp

@@ -411,7 +411,7 @@ TEST(yaml_config, test_read_ipv4) {
   config_yaml_get(cfg, &p, 1, prefix);
   printf("%x\n", addr);
 
-  p.defstrval = strdup("10.0.0.1");
+  p.defstrval = "10.0.0.1";
   strncpy(p.optname, "ipv4_3", sizeof(p.optname) - 1);
   config_yaml_get(cfg, &p, 1, prefix);
   printf("%x\n", addr);
@@ -419,7 +419,6 @@ TEST(yaml_config, test_read_ipv4) {
   config_yaml_end(cfg);
   free(cfg->cfgP[0]);
   end_configmodule(cfg);
-  free(p.defstrval);
 }
 
 TEST(yaml_config, yaml_read_str_as_int) {

common/utils/LOG/DOC/rtusage.md

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

common/utils/LOG/log.c

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

common/utils/LOG/log.h

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

common/utils/load_module_shlib.c

@@ -252,7 +252,7 @@ load_module_shlib_exit:
   return ret;
 }
 
-void * get_shlibmodule_fptr(char *modname, char *fname)
+void * get_shlibmodule_fptr(const char *modname, const char *fname)
 {
     for (int i=0; i<loader_data.numshlibs && loader_data.shlibs[i].name != NULL; i++) {
         if ( strcmp(loader_data.shlibs[i].name, modname) == 0) {

common/utils/load_module_shlib.h

@@ -82,7 +82,7 @@ extern loader_data_t loader_data;
 // clang-format on
 
 int load_module_version_shlib(char *modname, char *version, loader_shlibfunc_t *farray, int numf, void *initfunc_arg);
-void *get_shlibmodule_fptr(char *modname, char *fname);
+void *get_shlibmodule_fptr(const char *modname, const char *fname);
 #define load_module_shlib(M, F, N, I) load_module_version_shlib(M, NULL, F, N, I)
 void loader_reset();
 #endif

common/utils/nr/nr_common.c

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

common/utils/nr/nr_common.h

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

common/utils/telnetsrv/CMakeLists.txt

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

common/utils/telnetsrv/telnetsrv.h

@@ -76,7 +76,7 @@ typedef struct webdatadef {
 typedef void(*telnet_printfunc_t)(const char* format, ...);
 typedef int(*cmdfunc_t)(char*, int, telnet_printfunc_t prnt);
 typedef int (*webfunc_t)(char *cmdbuff, int debug, telnet_printfunc_t prnt, ...);
-typedef int (*webfunc_getdata_t)(char *cmdbuff, int debug, void *data, telnet_printfunc_t prnt);
+typedef int (*webfunc_getdata_t)(const char *cmdbuff, int debug, void *data, telnet_printfunc_t prnt);
 typedef int(*qcmdfunc_t)(char*, int, telnet_printfunc_t prnt,void *arg);
 
 #define TELNETSRV_CMDFLAG_PUSHINTPOOLQ (1 << 0) // ask the telnet server to push the command in a thread pool queue
@@ -195,7 +195,7 @@ VT escape sequence definition, for smarter display....
 #define TELNET_ADDCMD_FNAME "add_telnetcmd"
 #define TELNET_POLLCMDQ_FNAME "poll_telnetcmdq"
 #define TELNET_PUSHCMD_FNAME "telnet_pushcmd"
-typedef int(*add_telnetcmd_func_t)(char *, telnetshell_vardef_t *, telnetshell_cmddef_t *);
+typedef int(*add_telnetcmd_func_t)(const char *, telnetshell_vardef_t *, telnetshell_cmddef_t *);
 typedef void(*poll_telnetcmdq_func_t)(void *qid,void *arg);
 typedef void (*push_telnetcmd_func_t)(telnetshell_cmddef_t *cmd, char *cmdbuff, telnet_printfunc_t prnt);
 #ifdef TELNETSERVERCODE

common/utils/telnetsrv/telnetsrv_ci.c

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

common/utils/telnetsrv/telnetsrv_ciUE.c

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

common/utils/telnetsrv/telnetsrv_o1.c

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

doc/Aerial_FAPI_Split_Tutorial.md

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

doc/Doxyfile

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

doc/E1AP/e1ap_procedures.md

@@ -72,3 +72,36 @@ sequenceDiagram
   u->>c: BEARER CONTEXT MODIFICATION RESPONSE
   Note over c: e1apCUCP_handle_BEARER_CONTEXT_MODIFICATION_RESPONSE
 ```
+
+## PDU Session Release
+
+```mermaid
+sequenceDiagram
+    participant AMF
+    participant CUCP
+    participant CUUP
+    participant DU
+    participant UE
+
+    AMF->>CUCP: NG PDU SESSION RESOURCE RELEASE COMMAND
+    Note over CUCP: ngap_gNB_handle_pdusession_release_command
+    CUCP->>CUCP: rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND
+    Note over CUCP: set status PDU_SESSION_STATUS_TORELEASE
+    CUCP->>CUUP: E1 Bearer Context Modification Request
+    Note over CUUP: release_gtpu_tunnel (GTP tunnel, PDCP, SDAP)
+    CUUP->>CUCP: E1 Bearer Context Modification Response
+    Note over CUCP: rrc_gNB_send_f1_drb_release_request
+    CUCP->>DU: F1 UE Context Modification Request
+    Note over DU: handle_ue_context_drbs_release (release in MAC/RLC)
+    DU->>CUCP: F1 UE Context Modification Response
+    Note over CUCP: rrc_CU_process_ue_context_modification_response
+    Note over CUCP: replace existing CellGroupConfig
+    Note over CUCP: rrc_gNB_generate_dedicatedRRCReconfiguration
+    CUCP->>UE: RRCReconfiguration (DRB release list, NAS PDU)
+    UE->>CUCP: RRCReconfigurationComplete
+    Note over CUCP: handle_rrcReconfigurationComplete
+    Note over CUCP: rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE
+    CUCP->>AMF: NG PDU SESSION RESOURCE RELEASE RESPONSE
+    Note over CUCP: rm_drbs_by_pdusession (from stored RRC list)
+    Note over CUCP: rm_pduSession (from stored RRC list)
+```

doc/FEATURE_SET.md

@@ -352,7 +352,9 @@ These modes of operation are supported:
    - Formats 0,1,2,3, A1-A3, B1-B3
 * NTN
    - TA adjustemt based on ntn-Config-r17 information
-   - Autonomous TA adjustemt between SIB19 receptions based on DL time tracking
+   - Different TA adjustemt algorithms between SIB19 receptions:
+      - Autonomous TA adjustemt based on DL time tracking
+      - Standard compliant epoch time based TA adjustment including orbital propagation
    - UL Doppler pre-compensation based on continuous DL FO estimation
 *  Highly efficient 3GPP compliant LDPC encoder and decoder (BG1 and BG2 are supported)
 *  Highly efficient 3GPP compliant polar encoder and decoder

doc/MAC/mac-usage.md

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

doc/NR_NFAPI_archi.md

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

doc/ORAN_FHI7.2_Tutorial.md

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

doc/RUNMODEM.md

@@ -356,7 +356,9 @@ sudo ./ran_build/build/nr-uesoftmodem -O ../targets/PROJECTS/GENERIC-NR-5GC/CONF
 
 For LEO satellite scenarios, the parameter `--ntn-initial-time-drift` must be provided via command line, as the UE needs this value to compensate for the time drift during initial sync, before SIB19 was received.
 This parameter provides the drift rate of the complete DL timing (incl. feeder link and service link) in µs/s.
-Also, to perform an autonomous TA update based on the DL drift, the boolean parameter `--autonomous-ta` should be added in case of a LEO satellite scenario.
+
+To perform an autonomous TA update based on the DL drift, the boolean parameter `--autonomous-ta` can be added.
+If that parameter is omitted, the TA is continuously computed based on the SIB19 information.
 
 For LEO satellite scenario we assume the LO to be very accurate and the main FO contribution comes from Doppler shift.
 Therefore, we use the command line parameter `--cont-fo-comp 2` to continuously compensate the DL Doppler and pre-compensate the UL Doppler.
@@ -367,7 +369,7 @@ For other information on optional NR UE command line options, please refer [here
 So an example NR UE command for FDD, 5MHz BW, 15 kHz SCS, transparent LEO satellite 5G NR NTN is this:
 ```
 cd cmake_targets
-sudo ./ran_build/build/nr-uesoftmodem -O ../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.prop_delay 20 --rfsimulator.options chanmod --time-sync-I 0.1 --ntn-initial-time-drift -46 --autonomous-ta --initial-fo 57340 --cont-fo-comp 2
+sudo ./ran_build/build/nr-uesoftmodem -O ../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.prop_delay 20 --rfsimulator.options chanmod --time-sync-I 0.1 --ntn-initial-time-drift -46 --initial-fo 57340 --cont-fo-comp 2
 ```
 
 # Specific OAI modes
@@ -468,19 +470,30 @@ The hardcoded DRBs will be treated like GBR Flows. Due to code limitations at th
 
 ## IF setup with OAI
 
-OAI is also compatible with Intermediate Frequency (IF) equipment. This allows to use RF front-end that with arbitrary frequencies bands that do not comply with the standardised 3GPP NR bands. 
+OAI is also compatible with Intermediate Frequency (IF) equipment, allowing the
+use of RF front-ends operating on arbitrary frequency bands that do not conform
+to the standardized 3GPP NR bands.
 
-To configure the IF frequencies it is necessary to use two command-line options at UE side:
-- `if_freq`, downlink frequency in Hz
-- `if_freq_off`, uplink frequency offset in Hz
+### OAIUE configuration
+To configure IF frequencies on the UE side, provide the following command-line
+options:
+- `if_freq`: DL frequency in Hz
+- `if_freq_off`: UL frequency offset in Hz
 
-Accordingly, the following parameters must be configured in the RUs section of the gNB configuration file:
-- `if_freq`
-- `if_offset`
+### gNB configuration
+On the gNB side, the corresponding parameters must be set in the RUs section of
+the configuration file:
+- `if_freq`: DL frequency in Hz
+- `if_offset`: UL frequency offset in Hz
+
+> Note: When using a libconfig-based configuration file for the gNB, ensure that
+> `if_freq` numeric value is suffixed with "L" so it is correctly parsed as
+> 64-bit integer.
 
 ### Run OAI with custom DL/UL arbitrary frequencies
 
-The following example uses DL frequency 2169.080 MHz and UL frequency offset -400 MHz, with a configuration file for band 66 (FDD) at gNB side.
+The following example uses DL frequency 2169.080 MHz and UL frequency offset
+-400 MHz, with a configuration file for band 66 (FDD) at gNB side.
 
 On two separate machines with USRPs, run:
 

doc/RUN_NR_multiple_BWPs.md

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

doc/SW-archi-graph.md

@@ -79,10 +79,11 @@ in order:
   applied
 - run the current L1 RX job through (`phy_procedures_gNB_uespec_RX()`), which
   notably includes PUCCH, PUSCH, SRS processing
-- call the scheduler through `NR_ul_indication()`, which corresponds to both an
-  `RX_data.indication` and `CRC.indication` in FAPI parlance
+- call the scheduler through `NR_ul_indication()`, which corresponds to FAPI
+  uplink messages (e.g., `RX_data.indication`, `CRC.indication`,
+  `UCI.indication` etc.)
 - signal completion via FIFO queue `L1_rx_out()`, which tells `ru_thread()`
-  that it finished.
+  that RX processing finished.
 
 The signalling of scheduler data is done through a variable `UL_INFO`, which is
 filled by `L1_nr_prach_proc()` (for PRACH) and `phy_procedures_gNB_uespec_RX()`
@@ -92,5 +93,5 @@ After these steps, `rx_func()` returns to `L1_rx_thread()`, which will wait the
 next RX job.
 
 Note that while individual TX (RX) jobs are run sequentially through
-`L1_tx_thread()` (`L1_rx_thread()`), both TX and RX processing runs in
+`L1_tx_thread()` (`L1_rx_thread()`), both TX and RX processing run in
 parallel.