doc(episys): Move the images into dedicated images/ folder

- Fix the references to the dedicated images folder to the README files

CMakeLists.txt

@@ -363,6 +363,7 @@ add_library(ngap
   ${NGAP_DIR}/ngap_gNB.c
   ${NGAP_DIR}/ngap_common.c
   ${NGAP_DIR}/ngap_gNB_context_management_procedures.c
+  ${NGAP_DIR}/ngap_gNB_mobility_management.c
   ${NGAP_DIR}/ngap_gNB_decoder.c
   ${NGAP_DIR}/ngap_gNB_encoder.c
   ${NGAP_DIR}/ngap_gNB_handlers.c
@@ -941,9 +942,9 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
   ${OPENAIR1_DIR}/PHY/nr_phy_common/src/nr_phy_common_csirs.c
+  ${OPENAIR1_DIR}/PHY/nr_phy_common/src/nr_phy_common_srs.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_scrambling.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/refsig.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
   )
 
   set(PHY_NR_SRC
@@ -1166,6 +1167,7 @@ set(L2_NR_SRC
   ${NR_RRC_DIR}/rrc_gNB.c
   ${NR_RRC_DIR}/mac_rrc_dl_direct.c
   ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
+  ${NR_RRC_DIR}/rrc_gNB_asn1.c
   ${NR_RRC_DIR}/rrc_gNB_nsa.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${NR_RRC_DIR}/rrc_gNB_NGAP.c
@@ -1827,30 +1829,6 @@ target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIE
 target_link_libraries(lte-uesoftmodem PRIVATE
                       asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)
 
-# nr RRU
-add_executable(oainr_ru
-  ${OPENAIR_DIR}/executables/nr-ru.c
-  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
-  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
-  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
-  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
-  ${OPENAIR_DIR}/radio/COMMON/record_player.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${OPENAIR_DIR}/executables/main_nr_ru.c
-  ${OPENAIR_DIR}/executables/nr-oru.c
-)
-target_link_libraries(oainr_ru PRIVATE
-  -Wl,--start-group
-  UTIL SCHED_RU_LIB PHY_COMMON PHY_RU shlib_loader
-  -Wl,--end-group z dl)
-target_link_libraries(oainr_ru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
-  barrier actor)
-target_link_libraries(oainr_ru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management PHY_NR)
-
 # nr-softmodem
 ###################################################
 
@@ -1916,6 +1894,7 @@ target_link_libraries(nr-cuup PRIVATE
                       CONFIG_LIB ITTI SCTP_CLIENT
                       GTPV1U e1ap f1ap
                       time_management
+                      alg
                       z dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 if(E2_AGENT)

ci-scripts/Jenkinsfile-GitLab-Container

@@ -35,6 +35,8 @@ def gitCommitAuthorEmailAddr
 // list of failing stages
 def failingStages = ""
 
+OAI_Registry = "gracehopper3-oai.sboai.cs.eurecom.fr"
+
 pipeline {
   agent {
     label nodeExecutor
@@ -175,6 +177,28 @@ pipeline {
             }
           }
         }
+        stage ("Ubuntu-Jetson-Image-Builder") {
+          steps {
+            script {
+              triggerSlaveJob ('RAN-Ubuntu-Jetson-Image-Builder', 'Ubuntu-Jetson-Image-Builder')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                ubuntuJetsonBuildStatus = finalizeSlaveJob('RAN-Ubuntu-Jetson-Image-Builder')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += ubuntuJetsonBuildStatus
+              }
+            }
+          }
+        }
         stage ("RHEL-Cluster-Image-Builder") {
           steps {
             script {
@@ -269,6 +293,29 @@ pipeline {
             }
           }
         }
+        stage ("PhySim-GraceHopper-5G") {
+          when { expression {do5Gtest || do5GUeTest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-PhySim-GraceHopper-5G', 'PhySim-GraceHopper-5G')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                physimGH5GStatus = finalizeSlaveJob('RAN-PhySim-GraceHopper-5G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += physimGH5GStatus
+              }
+            }
+          }
+        }
         stage ("PhySim-Cluster-4G") {
           when { expression {do4Gtest} }
           steps {
@@ -661,6 +708,29 @@ pipeline {
             }
           }
         }
+        stage ("SA-Handover-CN5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-SA-Handover-CN5G', 'SA-Handover-CN5G')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                saHandoverStatus = finalizeSlaveJob('RAN-SA-Handover-CN5G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += saHandoverStatus
+              }
+            }
+          }
+        }
         stage ("SA-OAIUE-CN5G") {
           when { expression {do5Gtest || do5GUeTest} }
           steps {
@@ -766,11 +836,11 @@ def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
     shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
     shortenShaOne = shortenShaOne.trim()
     branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim()
-    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
+    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
   } else {
     shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT
     shortenShaOne = shortenShaOne.trim()
-    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:develop-' + shortenShaOne
+    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + shortenShaOne
   }
   // Workaround for the "cancelled" GitLab pipeline notification
   // The slave job is triggered with the propagate false so the following commands are executed

ci-scripts/Jenkinsfile-push-registry

@@ -31,6 +31,9 @@ if (params.LockResources != null && params.LockResources.trim().length() > 0)
 // Docker Hub account to push to
 def DH_Account = "oaisoftwarealliance"
 
+// internal registry to use
+def OAI_Registry = "gracehopper3-oai.sboai.cs.eurecom.fr"
+
 pipeline {
   agent {
     label nodeExecutor
@@ -79,14 +82,14 @@ pipeline {
             def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup", "oai-gnb-fhi72"]
             // Logging in on both registries
             sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
-            sh "docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
+            sh "docker login -u oaicicd -p oaicicd ${OAI_Registry} > /dev/null 2>&1"
             listOfImages.eachWithIndex { item, iindex ->
-              sh "docker pull --quiet porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA}"
-              sh "docker image tag porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
-              sh "docker image tag porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
+              sh "docker pull --quiet ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
+              sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
+              sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
               sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
               sh "docker push --quiet ${DH_Account}/${item}:develop"
-              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA}"
+              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
             }
             // Proxy is not following the same pattern.
             sh "docker image tag proxy:develop ${DH_Account}/proxy:develop"
@@ -95,7 +98,7 @@ pipeline {
             sh "docker push --quiet ${DH_Account}/proxy:${WEEK_TAG}"
             sh "docker rmi ${DH_Account}/proxy:develop ${DH_Account}/proxy:${WEEK_TAG}"
             // Logging out on both registries
-            sh "docker logout porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
+            sh "docker logout ${OAI_Registry} > /dev/null 2>&1"
             sh "docker logout > /dev/null 2>&1"
           }
         }
@@ -105,7 +108,7 @@ pipeline {
   post {
     always {
       script {
-        sh "docker logout porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
+        sh "docker logout ${OAI_Registry} > /dev/null 2>&1"
         sh "docker logout > /dev/null 2>&1"
         echo "End of Registry Push"
       }

ci-scripts/ci_infra.yaml

@@ -12,6 +12,14 @@ idefix:
   IF: wwan0
   MTU: 1500
 
+raspix:
+  Host: raspix
+  AttachScript: sudo /opt/mbim_scripts/start_quectel_mbim.sh
+  DetachScript: sudo /opt/mbim_scripts/stop_quectel_mbim.sh
+  NetworkScript: ip a show dev wwan0
+  IF: wwan0
+  MTU: 1500
+
 up2:
   Host: up2
   AttachScript: sudo /opt/mbim/start_quectel_mbim.sh
@@ -77,6 +85,14 @@ oc-cn5g-20897:
   Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
   LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"
 
+oc-cn5g-00102-ho:
+  Host: groot
+  NetworkScript: echo "inet 172.21.6.111"
+  RunIperf3Server: False
+  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ho"
+  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ho"
+  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ho %%log_dir%%"
+
 oc-cn5g-20897-aerial:
   Host: gracehopper1-oai
   NetworkScript: echo "inet 172.21.6.105"

ci-scripts/cls_analysis.py

@@ -26,65 +26,26 @@ import os
 import xml.etree.ElementTree as ET
 import json
 
-# Define the mapping of physim_test values to search patterns
-PHYSIM_PATTERN_MAPPING = {
-	'nr_ulsim': [
-		r'(Total PHY proc rx)\s+(\d+\.\d+)\s+us',  # Pattern for RX PHY processing time
-		r'(ULSCH total decoding time)\s+(\d+\.\d+)\s+us',  # Pattern for ULSCH decoding time
-	],
-	'nr_dlsim': [
-		r'(PHY proc tx)\s+(\d+\.\d+)\s+us',  # Pattern for TX PHY processing time
-		r'(DLSCH encoding time)\s+(\d+\.\d+)\s+us',  # Pattern for DLSCH encoding time
-	],
-	'ldpctest': [
-		r'(Encoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for encoding time mean
-		r'(Decoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for decoding time mean
-	],
-}
-# Define test conditions based on the simulation type
-PHYSIM_TEST_CONDITION = {
-	'nr_ulsim': 'test OK',  # For nr_ulsim, check if 'test OK' is present
-	'nr_dlsim': 'test OK',  # For nr_dlsim, check if 'test OK' is present
-	'ldpctest': None,	  # No condition for ldpctest, just process the patterns
-}
-
 class Analysis():
 
-	def analyze_physim(log, physim_test, options, threshold):
-		search_patterns = PHYSIM_PATTERN_MAPPING.get(physim_test)
-		test_condition = PHYSIM_TEST_CONDITION.get(physim_test)
-		success = False
-		msg = ''
+	def _get_test_description(properties):
+		env_vars = None
+		for p in properties:
+			if p["name"] == "ENVIRONMENT":
+				env_vars = p["value"] # save for later if no custom property
+			if p["name"] == "TEST_DESCRIPTION":
+				return p["value"]
+		# if we came till here, it means there is no custom test property
+		# saved in JSON.  See if we have a description in environment variables
+		if not env_vars:
+			return "<none>"
+		for ev in env_vars:
+			name, value = ev.split("=", 1)
+			if name == "TEST_DESCRIPTION":
+				return value
+		return "<none>"
 
-		try:
-			with open(log, 'r') as f:
-				log_content = f.read()
-		except FileNotFoundError as e:
-			msg = f'{log} file not found, exception: {e}'
-			return False, msg
-		except Exception as e:
-			msg = f'Error while parsing log file {log}: exception: {e}'
-			return False, msg
-
-		if test_condition and test_condition not in log_content:
-			msg = f"Test did not succeed, '{test_condition}' not found in log file {log}."
-			return False, msg
-
-		time1_match = re.search(search_patterns[0], log_content)
-		time2_match = re.search(search_patterns[1], log_content)
-		if not(time1_match and time2_match):
-			msg = f"Processing time not found in log file {log}."
-			return False, msg
-
-		success = float(time2_match.group(2)) < float(threshold)
-		if success:
-			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us'
-		else:
-			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us exceeds a limit of {threshold} us'
-
-		return success,msg
-
-	def analyze_oc_physim(result_junit, details_json, logPath):
+	def analyze_physim(result_junit, details_json, logPath):
 		try:
 			tree = ET.parse(result_junit)
 			root = tree.getroot()
@@ -116,7 +77,7 @@ class Analysis():
 		for test in root: # for each test
 			test_name = test.attrib["name"]
 			test_exec = json_test_desc[test_name]["properties"][1]["value"][0]
-			desc = json_test_desc[test_name]["properties"][1]["value"][1]
+			desc = Analysis._get_test_description(json_test_desc[test_name]["properties"])
 			# get runtime and checks
 			test_check = test.attrib["status"] == "run"
 			time = round(float(test.attrib["time"]), 1)
@@ -129,13 +90,16 @@ class Analysis():
 			with open(f'{log_dir}/{test_name}.log', 'w') as f:
 				f.write(output)
 			# prepare result and info
-			info = f"Runtime: {f'{time:.3f}'[:5]} s"
 			resultstr = 'PASS' if (test_check and time_check and output_check) else 'FAIL'
+			info = f"{test_name}.log: test {resultstr}"
+			for l in output.splitlines():
+				if l.startswith("CHECK "):
+					info += f"\n{l}"
 			if test_check:
 				if not output_check:
-					info += " Test log exceeds maximal allowed length 100 kB"
+					info += "\nTest log exceeds maximal allowed length 100 kB"
 				if not time_check:
-					info += " Test exceeds 150s"
+					info += "\nTest exceeds 150s"
 				if not (time_check and output_check):
 					nb_failed += 1 # time threshold/output length error, not counted for by ctest as of now
 			test_result[test_name] = [desc, info, resultstr]

ci-scripts/cls_cluster.py

@@ -34,7 +34,6 @@ import time
 import os
 
 import cls_oai_html
-import cls_analysis
 import constants as CONST
 import helpreadme as HELP
 import cls_containerize
@@ -417,34 +416,3 @@ class Cluster:
 			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_id}/')
 
 		return status
-
-	def deploy_oc_physim(self, ctx, HTML, oc_release, node):
-		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
-			HELP.GenericHelp(CONST.Version)
-			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {self.ranBranch} ranCommitID {self.ranCommitID}')
-		image_tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-		logging.debug(f'Running physims from server: {node}')
-		script = "scripts/oc-deploy-physims.sh"
-		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {self.eNBSourceCodePath}"
-		ret = cls_cmd.runScript(node, script, 600, options)
-		logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
-		with cls_cmd.getConnection(node) as ssh:
-			details_json = archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/{oc_release}-tests.json')
-			result_junit = archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/{oc_release}-run.xml')
-			archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/physim_log.txt')
-			archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/physim_pods_summary.txt')
-			archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/LastTestsFailed.log')
-		test_status, test_summary, test_result = cls_analysis.Analysis.analyze_oc_physim(result_junit, details_json, ctx.logPath)
-		if test_summary:
-			if test_status:
-				HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-				HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
-				logging.info('\u001B[1m Physical Simulator Pass\u001B[0m')
-			else:
-				HTML.CreateHtmlTestRowQueue('At least one physical simulator test failed!', 'KO', ["See below for details"])
-				HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
-				logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
-		else:
-			HTML.CreateHtmlTestRowQueue('Physical simulator failed', 'KO', [test_result])
-			logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
-		return test_status

ci-scripts/cls_cmd.py

@@ -45,12 +45,6 @@ def getConnection(host, d=None):
 	else:
 		return RemoteCmd(host, d=d)
 
-def runScript(host, path, timeout, parameters=None, redirect=None, silent=False):
-	if is_local(host):
-		return LocalCmd.exec_script(path, timeout, parameters, redirect, silent)
-	else:
-		return RemoteCmd.exec_script(host, path, timeout, parameters, redirect, silent)
-
 # provides a partial interface for the legacy SSHconnection class (getBefore(), command())
 class Cmd(metaclass=abc.ABCMeta):
 	def cd(self, d, silent=False):
@@ -111,12 +105,12 @@ class LocalCmd(Cmd):
 			logging.debug(f'Working dir is {self.cwd}')
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
 
-	def exec_script(path, timeout, parameters=None, redirect=None, silent=False):
+	def exec_script(self, path, timeout, parameters=None, redirect=None, silent=False):
 		if redirect and not redirect.startswith("/"):
 			raise ValueError(f"redirect must be absolute, but is {redirect}")
 		c = f"{path} {parameters}" if parameters else path
 		if not redirect:
-			ret = sp.run(c, shell=True, timeout=timeout, stdout=sp.PIPE, stderr=sp.STDOUT)
+			ret = sp.run(c, shell=True, cwd=self.cwd, timeout=timeout, stdout=sp.PIPE, stderr=sp.STDOUT)
 			ret.stdout = ret.stdout.decode('utf-8').strip()
 		else:
 			with open(redirect, "w") as f:
@@ -238,18 +232,15 @@ class RemoteCmd(Cmd):
 			cfg['sock'] = paramiko.ProxyCommand(ucfg['proxycommand'])
 		return cfg
 
-	def exec_script(host, path, timeout, parameters=None, redirect=None, silent=False):
+	def exec_script(self, path, timeout, parameters=None, redirect=None, silent=False):
 		if redirect and not redirect.startswith("/"):
 			raise ValueError(f"redirect must be absolute, but is {redirect}")
 		p = parameters if parameters else ""
 		r = f"> {redirect}" if redirect else ""
 		if not silent:
-			logging.debug(f"local> ssh {host} bash -s {p} < {path} {r} # {path} from localhost")
-		client = RemoteCmd._ssh_init()
-		cfg = RemoteCmd._lookup_ssh_config(host)
-		client.connect(**cfg)
+			logging.debug(f"local> ssh {self.hostname} bash -s {p} < {path} {r}")
 		bash_opt = 'BASH_XTRACEFD=1' # write bash set -x output to stdout, see bash(1)
-		stdin, stdout, stderr = client.exec_command(f"{bash_opt} bash -s {p} {r}", timeout=timeout)
+		stdin, stdout, stderr = self.client.exec_command(f"{bash_opt} bash -s {p} {r}", timeout=timeout)
 		# open() the file f at path, read() it and write() it into the stdin of the bash -s cmd
 		with open(path) as f:
 			stdin.write(f.read())
@@ -259,7 +250,6 @@ class RemoteCmd(Cmd):
 		if redirect: cmd += f" &> {redirect}"
 		ret = sp.CompletedProcess(args=cmd, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
 		ret.stdout = ret.stdout.decode('utf-8').strip()
-		client.close()
 		return ret
 
 	def run(self, line, timeout=300, silent=False, reportNonZero=True):

ci-scripts/cls_containerize.py

@@ -53,6 +53,7 @@ from cls_ci_helper import archiveArtifact
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
 IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
+DEFAULT_REGISTRY = "gracehopper3-oai.sboai.cs.eurecom.fr"
 
 def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -66,7 +67,8 @@ def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranc
 			ranTargetBranch = 'develop'
 		options += f" {ranTargetBranch}"
 	logging.info(f'execute "{script}" with options "{options}" on node {host}')
-	ret = cls_cmd.runScript(host, script, 90, options)
+	with cls_cmd.getConnection(host) as c:
+		ret = c.exec_script(script, 90, options)
 	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
 	return ret.returncode == 0
 
@@ -303,13 +305,18 @@ class Containerize():
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu.cross-arm64'
-		result = re.search('native_arm', self.imageKind)
+		result = re.search('native_armv9', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
 			imageNames.append(('ran-build-fhi72', 'build.fhi72.native_arm', 'ran-build-fhi72', ''))
 			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
 			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
 			imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
+		result = re.search('native_armv8', self.imageKind)
+		if result is not None:
+			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
+			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
+			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
 		
 		cmd.cd(lSourcePath)
 		# if asterix, copy the entitlement and subscription manager configurations
@@ -362,7 +369,6 @@ class Containerize():
 			cmd.close()
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTabFooter(False)
 			return False
 		else:
 			result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
@@ -486,7 +492,6 @@ class Containerize():
 				logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
 				ssh.close()
 				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
-				HTML.CreateHtmlTabFooter(False)
 				return False
 		else:
 			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')
@@ -555,7 +560,6 @@ class Containerize():
 		if ret.returncode != 0:
 			logging.error(f'No {baseImage} image present, cannot build tests')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTabFooter(False)
 			return False
 
 		# build ran-unittests image
@@ -566,7 +570,6 @@ class Containerize():
 		if ret.returncode != 0:
 			logging.error(f'Cannot build unit tests')
 			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
-			HTML.CreateHtmlTabFooter(False)
 			return False
 
 		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
@@ -585,18 +588,16 @@ class Containerize():
 
 		if ret.returncode == 0:
 			HTML.CreateHtmlTestRowQueue('Unit tests succeeded', 'OK', [ret.stdout])
-			HTML.CreateHtmlTabFooter(True)
 			return True
 		else:
 			HTML.CreateHtmlTestRowQueue('Unit tests failed (see also doc/UnitTests.md)', 'KO', [ret.stdout])
-			HTML.CreateHtmlTabFooter(False)
 			return False
 
 	def Push_Image_to_Local_Registry(self, node, HTML, tag_prefix=""):
 		lSourcePath = self.eNBSourceCodePath
 		logging.debug('Pushing images to server: ' + node)
 		ssh = cls_cmd.getConnection(node)
-		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
+		imagePrefix = DEFAULT_REGISTRY
 		ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
 		if ret.returncode != 0:
 			msg = 'Could not log into local registry'
@@ -667,7 +668,7 @@ class Containerize():
 		msg = "Pulled Images:\n" + '\n'.join(pulled_images)
 		return True, msg
 
-	def Pull_Image_from_Registry(self, HTML, node, images, tag=None, tag_prefix="", registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"):
+	def Pull_Image_from_Registry(self, HTML, node, images, tag=None, tag_prefix="", registry=DEFAULT_REGISTRY, username="oaicicd", password="oaicicd"):
 		logging.debug(f'\u001B[1m Pulling image(s) on server: {node}\u001B[0m')
 		if not tag:
 			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)

ci-scripts/cls_corenetwork.py

@@ -77,7 +77,8 @@ class CoreNetwork:
 		words = line[1:].strip().split(" ")
 		script_name = words[0]
 		options = " ".join(words[1:])
-		ret = cls_cmd.runScript(host, script_name, 300, parameters=options, silent=silent)
+		with cls_cmd.getConnection(host) as c:
+			ret = c.exec_script(script_name, 300, parameters=options, silent=silent)
 		return ret
 
 	def _command(self, cmd_list, must_succeed=False, silent=False):

ci-scripts/cls_native.py

@@ -64,18 +64,3 @@ class Native():
 			logging.error('\u001B[1m Building OAI Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(options, 'KO', CONST.ALL_PROCESSES_OK)
 		return success
-
-	def Run_Physim(ctx, HTML, host, directory, options, physim_test, threshold):
-		logging.debug(f'Runnin {physim_test} on server: {host}')
-		workSpacePath = f'{directory}/cmake_targets'
-		runLogFile=f'{workSpacePath}/physim.log'
-		with cls_cmd.getConnection(host) as cmd:
-			cmd.run(f'sudo LD_LIBRARY_PATH=.:{DPDK_PATH}/lib64/ {workSpacePath}/ran_build/build/{physim_test} {options} > {runLogFile} 2>&1')
-			physim_file = archiveArtifact(cmd, ctx, runLogFile)
-		success, msg = cls_analysis.Analysis.analyze_physim(physim_file, physim_test, options, threshold)
-		if success:
-			HTML.CreateHtmlTestRowQueue(options, 'OK', [msg])
-		else:
-			logging.error(msg)
-			HTML.CreateHtmlTestRowQueue(options, 'KO', [msg])
-		return success

ci-scripts/cls_oai_html.py

@@ -247,7 +247,7 @@ class HTMLManagement():
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  <p></p>\n')
-			self.htmlFile.write('  <div class="well well-lg">End of Test Report -- Copyright <span class="glyphicon glyphicon-copyright-mark"></span> 2018 <a href="http://www.openairinterface.org/">OpenAirInterface</a>. All Rights Reserved.</div>\n')
+			self.htmlFile.write('  <div class="well well-lg">End of Test Report -- Copyright <span class="glyphicon glyphicon-copyright-mark"></span> 2025 <a href="http://www.openairinterface.org/">OpenAirInterface</a>. All Rights Reserved.</div>\n')
 			self.htmlFile.write('</div></body>\n')
 			self.htmlFile.write('</html>\n')
 			self.htmlFile.close()
@@ -533,6 +533,6 @@ class HTMLManagement():
 					self.htmlFile.write('        <td bgcolor = "green" ><font color="white"><b>' + value[2]  + '</b></font></td>\n')
 				else:
 					self.htmlFile.write('        <td bgcolor = "red" ><font color="white"><b>' + value[2]  + '</b></font></td>\n')
-				self.htmlFile.write('        <td bgcolor = "lightcyan">' + value[1] + '</td>\n')
+				self.htmlFile.write(f'        <td colspan="2" bgcolor = "lightcyan"><pre style="display: inline flow-root list-item; margin: 0 3px 0 3px; min-width: 24em;">{value[1]}</pre></td>\n')
 
 		self.htmlFile.close()

ci-scripts/cls_oaicitest.py

@@ -46,6 +46,7 @@ import constants as CONST
 
 import cls_module
 import cls_corenetwork
+import cls_analysis
 import cls_cmd
 from cls_ci_helper import archiveArtifact
 
@@ -234,7 +235,8 @@ def Custom_Command(HTML, node, command):
 
 def Custom_Script(HTML, node, script):
 	logging.info(f"Executing custom script on {node}")
-	ret = cls_cmd.runScript(node, script, 90)
+	with cls_cmd.getConnection(node) as c:
+		ret = c.exec_script(script, 90)
 	logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
 	status = 'OK'
 	message = [ret.stdout]
@@ -249,6 +251,34 @@ def IdleSleep(HTML, idle_sleep_time):
 	HTML.CreateHtmlTestRow(f"{idle_sleep_time} sec", 'OK', CONST.ALL_PROCESSES_OK)
 	return True
 
+def Deploy_Physim(ctx, HTML, node, workdir, script, options):
+	logging.debug(f'Running physims on server {node} workdir {workdir}')
+	with cls_cmd.getConnection(node) as c:
+		sys_info = c.exec_script("scripts/sys-info.sh", 5)
+		ret = c.exec_script(script, 600, options)
+	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
+	HTML.CreateHtmlTestRowQueue('Query system info', 'OK', [sys_info.stdout])
+	with cls_cmd.getConnection(node) as ssh:
+		details_json = archiveArtifact(ssh, ctx, f'{workdir}/desc-tests.json')
+		result_junit = archiveArtifact(ssh, ctx, f'{workdir}/results-run.xml')
+		archiveArtifact(ssh, ctx, f'{workdir}/physim_log.txt')
+		archiveArtifact(ssh, ctx, f'{workdir}/LastTestsFailed.log')
+		archiveArtifact(ssh, ctx, f'{workdir}/LastTest.log')
+	test_status, test_summary, test_result = cls_analysis.Analysis.analyze_physim(result_junit, details_json, ctx.logPath)
+	if test_summary:
+		if test_status:
+			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
+			logging.info('\u001B[1m Physical Simulator Pass\u001B[0m')
+		else:
+			HTML.CreateHtmlTestRowQueue('At least one physical simulator test failed!', 'KO', ["See below for details"])
+			HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
+			logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
+	else:
+		HTML.CreateHtmlTestRowQueue('Physical simulator failed', 'KO', [test_result])
+		logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
+	return test_status
+
 #-----------------------------------------------------------
 # OaiCiTest Class Definition
 #-----------------------------------------------------------

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

@@ -15,7 +15,7 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
     plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
+    @include "neighbour-config.conf"
 
     nr_cellid = 12345678L;
 

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

@@ -0,0 +1,76 @@
+Active_gNBs = ( "oai-cu");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID = 0xe88;
+
+#     cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "oai-cu";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code =  1;
+    plmn_list = ({ mcc = 001; mnc = 03; mnc_length = 2; snssaiList = ({ sst = 1 }) });
+
+    @include "neighbour-config-ho.conf"
+
+    nr_cellid = 12345678L;
+
+    tr_s_preference  = "f1";
+
+    local_s_address  = "172.21.19.98";
+    remote_s_address = "0.0.0.0";
+    local_s_portd    = 2153;
+    remote_s_portd   = 2154;
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "172.21.6.109"; });
+
+    NETWORK_INTERFACES :
+    {
+
+        GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.19.98/22";
+        GNB_IPV4_ADDRESS_FOR_NGU    = "172.21.19.98/22";
+        GNB_PORT_FOR_S1U            = 2152; # Spec 2152
+    };
+  }
+);
+
+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";
+  pdcp_log_level   ="info";
+  rrc_log_level    ="info";
+  f1ap_log_level   ="info";
+  ngap_log_level   ="info";
+};

ci-scripts/conf_files/gnb-cucp.sa.e1-ho-n2.conf

@@ -0,0 +1,82 @@
+Active_gNBs = ( "cu-cp-0");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID = 0xe00;
+
+#     cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "cu-cp-0";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
+    @include "neighbour-config.conf"
+
+    nr_cellid = 12345678L;
+
+    tr_s_preference = "f1";
+
+    local_s_address = "192.168.71.150";
+    remote_s_address = "192.168.71.171";
+    local_s_portd   = 2153;
+    remote_s_portd  = 2153;
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+
+    E1_INTERFACE =
+    (
+      {
+        type = "cp";
+        ipv4_cucp = "192.168.71.150";
+        port_cucp = 38462;
+        ipv4_cuup = "0.0.0.0"; # multiple CU-UPs
+        port_cuup = 38462;
+      }
+    )
+
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
+    };
+  }
+);
+
+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";
+  pdcp_log_level = "info";
+  rrc_log_level = "info";
+  f1ap_log_level = "info";
+  ngap_log_level = "info";
+};

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

@@ -146,18 +146,8 @@ gNBs =
 
   );
 
-    servingCellConfigDedicated = ({
-      dl_bwp-Id_1 = 1;
-      dl_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart
-      dl_bwp1_subcarrierSpacing = 1;
-      firstActiveDownlinkBWP-Id = 1;
-      defaultDownlinkBWP-Id = 1;
-      ul_bwp-Id_1 = 1;
-      ul_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart
-      ul_bwp1_subcarrierSpacing = 1;
-      firstActiveUplinkBWP-Id = 1;
-    });
-
+    first_active_bwp = 1;
+    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;});
 
     # ------- SCTP definitions
     SCTP :

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

@@ -0,0 +1,212 @@
+Active_gNBs = ( "oai-du0");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    = 0xe88;
+    gNB_DU_ID = 0xe00;
+    gNB_name  = "oai-du0";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  = 1 ;
+    plmn_list = ({ mcc = 001; mnc = 03; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+
+    nr_cellid = 12345678L;
+
+    ////////// Physical parameters:
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # 4.01 GHz
+      absoluteFrequencySSB                                          = 629376;
+      dl_frequencyBand                                              = 78;
+      # 4 GHz
+      dl_absoluteFrequencyPointA                                    = 628720;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 51;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                            = 13750;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                               = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                          = 12;
+        initialDLBWPsearchSpaceZero                                 = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 51;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 13750;
+# 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                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#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                   = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 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;
+    };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc                = 1;
+  tr_s_preference       = "local_L1";
+  tr_n_preference       = "f1";
+  local_n_address       = "172.21.19.98";
+  remote_n_address      = "172.21.19.98";
+  local_n_portc         = 500;
+  local_n_portd         = 2154;
+  remote_n_portc        = 501;
+  remote_n_portd        = 2153;
+  pusch_TargetSNRx10    = 200;
+  pucch_TargetSNRx10    = 230;
+#  ul_prbblack_SNR_threshold  = 10;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference       = "local_mac";
+  prach_dtx_threshold   = 100;
+  pucch0_dtx_threshold  = 10;
+  max_ldpc_iterations   = 20;
+  sl_ahead              = 3;
+  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
+}
+);
+
+RUs = (
+{
+  local_rf         = "yes"
+  nb_tx            = 1
+  nb_rx            = 1
+  att_tx           = 0;
+  att_rx           = 0;
+  bands            = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain       = 114;
+  eNB_instances    = [0];
+# USRP is connected to an Octoclock in order to establish synchroniation with other USRPs
+  clock_src        = "external";
+  time_src         = "external";
+}
+);
+
+log_config :
+{
+  global_log_level ="info";
+  hw_log_level     ="info";
+  phy_log_level    ="info";
+  mac_log_level    ="info";
+  rlc_log_level    ="info";
+  pdcp_log_level   ="info";
+  rrc_log_level    ="info";
+  ngap_log_level   ="debug";
+  f1ap_log_level   ="info";
+};

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

@@ -0,0 +1,212 @@
+Active_gNBs = ( "oai-du1");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    = 0xe88;
+    gNB_DU_ID = 0xe01;
+    gNB_name  = "oai-du1";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  = 1 ;
+    plmn_list = ({ mcc = 001; mnc = 03; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+
+    nr_cellid = 11111111L;
+
+    ////////// Physical parameters:
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 1;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # 4.01 GHz
+      absoluteFrequencySSB                                          = 629376;
+      dl_frequencyBand                                              = 78;
+      # 4 GHz
+      dl_absoluteFrequencyPointA                                    = 628720;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 51;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                            = 13750;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                               = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                          = 12;
+        initialDLBWPsearchSpaceZero                                 = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 51;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 13750;
+# 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                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#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                   = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 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;
+    };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc                = 1;
+  tr_s_preference       = "local_L1";
+  tr_n_preference       = "f1";
+  local_n_address       = "172.21.19.99";
+  remote_n_address      = "172.21.19.98";
+  local_n_portc         = 500;
+  local_n_portd         = 2154;
+  remote_n_portc        = 501;
+  remote_n_portd        = 2153;
+  pusch_TargetSNRx10    = 200;
+  pucch_TargetSNRx10    = 230;
+#  ul_prbblack_SNR_threshold  = 10;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference       = "local_mac";
+  prach_dtx_threshold   = 100;
+  pucch0_dtx_threshold  = 10;
+  max_ldpc_iterations   = 20;
+  sl_ahead              = 3;
+  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
+}
+);
+
+RUs = (
+{
+  local_rf         = "yes"
+  nb_tx            = 1
+  nb_rx            = 1
+  att_tx           = 0;
+  att_rx           = 0;
+  bands            = [78];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain       = 114;
+  eNB_instances    = [0];
+# USRP is connected to an Octoclock in order to establish synchroniation with other USRPs
+  clock_src        = "external";
+  time_src         = "external";
+}
+);
+
+log_config :
+{
+  global_log_level ="info";
+  hw_log_level     ="info";
+  phy_log_level    ="info";
+  mac_log_level    ="info";
+  rlc_log_level    ="info";
+  pdcp_log_level   ="info";
+  rrc_log_level    ="info";
+  ngap_log_level   ="debug";
+  f1ap_log_level   ="info";
+};

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

@@ -197,7 +197,6 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 200; # 150;
   pucch_TargetSNRx10          = 200; #200;
-  ulsch_max_frame_inactivity  = 10;
   dl_max_mcs = 28;
   ul_max_mcs = 28;
 }

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

@@ -198,7 +198,6 @@ MACRLCs = (
   num_cc                      = 1;
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-#  ulsch_max_frame_inactivity  = 0;
   pusch_TargetSNRx10          = 150;
   pucch_TargetSNRx10          = 200;
   dl_max_mcs                  = 9;

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

@@ -16,6 +16,7 @@ gNBs =
 
     ////////// Physical parameters:
 
+    do_SINR                                                   = 1;
     min_rxtxtime                                              = 6;
     disable_harq                                              = 1;
     cu_sibs = [2];
@@ -205,7 +206,6 @@ MACRLCs = (
   num_cc                      = 1;
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-#  ulsch_max_frame_inactivity  = 0;
   pusch_TargetSNRx10          = 150;
   pucch_TargetSNRx10          = 200;
   dl_max_mcs                  = 9;

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

@@ -24,6 +24,7 @@ gNBs =
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
     do_SRS                = 1;
+    uess_agg_levels = [4,2,0,0,0];
 
     servingCellConfigCommon = (
     {
@@ -139,9 +140,9 @@ gNBs =
       # dl_UL_TransmissionPeriodicity
       # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
       dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 2;
+      nrofDownlinkSlots                                             = 1;
       nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
+      nrofUplinkSlots                                               = 3;
       nrofUplinkSymbols                                             = 4;
 
   ssPBCH_BlockPower                                             = -20;
@@ -178,11 +179,12 @@ MACRLCs = (
   num_cc                      = 1;
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 300;
-  pucch_TargetSNRx10          = 300;
-  ulsch_max_frame_inactivity  = 0;
+  pusch_TargetSNRx10          = 320;
+  pucch_TargetSNRx10          = 320;
   pusch_FailureThres          = 100;
-  ul_max_mcs		      = 28;
+  ul_max_mcs                  = 28;
+  ul_bler_target_upper        = 0.20;
+  ul_bler_target_lower        = 0.10;
 }
 );
 

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

@@ -193,8 +193,6 @@ RUs = (
   eNB_instances  = [0];
   ru_thread_core = 6;
   sl_ahead       = 10; #5;
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];
   tr_preference  = "raw_if4p5"; # important: activate FHI7.2
   do_precoding = 0; # needs to match O-RU configuration
 }

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

@@ -175,7 +175,6 @@ MACRLCs = (
   pusch_TargetSNRx10          = 270;
   pucch_TargetSNRx10          = 270;
   pusch_FailureThres          = 1000;
-  ulsch_max_frame_inactivity  = 0;
   ul_max_mcs                  = 25;
 }
 );

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

@@ -145,64 +145,10 @@ gNBs =
 
     );
 
-    # Dedicated Serving Cell Configuration
-    servingCellConfigDedicated = ({
-    # BWP-Downlink
-      # BWP 1 Configuration
-        dl_bwp-Id_1 = 1;
-        dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp1_subcarrierSpacing = 1;
-
-      # BWP 2 Configuration
-        dl_bwp-Id_2 = 2;
-        dl_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp2_subcarrierSpacing = 1;
-
-      # BWP 3 Configuration
-        dl_bwp-Id_3 = 3;
-        dl_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp3_subcarrierSpacing = 1;
-
-      firstActiveDownlinkBWP-Id = 1;  #BWP-Id
-      defaultDownlinkBWP-Id     = 1;  #BWP-Id
-
-      # bwp-InactivityTimer                 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30,
-      #                                                ms40,ms50, ms60, ms80,ms100, ms200,ms300, ms500,
-      #                                                ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
-      #                                                spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
-
-    # UplinkConfig
-      # BWP-Uplink
-        # BWP 1 Configuration
-          ul_bwp-Id_1 = 1;
-          ul_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp1_subcarrierSpacing = 1;
-
-        # BWP 2 Configuration
-          ul_bwp-Id_2 = 2;
-          ul_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp2_subcarrierSpacing = 1;
-
-        # BWP 3 Configuration
-          ul_bwp-Id_3 = 3;
-          ul_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp3_subcarrierSpacing = 1;
-
-        firstActiveUplinkBWP-Id = 1;  #BWP-Id
-      }
-    );
+    first_active_bwp = 1;
+    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;},
+                { scs = 1; bwpStart = 0; bwpSize = 51;},
+                { scs = 1; bwpStart = 0; bwpSize = 24;});
 
 
     # ------- SCTP definitions
@@ -233,7 +179,6 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 250;
   pucch_TargetSNRx10          = 200;
-  ulsch_max_frame_inactivity  = 0;
 }
 );
 

ci-scripts/conf_files/neighbour-config-ho.conf

@@ -0,0 +1,54 @@
+neighbour_list = (
+  {
+    nr_cellid = 12345678;
+    neighbour_cell_configuration = (
+      {
+        gNB_ID = 0xe01;
+        nr_cellid = 11111111;
+        physical_cellId = 1;
+        absoluteFrequencySSB = 629376;
+        subcarrierSpacing = 1; #30 KHz
+        band = 78;
+        plmn = { mcc = 001; mnc = 03; mnc_length = 2};
+        tracking_area_code = 1;
+      }
+    )
+  },
+  {
+    nr_cellid = 11111111;
+    neighbour_cell_configuration = (
+      {
+        gNB_ID = 0xe00;
+        nr_cellid = 12345678;
+        physical_cellId = 0;
+        absoluteFrequencySSB = 629376;
+        subcarrierSpacing = 1; #30 KHz
+        band = 78;
+        plmn = { mcc = 001; mnc = 03; mnc_length = 2};
+        tracking_area_code = 1;
+      }
+    )
+  }
+ );
+
+
+nr_measurement_configuration = {
+  Periodical = {
+    enable = 1;
+    includeBeamMeasurements = 1;
+    maxNrofRS_IndexesToReport = 4;
+  };
+
+  A2 = {
+    enable = 1;
+    threshold = 110;
+    timeToTrigger = 1;
+  };
+
+  A3 = ({
+    cell_id = -1; #Default
+    offset = 10;
+    hysteresis = 0;
+    timeToTrigger = 1
+  })
+};

ci-scripts/conf_files/neighbour-config.conf

@@ -1,52 +1,51 @@
-neighbour_list = (
-  {
-    nr_cellid = 1;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xb00;
-        nr_cellid = 2;
-        physical_cellId = 0x002;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 216; mnc = 03; mnc_length = 2};
-        tracking_area_code = 2;
-      },
-      {
-        gNB_ID = 0xa00;
-        nr_cellid = 3;
-        physical_cellId = 0x003;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
-        tracking_area_code = 3;
-      },
-      {
-        gNB_ID = 0xc00;
-        nr_cellid = 4;
-        physical_cellId = 0x004;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
-        tracking_area_code = 4;
-      }
-  )
-  },
-  {
-    nr_cellid = 2;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xe00;
-        nr_cellid = 1;
-        physical_cellId = 0x000;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 001; mnc = 01; mnc_length = 2};
-        tracking_area_code = 1;
-      }
-    )
-  }
- );
+############################################################
+#  gNB-to-gNB neighbour list + measurement configuration   #
+#  for the 2-cell rfsim setup (gNB_ID 0xe00 & 0xb00)       #
+############################################################
 
+neighbour_list = (
+  ##########################################################
+  #      Entry USED BY gNB_ID = 0xe00  (nr_cellid = 1)     #
+  ##########################################################
+  {
+    nr_cellid = 0; #  Serving cell of gNB 0xe00
+    neighbour_cell_configuration = (
+      {
+        gNB_ID              = 0xb00;
+        nr_cellid           = 1; # Cell served by gNB 0xb00
+        physical_cellId     = 1;
+        absoluteFrequencySSB= 621312;
+        subcarrierSpacing   = 1;  # 30 kHz
+        band                = 78;
+        plmn                = { mcc = 208; mnc = 99; mnc_length = 2 };
+        tracking_area_code  = 1;
+      }
+    );
+  },
+
+  ##########################################################
+  #      Entry USED BY gNB_ID = 0xb00  (nr_cellid = 2)     #
+  ##########################################################
+  {
+    nr_cellid = 1; #  Serving cell of gNB 0xb00
+    neighbour_cell_configuration = (
+      {
+        gNB_ID              = 0xe00;
+        nr_cellid           = 0;  # Cell served by gNB 0xe00
+        physical_cellId     = 0;
+        absoluteFrequencySSB= 641280;
+        subcarrierSpacing   = 1;  # 30 kHz
+        band                = 78;
+        plmn                = { mcc = 208; mnc = 99; mnc_length = 2 };
+        tracking_area_code  = 1;
+      }
+    );
+  }
+);
+
+############################################################
+#        Common NR measurement-event configuration         #
+############################################################
 
 nr_measurement_configuration = {
   Periodical = {

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

@@ -86,7 +86,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64

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

@@ -100,8 +100,8 @@ gNBs =
         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                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64

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

@@ -96,8 +96,8 @@ gNBs =
         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                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64

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

@@ -105,8 +105,8 @@ gNBs =
         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                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#one (0..15) 4,8,12,16,...60,64
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64

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

@@ -80,7 +80,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64

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

@@ -85,7 +85,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64

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

@@ -84,7 +84,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64

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

@@ -83,7 +83,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64

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

@@ -82,7 +82,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
+#one (0..15) 4,8,12,16,...60,64
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64

ci-scripts/docker/Dockerfile.physim.ubuntu

@@ -0,0 +1,46 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Ubuntu 24.04
+#
+#---------------------------------------------------------------------
+
+FROM ran-base:develop AS ran-tests
+
+#RUN apt-get update && \
+#    DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
+#    DEBIAN_FRONTEND=noninteractive apt-get install --yes \
+#        libgtest-dev \
+#        libyaml-cpp-dev
+
+RUN rm -Rf /oai-ran
+WORKDIR /oai-ran
+COPY . .
+
+WORKDIR /oai-ran/build
+# TODO should SANITIZE be ON? it makes it compile much longer
+RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON \
+        -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
+        -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
+        .. && \
+    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim

ci-scripts/main.py

@@ -242,10 +242,22 @@ def ExecuteActionWithParam(action, ctx):
 		st = test.findtext('idle_sleep_time_in_sec') or "5"
 		success = cls_oaicitest.IdleSleep(HTML, int(st))
 
-	elif action == 'Deploy_Run_PhySim':
+	elif action == 'Deploy_Run_OC_PhySim':
 		oc_release = test.findtext('oc_release')
 		node = test.findtext('node') or None
-		success = CLUSTER.deploy_oc_physim(ctx, HTML, oc_release, node)
+		script = "scripts/oc-deploy-physims.sh"
+		image_tag = cls_containerize.CreateTag(CLUSTER.ranCommitID, CLUSTER.ranBranch, CLUSTER.ranAllowMerge)
+		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.eNBSourceCodePath}"
+		workdir = CLUSTER.eNBSourceCodePath
+		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}"
+		workdir = CONTAINERS.eNBSourceCodePath
+		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
 	elif action == 'DeployCoreNetwork' or action == 'UndeployCoreNetwork':
 		cn_id = test.findtext('cn_id')
@@ -274,13 +286,6 @@ def ExecuteActionWithParam(action, ctx):
 				return True
 			success = CONTAINERS.Create_Workspace(node, HTML)
 
-	elif action == 'Run_Physim':
-		physim_options = test.findtext('physim_run_args')
-		physim_test = test.findtext('physim_test')
-		physim_threshold = test.findtext('physim_time_threshold') or 'inf'
-		node = test.findtext('node')
-		success = cls_native.Native.Run_Physim(ctx, HTML, node, RAN.eNBSourceCodePath, physim_options, physim_test, physim_threshold)
-
 	elif action == 'LicenceAndFormattingCheck':
 		node = test.findtext('node')
 		success = SCA.LicenceAndFormattingCheck(ctx, node, HTML)

ci-scripts/run_locally.sh

@@ -15,16 +15,18 @@ fi
 
 # The script assumes you've build the following images:
 #
-# docker build . -f docker/Dockerfile.gNB.ubuntu22 -t oai-gnb
-# docker build . -f docker/Dockerfile.nrUE.ubuntu22 -t oai-nr-ue
+# docker build . -f docker/Dockerfile.gNB.ubuntu -t oai-gnb
+# docker build . -f docker/Dockerfile.nr-cuup.ubuntu -t oai-nr-cuup
+# docker build . -f docker/Dockerfile.nrUE.ubuntu -t oai-nr-ue
 #
 # The images above depend on the following images:
 #
-# docker build . -f docker/Dockerfile.build.ubuntu22 -t ran-build
-# dokcer build . -f docker/Dockerfile.base.ubuntu22 -t ran-base
+# docker build . -f docker/Dockerfile.build.ubuntu -t ran-build
+# docker build . -f docker/Dockerfile.base.ubuntu -t ran-base
 
 docker tag oai-nr-ue oai-ci/oai-nr-ue:develop-${SHORT_COMMIT_SHA}
 docker tag oai-gnb oai-ci/oai-gnb:develop-${SHORT_COMMIT_SHA}
+docker tag oai-nr-cuup oai-ci/oai-nr-cuup:develop-${SHORT_COMMIT_SHA}
 
 python3 main.py --mode=InitiateHtml --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
     --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \

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

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+function die() { echo $@; exit 1; }
+[ $# -ge 1 ] || die "usage: $0 <directory> [ctest-options]"
+
+IMAGE=ran-physimtests:ci-temp
+CONTAINER=ran-physimtests
+function cleanup-docker() {
+  docker stop ${CONTAINER}
+  docker rm ${CONTAINER}
+  docker rmi ${IMAGE}
+  docker volume prune --force
+}
+trap cleanup-docker EXIT
+
+set -x
+DIR=$1
+RESULT_DIR=${DIR}/
+shift
+CTEST_OPT=$@
+
+# build physims
+docker build --progress=plain --tag ${IMAGE} --file ${DIR}/ci-scripts/docker/Dockerfile.physim.ubuntu ${DIR} &>> ${RESULT_DIR}/physim_log.txt
+if [ $? -ne 0 ]; then
+  echo "build of physims failed"
+  exit 1
+fi
+
+# get a JSON description of all tests to run
+docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --show-only=json-v1 &> ${RESULT_DIR}/desc-tests.json
+JSON_RES=$?
+
+# run the actual tests: we don't suppy --rm as we have to copy the files
+# similar to unit tests, we can't mount the file where we write physims-5g-run.xml to
+# as it would write a file as root, but this script is run as a normal user
+docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --output-junit results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${RESULT_DIR}/physim_log.txt
+RUN_RES=$?
+docker cp ${CONTAINER}:/oai-ran/build/results-run.xml ${RESULT_DIR}/
+docker cp ${CONTAINER}:/oai-ran/build/Testing/Temporary/LastTestsFailed.log ${RESULT_DIR}/
+docker cp ${CONTAINER}:/oai-ran/build/Testing/Temporary/LastTest.log ${RESULT_DIR}/
+
+# if both were successful, return 0
+# TODO not sure
+#[[ $JSON_RES -eq 0 && $RUN_RES -eq 0 ]] && exit 0
+
+exit 0

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

@@ -13,21 +13,22 @@ OAI_DIR=${4}
 cat /opt/oc-password | oc login -u oaicicd --server https://api.oai.cs.eurecom.fr:6443 > /dev/null
 oc project ${OC_NS} > /dev/null
 oc tag oaicicd-ran/oai-physim:${IMG_TAG} ${OC_NS}/oai-physim:${IMG_TAG}
-helm install ${OC_RELEASE} ${OAI_DIR}/charts/${OC_RELEASE} --set global.image.version=${IMG_TAG} --wait
+helm install ${OC_RELEASE} ${OAI_DIR}/charts/${OC_RELEASE} --set global.image.version=${IMG_TAG} --wait --timeout 120s
 POD_ID=$(oc get pods | grep oai-${OC_RELEASE} | awk '{print $1}')
 sleep 10
 echo "Monitoring logs for 'FINISHED' in pod '$POD_ID'"
 oc logs -f -n ${OC_NS} "$POD_ID" | while read -r line; do
   if [[ "$line" == *"FINISHED"* ]]; then
     echo "'FINISHED' detected in logs. Copying logs..."
-    oc logs -n ${OC_NS} "$POD_ID" >> ${OAI_DIR}/ci-scripts/physim_log.txt
-    oc describe pod $POD_ID >> ${OAI_DIR}/ci-scripts/physim_pods_summary.txt
-    oc cp "$POD_ID":/opt/oai-physim/Testing/Temporary/LastTestsFailed.log ${OAI_DIR}/ci-scripts/LastTestsFailed.log
-    oc cp "$POD_ID":/opt/oai-physim/${OC_RELEASE}-tests.json ${OAI_DIR}/ci-scripts/${OC_RELEASE}-tests.json
-    oc cp "$POD_ID":/opt/oai-physim/${OC_RELEASE}-run.xml ${OAI_DIR}/ci-scripts/${OC_RELEASE}-run.xml
+    oc cp "$POD_ID":/opt/oai-physim/Testing/Temporary/LastTestsFailed.log ${OAI_DIR}/LastTestsFailed.log
+    oc cp "$POD_ID":/opt/oai-physim/Testing/Temporary/LastTest.log ${OAI_DIR}/LastTest.log
+    oc cp "$POD_ID":/opt/oai-physim/${OC_RELEASE}-tests.json ${OAI_DIR}/desc-tests.json
+    oc cp "$POD_ID":/opt/oai-physim/${OC_RELEASE}-run.xml ${OAI_DIR}/results-run.xml
     break
   fi
 done
+oc logs -n ${OC_NS} "$POD_ID" >> ${OAI_DIR}/physim_log.txt
+oc describe pod $POD_ID >> ${OAI_DIR}/physim_log.txt
 helm uninstall ${OC_RELEASE} --wait
 oc delete istag oai-physim:${IMG_TAG} -n ${OC_NS}
 oc logout > /dev/null

ci-scripts/scripts/source-deploy-physims.sh

@@ -0,0 +1,30 @@
+
+function die() { echo $@; exit 1; }
+[ $# -ge 1 ] || die "usage: $0 <directory> [ctest-options]"
+
+set -x
+DIR=$1
+shift
+CTEST_OPT=$@
+
+cd ${DIR}/cmake_targets/ran_build/build
+ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim
+
+# get a JSON description of all tests to run
+ctest ${CTEST_OPT} --show-only=json-v1 &> ${DIR}/desc-tests.json
+JSON_RES=$?
+
+# we run the T2 offload tests, so provide some additional permissions
+# to be able to initialize DPDK
+sudo setcap cap_dac_override,cap_sys_admin+ep nr_ulsim
+sudo setcap cap_dac_override,cap_sys_admin+ep nr_dlsim
+ctest ${CTEST_OPT} --output-junit ${DIR}/results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${DIR}/physim_log.txt
+RUN_RES=$?
+cp Testing/Temporary/LastTestsFailed.log ${DIR}/
+cp Testing/Temporary/LastTest.log ${DIR}/
+
+# if both were successful, return 0
+# TODO not sure
+#[[ $JSON_RES -eq 0 && $RUN_RES -eq 0 ]] && exit 0
+
+exit 0

ci-scripts/scripts/sys-info.sh

@@ -0,0 +1,17 @@
+CORES=$(nproc)
+MODEL=$(lscpu | awk -F: '/Model name/ {print $2; exit}' | xargs)
+MAX_FREQ=$(lscpu | awk -F: '/CPU max MHz/ {printf "%.2f MHz", $2; exit}')
+CURRENT_FREQ=$(awk -F: '/cpu MHz/ {printf " %.2f MHz", $2; exit}' /proc/cpuinfo)
+RAM=$(free -h --si | awk '/Mem:/ {print $2}')
+# sudo -n: non-interactive, will silently fail in case we don't have privileges
+DMID=$(sudo -n dmidecode -t memory 2>/dev/null)
+if [ $? -eq 0 ]; then
+  RAM_TYPE=$(echo "$DMID" | awk -F: '/Type:/ {print $2}' | grep -Ev 'Unknown|Other|None' | head -1 | xargs)
+else
+  RAM_TYPE="can't query"
+fi
+
+
+echo "CPU: model ${MODEL}"
+echo "${CORES} cores, max CPU freq ${MAX_FREQ}, current ${CURRENT_FREQ}"
+echo "RAM ${RAM} type ${RAM_TYPE}"

ci-scripts/tests/cmd.py

@@ -36,17 +36,20 @@ class TestCmd(unittest.TestCase):
             self.assertEqual(ret.stdout, "test")
 
     def test_local_script(self):
-        ret = cls_cmd.runScript("localhost", "tests/scripts/hello-world.sh", 1)
+        with cls_cmd.getConnection("localhost") as ssh:
+            ret = ssh.exec_script("tests/scripts/hello-world.sh", 1)
         self.assertEqual(ret.args, "tests/scripts/hello-world.sh")
         self.assertEqual(ret.returncode, 0)
         self.assertEqual(ret.stdout, "+ echo hello, world\nhello, world")
 
-        ret = cls_cmd.runScript("localhost", "tests/scripts/hello-fail.sh", 1, "TESTFAIL")
+        with cls_cmd.getConnection("localhost") as ssh:
+            ret = ssh.exec_script("tests/scripts/hello-fail.sh", 1, "TESTFAIL")
         self.assertEqual(ret.args, "tests/scripts/hello-fail.sh TESTFAIL")
         self.assertEqual(ret.returncode, 1)
         self.assertEqual(ret.stdout, "TESTFAIL")
 
-        ret = cls_cmd.runScript("localhost", "tests/scripts/hello-fail.sh", 1, "TESTFAIL2", "/tmp/result")
+        with cls_cmd.getConnection("localhost") as ssh:
+            ret = ssh.exec_script("tests/scripts/hello-fail.sh", 1, "TESTFAIL2", "/tmp/result")
         self.assertEqual(ret.args, "tests/scripts/hello-fail.sh TESTFAIL2 &> /tmp/result")
         self.assertEqual(ret.returncode, 1)
         self.assertEqual(ret.stdout, "")
@@ -75,17 +78,20 @@ class TestCmd(unittest.TestCase):
 
     @unittest.skip("need to be able to passwordlessly SSH to localhost, also disable stty -ixon")
     def test_remote_script(self):
-        ret = cls_cmd.runScript("127.0.0.1", "tests/scripts/hello-world.sh", 1)
+        with cls_cmd.getConnection("127.0.0.1") as ssh:
+            ret = ssh.exec_script("tests/scripts/hello-world.sh", 1)
         self.assertEqual(ret.args, "tests/scripts/hello-world.sh")
         self.assertEqual(ret.returncode, 0)
         self.assertEqual(ret.stdout, "+ echo hello, world\nhello, world")
 
-        ret = cls_cmd.runScript("127.0.0.1", "tests/scripts/hello-fail.sh", 1, "TESTFAIL")
+        with cls_cmd.getConnection("127.0.0.1") as ssh:
+            ret = ssh.exec_script("tests/scripts/hello-fail.sh", 1, "TESTFAIL")
         self.assertEqual(ret.args, "tests/scripts/hello-fail.sh TESTFAIL")
         self.assertEqual(ret.returncode, 1)
         self.assertEqual(ret.stdout, "TESTFAIL")
 
-        ret = cls_cmd.runScript("127.0.0.1", "tests/scripts/hello-fail.sh", 1, "TESTFAIL2", "/tmp/result")
+        with cls_cmd.getConnection("127.0.0.1") as ssh:
+            ret = ssh.exec_script("tests/scripts/hello-fail.sh", 1, "TESTFAIL2", "/tmp/result")
         self.assertEqual(ret.args, "tests/scripts/hello-fail.sh TESTFAIL2 &> /tmp/result")
         self.assertEqual(ret.returncode, 1)
         self.assertEqual(ret.stdout, "")

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

@@ -26,7 +26,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		# the pull function has the authentication at the internal cluster hardcoded
 		# this is a refactoring opportunity: we should do it in a separate step
 		# and allow to have pull work with any registry
-		registry = "porcepix.sboai.cs.eurecom.fr"
+		registry = cls_containerize.DEFAULT_REGISTRY
 		with cls_cmd.getConnection("localhost") as cmd:
 			ret = cmd.run(f"ping -c1 -w1 {registry}")
 			if ret.returncode != 0: # could not ping once -> skip test

ci-scripts/xml_class_list.yml

@@ -1,7 +1,6 @@
   - Build_Proxy
   - Build_Cluster_Image
   - Pull_Cluster_Image
-  - Run_Physim
   - Build_eNB
   - Initialize_eNB
   - Terminate_eNB
@@ -23,7 +22,9 @@
   - Deploy_Object
   - Undeploy_Object
   - Cppcheck_Analysis
-  - Deploy_Run_PhySim
+  - Deploy_Run_OC_PhySim
+  - Build_Deploy_Docker_PhySim
+  - Build_Deploy_Source_PhySim
   - LicenceAndFormattingCheck
   - Push_Local_Registry
   - Pull_Local_Registry

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -0,0 +1,207 @@
+<!--
+
+ 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-f1-n2-ho</htmlTabRef>
+        <htmlTabName>F1 SA TDD N2 Handover</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <TestCaseRequestedList>
+ 111111
+ 800813
+ 000001
+ 000002
+ 000003
+ 020001
+ 020002
+ 030001
+ 030002
+ 000004
+ 040001
+ 050001
+ 020001
+ 020002
+ 050002
+ 030001
+ 030002
+ 050003
+ 020001
+ 020002
+ 050004
+ 050001
+ 020001
+ 020002
+ 050002
+ 100001
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
+        </testCase>
+
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Create new Workspace</desc>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="000001">
+                <class>Deploy_Object</class>
+                <desc>Deploy OAI 5G CoreNetwork</desc>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="000002">
+                <class>Deploy_Object</class>
+                <desc>Deploy OAI 5G CU-CP/CU-UP/DU 0 + UE RFsim SA</desc>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+                <services>oai-cucp-0 oai-cuup-0 oai-du-0 oai-nr-ue</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="000003">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+                <nodes>acamas</nodes>
+        </testCase>
+
+        <testCase id="000004">
+                <class>Deploy_Object</class>
+                <desc>Deploy OAI 5G CU-CP/CU-UP/DU 1 RFsim SA</desc>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+                <services>oai-cucp-1 oai-cuup-1 oai-du-1</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="020001">
+                <class>Ping</class>
+                <desc>Ping NR-UE from ext-dn</desc>
+                <id>rfsim5g_ext_dn</id>
+                <nodes>acamas</nodes>
+                <svr_id>rfsim5g_ue</svr_id>
+                <svr_node>acamas</svr_node>
+                <ping_args>-c 100 -i 0.25</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="020002">
+                <class>Ping</class>
+                <desc>Ping ext-dn from NR-UE</desc>
+                <id>rfsim5g_ue</id>
+                <nodes>acamas</nodes>
+                <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>acamas</svr_node>
+                <ping_args>-c 100 -i 0.25</ping_args>
+                <ping_packetloss_threshold>10</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="030001">
+                <class>Iperf</class>
+                <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
+                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+                <id>rfsim5g_ue</id>
+                <nodes>acamas</nodes>
+                <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>acamas</svr_node>
+                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+        </testCase>
+
+        <testCase id="030002">
+                <class>Iperf</class>
+                <desc>Iperf (UL/4Mbps/UDP)(30 sec)</desc>
+                <iperf_args>-u -b 1M -t 20</iperf_args>
+                <id>rfsim5g_ue</id>
+                <nodes>acamas</nodes>
+                <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>acamas</svr_node>
+                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
+        </testCase>
+
+        <testCase id="040001">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+        </testCase>
+
+        <testCase id="050001">
+                <class>Custom_Command</class>
+                <desc>Trigger N2 Handover</desc>
+                <node>acamas</node>
+                <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
+                <command_fail>yes</command_fail>
+        </testCase>
+
+        <testCase id="050002">
+                <class>Custom_Command</class>
+                <desc>UE (1) connected to DU-PCI 1?</desc>
+                <node>acamas</node>
+                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
+        </testCase>
+
+        <testCase id="050003">
+                <class>Custom_Command</class>
+                <desc>Trigger N2 Handover</desc>
+                <node>acamas</node>
+                <command>echo ci trigger_n2_ho 0,1 | ncat 192.168.71.180 9090</command>
+                <command_fail>yes</command_fail>
+        </testCase>
+
+        <testCase id="050004">
+                <class>Custom_Command</class>
+                <desc>UE (1) connected to DU-PCI 0?</desc>
+                <node>acamas</node>
+                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+        </testCase>
+
+        <testCase id="100001">
+                <class>Undeploy_Object</class>
+                <always_exec>true</always_exec>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+                <d_retx_th>10,100,100,100</d_retx_th>
+                <u_retx_th>10,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>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_image_build_arm.xml

@@ -40,7 +40,7 @@
 		<class>Build_Image</class>
 		<desc>Build all Images</desc>
 		<node>gracehopper3-oai</node>
-		<kind>native_arm</kind>
+		<kind>native_armv9</kind>
 	</testCase>
 
         <testCase id="000010">

ci-scripts/xml_files/container_image_build_jetson.xml

@@ -0,0 +1,53 @@
+<!--
+
+ 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>build-tab</htmlTabRef>
+        <htmlTabName>Build Container Images for ARM</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <TestCaseRequestedList>
+ 800813
+ 000001
+ 000010
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Create new Workspace for server 0</desc>
+                <node>jetson3-oai</node>
+        </testCase>
+        <testCase id="000001">
+                <class>Build_Image</class>
+                <desc>Build all Images</desc>
+                <node>jetson3-oai</node>
+                <kind>native_armv8</kind>
+        </testCase>
+
+        <testCase id="000010">
+                <class>Push_Local_Registry</class>
+                <desc>Push Images to Local Registry</desc>
+                <node>jetson3-oai</node>
+                <tag_prefix>armv8_</tag_prefix>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml

@@ -0,0 +1,251 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+  <htmlTabRef>TEST-F1-HO-B210</htmlTabRef>
+  <htmlTabName>F1 Handover 20 MHz TDD SA</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <TestCaseRequestedList>
+    000001
+    000002
+    000003
+    000004
+    000005
+    000006
+    000007
+    000008
+    000009
+    000010
+    000011
+    000012
+    000013
+    000014
+    000015
+    000016
+    000017
+    000018
+    000019
+    000020
+    000021
+    000022
+    000023
+    000024
+    000025
+    000026
+
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+	
+  <testCase id="000001">
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g-00102-ho</cn_id>
+  </testCase>
+
+  <testCase id="000002">
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <images>oai-gnb</images>
+    <node>groot</node>
+  </testCase>
+
+  <testCase id="000003">
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <images>oai-gnb</images>
+    <node>rocket</node>
+  </testCase>
+
+  <testCase id="000004">
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace for groot</desc>
+    <node>groot</node>
+  </testCase>
+
+  <testCase id="000005">
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace on rocket</desc>
+    <node>rocket</node>
+  </testCase>
+
+  <testCase id="000006">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB-CU in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
+    <node>groot</node>
+    <services>oai_cu</services>
+  </testCase>
+
+  <testCase id="000007">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB-DU0 (TDD/Band77/20MHz/B210) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
+    <services>oai_du0</services>
+    <node>groot</node>
+  </testCase>
+
+  <testCase id="000008">
+    <class>Attach_UE</class>
+    <desc>Attach Quectel</desc>
+    <id>raspix</id>
+  </testCase>
+
+  <testCase id="000009">
+    <class>Ping</class>
+    <desc>Ping: 100pings in 20sec</desc>
+    <id>raspix</id>
+    <svr_id>oc-cn5g-00102-ho</svr_id>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase id="000010">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB-DU1 (TDD/Band77/20MHz/B210) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
+    <node>rocket</node>
+    <services>oai_du1</services>
+  </testCase>
+
+  <testCase id="000011">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase id="000012">
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>groot</node>
+    <command>echo ci trigger_f1_ho | ncat 127.0.0.1 9090</command>
+  </testCase>
+
+  <testCase id="000013">
+    <class>Ping</class>
+    <desc>Ping: 50pings in 10sec</desc>
+    <id>raspix</id>
+    <svr_id>oc-cn5g-00102-ho</svr_id>
+    <ping_args>-c 50 -i 0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase id="000014">
+    <class>Custom_Command</class>
+    <desc>UE connected to DU1?</desc>
+    <node>groot</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
+  </testCase>
+
+  <testCase id="000015">
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>groot</node>
+    <command>echo ci trigger_f1_ho | ncat 127.0.0.1 9090</command>
+  </testCase>
+
+  <testCase id="000016">
+    <class>Ping</class>
+    <desc>Ping: 50pings in 10sec</desc>
+    <id>raspix</id>
+    <svr_id>oc-cn5g-00102-ho</svr_id>
+    <ping_args>-c 50 -i 0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase id="000017">
+    <class>Custom_Command</class>
+    <desc>UE connected to DU0?</desc>
+    <node>groot</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
+  </testCase>
+
+  <testCase id="000018">
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>groot</node>
+    <command>echo ci trigger_f1_ho | ncat 127.0.0.1 9090</command>
+  </testCase>
+
+  <testCase id="000019">
+    <class>Ping</class>
+    <desc>Ping: 50pings in 10sec</desc>
+    <id>raspix</id>
+    <svr_id>oc-cn5g-00102-ho</svr_id>
+    <ping_args>-c 50 -i 0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase id="000020">
+    <class>Custom_Command</class>
+    <desc>UE connected to DU1?</desc>
+    <node>groot</node>
+    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
+  </testCase>
+
+  <testCase id="000021">
+    <class>Detach_UE</class>
+    <always_exec>true</always_exec>
+    <desc>Detach Quectel</desc>
+    <id>raspix</id>
+  </testCase>
+
+  <testCase id="000022">
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy CU-DU0</desc>
+    <node>groot</node>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
+  </testCase>
+
+  <testCase id="000023">
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy DU1 </desc>
+    <node>rocket</node>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
+  </testCase>
+
+  <testCase id="000024">
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>groot</node>
+    <images>oai-gnb</images>
+  </testCase>
+
+  <testCase id="000025">
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>rocket</node>
+    <images>oai-gnb</images>
+  </testCase>
+
+  <testCase id="000026">
+    <class>UndeployCoreNetwork</class>
+    <always_exec>true</always_exec>
+    <desc>Terminate 5G Core</desc>
+    <cn_id>oc-cn5g-00102-ho</cn_id>
+  </testCase>
+
+</testCaseList>
+

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

@@ -22,7 +22,7 @@
 -->
 <testCaseList>
   <htmlTabRef>TEST-SA-FR1-N310-2x2-60MHz</htmlTabRef>
-  <htmlTabName>60 MHz 2x2 TDD SA</htmlTabName>
+  <htmlTabName>60 MHz 2x2 TDD SA DSUUU</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
   <TestCaseRequestedList>
     100000
@@ -114,8 +114,8 @@
 
   <testCase id="071000">
     <class>Iperf</class>
-    <desc>iperf (DL/200Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 200M -t 30 -R</iperf_args>
+    <desc>iperf (DL/150Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 150M -t 30 -R</iperf_args>
     <svr_id>matix-cn5g</svr_id>
     <id>up2</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -124,8 +124,8 @@
 
   <testCase id="071001">
     <class>Iperf</class>
-    <desc>iperf (UL/180Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 180M -t 30</iperf_args>
+    <desc>iperf (UL/250Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 250M -t 30</iperf_args>
     <svr_id>matix-cn5g</svr_id>
     <id>up2</id>
     <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
@@ -147,8 +147,8 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</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>
+    <d_retx_th>15,100,100,100</d_retx_th>
+    <u_retx_th>20,100,100,100</u_retx_th>
   </testCase>
 
   <testCase id="333333">

ci-scripts/xml_files/ldpc_gpu_test.xml

@@ -1,396 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
- 030105 040301 040502 040606 040601 040603 040608 040605 040646 040641 040643 040648 040645 040401 040201 030201
--->
-<testCaseList>
-	<htmlTabRef>test-ldpc-gpu</htmlTabRef>
-	<htmlTabName>Test-ldpc-GPU</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<TestCaseRequestedList>
-		000002 000003 000004 000005 000006 000007 000008 000009 000010 000011 000012 000013 000014 000015 000016 000017 000018 000019 000020 000021
-		000022 000023 000024 000025 000026 000027 000028 000029 000030 000031 000032 000033 000034 000035 000036 000037 000038 000039 000040 000041
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000002">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 3872 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000003">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 3872 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000004">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 4224 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000005">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 4224 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000006">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 4576 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000007">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 4576 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000008">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 4928 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000009">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 4928 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000010">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 5280 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000011">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 5280 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000012">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 5632 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000013">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 5632 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000014">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 6336 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000015">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 6336 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000016">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 7040 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000017">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 7040 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000018">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 7744 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000019">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 7744 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000020">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 8448 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000021">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 8448 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000022">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 1 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000023">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 1 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000024">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 100 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000025">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 100 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000026">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 193 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000027">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 193 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000028">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 500 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000029">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 500 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000030">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 561 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000031">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 561 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000032">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 600 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000033">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 600 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000034">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 641 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000035">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 641 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000036">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 2000 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000037">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 2000 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000038">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 3000 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000039">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 3000 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000040">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with CPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 3840 -s10 -n100</physim_run_args>
-	</testCase>
-
-	<testCase id="000041">
-		<class>Run_Physim</class>
-		<desc>Run LDPC Test with GPU</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>ldpctest</physim_test>
-		<physim_run_args>-l 3840 -s10 -n100 -G 1</physim_run_args>
-	</testCase>
-
-
-
-</testCaseList>

ci-scripts/xml_files/physim_4g_deploy_run.xml

@@ -37,7 +37,7 @@
         </testCase>
 
         <testCase id="010201">
-		<class>Deploy_Run_PhySim</class>
+		<class>Deploy_Run_OC_PhySim</class>
                 <desc>Deploy and run physical simulator on openshift</desc>
                 <oc_release>physims-4g</oc_release>
                 <node>avra</node>

ci-scripts/xml_files/physim_5g_deploy_run.xml

@@ -37,7 +37,7 @@
         </testCase>
 
         <testCase id="010201">
-		<class>Deploy_Run_PhySim</class>
+		<class>Deploy_Run_OC_PhySim</class>
                 <desc>Deploy and run physical simulator on openshift</desc>
                 <oc_release>physims-5g</oc_release>
                 <node>avra</node>

ci-scripts/xml_files/physim_gracehopper.xml

@@ -0,0 +1,46 @@
+<!--
+
+ 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>build-tab</htmlTabRef>
+        <htmlTabName>PhySim</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <TestCaseRequestedList>
+          800813
+          010201
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="800813">
+                <class>Create_Workspace</class>
+                <desc>Create new Workspace</desc>
+                <node>localhost</node>
+        </testCase>
+
+        <testCase id="010201">
+                <class>Build_Deploy_Docker_PhySim</class>
+                <desc>Deploy and Deploy PhySim</desc>
+                <node>localhost</node>
+                <ctest-opt>-R 5g -E physim.5g.nr_dlsim.mcs.mimo.test9 -j16</ctest-opt> <!-- one nr_dlsim test fails on ARM -->
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/t2_offload_dec_nr_ulsim.xml

@@ -1,230 +0,0 @@
-<!--
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
--->
-
-<testCaseList>
-	<htmlTabRef>test-t2-offload-dec</htmlTabRef>
-	<htmlTabName>Test T2 Offload Decoder</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                010204
-                010111 010112 010121 010122 010131 010132
-                010211 010212 010221 010222 010231 010232
-                010311 010312 010321 010322 010331 010332
-                402010
-        </TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="010204">
-		<class>Custom_Command</class>
-		<desc>Disable Sleep States</desc>
-		<node>caracal</node>
-		<command>sudo cpupower idle-set -D 0</command>
-	</testCase>
-
-	<testCase id="402010">
-		<class>Custom_Command</class>
-		<always_exec>true</always_exec>
-		<desc>Enable Sleep States</desc>
-		<node>caracal</node>
-		<command>sudo cpupower idle-set -E</command>
-	</testCase>
-
-	<testCase id="010111">
-		<class>Run_Physim</class>
-		<desc>Run nr_ulsim with CPU: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-	        <physim_test>nr_ulsim</physim_test>
-	        <physim_time_threshold>300</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -m5 -r106 -R106 -C10 -P</physim_run_args>
-	</testCase>
-
-	<testCase id="010112">
-		<class>Run_Physim</class>
-		<desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>nr_ulsim</physim_test>
-		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -m5 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-	</testCase>
-
-	<testCase id="010121">
-		<class>Run_Physim</class>
-		<desc>Run nr_ulsim with CPU: SNR = 30, MCS = 15, 106 PRBs, 1 layer</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>nr_ulsim</physim_test>
-		<physim_time_threshold>300</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -m15 -r106 -R106 -C10 -P</physim_run_args>
-	</testCase>
-
-	<testCase id="010122">
-		<class>Run_Physim</class>
-		<desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 15, 106 PRBs, 1 layer</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>nr_ulsim</physim_test>
-		<physim_time_threshold>150</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -m15 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-	</testCase>
-
-	<testCase id="010131">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with CPU: SNR = 30, MCS = 25, 106 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-				<node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r106 -R106 -C10 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="010132">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 25, 106 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-				<node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r106 -R106 -C10 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="010211">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with CPU: SNR = 30, MCS = 5, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-				<node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>300</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="010212">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-				<node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-	</testCase>
-
-	<testCase id="010221">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with CPU: SNR = 30, MCS = 15, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="010222">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>350</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="010231">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with CPU: SNR = 30, MCS = 25, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="010232">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>550</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="010311">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with CPU: SNR = 30, MCS = 5, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>300</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -W2 -z2 -y2 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="010312">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m5 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="010321">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with CPU: SNR = 30, MCS = 15, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>600</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -W2 -z2 -y2 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="010322">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>650</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m15 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="010331">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with CPU: SNR = 30, MCS = 25, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>650</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -W2 -z2 -y2 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="010332">
-                <class>Run_Physim</class>
-                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_ulsim</physim_test>
-                <physim_time_threshold>1100</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -m25 -r273 -R273 -C10 -W2 -z2 -y2 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-</testCaseList>

ci-scripts/xml_files/t2_offload_enc_nr_dlsim.xml

@@ -1,290 +0,0 @@
-<!--
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
--->
-
-<testCaseList>
-	<htmlTabRef>test-t2-offload-enc</htmlTabRef>
-	<htmlTabName>Test T2 Offload Encoder</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                102040
-                000111 000112 000121 000122 000131 000132
-                000211 000212 000221 000222 000231 000232
-                000311 000312 000321 000322 000331 000332
-                000411 000412 000421 000422 000431 000432
-                040201
-        </TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="102040">
-		<class>Custom_Command</class>
-		<desc>Disable Sleep States</desc>
-		<node>caracal</node>
-		<command>sudo cpupower idle-set -D 0</command>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Custom_Command</class>
-		<always_exec>true</always_exec>
-		<desc>Enable Sleep States</desc>
-		<node>caracal</node>
-		<command>sudo cpupower idle-set -E</command>
-	</testCase>
-
-	<testCase id="000111">
-		<class>Run_Physim</class>
-		<desc>Run nr_dlsim with CPU: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>nr_dlsim</physim_test>
-		<physim_time_threshold>230</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -e5 -b106 -R106 -X 8,9,10,11,12 -P</physim_run_args>
-	</testCase>
-
-	<testCase id="000112">
-		<class>Run_Physim</class>
-		<desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>nr_dlsim</physim_test>
-		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -e5 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000121">
-		<class>Run_Physim</class>
-		<desc>Run nr_dlsim with CPU: SNR = 30, MCS = 15, 106 PRBs, 1 layer</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>nr_dlsim</physim_test>
-		<physim_time_threshold>300</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -e15 -b106 -R106 -X 8,9,10,11,12 -P</physim_run_args>
-	</testCase>
-
-	<testCase id="000122">
-		<class>Run_Physim</class>
-		<desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 15, 106 PRBs, 1 layer</desc>
-		<always_exec>true</always_exec>
-		<node>caracal</node>
-		<physim_test>nr_dlsim</physim_test>
-		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n1000 -s30 -S30.2 -e15 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000131">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 25, 106 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>350</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b106 -R106 -X 8,9,10,11,12 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000132">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 25, 106 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b106 -R106 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="000211">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 5, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>300</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X 8,9,10,11,12 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000212">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-	</testCase>
-
-	<testCase id="000221">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 15, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>350</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X 8,9,10,11,12 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000222">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="000231">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 25, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X 8,9,10,11,12 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000232">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 1 layer</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="000311">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 5, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X 8,9,10,11,12 -x2 -z2 -y2 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000312">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="000321">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 15, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>450</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X 8,9,10,11,12 -x2 -z2 -y2 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000322">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="000331">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 25, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X 8,9,10,11,12 -x2 -z2 -y2 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000332">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 2 layers</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -x2 -z2 -y2 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="000411">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 5, 273 PRBs, 2 layers, 4 antennas</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X8,9,10,11,12 -x2 -z4 -y4 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000412">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 2 layers, 4 antennas</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e5 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="000421">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 20, 273 PRBs, 2 layers, 4 antennas</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X8,9,10,11,12 -x2 -z4 -y4 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000422">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 20, 273 PRBs, 2 layers, 4 antennas</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>300</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e15 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-
-        <testCase id="000431">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with CPU: SNR = 30, MCS = 27, 273 PRBs, 2 layers, 4 antennas</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>450</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X8,9,10,11,12 -x2 -z4 -y4 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000432">
-                <class>Run_Physim</class>
-                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 27, 273 PRBs, 2 layers, 4 antennas</desc>
-                <always_exec>true</always_exec>
-                <node>caracal</node>
-                <physim_test>nr_dlsim</physim_test>
-                <physim_time_threshold>450</physim_time_threshold>
-                <physim_run_args>-n1000 -s30 -S30.2 -e25 -b273 -R273 -X4,5,6,7,8,9 -x2 -z4 -y4 -P --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev af:00.0 --nrLDPC_coding_aal.dpdk_core_list 11-12 --nrLDPC_coding_aal.is_t2 1</physim_run_args>
-        </testCase>
-</testCaseList>

ci-scripts/xml_files/t2_offload_physim_enc_dec.xml

@@ -0,0 +1,54 @@
+<!--
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+-->
+
+<testCaseList>
+        <htmlTabRef>test-t2-offload-enc-dec</htmlTabRef>
+        <htmlTabName>Test T2 Offload</htmlTabName>
+        <htmlTabIcon>tasks</htmlTabIcon>
+        <TestCaseRequestedList>
+                010204
+                111111
+                402010
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="010204">
+                <class>Custom_Command</class>
+                <desc>Disable Sleep States</desc>
+                <node>caracal</node>
+                <command>sudo cpupower idle-set -D 0</command>
+        </testCase>
+
+        <testCase id="402010">
+                <class>Custom_Command</class>
+                <always_exec>true</always_exec>
+                <desc>Enable Sleep States</desc>
+                <node>caracal</node>
+                <command>sudo cpupower idle-set -E</command>
+        </testCase>
+
+        <testCase id="111111">
+                <class>Build_Deploy_Source_PhySim</class>
+                <desc>Build and Deploy PhySim T2 Offload tests</desc>
+                <node>caracal</node>
+                <ctest-opt>-R 5g-offload -j1</ctest-opt>
+        </testCase>
+</testCaseList>

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

@@ -100,7 +100,6 @@ services:
             - SYS_NICE
         environment: 
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
-                                    --rfsimulator.options chanmod
                                     --gNBs.[0].remote_s_address 0.0.0.0
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.150
                                     --telnetsrv.shrmod ci
@@ -111,6 +110,7 @@ services:
             public_net:
                 ipv4_address: 192.168.71.150
         volumes:
+          - ../../conf_files/neighbour-config.conf:/opt/oai-gnb/etc/neighbour-config.conf
           - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"

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

@@ -88,7 +88,7 @@ services:
         cap_drop:
             - ALL
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim --log_config.global_log_options level,nocolor,time --gNBs.[0].TIMERS.t300 1000
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn

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

@@ -0,0 +1,306 @@
+services:
+    mysql:
+        container_name: "rfsim5g-mysql"
+        image: mysql:8.0
+        volumes:
+            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+        environment:
+            - TZ=Europe/Paris
+            - MYSQL_DATABASE=oai_db
+            - MYSQL_USER=test
+            - MYSQL_PASSWORD=test
+            - MYSQL_ROOT_PASSWORD=linux
+        healthcheck:
+            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
+            interval: 10s
+            timeout: 5s
+            retries: 30
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.131
+    oai-amf:
+        container_name: "rfsim5g-oai-amf"
+        image: oaisoftwarealliance/oai-amf:ci-tmp-pr-372-26c14bcd
+        environment:
+            - TZ=Europe/paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+        depends_on:
+            - mysql
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.132
+    oai-smf:
+        container_name: "rfsim5g-oai-smf"
+        image: oaisoftwarealliance/oai-smf:v2.1.9
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+        depends_on:
+            - oai-amf
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.133
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.1.9
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+        depends_on:
+            - oai-smf
+        cap_add:
+            - NET_ADMIN
+            - SYS_ADMIN
+        cap_drop:
+            - ALL
+        privileged: true
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.134
+                interface_name: eth0
+            traffic_net:
+                ipv4_address: 192.168.72.134
+                interface_name: eth1
+    oai-ext-dn:
+        privileged: true
+        container_name: rfsim5g-oai-ext-dn
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        entrypoint: /bin/bash -c \
+              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
+              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
+        depends_on:
+            - oai-upf
+        networks:
+            traffic_net:
+                ipv4_address: 192.168.72.135
+        healthcheck:
+            test: /bin/bash -c "ping -c 2 192.168.72.134"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-cucp-0:
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: rfsim5g-oai-cucp-0
+        cap_drop:
+            - ALL
+        environment:
+            USE_ADDITIONAL_OPTIONS: --telnetsrv --telnetsrv.shrmod ci
+                                    --telnetsrv.listenaddr 192.168.71.150
+                                    --gNBs.[0].nr_cellid 0
+                                    --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+        depends_on:
+            - oai-amf
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        volumes:
+          - ../../conf_files/neighbour-config.conf:/opt/oai-gnb/etc/neighbour-config.conf
+          - ../../conf_files/gnb-cucp.sa.e1-ho-n2.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-cuup-0:
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        container_name: rfsim5g-oai-cuup-0
+        cap_drop:
+            - ALL
+        environment:
+            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.71.150
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cuup 192.168.71.151
+                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NGU 192.168.71.151
+                                    --gNBs.[0].local_s_address 192.168.71.151
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-cucp-0
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.151
+        volumes:
+            - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-cuup"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+
+    oai-du-0:
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: rfsim5g-oai-du-0
+        cap_drop:
+            - ALL
+        environment:
+            USE_ADDITIONAL_OPTIONS: --rfsim
+                                    --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].nr_cellid 0
+                                    --telnetsrv --telnetsrv.listenaddr 192.168.71.171
+                                    --telnetsrv.shrmod ci
+                                    --rfsimulator.serveraddr 192.168.71.190
+                                    --gNBs.[0].servingCellConfigCommon.[0].ra_ResponseWindow 5
+            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+        depends_on:
+            - oai-cucp-0
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.171
+        volumes:
+            - ../../conf_files/neighbour-config.conf:/opt/oai-gnb/etc/neighbour-config.conf
+            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-nr-ue:
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        container_name: rfsim5g-oai-nr-ue
+        cap_drop:
+            - ALL
+        cap_add:
+            - NET_ADMIN  # for interface bringup
+            - NET_RAW    # for ping
+        environment:
+            USE_ADDITIONAL_OPTIONS: --rfsim --rfsimulator.serveraddr server
+                                    --band 78 -C 3619200000 -r 106 --numerology 1 --ssb 516
+                                    --uicc0.imsi 208990100001100
+                                    --log_config.global_log_options level,nocolor,time
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.190
+        devices:
+             - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-cucp-1:
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: rfsim5g-oai-cucp-1
+        cap_drop:
+            - ALL
+        environment:
+            USE_ADDITIONAL_OPTIONS: --telnetsrv --telnetsrv.shrmod ci
+                                    --telnetsrv.listenaddr 192.168.71.180
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.71.180
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cuup 192.168.71.181
+                                    --gNBs.[0].local_s_address 192.168.71.180
+                                    --gNBs.[0].remote_s_address 192.168.71.181
+                                    --gNBs.[0].gNB_ID 0xb00
+                                    --gNBs.[0].nr_cellid 1
+                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NG_AMF 192.168.71.180
+                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NGU 192.168.71.180
+                                    --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.180
+        volumes:
+          - ../../conf_files/neighbour-config.conf:/opt/oai-gnb/etc/neighbour-config.conf
+          - ../../conf_files/gnb-cucp.sa.e1-ho-n2.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-cuup-1:
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        container_name: rfsim5g-oai-cuup-1
+        cap_drop:
+            - ALL
+        environment:
+            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.71.180
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cuup 192.168.71.181
+                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NGU 192.168.71.181
+                                    --gNBs.[0].local_s_address 192.168.71.181
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-cucp-0
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.181
+        volumes:
+            - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-cuup"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-du-1:
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: rfsim5g-oai-du-1
+        cap_drop:
+            - ALL
+        environment:
+            USE_ADDITIONAL_OPTIONS: --rfsim
+                                    --rfsimulator.serveraddr 192.168.71.190
+                                    --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].gNB_DU_ID 1234
+                                    --gNBs.[0].gNB_ID 0xb00
+                                    --gNBs.[0].nr_cellid 1
+                                    --gNBs.[0].servingCellConfigCommon.[0].physCellId 1
+                                    --gNBs.[0].servingCellConfigCommon.[0].absoluteFrequencySSB 621312
+                                    --gNBs.[0].servingCellConfigCommon.[0].dl_absoluteFrequencyPointA 620040
+                                    --MACRLCs.[0].local_n_address 192.168.71.182
+                                    --MACRLCs.[0].remote_n_address 192.168.71.180
+            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+        depends_on:
+            - oai-cucp-1
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.182
+        volumes:
+            - ../../conf_files/neighbour-config.conf:/opt/oai-gnb/etc/neighbour-config.conf
+            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            start_period: 10s
+            start_interval: 500ms
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+networks:
+    public_net:
+        driver: bridge
+        name: rfsim5g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.71.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-public"
+    traffic_net:
+        driver: bridge
+        name: rfsim5g-oai-traffic-net
+        ipam:
+            config:
+                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-traffic"

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

@@ -0,0 +1,90 @@
+services:
+    oai_cu:
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: oai-cu
+        cap_drop:
+            - ALL
+        ulimits:
+          core: -1 # for core dumps
+        environment:
+            USE_ADDITIONAL_OPTIONS: --telnetsrv --telnetsrv.listenport 9090 --telnetsrv.shrmod ci
+                                    --log_config.global_log_options level,nocolor,utc_time,line_num,function
+        volumes:
+            - ../../conf_files/gnb-cu.sa.f1.ho.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/neighbour-config-ho.conf:/opt/oai-gnb/etc/neighbour-config-ho.conf
+        # for performance reasons, we use host mode: in bridge mode, we have
+        # unacceptable DL TCP performance. However, the whole point of
+        # containerization is to not be in host mode, so update this to macvlan
+        # later.
+        network_mode: "host"
+        #entrypoint: /bin/bash -c "sleep infinity"
+        healthcheck:
+            # pgrep does NOT work
+            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai_du0:
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: oai-du0
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+            - IPC_LOCK
+        ulimits:
+          core: -1 # for core dumps
+        environment:
+            USE_B2XX: 'yes'
+            USE_ADDITIONAL_OPTIONS: --RUs.[0].sdr_addrs serial=30AD30F
+                                    --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci
+                                    --log_config.global_log_options level,nocolor,utc_time,line_num,function
+        devices:
+            - /dev/bus/usb/:/dev/bus/usb/
+        volumes:
+            - ../../conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf:/opt/oai-gnb/etc/gnb.conf
+        # for performance reasons, we use host mode: in bridge mode, we have
+        # unacceptable DL TCP performance. However, the whole point of
+        # containerization is to not be in host mode, so update this to macvlan
+        # later.
+        network_mode: "host"
+        #entrypoint: /bin/bash -c "sleep infinity"
+        healthcheck:
+            # pgrep does NOT work
+            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai_du1:
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: oai-du1
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+            - IPC_LOCK
+        ulimits:
+          core: -1 # for core dumps
+        environment:
+            USE_B2XX: 'yes'
+            USE_ADDITIONAL_OPTIONS: --RUs.[0].sdr_addrs serial=31F8010
+                                    --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci
+                                    --log_config.global_log_options level,nocolor,utc_time,line_num,function
+        devices:
+            - /dev/bus/usb/:/dev/bus/usb/
+        volumes:
+            - ../../conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf:/opt/oai-gnb/etc/gnb.conf
+        # for performance reasons, we use host mode: in bridge mode, we have
+        # unacceptable DL TCP performance. However, the whole point of
+        # containerization is to not be in host mode, so update this to macvlan
+        # later.
+        network_mode: "host"
+        #entrypoint: /bin/bash -c "sleep infinity"
+        healthcheck:
+            # pgrep does NOT work
+            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5

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

@@ -9,7 +9,7 @@ services:
         container_name: oai-gnb
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --sa --thread-pool 7,8,9,10,11,12
+            USE_ADDITIONAL_OPTIONS: --thread-pool 7,8,9,10,11,12
         devices:
             - /dev/vfio:/dev/vfio/
         volumes:

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

@@ -23,7 +23,7 @@ services:
       - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:25-2
+    image: cubb-build:25-2-srs
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
     command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"

cmake_targets/build_oai

@@ -82,8 +82,6 @@ Options:
   Makes the NR softmodem
 --RU
   Makes the OAI RRU
---nrRU
-  Makes the OAI nrRRU
 --UE
    Makes the UE specific parts (usim, nvram) from the given configuration file
 --nrUE
@@ -229,11 +227,6 @@ function main() {
             TARGET_LIST="$TARGET_LIST oairu"
             echo_info "Will compile RRU"
             shift;;
-       --nrRU)
-            nrRU=1
-            TARGET_LIST="$TARGET_LIST oainr_ru"
-            echo_info "Will compile nrRRU"
-            shift;;
        --UE)
             UE=1
             TARGET_LIST="$TARGET_LIST lte-uesoftmodem conf2uedata usim nvram"
@@ -463,7 +456,7 @@ function main() {
   if [[ $TARGET_LIST != "" ]] && [[ -f $OPENAIR_DIR/CMakeLists.txt ]]; then
     # add some default libraries that should always be built
     # for eNB, gNB, UEs, simulators
-    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ||  $nrRU == 1 ]]; then
+    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ]]; then
       TARGET_LIST="$TARGET_LIST params_libconfig coding rfsimulator dfts params_yaml vrtsim rf_emulator"
     fi
 

common/5g_platform_types.h

@@ -55,4 +55,53 @@ typedef enum {
 
 typedef enum { NON_DYNAMIC, DYNAMIC } fiveQI_t;
 
+/* QoS Priority Level */
+typedef enum {
+  QOS_PRIORITY_SPARE = 0,
+  QOS_PRIORITY_HIGHEST,
+  QOS_PRIORITY_2,
+  QOS_PRIORITY_3,
+  QOS_PRIORITY_4,
+  QOS_PRIORITY_5,
+  QOS_PRIORITY_6,
+  QOS_PRIORITY_7,
+  QOS_PRIORITY_8,
+  QOS_PRIORITY_9,
+  QOS_PRIORITY_10,
+  QOS_PRIORITY_11,
+  QOS_PRIORITY_12,
+  QOS_PRIORITY_13,
+  QOS_PRIORITY_LOWEST,
+  QOS_NO_PRIORITY
+} qos_priority_t;
+
+/* Pre-emption Capability */
+typedef enum {
+  PEC_SHALL_NOT_TRIGGER_PREEMPTION = 0,
+  PEC_MAY_TRIGGER_PREEMPTION,
+  PEC_MAX,
+} qos_pec_t;
+
+/* Pre-emption Vulnerability */
+typedef enum {
+  PEV_NOT_PREEMPTABLE = 0,
+  PEV_PREEMPTABLE = 1,
+  PEV_MAX,
+} qos_pev_t;
+
+/* Allocation Retention Priority */
+typedef struct {
+  qos_priority_t priority_level;
+  qos_pec_t pre_emp_capability;
+  qos_pev_t pre_emp_vulnerability;
+} qos_arp_t;
+
+typedef struct pdusession_level_qos_parameter_s {
+  uint8_t qfi;
+  uint64_t fiveQI;
+  uint64_t qos_priority;
+  fiveQI_t fiveQI_type;
+  qos_arp_t arp;
+} pdusession_level_qos_parameter_t;
+
 #endif

common/config/config_load_configmodule.c

@@ -300,12 +300,16 @@ configmodule_interface_t *load_configmodule(int argc,
       cfgmode = strdup(CONFIG_LIBCONFIGFILE);
     }
   }
-  static configmodule_interface_t *cfgptr;
+  static configmodule_interface_t *cfgptr = NULL;
   if (cfgptr)
     fprintf(stderr, "ERROR: Call load_configmodule more than one time\n");
 
   // The macros are not thread safe print_params and similar
   cfgptr = calloc(sizeof(configmodule_interface_t), 1);
+  if (!cfgptr) {
+    fprintf(stderr, "ERROR: cannot allocate a memory for configuration\n");
+    return NULL;
+  }
   /* argv_info is used to memorize command line options which have been recognized */
   /* and to detect unrecognized command line options which might have been specified */
     cfgptr->argv_info = calloc(sizeof(int32_t), argc+10);

common/platform_constants.h

@@ -97,4 +97,7 @@
 #define UNUSED_VARIABLE(vARIABLE) (void)(vARIABLE)
 #define NUM_PRACH_RX_FOR_NOISE_ESTIMATE 100
 
+// SDAP
+#define MAX_QOS_FLOWS 64
+
 #endif /* __PLATFORM_CONSTANTS_H__ */

common/utils/nr/nr_common.h

@@ -88,6 +88,8 @@ static inline const char *rnti_types(nr_rnti_type_t rr)
 #define NR_NUMBER_OF_SYMBOLS_PER_SLOT_EXTENDED_CP 12
 #define NR_MAX_NB_LAYERS 4 // 8
 
+#define BOUNDED_EVAL(a, b, c) (min(c, max(a, b)))
+
 // Since the IQ samples are represented by SQ15 R+I (see https://en.wikipedia.org/wiki/Q_(number_format)) we need to compensate when
 // calcualting signal energy. Instead of shifting each sample right by 15, we can normalize the result in dB scale once its
 // calcualted. Signal energy is calculated using RMS^2, where each sample is squared before taking the average of the sum, therefore
@@ -175,6 +177,17 @@ typedef struct {
   uint32_t step;
 } NR_timer_t;
 
+typedef struct val_init {
+  int val;
+  bool init;
+} val_init_t;
+
+typedef struct meas_s {
+  uint16_t Nid_cell;
+  val_init_t ss_rsrp_dBm;
+  val_init_t csi_rsrp_dBm;
+} meas_t;
+
 /**
  * @brief To start a timer
  * @param timer Timer to be started

common/utils/telnetsrv/telnetsrv.c

@@ -375,32 +375,32 @@ char *telnet_getvarvalue(telnetshell_vardef_t *var, int varindex)
   char *val;
   switch (var[varindex].vartype) {
     case TELNET_VARTYPE_INT32:
-      val = malloc(64);
+      val = calloc_or_fail(1, 64);
       snprintf(val, 64, "%i", *(int32_t *)(var[varindex].varvalptr));
       break;
 
     case TELNET_VARTYPE_INT64:
-      val = malloc(128);
+      val = calloc_or_fail(1, 128);
       snprintf(val, 128, "%lli", (long long)*(int64_t *)(var[varindex].varvalptr));
       break;
 
     case TELNET_VARTYPE_INT16:
-      val = malloc(16);
+      val = calloc_or_fail(1, 16);
       snprintf(val, 16, "%hi", *(short *)(var[varindex].varvalptr));
       break;
 
     case TELNET_VARTYPE_INT8:
-      val = malloc(16);
+      val = calloc_or_fail(1, 16);
       snprintf(val, 16, "%i", (int)(*(int8_t *)(var[varindex].varvalptr)));
       break;
 
     case TELNET_VARTYPE_UINT:
-      val = malloc(64);
+      val = calloc_or_fail(1, 64);
       snprintf(val, 64, "%u", *(unsigned int *)(var[varindex].varvalptr));
       break;
 
     case TELNET_VARTYPE_DOUBLE:
-      val = malloc(32);
+      val = calloc_or_fail(1, 32);
       snprintf(val, 32, "%g\n", *(double *)(var[varindex].varvalptr));
       break;
 
@@ -409,7 +409,7 @@ char *telnet_getvarvalue(telnetshell_vardef_t *var, int varindex)
       break;
 
     default:
-      val = malloc(64);
+      val = calloc_or_fail(1, 64);
       snprintf(val, 64, "ERR:var %i unknown type", varindex);
       break;
   }
@@ -927,7 +927,7 @@ int add_telnetcmd(char *modulename, telnetshell_vardef_t *var, telnetshell_cmdde
       for (int j = 0; cmd[j].cmdfunc != NULL; j++) {
         if (cmd[j].cmdflags & TELNETSRV_CMDFLAG_PUSHINTPOOLQ) {
           if (afifo == NULL) {
-            afifo = malloc(sizeof(notifiedFIFO_t));
+            afifo = calloc_or_fail(1, sizeof(notifiedFIFO_t));
             initNotifiedFIFO(afifo);
           }
           cmd[j].qptr = afifo;
@@ -956,8 +956,8 @@ int  telnetsrv_checkbuildver(char *mainexec_buildversion, char **shlib_buildvers
 }
 
 int telnetsrv_getfarray(loader_shlibfunc_t  **farray) {
-  int const num_func_tln_srv = 3;	
-  *farray = malloc(sizeof(loader_shlibfunc_t) * num_func_tln_srv);
+  int const num_func_tln_srv = 3;
+  *farray = calloc_or_fail(num_func_tln_srv, sizeof(loader_shlibfunc_t));
   (*farray)[0].fname=TELNET_ADDCMD_FNAME;
   (*farray)[0].fptr=(int (*)(void) )add_telnetcmd;
   (*farray)[1].fname=TELNET_POLLCMDQ_FNAME;

common/utils/telnetsrv/telnetsrv_5Gue_measurements.c

@@ -86,7 +86,7 @@ int get_measurgroups(telnet_measurgroupdef_t **measurgroups) {
 
 void measurcmd_display_phycpu(telnet_printfunc_t prnt) {
   PHY_VARS_NR_UE *UE = PHY_vars_UE_g[0][0];
-  telnet_cpumeasurdef_t cpumeasur[MAX_CPU_STAT_TYPE];
+  telnet_cpumeasurdef_t cpumeasur[MAX_CPU_STAT_TYPE] = {};
   for (int i = 0; i < MAX_CPU_STAT_TYPE; i++) {
     sprintf(cpumeasur[i].statname, "%s", UE->phy_cpu_stats.cpu_time_stats[i].meas_name);
     cpumeasur[i].astatptr = &UE->phy_cpu_stats.cpu_time_stats[i];

common/utils/telnetsrv/telnetsrv_ci.c

@@ -38,6 +38,7 @@
 #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/RRC/NR/rrc_gNB_mobility.h"
 
 #define TELNETSERVERCODE
 #include "telnetsrv.h"
@@ -196,6 +197,53 @@ int rrc_gNB_trigger_f1_ho(char *buf, int debug, telnet_printfunc_t prnt)
   return 0;
 }
 
+extern void nr_HO_N2_trigger_telnet(gNB_RRC_INST *rrc, uint32_t neighbour_pci, uint32_t rrc_ue_id);
+
+/** @brief Trigger N2 handover for UE
+ *  @param buf: Neighbour PCI, SCell PCI, RRC UE ID
+ *  @param debug: Debug flag
+ *  @param prnt: Print function
+ *  @return 0 on success, -1 on failure */
+int rrc_gNB_trigger_n2_ho(char *buf, int debug, telnet_printfunc_t prnt)
+{
+  if (!RC.nrrrc)
+    ERROR_MSG_RET("no RRC present, cannot list counts\n");
+
+  if (!buf) {
+    ERROR_MSG_RET("Please provide neighbour cell id and ue id\n");
+  } else {
+    // Parse neighbour cell PCI
+    char *token = strtok(buf, ",");
+    if (!token) {
+      ERROR_MSG_RET("Invalid input. Expected format: Neighbour PCI, ueId\n");
+    }
+    uint32_t neighbour_pci = strtol(token, NULL, 10);
+
+    // Parse ueId
+    token = strtok(NULL, ",");
+    if (!token) {
+      ERROR_MSG_RET("Missing UE ID\n");
+    }
+    uint32_t ueId = strtol(token, NULL, 10);
+
+    // Retrieve UE context
+    rrc_gNB_ue_context_t *ue_p = rrc_gNB_get_ue_context(RC.nrrrc[0], ueId);
+    if (!ue_p) {
+      ERROR_MSG_RET("UE with id %u not found\n", ueId);
+    }
+    gNB_RRC_UE_t *UE = &ue_p->ue_context;
+
+    // Trigger N2 handover
+    nr_HO_N2_trigger_telnet(RC.nrrrc[0], neighbour_pci, UE->rrc_ue_id);
+
+    // Print success message
+    prnt("RRC N2 handover triggered for UE %u with neighbour cell id %u\n",
+         ueId,
+         neighbour_pci);
+  }
+  return 0;
+}
+
 int force_ul_failure(char *buf, int debug, telnet_printfunc_t prnt)
 {
   if (!RC.nrmac)
@@ -245,6 +293,7 @@ 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_n2_ho", "[neighbour_pci(uint32_t),ueId(uint32_t)]", rrc_gNB_trigger_n2_ho},
     {"", "", NULL},
 };
 

common/utils/telnetsrv/telnetsrv_enb_measurements.c

@@ -160,7 +160,7 @@ void measurcmd_display_rlcstats(telnet_printfunc_t prnt) {
   UE_info_t *UE_info = &(RC.mac[eNB_id]->UE_info);
   telnet_ltemeasurdef_t  statsptr[]=LTE_RLCMEASURE;
   int num_rlcmeasure = sizeof(statsptr)/sizeof(telnet_ltemeasurdef_t );
-  unsigned int *rlcstats = malloc(num_rlcmeasure*sizeof(unsigned int));
+  unsigned int *rlcstats = calloc_or_fail(num_rlcmeasure,sizeof(unsigned int));
   eNB_MAC_INST *eNB = RC.mac[eNB_id];
 
   for(int i=0; i <num_rlcmeasure ; i++) {

doc/BUILD.md

@@ -1,26 +1,14 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">OAI Build Procedures</font></b>
-    </td>
-  </tr>
-</table>
+# OAI Build Procedures
 
 [[_TOC_]]
 
 This page is valid on tags starting from **`2019.w09`**.
 
-# Overview
+## Overview
 
 The [OAI EPC](https://github.com/OPENAIRINTERFACE/openair-epc-fed/blob/master/docs/DEPLOY_HOME_MAGMA_MME.md) and [OAI 5GC](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/docs/DEPLOY_HOME.md) are developed in distinct projects with their own documentation and are not further described here.
 
-OAI softmodem sources, which aim to implement 3GPP compliant UEs, eNodeB and gNodeB can be downloaded from the Eurecom [gitlab repository](./GET_SOURCES.md).
+OAI softmodem sources, which aim to implement 3GPP compliant UEs, eNodeB and gNodeB can be downloaded from the Eurecom [gitlab repository](setup/GET_SOURCES.md).
 
 Sources come with a build script [build_oai](../cmake_targets/build_oai) located at the root of the `openairinterface5g/cmake_targets` directory. This script is developed to build the oai binaries (executables,shared libraries) for different hardware platforms, and use cases.
 
@@ -40,7 +28,7 @@ Running the  [build_oai](../cmake_targets/build_oai) script also generates some
 - `nvram`: a binary used to build (4G) UE (IMEI...) and EMM (IMSI, registered PLMN) non volatile data.
 - `genids` T Tracer utility, used at build time to generate `T_IDs.h` include file. This binary is located in the [T Tracer source file directory](../common/utils/T) .
 
-The build system for OAI uses [cmake](https://cmake.org/) which is a  tool to generate makefiles. The `build_oai` script is a wrapper using `cmake` and `make`/`ninja` to ease the oai build and use. It logs the `cmake` and `ninja`/`make` commands it executes. The file describing how to build the executables from source files is the [CMakeLists.txt](../CMakeLists.txt), it is used as input by cmake to generate the makefiles.
+The build system for OAI uses [cmake](https://cmake.org/) which is a  tool to generate makefiles. The `build_oai` script is a wrapper using `cmake` and `make`/`ninja` to ease the oai build and use. It logs the `cmake` and `ninja`/`make` commands it executes. The file describing how to build the executables from source files is the [CMakeLists.txt](CMakeLists.txt), it is used as input by cmake to generate the makefiles.
 
 cmake is further extended by using [CPM](https://github.com/cpm-cmake/CPM.cmake). CPM is a cmake script that handles external code dependencies. It is setup to cache downloaded code in `~/.cache/cpm`. While most external dependencies should be handled by system package managers, CPM has the advantage of using any code that is available in a public git repository.
 
@@ -49,9 +37,9 @@ The oai softmodem supports many use cases, and new ones are regularly added. Mos
 - s1, noS1
 - all simulators as the rfsimulator, the L2 simulator, with exception of PHY simulators, which are distinct executables. 
 
-# Running `build_oai`
+## Running `build_oai`
 
-## List of options
+### List of options
 
 Calling the `build_oai` script with the `-h` option gives the list of all available options. A number of important ones:
 
@@ -64,9 +52,9 @@ Calling the `build_oai` script with the `-h` option gives the list of all availa
 - `--ninja` is to use the `ninja` build tool, which speeds up compilation.
 - `-c` is to clean the workspace and force a complete rebuild.
 
-`build_oai` also provides various options to enable runtime error checkers, i.e. sanitizers in order to find various types of bugs in the codebase and eventually enhance the stability of the OAI softmodems. Refer to [sanitizers.md](./dev_tools/sanitizers.md) for more details.
+`build_oai` also provides various options to enable runtime error checkers, i.e. sanitizers in order to find various types of bugs in the codebase and eventually enhance the stability of the OAI softmodems. Refer to [sanitizers.md](dev_tools/sanitizers.md) for more details.
 
-## Installing dependencies
+### Installing dependencies
 
 Install all dependencies by issuing the `-I` option. To install furthermore libraries for optional libraries, use the `--install-optional-packages` option. The `-I` option will also install dependencies for an SDR when paired with `-w`. For instance, in order to install all dependencies and the ones for USRP, run:
 
@@ -77,7 +65,7 @@ cd openairinterface5g/cmake_targets/
 
 Note the section on installing UHD further down for more information.
 
-## Installing (new) asn1c from source
+### Installing (new) asn1c from source
 
 With tag 2023.w22, we switch from our [own
 `asn1c`](https://gitlab.eurecom.fr/oai/asn1c.git) to a [community-maintained
@@ -107,7 +95,7 @@ install elsewhere, using one of these two methods:
 cmake .. -GNinja -DASN1C_EXEC=/opt/asn1c/bin/asn1c
 ```
 
-## Installing UHD from source
+### Installing UHD from source
 
 Previously for Ubuntu distributions, when installing the pre-requisites, most of the packages are installed from PPA.
 
@@ -139,7 +127,7 @@ See:
 * `cmake_targets/tools/uhd-4.x-tdd-patch.diff`
 * `cmake_targets/tools/build_helper` --> function `install_usrp_uhd_driver_from_source`
 
-## Building PHY Simulators
+### Building PHY Simulators
 
 The PHY layer simulators (LTE and NR) can be built as follows:
 
@@ -150,9 +138,9 @@ cd openairinterface5g/cmake_targets/
 
 After completing the build, the binaries are available in the `cmake_targets/ran_build/build` directory.
 
-Detailed information about these simulators can be found [in the dedicated page](./physical-simulators.md)
+Detailed information about these simulators can be found [in the dedicated page](usage/physical-simulators.md)
 
-## Building UEs, eNodeB and gNodeB Executables
+### Building UEs, eNodeB and gNodeB Executables
 
 After downloading the source files, a single build command can be used to get the binaries supporting all the oai softmodem use cases (UE and [eg]NodeB):
 
@@ -165,7 +153,7 @@ You can build any oai softmodem executable separately, you may not need all of t
 
 After completing the build, the binaries are available in the `cmake_targets/ran_build/build` directory.
 
-## Building Optional Binaries
+### Building Optional Binaries
 
 There are a number of optional libraries that can be built in support of the
 RAN, such as telnetsrv, scopes, offloading libraries, etc.
@@ -187,7 +175,7 @@ Some libraries have further dependencies and might not build on every system:
 - `websrv`: npm and others
 - `ldpc_aal`: DPDK with patch
 
-# Running `cmake` directly
+## Running `cmake` directly
 
 `build_oai` is a wrapper on top of `cmake`. It is therefore possible to run `cmake` directly. An example using `ninja`: to build all "main targets" for 5G, excluding additional libraries:
 ```
@@ -217,9 +205,9 @@ cmake-gui ../../..
 ```
 You can of course use all standard cmake/ninja/make commands in this directory.
 
-## cmake presets
+### cmake presets
 
-CMake presets are common project configure options. See https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html
+CMake presets are common project configure options. See [here](https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html).
 
 Configure presets:
 
@@ -241,7 +229,7 @@ To build using a build preset:
 
     cmake --build --preset <preset_name>
 
-# Cross Compile
+## Cross Compile
 
-If you want to use cross-compiler on x86 platform for aarch64 version, please refer the [cross-compile.md](./cross-compile.md) for more information.
+If you want to use cross-compiler on x86 platform for aarch64 version, please refer the [cross-compile.md](setup/cross-compile.md) for more information.
 

doc/E1AP/e1ap_procedures.md

@@ -1,16 +1,4 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">E1AP Procedures</font></b>
-    </td>
-  </tr>
-</table>
+# E1AP Procedures
 
 [[_TOC_]]
 

doc/F1AP/F1-design.md

@@ -1,16 +1,4 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">F1 split design</font></b>
-    </td>
-  </tr>
-</table>
+# F1 split design
 
 [[_TOC_]]
 

doc/F1AP/F1AP-lib.md

@@ -1,16 +1,4 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">F1AP Messages Encoding & Decoding Library</font></b>
-    </td>
-  </tr>
-</table>
+# F1AP Messages Encoding & Decoding Library
 
 [[_TOC_]]
 

doc/L1_L2/L1SIM.md

@@ -1,38 +1,27 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">Open Air LTE Emulation</font></b>
-    </td>
-  </tr>
-</table>
+# Open Air LTE Emulation
 
-**Note: unless you know what you are doing, you likely do not need this!
+> **Note:**
+> **Unless you know what you are doing, you likely do not need this!
 Rather, you are probably looking for the
-[RFsimulator](../radio/rfsimulator/README.md)!**
+[RFsimulator](../../radio/rfsimulator/README.md)!**
 
 oaisim has been scraped and replaced by the same programs that are used for the
 real-time operation, `lte-softmodem` and `lte-uesoftmodem`. This uses the IF4p5
 fronthaul protocol to achieve the communication.
 
-Context: oaisim used to be a simulation mode inside OAI to emulate an eNB and
+> Context: oaisim used to be a simulation mode inside OAI to emulate an eNB and
 multiple UEs.
 
 [[_TOC_]]
 
-# Build
+## Build
 
-Build eNB/UE as normal, as also described in [How to build the eNB and the UE](./BUILD.md):
+Build eNB/UE as normal, as also described in [How to build the eNB and the UE](../BUILD.md):
 ```bash
 ./build_oai -c --ninja --eNB --UE
 ```
 
-# How to run an eNB with the noS1 option
+## How to run an eNB with the noS1 option
 
 The following paragraph(s) explains how to run the L1 simulator in noS1 mode and using the oai kernel modules.
 
@@ -48,7 +37,7 @@ $ cd ../ran_build/build
 $ sudo -E ./lte-softmodem -O YYY.conf --noS1
 ```
 
-# How to run a UE with the noS1 option
+## How to run a UE with the noS1 option
 
 Similarly modify the example configuration file in `/openairinterface5g/ci-scripts/conf_files/rru.band7.nos1.simulator.conf` and replace loopback interface and IP addresses. Copy your modifications to a new file, let's call XXX.conf the resulting configuration file.
 
@@ -64,7 +53,7 @@ $ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1
 
 That should give you equivalent functionality to what you had with oaisim including noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs. 
 
-# How to ping an eNB from a UE and vice versa (with the noS1 option)
+## How to ping an eNB from a UE and vice versa (with the noS1 option)
 
 Once your eNB and UE (built with the noS1 option) are running and synchronised, you can ping the eNB from the UE with the following command:
 

doc/L1_L2/L2NFAPI.md

@@ -1,16 +1,4 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">L2 nFAPI Simulator Usage</font></b>
-    </td>
-  </tr>
-</table>
+# L2 nFAPI Simulator Usage
 
 ## 4G L2 nFAPI simulator
 
@@ -18,11 +6,11 @@ This simulator allows to test L2 and above Layers using the nFAPI interface.
 
 The UE executable is able to "simulate" multiple UEs in order to stimulate the scheduler in the eNB.
 
-**This simulator is available starting the `v1.0.0` release on the `master` branch.**
+> **This simulator is available starting the `v1.0.0` release on the `master` branch.**
 
-**2022/03/08: CAUTION, THIS TUTORIAL IS NO LONGER VALID on the `develop` branch after the `2022.w01` tag.**
+> **2022/03/08: CAUTION, THIS TUTORIAL IS NO LONGER VALID on the `develop` branch after the `2022.w01` tag.**
 
-**2022/03/08: CAUTION, THE LAST VALID TAG on `develop` branch is `2021.w51_c`.**
+> **2022/03/08: CAUTION, THE LAST VALID TAG on `develop` branch is `2021.w51_c`.**
 
 Currently the Continuous Integration process is validating this simulator the following way:
 
@@ -38,11 +26,12 @@ Normally it should be fine to run both executables on the same host using the `l
 2. [No S1 -- eNB and UE on 2 hosts](L2NFAPI_NOS1.md)
 
 
-**2022/03/08: Starting the `2022.w01` tag on the `develop` branch, the L2 nFAPI simulation is using a proxy.**
+> **2022/03/08: Starting the `2022.w01` tag on the `develop` branch, the L2 nFAPI simulation is using a proxy.**
 
 ## 5G L2 nFAPI simulator
 
-**Note: L2 simulator does not work anymore.**
+> **Note:**
+> **L2 simulator does not work anymore.**
 
 ### Download and Build the Proxy Server (from EpiSci)
 

doc/L1_L2/L2NFAPI_NOS1.md

@@ -1,26 +1,14 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">L2 nFAPI Simulator (no S1 Mode / 2-host deployment)</font></b>
-    </td>
-  </tr>
-</table>
+# L2 nFAPI Simulator (no S1 Mode / 2-host deployment)
 
-**2022/03/08: CAUTION, THIS TUTORIAL IS NO LONGER VALID on the `develop` branch after the `2022.w01` tag.**
+> **2022/03/08: CAUTION, THIS TUTORIAL IS NO LONGER VALID on the `develop` branch after the `2022.w01` tag.**
 
-**2022/03/08: CAUTION, THE LAST VALID TAG on `develop` branch is `2021.w51_c`.**
+> **2022/03/08: CAUTION, THE LAST VALID TAG on `develop` branch is `2021.w51_c`.**
 
 **Table of Contents**
 
 [[_TOC_]]
 
-# 1. Environment #
+## 1. Environment 
 
 You may not have access to an EPC or you don't want to hassle to deploy one.
 
@@ -31,11 +19,11 @@ You may not have access to an EPC or you don't want to hassle to deploy one.
 
 Example of L2 nFAPI Simulator testing environment:
 
-<img src="./images/L2-sim-noS1-2-host-deployment.png" alt="" border=3>
+![L2-sim-noS1-2-host-deployment](../images/L2-sim-noS1-2-host-deployment.png)
 
-Note that the IP addresses are indicative and need to be adapted to your environment.
+> Note that the IP addresses are indicative and need to be adapted to your environment.
 
-# 2. Retrieve the OAI eNB-UE source code #
+## 2. Retrieve the OAI eNB-UE source code 
 
 At the time of writing, the tag used in the `develop` branch to do this documentation was `2020.w16`.
 
@@ -57,7 +45,7 @@ cd ue_folder
 git checkout develop
 ```
 
-# 3. Setup of the USIM information in UE folder #
+## 3. Setup of the USIM information in UE folder 
 
 ```bash
 $ ssh sudousername@machineC
@@ -113,11 +101,11 @@ UE1: // <- Edit here
 
 You can repeat the operation for as many users you want to test with.
 
-# 4. Setup of the Configuration files #
+## 4. Setup of the Configuration files 
 
-**CAUTION: both proposed configuration files resides in the ci-scripts realm. You can copy them but you CANNOT push any modification on these 2 files as part of an MR without informing the CI team.**
+> **CAUTION: both proposed configuration files resides in the ci-scripts realm. You can copy them but you CANNOT push any modification on these 2 files as part of an MR without informing the CI team.**
 
-## 4.1. The eNB Configuration file ##
+### 4.1. The eNB Configuration file 
 
 ```bash
 $ ssh sudousername@machineB
@@ -143,7 +131,8 @@ MACRLCs = (
 );
 ```
 
-If you are testing more than 16 UEs, a proper setting on the RUs is necessary. **Note that this part is NOT present in the original configuration file**.
+If you are testing more than 16 UEs, a proper setting on the RUs is necessary. 
+> **Note that this part is NOT present in the original configuration file**.
 
 ```
 RUs = (
@@ -178,7 +167,7 @@ Last, the S1 interface shall be properly set.
     };
 ```
 
-## 4.2. The UE Configuration file ##
+### 4.2. The UE Configuration file 
 
 ```bash
 $ ssh sudousername@machineB
@@ -203,11 +192,11 @@ L1s = (
 );
 ```
 
-# 5. Build OAI UE and eNodeB #
+## 5. Build OAI UE and eNodeB 
 
-See [Build documentation](./BUILD.md).
+See [Build documentation](../BUILD.md).
 
-# 6. Start the eNB #
+## 6. Start the eNB 
 
 In the first terminal (the one you used to build the eNB):
 
@@ -229,7 +218,7 @@ If you don't use redirection, you can test but many logs are printed on the cons
 
 We do recommend the redirection in steady mode once your setup is correct.
 
-# 7. Start the UE #
+## 7. Start the UE 
 
 In the second terminal (the one you used to build the UE):
 
@@ -279,7 +268,7 @@ oaitun_uem1 Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-
 
 Having the 4 oaitun_ue tunnel interfaces up and with an allocated address means the connection with EPC went alright.
 
-# 8. Test with ping #
+## 8. Test with ping 
 
 In a third terminal, after around 10 seconds, the UE(s) shall be connected to the eNB: Check with ifconfig
 
@@ -319,15 +308,15 @@ $ ssh sudousername@machineC
 iperf -c 10.0.1.1 -u -t 30 -b 2M -i 1 -fm -B 10.0.1.2 -p 5002
 ```
 
-# 9. Limitations #
+## 9. Limitations 
 
 
 ----
 
 [oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
 
-[oai softmodem features](FEATURE_SET.md)
+[oai softmodem features](../setup/FEATURE_SET.md)
 
-[oai softmodem build procedure](BUILD.md)
+[oai softmodem build procedure](../BUILD.md)
 
 [L2 nfapi simulator](L2NFAPI.md)

doc/L1_L2/L2NFAPI_S1.md

@@ -1,26 +1,14 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">L2 nFAPI Simulator (with S1 / 2-host deployment)</font></b>
-    </td>
-  </tr>
-</table>
+# L2 nFAPI Simulator (with S1 / 2-host deployment)
 
-**2022/03/08: CAUTION, THIS TUTORIAL IS NO LONGER VALID on the `develop` branch after the `2022.w01` tag.**
+> **2022/03/08: CAUTION, THIS TUTORIAL IS NO LONGER VALID on the `develop` branch after the `2022.w01` tag.**
 
-**2022/03/08: CAUTION, THE LAST VALID TAG on `develop` branch is `2021.w51_c`.**
+> **2022/03/08: CAUTION, THE LAST VALID TAG on `develop` branch is `2021.w51_c`.**
 
 **Table of Contents**
 
 [[_TOC_]]
 
-# 1. Environment #
+## 1. Environment 
 
 3 servers are used in this deployment. You can use Virtual Machines instead of each server; like it is done in the CI process.
 
@@ -30,17 +18,17 @@
 
 Example of L2 nFAPI Simulator testing environment:
 
-<img src="./images/L2-sim-S1-3-host-deployment.png" alt="" border=3>
+![L2-sim-S1-3-host-deployment](../images/L2-sim-S1-3-host-deployment.png)
 
-Note that the IP addresses are indicative and need to be adapted to your environment.
+> Note that the IP addresses are indicative and need to be adapted to your environment.
 
-# 2. Prepare the EPC #
+## 2. Prepare the EPC 
 
 Create the environment for the EPC and register all **USIM** information into the **HSS** database.
 
 If you are using OAI-EPC ([see on GitHub](https://github.com/OPENAIRINTERFACE/openair-epc-fed)), build **HSS/MME/SPGW** and create config files.
 
-# 3. Retrieve the OAI eNB-UE source code #
+## 3. Retrieve the OAI eNB-UE source code 
 
 At the time of writing, the tag used in the `develop` branch to do this documentation was `2020.w16`.
 
@@ -62,7 +50,7 @@ cd ue_folder
 git checkout develop
 ```
 
-# 4. Setup of the USIM information in UE folder #
+## 4. Setup of the USIM information in UE folder 
 
 ```bash
 $ ssh sudousername@machineC
@@ -118,11 +106,11 @@ UE1: // <- Edit here
 
 You can repeat the operation for as many users you want to test with.
 
-# 5. Setup of the Configuration files #
+## 5. Setup of the Configuration files 
 
-**CAUTION: both proposed configuration files resides in the ci-scripts realm. You can copy them but you CANNOT push any modification on these 2 files as part of an MR without informing the CI team.**
+> **CAUTION: both proposed configuration files resides in the ci-scripts realm. You can copy them but you CANNOT push any modification on these 2 files as part of an MR without informing the CI team.**
 
-## 5.1. The eNB Configuration file ##
+### 5.1. The eNB Configuration file 
 
 ```bash
 $ ssh sudousername@machineB
@@ -148,7 +136,8 @@ MACRLCs = (
 );
 ```
 
-If you are testing more than 16 UEs, a proper setting on the RUs is necessary. **Note that this part is NOT present in the original configuration file**.
+If you are testing more than 16 UEs, a proper setting on the RUs is necessary. 
+> **Note that this part is NOT present in the original configuration file**.
 
 ```
 RUs = (
@@ -183,7 +172,7 @@ Last, the S1 interface shall be properly set.
     };
 ```
 
-## 5.2. The UE Configuration file ##
+### 5.2. The UE Configuration file 
 
 ```bash
 $ ssh sudousername@machineB
@@ -208,11 +197,11 @@ L1s = (
 );
 ```
 
-# 6. Build OAI UE and eNodeB #
+## 6. Build OAI UE and eNodeB 
 
-See [Build documentation](./BUILD.md).
+See [Build documentation](../BUILD.md).
 
-# 7. Start EPC #
+## 7. Start EPC 
 
 Start the EPC on machine `A`.
 
@@ -221,7 +210,7 @@ $ ssh sudousername@machineA
 # Start the EPC
 ```
 
-# 8. Start the eNB #
+## 8. Start the eNB 
 
 In the first terminal (the one you used to build the eNB):
 
@@ -235,7 +224,7 @@ If you don't use redirection, you can test but many logs are printed on the cons
 
 We do recommend the redirection in steady mode once your setup is correct.
 
-# 9. Start the UE #
+## 9. Start the UE 
 
 In the second terminal (the one you used to build the UE):
 
@@ -285,7 +274,7 @@ oaitun_uem1 Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-
 
 Having the 4 oaitun_ue tunnel interfaces up and with an allocated address means the connection with EPC went alright.
 
-# 10. Test with ping #
+## 10. Test with ping 
 
 In a third terminal, after around 10 seconds, the UE(s) shall be connected to the eNB: Check with ifconfig
 
@@ -299,15 +288,15 @@ $ ping -c 20 192.172.0.5
 
 iperf operations can also be performed.
 
-# 11. Limitations #
+## 11. Limitations 
 
 
 ----
 
 [oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
 
-[oai softmodem features](FEATURE_SET.md)
+[oai softmodem features](../setup/FEATURE_SET.md)
 
-[oai softmodem build procedure](BUILD.md)
+[oai softmodem build procedure](../BUILD.md)
 
 [L2 nfapi simulator](L2NFAPI.md)

doc/L1_L2/nfapi.md

@@ -10,7 +10,7 @@ about nFAPI can be found in SCF 225.2.0.
 
 [[_TOC_]]
 
-# Quickstart
+## Quickstart
 
 Compile OAI as normal. Start the CN and make sure that the VNF configuration
 matches the PLMN/IP addresses. Then, run the VNF
@@ -29,7 +29,7 @@ VNF!)
 You should not observe a difference between nFAPI split and monolithic.
 
 
-# Status
+## Status
 
 All FAPI message can be transferred between VNF and PNF. This is because OAI
 uses FAPI with its corresponding messages internally, whether a split is in use
@@ -54,7 +54,7 @@ When using RFsim, the system might run slower than in monolithic. This is
 because the PNF needs to slow down the execution time of a specific slot,
 because it has to send a Slot.indication to the VNF for scheduling.
 
-# Configuration
+## Configuration
 
 Both PNF and VNF are run through the `nr-softmodem` executable. The type of
 mode is switched through the `--nfapi` switch, with options `MONOLITHIC`
@@ -70,7 +70,7 @@ If the type is `VNF`, you have to modify the `MACRLCs.tr_s_preference`
 - `MACRLCs.local_s_portd` (local south port for control): VNF's P5 local port
 - `MACRLCs.remote_s_portd` (remote south port for data): PNF's P7 remote port
 
-Note that any L1-specific section (`L1s`, `RUs`,
+> Note that any L1-specific section (`L1s`, `RUs`,
 RFsimulator-specific/IF7.2-specific configuration or other radios, if
 necessary) will be ignored and can be deleted.
 
@@ -84,7 +84,7 @@ If the type is `PNF`, you have to modify modify the `L1s.tr_n_preference`
 - `L1s.local_n_portd` (local north port for data): PNF's P7 local port
 - `L1s.remote_n_portd` (remote north port for data): VNF's P7 remote port
 
-Note that this file should contain additional, L1-specific sections (`L1s`,
+> Note that this file should contain additional, L1-specific sections (`L1s`,
 `RUs` RFsimulator-specific/IF7.2-specific configuration or other radios, if
 necessary).
 
@@ -109,10 +109,10 @@ can proceed as follows:
   `pnf.conf`, or provide them on the command line for the PNF.
 - to run, proceed as described in the quick start above.
 
-Note: all L1-specific options have to be passed to the PNF, and remaining
+> Note: all L1-specific options have to be passed to the PNF, and remaining
 options to the VNF.
 
-## Transport mechanisms between VNF and PNF
+### Transport mechanisms between VNF and PNF
 
 Currently, the VNF/PNF split supports three transport mechanisms between each
 other:
@@ -121,7 +121,8 @@ other:
 
    The socket type may be changed by editing `nfapi_pnf_config_create()` and
    `nfapi_vnf_config_create()`, in both of which `_this->sctp = <value, 0 or
-   1>;` indicate whether SCTP or regular sockets are to be used.  Note: The
+   1>;` indicate whether SCTP or regular sockets are to be used.  
+   > Note: The
    value of `_this->sctp` **must** be the same on the VNF and PNF.
 2. Intel WLS Lib, which uses DPDK to achieve a shared memory communication between components.
 3. nvIPC, which is used exclusively for the NVIDIA Aerial L1. Thus, it is only
@@ -131,15 +132,15 @@ The change between transport mechanisms is done at compilation time:
 - No changes to the `build_oai` call are required in order to select socket communication, as it is the default.
 - In order to select WLS as the transport mechanism between VNF and PNF, first install the WLS library, and afterwards use `-t WLS` as a parameter of `build_oai`:
 
-### How to use nFAPI
+#### How to use nFAPI
 
 nFAPI is used by default. Compile and configure as indicated above.
 
-### How to use Aerial
+#### How to use Aerial
 
-Refer to [this document](./Aerial_FAPI_Split_Tutorial.md) for more information.
+Refer to [this document](../tutorials/Aerial_FAPI_Split_Tutorial.md) for more information.
 
-### How to use WLS lib
+#### How to use WLS lib
 
 Before the first compilation with WLS support, the [WLS
 library](https://docs.o-ran-sc.org/projects/o-ran-sc-o-du-phy/en/latest/wls-lib.html)
@@ -152,7 +153,7 @@ The WLS library has a few dependencies:
 
 Additionally, a patch needs to be applied to the WLS lib Makefile in order for
 the shared library and headers to be installed into the system, the necessary
-patch is available [here](../cmake_targets/tools/install_wls_lib.patch)
+patch is available [here](../../cmake_targets/tools/install_wls_lib.patch)
 
 Clone the code and apply the patch
 
@@ -169,11 +170,11 @@ After installing WLS, you can run the build command as shown below:
 
     ./build_oai -t WLS -w USRP --gNB --nrUE --ninja -C
 
-#### How to run OAI PNF with OAI VNF
+##### How to run OAI PNF with OAI VNF
 
 Refer to the above steps in [Quickstart](#quickstart), but run the PNF first as it is the WLS "master".
 
-#### How to run OAI PNF with OSC/Radisys O-DU
+##### How to run OAI PNF with OSC/Radisys O-DU
 
 Set up the hugepages for DPDK (1GB page size, 6 pages; this only needs to be
 done once):
@@ -217,7 +218,7 @@ Run the O-DU over GDB
 
     sudo -E gdb -ex run --readnever --args  ./odu/odu
 
-Note: If you see the following prompt in GDB
+> Note: If you see the following prompt in GDB
 
     This GDB supports auto-downloading debuginfo from the following URLs:
       <https://debuginfod.ubuntu.com>
@@ -231,11 +232,11 @@ Run the OAI-UE
 
     sudo ./nr-uesoftmodem -r 273 --numerology 1 --band 78 -C 3400140000 --ssb 1518 --uicc0.imsi 001010000000001 --rfsim
 
-# nFAPI logging system
+## nFAPI logging system
 
 nFAPI has its own logging system, independent of OAI's. It can be activated by
 setting the `NFAPI_TRACE_LEVEL` environment variable to an appropriate value;
-see [the environment variables documentation](./environment-variables.md) for
+see [the environment variables documentation](../setup/environment-variables.md) for
 more info.
 
 To see the (any) periodical output at the PNF, define `NFAPI_TRACE_LEVEL=info`.

doc/MAC/mac-usage.md

@@ -38,7 +38,7 @@ The actual scheduler implementation can be found in functions `pf_dl()` and
 [`gNB_scheduler_ulsch.c`](../../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c)
 (for UL), respectively.
 
-## PDDCH aggregation level
+## PDCCH aggregation level
 
 PDCCH aggregation level is selected using closed loop controller, where DL HARQ
 feedback is the controller feedback signal. It is used to increment `pdcch_cl_adjust`
@@ -60,7 +60,7 @@ in aggregation level 2 which translates to `uess_agg_levels` set to `[0, 2, 0,
 Say we have 90% PDCCH success rate at aggregation level 1, `pdcch_cl_adjust` will stay at 0
 for most of the time. 2 consecutive PDCCH failures will not result in increasing the aggregation
 level (because (0.05 + 0.05) * 4 = 0.4 which is closer to 0 than to 1). If PDCCH fails 3 times
-in a row the aggregation level will change to 2 and hopefully back to 1 once more PDDCH successes
+in a row the aggregation level will change to 2 and hopefully back to 1 once more PDCCH successes
 happen.
 
 ### Example 2
@@ -78,7 +78,7 @@ available in the the file `nrMAC-stats.log` in the same directory in which
 Example:
 
 ```
-UE RNTI 2460 CU-UE-ID 2 in-sync PH 28 dB PCMAX 24 dBm, average RSRP -74 (8 meas)
+UE RNTI 2460 CU-UE-ID 2 in-sync PH 28 dB PCMAX 24 dBm, average RSRP -74 (8 meas), average SINR 40.0 (32 meas)
 UE 2460: CQI 15, RI 2, PMI (14,1)
 UE 2460: UL-RI 2 TPMI 0
 UE 2460: dlsch_rounds 32917/5113/1504/560, dlsch_errors 211, pucch0_DTX 1385, BLER 0.19557 MCS (1) 23 CCE fail 3
@@ -103,6 +103,8 @@ In the first line,
 * `RSRP` (`-74`): measured power of the DL reference signals at the UE. >-80dBm
   you should have full DL throughput. <-95 dBm, you are very limited in terms
   of connectivity.
+* `SINR` (`40.0`): measured signal to interference and noise ratio of the SSB
+  received at the UE. Maximum value that can be reported by the UE is 40.0 dB.
 
 The second and third line reflect channel state information (CSI) as
 reported by the UE, and only appear if CSI-RS/SRS are enabled and _received_
@@ -402,3 +404,13 @@ pattern2: {
     nrofUplinkSymbols2             = 0;
 };
 ```
+
+#### UL-heavy TDD patterns
+
+"UL-heavy TDD patterns", i.e., TDD patterns that have many UL slots are
+supported. Examples for such patterns would be DSUUU or DDDSUUUUUU.
+
+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]`.

doc/README.md

@@ -1,16 +1,4 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">OpenAirInterface documentation overview</font></b>
-    </td>
-  </tr>
-</table>
+# OpenAirInterface documentation overview
 
 This is the general overview page of the OpenAirInterface documentation.  
 This page groups links to general information, tutorials, design documents, radio integration, and special-purpose libraries.
@@ -23,81 +11,81 @@ Beware if you previously pulled the `develop` branch that your repository may be
 
 [[_TOC_]]
 
-# General
+## General
 
-- [FEATURE_SET.md](./FEATURE_SET.md): lists supported features
-- [GET_SOURCES.md](./GET_SOURCES.md): how to download the sources
-- [BUILD.md](./BUILD.md): how to build the sources
-- [code-style-contrib.md](./code-style-contrib.md): overall working practices, code style, and review process
-- [cross-compile.md](./cross-compile.md): how to cross-compile OAI for ARM
-- [clang-format.md](./clang-format.md): how to format the code
-- [sanitizers.md](./dev_tools/sanitizers.md): how to run with ASan/UBSan/MemSAN/TSan
-- [environment-variables.md](./environment-variables.md): the environment variables used by OAI
-- [tuning_and_security.md](./tuning_and_security.md): performance and security considerations
+- [FEATURE_SET.md](setup/FEATURE_SET.md): lists supported features
+- [GET_SOURCES.md](setup/GET_SOURCES.md): how to download the sources
+- [BUILD.md](BUILD.md): how to build the sources
+- [code-style-contrib.md](setup/code-style-contrib.md): overall working practices, code style, and review process
+- [cross-compile.md](setup/cross-compile.md): how to cross-compile OAI for ARM
+- [clang-format.md](setup/clang-format.md): how to format the code
+- [sanitizers.md](dev_tools/sanitizers.md): how to run with ASan/UBSan/MemSAN/TSan
+- [environment-variables.md](setup/environment-variables.md): the environment variables used by OAI
+- [tuning_and_security.md](testing/tuning_and_security.md): performance and security considerations
 
 There is some general information in the [OpenAirInterface Gitlab Wiki](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/home)
 
-# Tutorials
+## Tutorials
 
 - Step-by-step tutorials to set up 5G:
-  * [OAI 5GC](./NR_SA_Tutorial_OAI_CN5G.md)
-  * [OAI gNB with COTS UE](./NR_SA_Tutorial_COTS_UE.md)
-  * [OAI NR-UE](./NR_SA_Tutorial_OAI_nrUE.md)
-  * [Multiple OAI NR-UE with RFsimulator](./NR_SA_Tutorial_OAI_multi_UE.md)
-- [RUNMODEM.md](./RUNMODEM.md): Generic information on how to
+  * [OAI 5GC](tutorials/NR_SA_Tutorial_OAI_CN5G.md)
+  * [OAI gNB with COTS UE](tutorials/NR_SA_Tutorial_COTS_UE.md)
+  * [OAI NR-UE](tutorials/NR_SA_Tutorial_OAI_nrUE.md)
+  * [Multiple OAI NR-UE with RFsimulator](tutorials/NR_SA_Tutorial_OAI_multi_UE.md)
+- [RUNMODEM.md](usage/RUNMODEM.md): Generic information on how to
   * Run simulators
   * Run with hardware
   * Specific OAI modes (phy-test, do-ra, noS1)
   * (5G) Using SDAP and custom DRBs
   * IF setups and arbitrary frequencies
   * MIMO
-- [How to run OAI with O-RAN 7.2 FHI](./ORAN_FHI7.2_Tutorial.md)
-- [How to run a 5G-NSA setup](./TESTING_GNB_W_COTS_UE.md)
-- [How to run a 4G setup using L1 simulator](./L1SIM.md) _Note: we recommend the RFsimulator_
-- [How to use the L2 simulator](./L2NFAPI.md)
+- [How to run OAI with O-RAN 7.2 FHI](tutorials/ORAN_FHI7.2_Tutorial.md)
+- [How to run a 5G-NSA setup](testing/TESTING_GNB_W_COTS_UE.md)
+- [How to run a 4G setup using L1 simulator](L1_L2/L1SIM.md) _Note: we recommend the RFsimulator_
+- [How to use the L2 simulator](L1_L2/L2NFAPI.md)
 - [How to use the OAI channel simulator](../openair1/SIMULATION/TOOLS/DOC/channel_simulation.md)
-- [How to use multiple BWPs](./RUN_NR_multiple_BWPs.md)
-- [How to run OAI-VNF and OAI-PNF](./nfapi.md): how to run the FAPI/nFAPI split,
+- [How to use multiple BWPs](usage/RUN_NR_multiple_BWPs.md)
+- [How to run OAI-VNF and OAI-PNF](L1_L2/nfapi.md): how to run the FAPI/nFAPI split,
   including some general remarks on FAPI/nFAPI.
-- [How to use the positioning reference signal (PRS)](./RUN_NR_PRS.md)
-- [How to use device-to-device communication (D2D, 4G)](./d2d_emulator_setup.txt)
+- [How to use the positioning reference signal (PRS)](usage/RUN_NR_PRS.md)
+- [How to use device-to-device communication (D2D, 4G)](setup/d2d_emulator_setup.txt)
 - [How to run with E2 agent](../openair2/E2AP/README.md)
-- [How to run the physical simulators](./physical-simulators.md)
-- [How to setup OAI with Nvidia Aerial and Foxconn](./Aerial_FAPI_Split_Tutorial.md)
-- [How to setup OAI with LDPC accelerators (Xilinx T2/Intel ACCs)](./LDPC_OFFLOAD_SETUP.md)
-- [How to do a handover](./handover-tutorial.md)
-- [How to setup gNB frequency](./gNB_frequency_setup.md)
+- [How to run the physical simulators](usage/physical-simulators.md)
+- [How to setup OAI with Nvidia Aerial and Foxconn](tutorials/Aerial_FAPI_Split_Tutorial.md)
+- [How to setup OAI with LDPC accelerators (Xilinx T2/Intel ACCs)](tutorials/LDPC_OFFLOAD_SETUP.md)
+- [How to do a handover](tutorials/handover-tutorial.md)
+- [How to setup gNB frequency](setup/gNB_frequency_setup.md)
 
 Legacy unmaintained files:
-- [`L2NFAPI_NOS1.md`](./L2NFAPI_NOS1.md), [`L2NFAPI_S1.md`](./L2NFAPI_S1.md):
+- [`L2NFAPI_NOS1.md`](L1_L2/L2NFAPI_NOS1.md), [`L2NFAPI_S1.md`](L1_L2/L2NFAPI_S1.md):
   old L2simulator, not valid anymore
-- [`SystemX-tutorial-design.md`](./SystemX-tutorial-design.md): old, high-level
+- [`SystemX-tutorial-design.md`](architecture/SystemX-tutorial-design.md): old, high-level
   documentation
-- [`UL_MIMO.txt`](./UL_MIMO.txt): UL-MIMO specific notes
+- [`UL_MIMO.txt`](usage/UL_MIMO.txt): UL-MIMO specific notes
 
-# Designs
+## Designs
 
 - General software architecture notes: [SW_archi.md](./SW_archi.md)
-- [Information on E1](./E1AP/E1-design.md)
-- [Information on F1](./F1AP/F1-design.md)
-- [Information on how NR nFAPI works](./NR_NFAPI_archi.md)
-- [Flow graph of the L1 in gNB](SW-archi-graph.md)
-- [L1 threads in NR-UE](./nr-ue-design.md)
-- [Information on gNB MAC](./MAC/mac-usage.md)
-- [Information on gNB RRC](./RRC/rrc-usage.md)
-- [Information on analog beamforming implementation](./analog_beamforming.md)
-- [Information on the UE 5G NAS implementation](./5Gnas.md)
+- [Information on E1](E1AP/E1-design.md)
+- [Information on F1](F1AP/F1-design.md)
+- [Information on how NR nFAPI works](architecture/NR_NFAPI_archi.md)
+- [Flow graph of the L1 in gNB](architecture/SW-archi-graph.md)
+- [L1 threads in NR-UE](architecture/nr-ue-design.md)
+- [Information on gNB MAC](MAC/mac-usage.md)
+- [Information on gNB RRC](RRC/rrc-usage.md)
+- [Information on analog beamforming implementation](tutorials/analog_beamforming.md)
+- [Information on the UE 5G NAS implementation](tutorials/5Gnas.md)
 
-# Building and running from images
+## Building and running from images
 
 - [How to build images](../docker/README.md)
 - [How to run 5G with the RFsimulator from images](../ci-scripts/yaml_files/5g_rfsimulator/README.md)
 - [How to run 4G with the RFsimulator from images](../ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md)
 - [How to run physical simulators in OpenShift](../openshift/README.md)
 
-# Libraries
+## Libraries
 
-## General
+### General
 
 - The [T tracer](../common/utils/T/DOC/T.md): a generic tracing tool (VCD, Wireshark, GUI, to save for later, ...)
 - [OPT](../openair2/UTIL/OPT/README.txt): how to trace to wireshark
@@ -106,9 +94,9 @@ Legacy unmaintained files:
 - The [shared object loader](../common/utils/DOC/loader.md)
 - The [threadpool](../common/utils/threadPool/thread-pool.md) used in L1
 - The [LDPC implementation](../openair1/PHY/CODING/DOC/LDPCImplementation.md) is a shared library
-- The [time management](time_management.md) module
+- The [time management](architecture/time_management.md) module
 
-## Radios
+### Radios
 
 Some directories under `radio` contain READMEs:
 
@@ -122,22 +110,22 @@ Some directories under `radio` contain READMEs:
 
 The other SDRs (AW2S, LimeSDR, ...) have no READMEs.
 
-## Special-purpose libraries
+### Special-purpose libraries
 
 - OAI has two scopes: one based on Xforms and one based on imgui, described in [this README](../openair1/PHY/TOOLS/readme.md)
 - OAI comes with an integrated [telnet server](../common/utils/telnetsrv/DOC/telnethelp.md) to monitor and control
 - OAI comes with an integrated [web server](../common/utils/websrv/DOC/websrv.md)
 
-# Testing
+## Testing
 
-- [UnitTests.md](./UnitTests.md) explains the unit testing setup
+- [UnitTests.md](testing/UnitTests.md) explains the unit testing setup
 - Component tests are under `tests/`. Currently, there is a simple CU-UP
   tester, see the corresponding [README.md](../tests/nr-cuup/README.md).
-- [TESTBenches.md](./TESTBenches.md) lists the CI setup and links to pipelines
+- [TESTBenches.md](testing/TESTBenches.md) lists the CI setup and links to pipelines
 - The CI setup uses a [custom framework](../ci-scripts/README.md) to run
   end-to-end tests.
 
-# Developer tools
+## Developer tools
 
 - [formatting](../tools/formatting/README.md) is a clang-format error detection tool
 - [iwyu](../tools/iwyu/README.md) is a tool to detect `#include` errors

doc/RRC/rrc-dev.md

@@ -210,7 +210,7 @@ sequenceDiagram
   end
 ```
 
-## Handover
+## Inter-DU Handover (F1)
 
 The basic handover (HO) structure is as follows. In order to support various
 handover "message passing implementation" (F1AP, NGAP, XnAP), RRC employs
@@ -264,6 +264,94 @@ sequenceDiagram
   sdu->>cucp: F1AP UE Context Release Complete
   Note over ue,tdu: UE active on target DU
 ```
+## Inter-gNB Handover (N2)
+
+This is an inter-NG-RAN procedure. The N2 handover specification is defined in the following documents:
+
+* 3GPP TS 23.502, 4.9.1.3 Inter NG-RAN node N2 based handover:
+  - Outlines detailed handover signaling flows for N2-based handovers.
+  - Covers both intra-system (between 5G gNBs) and inter-system (between 5G and LTE eNBs) handovers.
+* 3GPP TS 38.300, section 9 Mobility and State Transitions:
+  - describes mobility procedures at the NG-RAN level, depending on the RRC state.
+* 3GPP TS 38.413 (NGAP), section 8.4 UE Mobility Management Procedures:
+  - Specifies the signaling procedures over the N2 interface.
+  - Includes messages like Handover Request, Handover Command, and Handover Preparation.
+* 3GPP TS 38.331 (RRC): details the UE-level RRC procedures involved during handovers
+
+### End-to-end flow
+
+```mermaid
+sequenceDiagram
+  participant ue as UE
+  participant sdu as source DU
+  participant scucp as source CU-CP
+  participant scuup as source CU-UP
+  participant tdu as target DU
+  participant tcucp as target CU-CP
+  participant tcuup as target CU-UP
+  participant amf as AMF
+
+  Note over ue,sdu: UE active on source DU
+  alt HO triggered through A3 event
+    ue->>sdu: RRC Measurement Report
+    sdu->>scucp: F1AP UL RRC Msg Transfer (RRC Measurement Report)
+    Note over scucp: Handover decision (A3 event trigger)
+  else Manual Trigger
+    Note over scucp: Handover decision (e.g., telnet)
+  end
+  Note over scucp: nr_rrc_trigger_n2_ho() ("on source CU")
+  scucp->>amf: HANDOVER REQUIRED
+  amf->>tcucp: HANDOVER REQUEST
+  Note over tcucp: rrc_gNB_process_Handover_Request
+  Note over tcucp: trigger_bearer_setup
+  tcucp->>tcuup: Bearer Context Setup Request
+  tcuup->>tcucp: Bearer Context Setup Response
+  Note over tcucp: rrc_gNB_process_e1_bearer_context_setup_resp
+  Note over tcucp: nr_rrc_trigger_n2_ho_target() ("on target CU")
+  Note over tcucp: nr_initiate_handover()
+  tcucp->>tdu: F1AP UE Context Setup Req
+  Note over tdu: Create UE context
+  tdu->>tcucp: F1AP UE Context Setup Resp (incl. CellGroupConfig)
+  Note over tcucp: rrc_CU_process_ue_context_setup_response() ("on target CU")
+  Note over tcucp: e1_send_bearer_updates()
+  tcucp->>tcuup: E1AP Bearer Context Modification Req
+  tcuup->>tcucp: E1AP Bearer Context Modification Resp
+  tcucp-->>tcucp: callback: ho_req_ack()
+  Note over tcucp: nr_rrc_n2_ho_acknowledge() ("on target CU")
+  tcucp->>amf: HANDOVER REQUEST ACKNOWLEDGE (data forwarding info)
+  amf->>scucp: HANDOVER COMMAND
+  scucp->>sdu: F1AP UE Context Modification Req (RRC Reconfiguration)
+  sdu->>ue: RRC Reconfiguration
+  sdu->>scucp: F1AP UE Context Modification Resp
+  Note over sdu: Stop scheduling UE
+  Note over scucp: rrc_CU_process_ue_context_modification_response()
+  Note over scucp: e1_send_bearer_updates()
+  scucp->>scuup: E1 Bearer Context Modification Req (PDCP Status Request)
+  scuup->>scucp: E1 Bearer Context Modification Resp (PDCP Status Info)
+  scucp->>amf: NG Uplink RAN Status Transfer
+  amf->>tcucp: NG Downlink RAN Status Transfer
+  tcucp->>tcuup: E1 Bearer Context Modification Req (PDCP Status Info)
+  tcuup->>tcucp: E1 Bearer Context Modification Resp
+  Note over ue: UE attachment to target DU
+  Note over ue,tdu: RA (Msg1 + Msg2)
+  ue->>tdu: RRC Reconfiguration Complete
+  tdu->>tcucp: F1AP UL RRC Msg Transfer (RRC Reconfiguration Complete)
+  tcucp-->>tcucp: callback: ho_success()
+  Note over tcucp: nr_rrc_n2_ho_complete() ("on target CU")
+  Note over tcucp: handle_rrcReconfigurationComplete() ("on target CU")
+  tcucp->>amf: HANDOVER NOTIFY
+  amf->>scucp: UE Context Release Command
+  note over scucp: ngap_gNB_handle_ue_context_release_command
+  note over scucp: rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND
+  scucp->>scuup: E1 Bearer Context Release Command
+  scuup->>scucp: E1 Bearer Context Release Complete
+  Note over scucp: rrc_gNB_generate_RRCRelease
+  scucp->>sdu: F1 UE Context Release Command
+  sdu->>scucp: F1 UE Context Release Complete
+  note over scucp: rrc_CU_process_ue_context_release_complete
+  note over scucp: rrc_remove_ue
+  Note over ue,tdu: UE active on target DU
+```
 
 # Structures
 
@@ -308,7 +396,8 @@ corresponding CU.
 
 `nr_ho_source_cu_t` contains notably a function pointer `ho_cancel` for
 handover cancel.  `nr_ho_target_cu_t` contains function pointers `ho_req_ack`
-for handover request acknowledge and `ho_success` for handover success.  As can
+for handover request acknowledge, `ho_success` for handover success,
+`ho_failure` for handover failure (N2 only).
 be seen in the sequence diagram above, either the "target CU" or "source CU"
 needs to do an operation, and a "switch" from target to source CU is done using
 these function pointers. For instance, in F1, the handover request acknowledge

doc/RRC/rrc-usage.md

@@ -99,6 +99,26 @@ the [MAC configuration](../MAC/mac-usage.md) as well for SIB configuration.
 
 ### Neighbor-gNB configuration
 
-    TBD
+#### What is a gNB neighbor?
+
+Network continuity is a key aspect of 5G. In the 5G architecture, gNB neighbors play a central role in maintaining service continuity through mechanisms such as handover and load balancing.  By definition, a gNB neighbor is another gNB that can be measured and linked by the UE. If the current serving gNB is no longer optimal, the UE may connect to a neighbor gNB.
+
+To support this behavior, the network configuration specifies additional frequencies and cells that the UE should measure. The UE reports these measurements to the network, which then decides whether or not to initiate a handover.
+
+Neighbor types include:
+- **Intra-gNB neighbors** - cells belonging to the same gNB
+- **Inter-gNB neighbors** - cells belonging to different gNBs
+- **Inter-RAT neighbors** - cells belonging to another RAT (e.g., LTE)
+
+#### Required configuration parameters
+
+To define a neighbor cell in the configuration file, the following parameters are typically needed:
+- **gNB ID** - unique identifier of the gNB
+- **Cell ID** - identifier of the cell within the gNB
+- **Physical Cell ID** - identifier of the cell’s synchronization signal (PCI)
+- **Absolute Frequency** - frequency used by the SSB (absoluteFrequencySSB)
+- **Subcarrier Spacing** - numerology (e.g., 15 kHz, 30 kHz)
+- **PLMN configuration** - MCC, MNC, and MNC length
+- **Tracking Area Code (TAC)** - identifier of the tracking area
 
 Refer to the [handover tutorial](../handover-tutorial.md) for more information.

doc/RUN_NR_multiple_BWPs.md

@@ -1,51 +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 to the gNB configuration file under "servingCellConfigDedicated": 
-
-## Setup of the Configuration files ##
-```
-    firstActiveDownlinkBWP-Id = 1;  #BWP-Id
-    defaultDownlinkBWP-Id     = 1;  #BWP-Id
-    firstActiveUplinkBWP-Id   = 1;  #BWP-Id
-```
-
-Each dedicated BWP must have:
-```
-    # BWP 1 Configuration
-    dl_bwp-Id_1 = 1;
-    dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-    # subcarrierSpacing
-    # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-    dl_bwp1_subcarrierSpacing = 1;
-```   
-
- Find these parameters in this configuration file: "targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf"
-     
-# Testing gNB and UE in RF simulator
-
-## gNB command:
-```
-    sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --rfsim
-```
-
-## UE command:
-```
-    sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --uicc0.imsi 208990000000001 --rfsimulator.serveraddr 127.0.0.1
-```

doc/architecture/NR_NFAPI_archi.md

@@ -4,18 +4,18 @@ Their internal processing is broadly independent on which transport mechanism
 is responsible for exchanging data between the 2 components.
 
 To read more about the transport mechanisms available, and how to run the split, please refer to
-[this file](./nfapi.md).
+[this file](../L1_L2/nfapi.md).
 
 [[_TOC_]]
 
 # VNF/PNF Split
 
-The gNB is split into VNF(L2+) and PNF(L1)
+The gNB is split into `VNF(L2+)` and `PNF(L1)`
 
 These component are configured via the functions:
 
-- configure_nr_nfapi_vnf()
-- configure_nr_nfapi_pnf()
+- `configure_nr_nfapi_vnf()`
+- `configure_nr_nfapi_pnf()`
 
 These functions initialize the configuration appropriate for the transport mechanism selected ( setting the
 pack/unpack function pointers, as well as the appropriate send functions )
@@ -25,7 +25,7 @@ After this, a thread is created for the P5 receive loop, which initializes the t
 This created thread may be only for P5 messages, or P5 and P7, depending on the transport type
 
 - When using socket-based communication (which uses nFAPI encoding), the receiving loop for P7 messages is separate from
-  P5, it starts upon the PNF_START exchange
+  P5, it starts upon the `PNF_START` exchange
 - In the other transport mechanisms (WLS and nvIPC, which use FAPI encoding), the receiving loop is the same for P5 and
   P7 messages, the P7 configuration is done immediately after the P5 configuration.
 
@@ -40,8 +40,8 @@ them
 Upon the reception of a message (whether in its entirety or segmented in the case of nFAPI), the messages are sent to
 the appropriate handler:
 
-- pnf_nr_handle_p5_message
-- vnf_nr_handle_p4_p5_message
+- `pnf_nr_handle_p5_message`
+- `vnf_nr_handle_p4_p5_message`
 
 In each of these functions, there's a switch calling the appropriate handler according to the message ID, for example:
 
@@ -55,18 +55,19 @@ These loops are autonomous in their thread waiting incoming message.
 
 ## P7 interface main loop
 
-- Note: As explained before, the P7 reception loop is the same as the P5 messages when not using socket-based
+> Note
+> As explained before, the P7 reception loop is the same as the P5 messages when not using socket-based
   communication
 
 In this case, when the P5 interface receives appropriate message, it starts the p7 interface by launching a thread
 
-- On the PNF, this is done in the START.request handler ( nr_start_request(...) )
-- On the VNF, this is done in ( configure_nr_p7_vnf(...) )
+- On the PNF, this is done in the START.request handler ( `nr_start_request(...)` )
+- On the VNF, this is done in ( `configure_nr_p7_vnf(...)` )
 
 Much in the same way as when processing P5 messages, the following functions are called to unpack and process them:
 
-- pnf_nr_handle_p7_message
-- vnf_nr_handle_p7_message
+- `pnf_nr_handle_p7_message`
+- `vnf_nr_handle_p7_message`
 
 ```
 case NFAPI_NR_PHY_MSG_TYPE_SLOT_INDICATION:
@@ -77,11 +78,11 @@ case NFAPI_NR_PHY_MSG_TYPE_SLOT_INDICATION:
 ## P7 UL transmission by PNF
 
 RF samples are received, and decoding is done by the PNF using control data transmitted by the VNF to the PNF through
-downlink p7 messages (UL_TTI.request and UL_DCI.request).
+downlink p7 messages (`UL_TTI.request` and `UL_DCI.request`).
 
-After decoding, results are accumulated into the gNB->UL_INFO structure at the PNF.
+After decoding, results are accumulated into the `gNB->UL_INFO` structure at the PNF.
 
-The data in the UL_INFO struct is transmitted through the configured send function pointer (send_p7_msg), which packs 
+The data in the UL_INFO struct is transmitted through the configured send function pointer (`send_p7_msg`), which packs 
 the message into a buffer according to the encoding and sends it to the VNF
 
 ```
@@ -123,7 +124,7 @@ int nfapi_pnf_p7_nr_rach_ind(nfapi_pnf_p7_config_t* config, nfapi_nr_rach_indica
 Through the P7 reception loop, the VNF receives a buffer containing the messages, which it handles by the following
 process:
 
-- Unpack the header by use of the hdr_unpack_func function pointer
+- Unpack the header by use of the `hdr_unpack_func` function pointer
 - According to the Message ID in the header, send the buffer to the appropriate handler by use of a switch statement:
 
 ```
@@ -133,7 +134,7 @@ process:
 
 ```
 
-- In the handler function, unpack the entire message, by using the unpack_func function pointer.
+- In the handler function, unpack the entire message, by using the `unpack_func` function pointer.
 - If the unpack procedure is successful, call the previously configure callback for that message type:
 
 ```
@@ -155,20 +156,20 @@ process:
 
 ```
 
-vnf_nr_dispatch_p7_message() is the function that contains the switch on various message headers so that the appropriate
+`vnf_nr_dispatch_p7_message()` is the function that contains the switch on various message headers so that the appropriate
 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().
+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()`.
 
-The function trigger_scheduler(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
+The function `trigger_scheduler(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
+Finally, `NR_UL_indication` is called to process the other P7 messages received from the PNF that were put in theire
 respective queues.
-For example, the TX_DATA.request message is sent in the following manner:
+For example, the `TX_DATA.request` message is sent in the following manner:
 
 ```
   if (g_sched_resp.TX_req.Number_of_PDUs > 0)
@@ -223,13 +224,13 @@ graph TD
 
 ## P7 DL Reception at PNF
 
-Through the infinite loop [while(pnf_p7->terminate == 0)] running in pnf_nr_p7_message_pump(), the PNF receives and
+Through the infinite loop `[while(pnf_p7->terminate == 0)]` running in `pnf_nr_p7_message_pump()`, the PNF receives and
 unpacks the downlink P7 message received on its socket. Based on the unpacked message, the appropriate message
 structures are filled in the PNF, and these are used further down the pipeline for processing.
 Through the P7 reception loop, the PNF receives a buffer containing a P7 message from the VNF, which it processes the
 following way:
 
-- Unpack the header by use of the hdr_unpack_func function pointer
+- Unpack the header by use of the `hdr_unpack_func` function pointer
 - According to the Message ID in the header, send the buffer to the appropriate handler by use of a switch statement:
 
 ```
@@ -259,8 +260,8 @@ following way:
       
   ```
 
-- The messages are later processed in the NR_slot_indication function, which is called in the tx_func function (
-  L1_tx_thread )
+- The messages are later processed in the `NR_slot_indication` function, which is called in the `tx_func function (
+  L1_tx_thread )`
 
 ## PNF functional flowchart
 

doc/architecture/SW_archi.md

@@ -1,21 +1,3 @@
-<style type="text/css" rel="stylesheet">
-
-body {
-   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-   font-size: 13px;
-   line-height: 18px;
-   color: #fff;
-   background-color: #110F14;
-}
-  h2 { margin-left: 20px; }
-  h3 { margin-left: 40px; }
-  h4 { margin-left: 60px; }
-
-.func2 { margin-left: 20px; }
-.func3 { margin-left: 40px; }
-.func4 { margin-left: 60px; }
-
-</style>
 
 ```mermaid
 flowchart TB
@@ -83,11 +65,10 @@ end
 ```
 
 This tuto for 5G gNB design, with Open Cells main
-{: .text-center}
 
-# The main thread is in ru_thread()
+## The main thread is in ru_thread()
 The infinite loop:
-## rx_rf()
+### rx_rf()
   Collect radio signal samples from RF board  
     all SDR processing is triggered by I/Q sample reception and it's date (timestamp)  
     TX I/Q samples will have a date in the future, compared to RX timestamp  
@@ -97,11 +78,11 @@ The infinite loop:
     (each sample has a incremental number representing a very accurate timing)  
 raw incoming data is in buffer called "rxdata"  
     We derivate frame number, slot number, ... from the RX timestamp
-{: .func2}
-## gNB_top()
+
+### gNB_top()
 only compute frame numbre, slot number, ...
-{: .func3}
-## ocp_rxtx()
+
+### ocp_rxtx()
 main processing for both UL and DL  
 start by calling oai_subframe_ind() that trigger processing in pnf_p7_subframe_ind() purpose ???  
 all the context is in the passed structure UL_INFO  
@@ -110,92 +91,92 @@ but not actual coherency (see below handle_nr_rach() assumes data is up-to-date)
 The first part (in NR_UL_indication, uses the data computed by the lower part (phy_procedures_gNB_uespec_RX), but for the **previous** slot  
 Then, phy_procedures_gNB_uespec_RX will hereafter replace the data for the next run  
 This is very tricky and not thread safe at all.
-{: .func3}
 
-### NR_UL_indication()  
+
+#### NR_UL_indication()
 This block processes data already decoded and stored in structures behind UL_INFO
-{: .func4}
+
 
 * handle_nr_rach()  
 process data from RACH primary detection  
 if the input is a UE RACH detection
-{: .func4}
+
     * nr_schedule_msg2()
-{: .func4}
+
 * handle_nr_uci()  
 handles uplink control information, i.e., for the moment HARQ feedback.
-{: .func4}
+
 * handle_nr_ulsch()  
 handles ulsch data prepared by nr_fill_indication()
-{: .func4}
+
 * gNB_dlsch_ulsch_scheduler ()  
 the **scheduler** is called here, see dedicated chapter
-{: .func4}
+
 * NR_Schedule_response()  
 process as per the scheduler decided
-{: .func4}
 
-### L1_nr_prach_procedures()  
+
+#### L1_nr_prach_procedures()  
 ????
-{: .func4}
-### phy_procedures_gNB_uespec_RX()
+
+#### phy_procedures_gNB_uespec_RX()
 * nr_decode_pucch0()  
 actual CCH channel decoding form rxdataF (rx data in frequency domain)  
 populates UL_INFO.uci_ind, actual uci data is in gNB->pucch  
-{: .func4}
+
 * nr_rx_pusch()  
-{: .func4}
+
     * extracts data from rxdataF (frequency transformed received data)
-{: .func4}
+
     * nr_pusch_channel_estimation()
-{: .func4}
+
     * nr_ulsch_extract_rbs_single()
-{: .func4}
+
     * nr_ulsch_scale_channel()
-{: .func4}
+
     * nr_ulsch_channel_level()
-{: .func4}
+
     * nr_ulsch_channel_compensation()
-{: .func4}
+
     * nr_ulsch_compute_llr()  
 this function creates the "likelyhood ratios"  
-{: .func4}
+
 * nr_ulsch_procedures()
-{: .func4}
+
     * actual ULsch decoding
-{: .func4}
+
     * nr_ulsch_unscrambling()
- {: .func4}
+ 
    * nr_ulsch_decoding()
- {: .func4}
+ 
    * nr_fill_indication()   
 populate the data for the next call to "NR_UL_indication()"  
 it would be better to call **NR_UL_indication()** now instead of before (on previous slot)
-{: .func4}
 
-### phy_procedures_gNB_TX()
+
+#### phy_procedures_gNB_TX()
 * nr_common_signal_procedures()  
 generate common signals
-{: .func4}
+
 * nr_generate_dci_top()
 generate DCI: the scheduling informtion for each UE in both DL and UL
-{: .func4}
+
 * nr_generate_pdsch()  
 generate DL shared channel (user data)
-{: .func4}
 
-### nr_feptx_prec()
+
+#### nr_feptx_prec()
 tx precoding
-{: .func3}
-### nr_feptx0
+
+#### nr_feptx0
 do the inverse DFT
-{: .func3}
-### tx_rf()
+
+#### tx_rf()
 send radio signal samples to the RF board  
 the samples numbers are the future time for these samples emission on-air
-{: .func3}
 
-# Scheduler
+
+## Scheduler
 
 The main scheduler function  is called by the chain: nr_ul_indication()=>gNB_dlsch_ulsch_scheduler()
 It calls sub functions to process each physical channel (rach, ...)  
@@ -274,7 +255,7 @@ nr_preprocessor_phytest()], multiple users [nr_dlsch_preprocessor()].
   process information, and fill nFAPI structures (allocate a DCI and PDCCH
   messages, TX_req, ...)
 
-# RRC
+## RRC
 RRC is a regular thread with itti loop on queue: TASK_RRC_GNB
 it receives it's configuration in message NRRRC_CONFIGURATION_REQ, then real time mesages for all events: S1/NGAP events, X2AP messages and RRC_SUBFRAME_PROCESS  
   
@@ -283,7 +264,7 @@ RRC_SUBFRAME_PROCESS message is send each subframe
 how does it communicate to  scheduler ?  
 
 
-# RLC
+## RLC
 RLC code is new implementation, not using OAI mechanisms: it is implemented directly on pthreads, ignoring OAI common functions.  
 It is a library, running in thread RRC but also in PHY layer threads and some bits in pdcp running thread or F1 interface threads.
 
@@ -302,9 +283,9 @@ nr_rlc_ms_tick() must be called periodically to manage the internal timers
 
 successful_delivery() and max_retx_reached(): in ??? trigger, the RLC sends a itti message to RRC: RLC_SDU_INDICATION (neutralized by #if 0 right now)
 
-## RLC data flow
+### RLC data flow
 
-### TX Flow
+#### TX Flow
 
 Incoming data to be transmitted is forwarded to RLC by PDCP via `rlc_data_req()`.
 
@@ -315,11 +296,11 @@ At the transport layer, in downlink (DL) at the gNB and uplink (UL) at UE, the s
 
 Subsequently, the scheduler issues commands to lower layers.
 
-### RX Flow
+#### RX Flow
 
 In the RX chain, in downlink (DL) at the UE and uplink (UL) at gNB, the transport layer pushes data into RLC through `mac_rlc_data_ind()`. Following this, RLC forwards the data to PDCP by invoking `pdcp_data_ind()` via a complex internal callback mechanism (`deliver_sdu()`).
 
-# PDCP
+## PDCP
 
 The PDCP implementation is secured by a general mutex, akin to the design of the RLC layer. This setup ensures that PDCP data remains isolated and encapsulated.
 
@@ -327,19 +308,19 @@ Initialization of the PDCP layer follows a structure similar to that of the RLC
 
 To manage UE connections, `nr_pdcp_add_srbs()` is employed for adding UE SRBs in PDCP, while `nr_pdcp_remove_UE()` is used for their removal. Similarly, `nr_pdcp_add_drbs()` adds UE DRBs in PDCP, with `nr_pdcp_remove_UE()` handling their removal.
 
-## PDCP Tx flow
+### PDCP Tx flow
 
 On the Tx side (downlink in gNB), the entry functions `nr_pdcp_data_req_drb()` and `nr_pdcp_data_req_srb()` are called by the upper layer. The upper layer could be GTP or a PDCP internal thread like `gnb_tun_read_thread()`, which reads directly from the Linux socket if the 3GPP core implementation is skipped. The PDCP internals for `nr_pdcp_data_req_srb()` and `nr_pdcp_data_req_drb()` are thread-safe. Within these functions, the PDCP manager protects access to the SDU receiving function of PDCP (`recv_sdu()` callback, corresponding to `nr_pdcp_entity_recv_pdu()` for DRBs) using mutex. When necessary, the PDCP layer pushes this data to RLC by calling `rlc_data_req()`.
 
-## PDCP Rx flow
+### PDCP Rx flow
 
 At the Rx side, `pdcp_data_ind()` serves as the entry point for receiving data from RLC. Within `pdcp_data_ind()`, the PDCP manager mutex protects access to the PDU receiving function of PDCP (`recv_pdu()` callback corresponding to `nr_pdcp_entity_recv_pdu()` for DRBs). Following this, the `deliver_sdu_drb()` function dispatches the received data to the SDAP sublayer.
 
-## PDCP security
+### PDCP security
 
 nr_pdcp_config_set_security(): sets the keys for AS security of a UE
 
-# AM DRB traffic flow in OAI
+## AM DRB traffic flow in OAI
 
 A sequence diagram of the traffic flow across PDCP and RLC layers. By default, data traffic is directed towards AM DRBs.
 
@@ -430,46 +411,46 @@ and for uplink:
     SG->>GG: send to GTP-U
 ```
 
-# GTP
+## GTP
 Gtp + UDP are two twin threads performing the data plane interface to the core network
 The design is hybrid: thread and inside other threads calls. It should at least be protected by a mutex.
-## GTP thread
+### GTP thread
 Gtp thread has a itti interface: queue TASK_GTPV1_U  
 The interface is about full definition: control messages (create/delet GTP tunnels) and data messages (user plane UL and DL).  
 PDCP layer push to the GTP queue (outside UDP thread that do almost nothing and work only with GTP thread) is to push a UL packet.
 
 
-## GTP thread running code from other layers
+### GTP thread running code from other layers
 gtp thread calls directly nr_pdcp_data_req_drb(), so it runs inside it's context internal pdcp structures updates
 
-## inside other threads
+### inside other threads
 gtpv1u_create_s1u_tunnel(), delete tunnel, ... functions are called inside the other threads, without mutex.
 
-# New GTP
-## initialization
+## New GTP
+### initialization
 
 gtpv1uTask(): this creates only the thread, doesn't configure anything
 gtpv1Init(): creates a listening socket to Linux for a given reception and select a local IP address
 
-## newGtpuCreateTunnel()   
+### newGtpuCreateTunnel()
 this function will replace the xxx_create_tunnel_xxx() for various cases  
 The parameters are: 
 1. outgoing TEid, associated with outpoing pair(rnti, id)
 2. incoming packets callback, incoming pair(rnti,id) and a callback function for incoming data 
 
-## outgoing packets 
+### outgoing packets
 
 Each call to newGtpuCreateTunnel() creates a outgoing context for a teid (given as function input), a pair(rnti,outgoing id).  
  Each outgoing packet received on GTP-U ITTI queue must match one pair(rnti,id), so the gtp-u thread can lookup the related TEid and use it to encode the outpoing GTP-U tunneled packet.  
 
-## incoming packets   
+### incoming packets
 
 newGtpuCreateTunnel() computes and return the incoming teid that will be used for incoming packets.
 When a incoming packet arrives on this incoming teid, the GTP-U thread calls the defined callback, with the associated pair(rnti, incoming id).  
 
 stuff like enb_flag, mui and more important data are not given explicitly by any legacy function (gtpv1u_create_s1u_tunnel), but the legacy and the new interface to lower layer (like pdcp) require this data. We hardcode it in first version.
 
-## remaining work 
+### remaining work
 These teids and "instance", so in a Linux socket: same teid can co-exist for different sockets
  Remain here a lack to fill: the information given in the legacy funtions is not enough to fullfil the data needed by the callback  
 
@@ -478,17 +459,10 @@ cmake new option: NEW_GTPU to use the new implementation (it changes for the ent
 It is possible to use both old and new GTP in same executable because the itti task and all functions names are different 
 Current status of new implementation: not tested, X2 not developped, 5G new GTP option not developped, remain issues on data coming from void: muid, enb_flag, ...
 
-# NGAP
+## NGAP
 NGAP would be a itti thread as is S1AP (+twin thread SCTP that is almost void processing)?  
 About all messages are exchanged with RRC thread  
 
 
-<div class="panel panel-info">
-**Note**
-{: .panel-heading}
-<div class="panel-body">
 
 
-</div>
-</div>
-

doc/architecture/SystemX-tutorial-design.md

@@ -1,6 +1,6 @@
 # OpenAirInterface for SystemX
 
-# Terminology
+## Terminology
 
 ****This document use the 5G terminology****
 
@@ -16,37 +16,37 @@ gNB functions, depending on the functional split option. Its operation
 is controlled by the CU. Distributed Unit (DU) also known with other
 names like RRH/RRU/RE/RU/PNF.
 
-In OpenAir code, the terminology is often RU and BBU.
+> In OpenAir code, the terminology is often RU and BBU.
 
-# OpenAirUsage
+## OpenAirUsage
 
-## EPC and general environment
+### EPC and general environment
 
-### OAI EPC
+#### OAI EPC
 
 Use the stable OAI EPC, that can run in one machine (VM or standalone)
 
-Draft description:
-<https://open-cells.com/index.php/2017/08/22/all-in-one-openairinterface-august-22nd/>
+[Draft description](https://open-cells.com/index.php/2017/08/22/all-in-one-openairinterface-august-22nd/)
 
-## Standalone 4G
+### Standalone 4G
 
 EPC+eNB on one machine, the UE can be commercial or OAI UE.
 
-### USRP B210
+#### USRP B210
 
-Main current issue: traffic is good only on coaxial link between UE and
+> **Main current issue** 
+> Traffic is good only on coaxial link between UE and
 eNB (probably power management issue).
 
-### Simulated RF
+#### Simulated RF
 
 Running eNB+UE both OAI can be done over a virtual RF link.
 
 The UE current status is that threads synchronization is implicit in
-some cases. As the RF simulator is very quick, a “sleep()” is required
+some cases. As the RF simulator is very quick, a `“sleep()”` is required
 in the UE main loop
 
-(line 1744, targets/RT/USER/lte-ue.c).
+> (line 1744, targets/RT/USER/lte-ue.c).
 
 Running also the UE in the same machine is possible with simulated RF.
 
@@ -106,27 +106,26 @@ The traffic genenrator has to specify the interface:
 route add default oaitun_ue1
 ```
 
-or specify the outgoing route in the traffic generator (like option “-I”
+or specify the outgoing route in the traffic generator (like option `“-I”`
 in ping command).
 
-## 5G and F1
+### 5G and F1
 
-Today 5G achievement is limited to physical layer.
+> Today 5G achievement is limited to physical layer.
 
-The available modulation is 40MHz, that require one X310 or N300 for the
-gNB and a X310 or N300 for the nrUE.
+The available modulation is `40MHz`, that require one `X310` or `N300` for the
+gNB and a `X310` or `N300` for the nrUE.
 
-### Usage with X310
+#### Usage with X310
 
-Linux configuration:
-<https://files.ettus.com/manual/page_usrp_x3x0_config.html>
+[Linux configuration](https://files.ettus.com/manual/page_usrp_x3x0_config.html)
 
 We included most of this configuration included in OAI source code.
 
-Remain to set the NIC (network interface card) MTU to 9000 (jumbo
+Remain to set the NIC (network interface card) MTU to `9000` (jumbo
 frames).
 
-### Running 5G
+#### Running 5G
 
 Usage with RFsimulator:
 

doc/architecture/nr-ue-design.md

@@ -1,4 +1,4 @@
-# PHY and MAC Interface
+## PHY and MAC Interface
 The PHY sends scheduling requests and data indication to MAC via `nr_ue_dl_indication` for DL path and `nr_ue_ul_indication()` for UL path and the MAC sends scheduling configuration to PHY via `nr_ue_scheduled_response()`. The following diagram shows the interaction for PDCCH and PDSCH reception.
 ```mermaid
 sequenceDiagram
@@ -8,16 +8,16 @@ sequenceDiagram
     MAC->>+PHY: Schedules PDSCH reception (via nr_ue_scheduled_response)
 ```
 
-# Multi-threading Design
+## Multi-threading Design
 The `UE_thread` function in `nr-ue.c` is the main top level thread that interacts with the radio unit. Once the thread spawns, it starts the 'Initial Synchronization'. Once its complete, the regular processing of slots commences.
 
 The UE exits when at any point in operation it gets out of synchronization. When the command line option `--non-stop` is used, the UE goes to 'Initial Synchronization' mode when it loses synchronization with gNB. However, this feature is not fully implemented and it is a work in progress at the time of writing this documentation. This will be the default behavior (not a command line option) when the feature is fully implemented.
 
 UE uses actors which are threads dedicated to particular activity. Sync Actor handles initial sync. DL Actors handle DLSCH PHY procedures. UL procedures are are run on the UL Actor
 
-![design](nr-ue-threads.svg)
+![design](../images/nr-ue-threads.svg)
 
-## Initial Synchronization Block
+### Initial Synchronization Block
 ```mermaid
 graph TD
     start(Start) -->|UE_thread| rxRu["RU read<br/>(Reads two frames)"]
@@ -26,7 +26,7 @@ graph TD
     sync --> |UE_thread| frameSync["Frame synchronization<br/>(Shift received samples to align with frame)"]
     rxRuDummy --> |UE_thread| frameSync
 ```
-## Regular Slot Processing
+#### Regular Slot Processing
 ```mermaid
 graph TD
     sync["Frame synchronization<br/>(Shift received samples to align with frame)"] -->|UE_thread| hw_read["RU read (slot n)"]

doc/architecture/time_management.md

@@ -96,8 +96,8 @@ time_management = {
 ```
 ### RF simulator CU/DU "IQ samples time"
 
-Let's suppose the CU runs on a machine with IP address 1.2.3.4 and the DU
-runs on a machine with IP address 10.11.12.13.
+Let's suppose the CU runs on a machine with IP address `1.2.3.4` and the DU
+runs on a machine with IP address `10.11.12.13`.
 
 The DU has the time source and so is the server. The CU acts as a client.
 
@@ -153,11 +153,11 @@ time_management = {
 }
 ```
 
-Note that the time management module is flexible. It's possible to
+> **Note** that the time management module is flexible. It's possible to
 configure more complex setups. For example the time source can be a gNB
 and several UEs can be connected as client.
 
-One could also write a simple program acting as a time source and distributing
+> One could also write a simple program acting as a time source and distributing
 time to everyone (one or several gNB, several UEs).
 
 ## Programming API

doc/dev_tools/sanitizers.md

@@ -1,27 +1,15 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./../images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">OAI Build Procedures</font></b>
-    </td>
-  </tr>
-</table>
+# OAI Build Procedures
 
 [[_TOC_]]
 
-# Sanitize options in `build_oai`
+## Sanitize options in `build_oai`
 
 The `build_oai` script provides various [Instrumentation Options](https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html) to add run-time instrumentation to the code and enable runtime error checkers, i.e. sanitizers, in order to help find various types of bugs in the codebase and eventually enhance the stability of the OAI softmodems.  The following sanitizers can be enabled using different build options:
 
-## Address Sanitizer (ASAN)
+### Address Sanitizer (ASAN)
 [Address Sanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer) is enabled using the `--sanitize-address` option or its shorthand `-fsanitize=address`. It serves as a fast memory error detector and helps detect issues like out-of-bounds accesses, use-after-free bugs, and memory leaks.
 
-### Run OAI Softmodem with ASAN on
+#### Run OAI Softmodem with ASAN on
 
 It is necessary to add the envinronment variable `LD_LIBRARY_PATH` to the run command, e.g.:
 ```
@@ -29,7 +17,7 @@ cd cmake_targets/ran_build/build
 sudo LD_LIBRARY_PATH=. ./nr-softmodem ...
 ```
 
-### Possible problems
+#### Possible problems
 
 On some systems with specific ASan versions, executing a program compiled with
 ASan might fail with an error `DEADLYSIGNAL`, or simply a segmentation fault.
@@ -48,7 +36,7 @@ sudo sysctl vm.mmap_rnd_bits=30
 which reduces the number of bits for memory mappings used to randomize mmap
 base addresses. _This reduces the security of the system._
 
-## Undefined Behavior Sanitizer (UBSAN)
+### Undefined Behavior Sanitizer (UBSAN)
 [Undefined Behavior Sanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html) (UBSAN) is a runtime undefined behavior checker. It uses compile-time instrumentation to catch undefined behavior by inserting code that performs specific checks before operations that may cause it. UBSAN can be activated with the `--sanitize-undefined` option or `-fsanitize=undefined`.
 
 UBSAN offers a range of suboptions that enable precise checks for various types of undefined behavior at runtime. These suboptions can be set by tweaking the [CMakeLists.txt](../../CMakeLists.txt) file. Here is an overview of some key suboptions:
@@ -62,7 +50,7 @@ UBSAN offers a range of suboptions that enable precise checks for various types
 * `-fsanitize=object-size`: Checks out-of-bounds pointer accesses.
 * `-fsanitize=float-divide-by-zero`: Detects floating-point division by zero.
 
-## Memory Sanitizer
+### Memory Sanitizer
 To enable [Memory Sanitizer](https://clang.llvm.org/docs/MemorySanitizer.html), use the `--sanitize-memory` option or `-fsanitize=memory`. It requires clang and is incompatible with ASAN and UBSAN. Building with this option helps catch issues related to uninitialized memory reads.
 
 To build with Memory Sanitizer, use the following command:
@@ -70,10 +58,10 @@ To build with Memory Sanitizer, use the following command:
 CC=/usr/bin/clang CXX=/usr/bin/clang++ ./build_oai ... --sanitize-memory
 ```
 
-## Thread Sanitizer
+### Thread Sanitizer
 [Thread Sanitizer](https://clang.llvm.org/docs/ThreadSanitizer.html) can be activated using the `--sanitize-thread` option or `-fsanitize=thread`. This sanitizer helps identify data races and other threading-related issues in the code.
 
-# Summary of Sanitizer Options
+## Summary of Sanitizer Options
 
 - `--sanitize`: Shortcut for using both ASAN and UBSAN.
 - `--sanitize-address` or `-fsanitize=address`: Enable ASAN on all targets.

doc/episys/lte_mode_l2_emulator/README.md

@@ -3,37 +3,39 @@ user to run multiple UEs in separate Linux processes/machines/VMs/etc. They use
 entity between the UE(s) and eNB. The UEs use nFAPI to communicate with the eNB. The
 nFAPI interface allows us to run in an emulated layer 2 mode, meaning that we are bypassing
 the layer 1 (PHY) functionality. Because we are bypassing the PHY layer,
-channel modeling capabilties have been added in the LTE UE phy_stub_ue.c file. To understand
-the interfaces between the different components associated with LTE mode, the image
-functional_diagram_proxy_lte.png has been provided.
+channel modeling capabilties have been added in the LTE UE `phy_stub_ue.c` file. To understand
+the interfaces between the different components associated with LTE mode, the image is shown below.
+
+![functional_diagram_proxy_lte](../images/functional_diagram_proxy_lte.png)
 
 This functionality allows the user to plug in their own channel model and emulate the packet dropping procedure
 in real time. The channel modeling has not been provided by EpiSci, but the OAI code
 base already has some BLER curves available for use. The channel modeling functionality
-that is included in the phy_stub_ue.c file only includes the downlink channel modeling.
+that is included in the `phy_stub_ue.c` file only includes the downlink channel modeling.
 Any uplink channel modeling must be conducted in some sort of proxy, which would sit
-between the UEs and eNB. (A description of the downlink channel modeling is shown in the
-Channel_Abstraction_UE_Handling_LTE.PNG image).
+between the UEs and eNB. (A description of the downlink channel modeling is illustrated below).
+
+![Channel_Abstraction_UE_Handling_LTE](../images/Channel_Abstraction_UE_Handling_LTE.PNG)
 
 The updates to the OAI code base removed some latent bugs, added multi-UE scalability,
 and were tested with a standard bypass proxy between the UE(s) and eNB. The bypass proxy is
-publicly available on GitHub (https://github.com/EpiSci/oai-lte-multi-ue-proxy). With this package,
+publicly available on [GitHub](https://github.com/EpiSci/oai-lte-multi-ue-proxy). With this package,
 various multi-UE scenarios can be tested without the overhead of PHY-layer features
 of underlying radios. The features added in the L2 Emulator Mode for LTE are:
 
  - Ease of use of gprof and address sanitizer for debugging purposes
  - Updated json files to allow for GDB, real-time debugging capabilities
  - Updated logging features to minimally log only key connection milestones. This improves scalability of multiple UEs.
-The logging mechanism described here is located in the log.c and log.h files. The LOG_MINIMAL
-function allows us to remove most OAI logging and includes LOG_A(...) logs and above. The LOG_A
-logs were chosen as analysis logs to meet EpiSci's internal testing procedure. The LOG_As
+The logging mechanism described here is located in the `log.c` and `log.h` files. The `LOG_MINIMAL`
+function allows us to remove most OAI logging and includes `LOG_A(...)` logs and above. The `LOG_A`
+logs were chosen as analysis logs to meet EpiSci's internal testing procedure. The `LOG_As`
 only include logs that are considered to be milestones in a given test. For example, a
 log indicating that the RACH procedure has been completed for LTE. To select full logging, 
-set LOG_MINIMAL = 0 in the log.h file.
+set `LOG_MINIMAL = 0` in the `log.h` file.
  - Updated logging to include time stamp for timing analysis
  - Updated memory allocation procedures to correct size requirements
  - Added debugging features to handle signal terminations
- - nfapi.c pullarray8 fix invalid pointer math
+ - `nfapi.c` pullarray8 fix invalid pointer math
  - Overlapping destination and source memory in memcpy, so updated to memmove to check for this bug
  - Advanced error checking mechanisms in critical pack and unpack functions
  - Created option for CPU assignment to UE to improve scalability
@@ -41,8 +43,8 @@ set LOG_MINIMAL = 0 in the log.h file.
  - Updated random value seeds to minimize probability of error in generation of random values
  - Enables capability round robin scheduler if desired
  - Enables capability real time scheduler if desired
- - Added new standalone functions to the UE phy-layer (phy_stub_ue.c) to incorporate individual UE entities
- - Updated sending and packing functions in UE (lte_ue.c) to incorporate new standalone changes
+ - Added new standalone functions to the UE phy-layer (`phy_stub_ue.c`) to incorporate individual UE entities
+ - Updated sending and packing functions in UE (`lte_ue.c`) to incorporate new standalone changes
  - Incorporated semaphores to control timing of incoming downlink packets
  - Implemented new queuing system to handle message exchange from UE to eNB and vice versa
  - Updated global value in nFAPI for size of subframe

doc/episys/nsa_mode_l2_emulator/README.md

@@ -3,37 +3,39 @@ user to run multiple UEs in separate Linux processes/machines/VMs/etc. They use
 entity between the UE(s) and eNB/gNB. The UEs use nFAPI to communicate with the eNB/gNB. The
 nFAPI interface allows us to run in an emulated L2 mode, meaning that we are bypassing
 the layer 1 (PHY) layer functionality. Becasue we are bypassing the PHY layer, special
-channel modeling capabilty has been added in the LTE UE phy_stub_ue.c file. To understand
-the interfaces between the different components associated with NSA mode, the image
-functional_diagram_proxy_nsa.png has been provided.
+channel modeling capabilty has been added in the LTE UE `phy_stub_ue.c` file. To understand
+the interfaces between the different components associated with NSA mode, the image is shown below.
+
+![functional_diagram_proxy_nsa](../images/functional_diagram_proxy_nsa.png)
 
 This functionality allows the user to plug in their own channel model and emulate the packet dropping procedure
 in real time. The channel modeling has not been provided by EpiSci, but the OAI code
 base already has some BLER curves available for use. The chanel modeling functionality
-that is included in the phy_stub_ue.c file only includes the downlink channel modeling.
+that is included in the `phy_stub_ue.c` file only includes the downlink channel modeling.
 Any uplink channel modeling must be conducted in some sort of proxy, which would sit
-between the UEs and eNB/gNB. (A description of the downlink channel modeling is shown in the
-Channel_Abstraction_UE_Handling_LTE.PNG image).
+between the UEs and eNB/gNB. (A description of the downlink channel modeling is illustrated below).
+
+![Channel_Abstraction_UE_Handling_LTE](../images/Channel_Abstraction_UE_Handling_LTE.PNG)
 
 The updates to the OAI code base removed some latent bugs, added multi-UE scalability,
 and were tested with a standard bypass proxy between the UE(s) and eNB/gNB. The bypass proxy is
-publicly available on GitHub (https://github.com/EpiSci/oai-lte-multi-ue-proxy). With this package,
+publicly available on [GitHub](https://github.com/EpiSci/oai-lte-multi-ue-proxy). With this package,
 various multi-UE scenarios can be tested without the overhead of PHY-layer features
 of underlying radios. The added features to the OAI code base are listed below.
 
  - Ease of use of gprof and address sanitizer for debugging purposes
  - Updated json files to allow for GDB, real-time debugging capabilities
  - Updated logging features to minimally log only key connection milestones. This improves scalability of multiple UEs.
-The logging mechanism described here is located in the log.c and log.h files. The LOG_MINIMAL
-function allows us to remove most logs and include LOG_A(...) logs and above. The LOG_A
-logs were chosen as analysis logs to meet EpiSci's internal testing procedure. The LOG_As
+The logging mechanism described here is located in the `log.c` and `log.h` files. The `LOG_MINIMAL`
+function allows us to remove most logs and include `LOG_A(...)` logs and above. The `LOG_A`
+logs were chosen as analysis logs to meet EpiSci's internal testing procedure. The `LOG_As`
 only include logs that are considered to be milestones in a given test. For example, a
 log indicating that the CFRA procedure has been completed for NSA mode. To revert to full logging, 
-set LOG_MINIMAL = 0 in the log.h file.
+set `LOG_MINIMAL = 0` in the `log.h` file.
  - Updated logging to include time stamp for timing analysis
  - Updated memory allocation procedures to correct size requirements
  - Added debugging features to handle signal terminations
- - nfapi.c pullarray8 fix invalid pointer math
+ - `nfapi.c` pullarray8 fix invalid pointer math
  - Overlapping destination and source memory in memcpy, so updated to memmove to check for this bug
  - Advanced error checking mechanisms in critical pack and unpack functions
  - Created option for CPU assignment to UE to improve scalability
@@ -41,8 +43,8 @@ set LOG_MINIMAL = 0 in the log.h file.
  - Updated random value seeds to minimize probability of error in generation of random values
  - Enables capability round robin scheduler if desired
  - Enables capability real time scheduler if desired
- - Added new standalone functions to the UE phy-layer (phy_stub_ue.c) to incorporate individual UE entities
- - Updated sending and packing functions in UE (lte_ue.c) to incorporate new standalone changes
+ - Added new standalone functions to the UE phy-layer (`phy_stub_ue.c`) to incorporate individual UE entities
+ - Updated sending and packing functions in UE (`lte_ue.c`) to incorporate new standalone changes
  - Incorporated semaphores to control timing of incoming downlink packets
  - Implemented new queuing system to handle message exchange from UE to eNB and vice versa
  - Updated global value in nFAPI for size of subframe
@@ -52,7 +54,7 @@ set LOG_MINIMAL = 0 in the log.h file.
 Additionally, NSA mode includes the establishment between an NR UE and the gNB via the LTE UE and eNB
 connection. For NSA mode, the downlink channel abstraction has not been added to the feature set yet.
 NSA mode has been tested and is fully functional with EpiSci's public version of the nFAPI proxy
-located at https://github.com/EpiSci/oai-lte-multi-ue-proxy
+located at [GitHub Repository](https://github.com/EpiSci/oai-lte-multi-ue-proxy)
 NSA mode establishment includes the following steps:
 
  - First UE capability enquiry is sent to NR UE
@@ -74,21 +76,23 @@ NSA mode establishment includes the following steps:
  - Msg 3 is generated and sent to gNB
  - CFRA procedure is complete
 
-Please note, the current status is:
+**Please note, the current status is:**
+
  - A single NSA UE is able to ping an external source
  - Up to 4 NSA UEs can complete the CFRA procedure with a single gNB
  - UE-to-UE traffic is still in work (incomplete due to gNB crashing)
  - The gNB is crashing regularly and is still in work
 
-Test Setup:
+**Test Setup:**
+
 For launching the multi-UE for NSA mode, there is a provided test script in the
 public EpiSci GitHub multi-ue-proxy repository. However, a brief outline of the
 test set up is included below.
 
-    If running multiple NSA UEs in a single machine, you will need to launch
-    multiple LTE and NR UE processes. For example, to launch a 2 NSA UE scenario
-    there will be a total of 7 processes running for this particular scenario.
-    These processes are LTE UE #1, LTE UE #2, NR UE #1, NR UE #2, eNB, gNB and the
-    proxy. A detailed description of the launch processes can be found at
-    https://github.com/EpiSci/oai-lte-multi-ue-proxy/blob/master/README.md
+If running multiple NSA UEs in a single machine, you will need to launch
+multiple LTE and NR UE processes. For example, to launch a 2 NSA UE scenario
+there will be a total of 7 processes running for this particular scenario.
+These processes are `LTE UE #1`, `LTE UE #2`, `NR UE #1`, `NR UE #2`, `eNB`, `gNB` and the
+`proxy`. A detailed description of the launch processes can be found at
+[GitHub Repository](https://github.com/EpiSci/oai-lte-multi-ue-proxy/blob/master/README.md)