Fix network namespace usage in the up traffic step

Optimization pass for channel modelling on transmission in vrtsim. This
comes from a requirement of O-RU to perform channel modelling with minimum
latency.

- Reduced MAX_CHANNEL_LENGTH to 200 and introduced SAVED_SAMPLES_LEN
- Refactored channel modelling actor allocation to parallelize work better
- Improved batching and task creation for channel modelling
- Replaced static global saved_samples with local static buffer in vrtsim_write_with_chanmod

.clang-format

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

CHANGELOG.md

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

CMakeLists.txt

@@ -282,7 +282,7 @@ add_boolean_option(TRACY_ENABLE OFF "Enable tracy instrumentation" ON)
 if (TRACY_ENABLE)
   # the tracy version here should match the tracy server version
   # below is latest release as of this commit
-  CPMAddPackage("gh:wolfpld/tracy#0.12.2")
+  CPMAddPackage("gh:wolfpld/tracy#v0.12.2")
 endif()
 
 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
@@ -464,9 +464,6 @@ target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
-if(E2_AGENT)
-  target_compile_definitions(f1ap PRIVATE E2_AGENT)
-endif()
 
 # LPP
 ##############
@@ -655,6 +652,7 @@ add_library(SCHED_LIB ${SCHED_SRC})
 target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)
 
 set(SCHED_NR_SRC
+  ${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
   ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
   ${OPENAIR1_DIR}/SCHED_NR/nr_prach_procedures.c
   ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
@@ -941,6 +939,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
@@ -1216,6 +1215,7 @@ set (MAC_SRC
 
 set (MAC_NR_SRC
   ${NR_PHY_INTERFACE_DIR}/NR_IF_Module.c
+  ${NR_PHY_INTERFACE_DIR}/nr_sched_response.c
   ${NR_GNB_MAC_DIR}/main.c
   ${NR_GNB_MAC_DIR}/config.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler.c
@@ -1283,6 +1283,12 @@ set (MISC_NFAPI_LTE
 
 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})
 
+set (MISC_NFAPI_NR
+ ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
+ )
+
+add_library(MISC_NFAPI_NR_LIB ${MISC_NFAPI_NR})
+
 add_library(L2
   ${L2_SRC}
   ${MAC_SRC}
@@ -1291,9 +1297,6 @@ add_library(L2
   )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-if(E2_AGENT)
-  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
-endif()
 
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
 target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)
@@ -1309,9 +1312,6 @@ add_library(L2_NR
 target_link_libraries(L2_NR PRIVATE ds alg)
 target_link_libraries(L2_NR PRIVATE f1ap_lib)
 target_include_directories(L2_NR PRIVATE ${F1AP_DIR}/lib)
-if(E2_AGENT)
-  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
-endif()
 
 add_library(e1_if
   ${NR_RRC_DIR}/cucp_cuup_direct.c
@@ -2091,7 +2091,7 @@ if (${T_TRACER})
         oai_eth_transpro HASHTABLE UTIL
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
         NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
-        MISC_NFAPI_LTE_LIB
+        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
         GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE SIMU

ci-scripts/cls_cluster.py

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

ci-scripts/cls_containerize.py

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

ci-scripts/cls_module.py

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

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

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

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

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

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

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

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

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

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

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

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

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

ci-scripts/datalog_rt_stats.100.2x2.yaml

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

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

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

ci-scripts/datalog_rt_stats.2x2.yaml

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

ci-scripts/datalog_rt_stats.60.2x2.yaml

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

ci-scripts/datalog_rt_stats.default.yaml

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

ci-scripts/main.py

@@ -214,7 +214,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		core_op = getattr(cls_oaicitest.OaiCiTest, action)
 		success = core_op(cn_id, ctx, HTML)
 
-	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace" or action == "Stop_Object":
+	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace":
 		CONTAINERS.yamlPath = test.findtext('yaml_path')
 		string_field=test.findtext('d_retx_th')
 		if (string_field is not None):
@@ -227,8 +227,6 @@ def ExecuteActionWithParam(action, ctx, node):
 		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
 		if action == 'Deploy_Object':
 			success = CONTAINERS.DeployObject(ctx, node, HTML)
-		elif action == 'Stop_Object':
-			success = CONTAINERS.StopObject(ctx, node, HTML)
 		elif action == 'Undeploy_Object':
 			success = CONTAINERS.UndeployObject(ctx, node, HTML, RAN)
 		elif action == 'Create_Workspace':

ci-scripts/tests/deployment.py

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

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

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

ci-scripts/xml_class_list.yml

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

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

@@ -42,13 +42,6 @@
  002006
  444444
  100002
- 100003
- 100004
- 100005
- 100006
- 100007
- 100008
- 100009
  100001
  222221
  222222
@@ -102,10 +95,10 @@
 
         <testCase id="000002">
                 <class>Deploy_Object</class>
-                <desc>Deploy OAI nearRT-RIC</desc>
+                <desc>Deploy OAI FlexRIC</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>nearRT-RIC</services>
+                <services>oai-flexric</services>
         </testCase>
 
         <testCase id="000003">
@@ -158,72 +151,16 @@
         </testCase>
 
         <testCase id="100002">
-                <class>Stop_Object</class>
-                <desc>Stop RC monitoring xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-rc-moni</services>
-        </testCase>
-
-        <testCase id="100003">
-                <class>Stop_Object</class>
-                <desc>Stop KPM monitoring xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-moni</services>
-        </testCase>
-
-        <testCase id="100004">
-                <class>Stop_Object</class>
-                <desc>Stop KPM monitoring and RC control xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-rc</services>
-        </testCase>
-
-        <testCase id="100005">
-                <class>Stop_Object</class>
-                <desc>Stop custom SMs monitoring xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-gtp-mac-rlc-pdcp-moni</services>
-        </testCase>
-
-        <testCase id="100006">
-                <class>Stop_Object</class>
-                <desc>Stop OAI UEs</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>oai-nr-ue oai-nr-ue2</services>
-        </testCase>
-
-        <testCase id="100007">
-                <class>Stop_Object</class>
-                <desc>Stop OAI gNB</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>oai-gnb</services>
-        </testCase>
-
-        <testCase id="100008">
-                <class>Stop_Object</class>
-                <desc>Stop nearRT-RIC</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>nearRT-RIC</services>
-        </testCase>
-
-        <testCase id="100009">
                 <class>Undeploy_Object</class>
-                <desc>Undeploy RAN and FlexRIC</desc>
+                <desc>Undeploy RAN and Flexric</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <always_exec>true</always_exec>
-	</testCase>
+        </testCase>
 
         <testCase id="010000">
                 <class>Deploy_Object</class>
-                <desc>Deploy RC monitoring</desc>
+                <desc>RC monitoring</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <services>xapp-rc-moni</services>
@@ -231,7 +168,7 @@
 
         <testCase id="010001">
                 <class>Deploy_Object</class>
-                <desc>Deploy KPM monitoring</desc>
+                <desc>KPM monitoring</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <services>xapp-kpm-moni</services>
@@ -239,7 +176,7 @@
 
         <testCase id="010002">
                 <class>Deploy_Object</class>
-                <desc>Deploy KPM monitoring and RC control</desc>
+                <desc>KPM monitoring and RC control</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <services>xapp-kpm-rc</services>
@@ -247,7 +184,7 @@
 
         <testCase id="010003">
                 <class>Deploy_Object</class>
-                <desc>Deploy custom SMs monitoring</desc>
+                <desc>Custom SMs monitoring</desc>
                 <node>localhost</node>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                 <services>xapp-gtp-mac-rlc-pdcp-moni</services>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -36,11 +36,6 @@
  020003
  030001
  030002
- 050001
- 050002
- 050003
- 020001
- 020002
  100001
  222222
         </TestCaseRequestedList>
@@ -144,32 +139,12 @@
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
-        <testCase id="050001">
-                <class>Custom_Command</class>
-                <desc>Trigger PDU Session Release via gNB telnet</desc>
-                <node>acamas</node>
-                <command>echo ci pdu_session_release 2 | ncat 192.168.71.140 9090</command>
-        </testCase>
-
-        <testCase id="050002">
-                <class>Custom_Command</class>
-                <desc>Add PDU Session via UE telnet</desc>
-                <node>acamas</node>
-                <command>echo ci add_pdu_session 6,7 | ncat 192.168.71.150 8091</command>
-        </testCase>
-
-        <testCase id="050003">
-                <class>Custom_Command</class>
-                <desc>Trigger PDU Session Release via gNB telnet</desc>
-                <node>acamas</node>
-                <command>echo ci pdu_session_release 6 | ncat 192.168.71.140 9090</command>
-        </testCase>
-
         <testCase id="100001">
                 <class>Undeploy_Object</class>
                 <always_exec>true</always_exec>
                 <desc>Undeploy all OAI 5G stack</desc>
                 <node>localhost</node>
+                <services>oai-vnf oai-pnf</services>
                 <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                 <d_retx_th>1,0,0,0</d_retx_th>
                 <u_retx_th>1,0,0,0</u_retx_th>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

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

ci-scripts/xml_files/container_sa_aerial_quectel.xml

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

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

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

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

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

ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml

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

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

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

ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml

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

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

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

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

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

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

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

cmake_targets/tools/install_wls_lib.patch

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

common/utils/LOG/DOC/rtusage.md

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

common/utils/LOG/log.c

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

common/utils/LOG/log.h

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

common/utils/nr/nr_common.c

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

common/utils/nr/nr_common.h

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

common/utils/telnetsrv/CMakeLists.txt

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

common/utils/telnetsrv/telnetsrv_ci.c

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

common/utils/telnetsrv/telnetsrv_ciUE.c

@@ -39,7 +39,6 @@
 #include "openair2/RRC/NR_UE/rrc_proto.h"
 #include "openair1/PHY/phy_extern_nr_ue.h"
 #include "openair1/PHY/defs_nr_common.h"
-#include "openair3/NAS/NR_UE/nr_nas_msg.h"
 
 #define TELNETSERVERCODE
 #include "telnetsrv.h"
@@ -53,14 +52,6 @@ const char* NR_UE_L2_STATE_STR[] = {
 #undef UE_STATE
 };
 
-static int get_default_ue_id(void)
-{
-  NR_UE_RRC_INST_t *rrc = get_NR_UE_rrc_inst(0);
-  if (!rrc)
-    return -1;
-  return rrc->ue_id;
-}
-
 /**
  * Get the synchronization state of a UE.
  *
@@ -141,40 +132,6 @@ static int get_dl_toa(char *buf, int debug, telnet_printfunc_t prnt)
   return 0;
 }
 
-static int add_pdu_session(char *buf, int debug, telnet_printfunc_t prnt)
-{
-  int ue_id = -1;
-  int pdusession_id = -1;
-
-  if (!buf) {
-    ERROR_MSG_RET("Missing argument: expected PDUSessionID[,UE_ID]\n");
-  }
-
-  // Try parsing values in the form: "PDUSessionID[,UE_ID]"
-  int n = sscanf(buf, "%d,%d", &pdusession_id, &ue_id);
-  if (n == 1) {
-    // Only PDUSessionID provided: use default UE ID
-    ue_id = get_default_ue_id();
-    if (ue_id < 0)
-      ERROR_MSG_RET("No default UE context found\n");
-  } else if (n != 2) {
-    ERROR_MSG_RET("Invalid format: expected PDUSessionID[,UE_ID]\n");
-  }
-
-  if (pdusession_id < 0 || pdusession_id > 255)
-    ERROR_MSG_RET("PDUSessionID must be in range [0,255]\n");
-  if (ue_id < 0)
-    ERROR_MSG_RET("UE_ID must be >= 0\n");
-
-  nr_ue_nas_t *nas = get_ue_nas_info(ue_id);
-  if (!nas)
-    ERROR_MSG_RET("No NAS context found for UE_ID %d\n", ue_id);
-
-  request_pdusession(nas, pdusession_id);
-  prnt("Triggered PDU session request for UE %d with ID %d\n", ue_id, pdusession_id);
-  return 0;
-}
-
 /* Telnet shell command definitions */
 static telnetshell_cmddef_t cicmds[] = {
   {"sync_state", "[UE_ID(int,opt)]", get_sync_state},
@@ -183,7 +140,6 @@ static telnetshell_cmddef_t cicmds[] = {
   {"force_crnti_ra", "", force_crnti_ra},
   {"deregistration", "", force_deregistration},
   {"get_max_dl_toa", "[ant]", get_dl_toa},
-  {"add_pdu_session", "[PDUSessionID(int)],[UE_ID(int,opt)]", add_pdu_session},
   {"", "", NULL},
 };
 

common/utils/telnetsrv/telnetsrv_o1.c

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

doc/Aerial_FAPI_Split_Tutorial.md

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

doc/Doxyfile

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

doc/E1AP/e1ap_procedures.md

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

doc/MAC/mac-usage.md

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

doc/NR_NFAPI_archi.md

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

doc/ORAN_FHI7.2_Tutorial.md

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

doc/RUN_NR_multiple_BWPs.md

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

doc/SW-archi-graph.md

@@ -1,97 +1,74 @@
-This document is a high-level overview over the L1 threading mechanism.
-
 ```mermaid
 flowchart TB
-    ru_thread --> RFin[block rx_rf] --> UL{is UL slot?}
-    UL -- yes --> wait_free_rx_tti --> fep_rx --> rx_nr_prach_ru --> msg:L1_tx_out
-    UL -- no  --> msg:L1_tx_out
-    msg:L1_tx_out -- asnyc launch --> L1_tx_thread
-    msg:L1_tx_out --> RFin
-```
+    A[ru_thread] --> RFin>block rx_rf] --> feprx
+    feprx --> half-slot --> end_feprx
+    feprx --> second-thread -- block_end_feprx --> end_feprx>feprx]
+    end_feprx --> rx_nr_prach_ru
+rx_nr_prach_ru -- block_queue_singleton --> resp_L1>resp L1]
+resp_L1 -- async launch --> rx_func
+resp_L1 -- immediate return --> RFin
 
-The main thread is `ru_thread()`. It blocks on reception of radio samples
-(either time domain or frequency domain).  In the case of an UL slot, it waits
-that no more than N UL jobs are scheduled (via `wait_free_rx_tti()`, which
-waits on queue `L1_rx_out`, cf. the RX L1 processing further below). Then:
-
-- if the radio is time domain-based, it performs RX front-end processing (RX
-  FEP -> `fep_rx()`, i.e. DFT) to reach a frequency domain representation of
-  the RX signal, as well as does DFT for PRACH.
-- if the radio is frequency domain-based, nothing is done.
-
-Afterwards, it triggers TX processing by pushing a message into the FIFO queue
-`L1_tx_out`, which asynchronously starts a TX job in `L1_tx_thread()` (see
-below). After that, it blocks again on reception on the radio.
+subgraph rxfunc
+rx_func_implem[rx_func] 
+    subgraph rxfuncbeg
+      handle_nr_slot_ind
+      --> rnti_to_remove-mgmt
+      --> L1_nr_prach_procedures
+      --> apply_nr_rotation_RX
+    end 
+    subgraph phy_procedures_gNB_uespec_RX
+      fill_ul_rb_mask
+      --> pucch(decode each gNB->pucch)
+      -->nr_fill_ul_indication
+      --> nr_ulsch_procedures
+      --> nr_ulsch_decoding
+      --> segInParallel[[all segments decode in parallel]]
+      --> barrier_end_of_ulsch_decoding
+    end 
+    subgraph NR_UL_indication
+      handle_nr_rach
+      --> handle_nr_uci
+      --> handle_nr_ulsch
+      subgraph gNB_dlsch_ulsch_scheduler
+          run_pdcp
+          --> schedule_xxxx
+      end
+      handle_nr_ulsch --> gNB_dlsch_ulsch_scheduler
+      subgraph NR_Schedule_response
+         L1_tx_free3>L1_tx_free]
+         --> handle_nr_nfapi_xxx_pdu
+         --> sendTxFilled((L1_tx_filled))
+         --> nr_fill_ul_xxx
+         --> nr_schedule_rx_prach()
+      end
+      gNB_dlsch_ulsch_scheduler --> NR_Schedule_response
+    end 
+    rx_func_implem --> rxfuncbeg
+    rxfuncbeg --> phy_procedures_gNB_uespec_RX
+phy_procedures_gNB_uespec_RX --> NR_UL_indication
+-- block_queue_block_PNF_monolithic --> L1_tx_free2>L1 tx filled]
+-- async launch --> tx_func
+L1_tx_free2 -- send_msg --> rsp((resp_L1))
+end 
+rx_func --> rxfunc
 
 
-```mermaid
-flowchart TB
-    L1_tx_thread --> TX_in[block L1_tx_out] --> NR_slot_indication
-
-    subgraph tx_func
-
-        NR_slot_indication --> msg:resp_L1 --> phy_procedures_gNB_tx --> ru_tx_func
-        NR_slot_indication["run the scheduler:
-          - monolithic: run_scheduler_monolithic()
-          - nFAPI: send indication via pnf_send_slot_ind()"]
-        msg:resp_L1 -- async launch --> L1_RX_thread
+subgraph tx_func
+    direction LR
+    subgraph phy_procedures_gNB_TX
+       dcitop[nr_generate dci top]
+       --> nr_generate_csi_rs
+       --> apply_nr_rotation_TX
+       -- send_msg --> end_tx_func((L1_tx_out))
     end
-    ru_tx_func --> TX_in
+    subgraph tx_reorder_thread
+        L1_tx_out>L1_tx_out]
+        --> reorder{re order} --> reorder
+        reorder --> ru_tx_func
+        reorder --> L1_tx_free((L1_tx_free))
+        ru_tx_func --> feptx_prec
+        --> feptx_ofdm
+    end 
+end
+
 ```
-
-The `L1_tx_thread()` processes individual TX jobs sequentially, by waiting for
-new messages on queue `L1_tx_out`, signalling individual TX jobs. For each
-message, it calls `tx_func()` which does in order:
-
-- run the scheduler through `NR_slot_indication`, which corresponds to a
-  "Slot.indication" in FAPI parlance. This runs the scheduler, and schedules a
-  given slot (either downlink, uplink, or both).
-- trigger RX processing by pushing a message into the FIFO queue `resp_L1`,
-  asynchronously starting an RX job in `L1_rx_thread()` (see below).
-- process the current L1 TX job through `phy_procedures_gNB_tx()`
-- write to the radio board via `ru_tx_func()`.
-
-After these steps, `tx_func()` return to `L1_tx_thread()`, which will wait for
-the next TX job.
-
-```mermaid
-flowchart TB
-    L1_rx_thread --> RX_in[block resp_L1] --> L1_nr_prach_proc
-
-    subgraph rx_func
-
-        L1_nr_prach_proc --> phase_comp{apply phase comp.?}
-        phase_comp -- yes --> apply_nr_rotation --> phy_procedures_gNB_uespec_RX
-        phase_comp -- no --> phy_procedures_gNB_uespec_RX
-        phy_procedures_gNB_uespec_RX --> NR_ul_indication --> msg:L1_rx_out
-        NR_ul_indication["run the scheduler: NR_UL_indication()"]
-        msg:L1_rx_out -- async signal free --> ru_thread
-    end
-    msg:L1_rx_out --> RX_in
-```
-
-The `L1_rx_thread()` processes individual RX jobs sequentially. It waits for a
-new RX job through the queue `resp_L1`, and then calls `rx_func()`, which does
-in order:
-
-- run PRACH processing via `L1_nr_prach_proc()`
-- optionally apply rotation to the RX signal if phase compensation is to be
-  applied
-- run the current L1 RX job through (`phy_procedures_gNB_uespec_RX()`), which
-  notably includes PUCCH, PUSCH, SRS processing
-- call the scheduler through `NR_ul_indication()`, which corresponds to FAPI
-  uplink messages (e.g., `RX_data.indication`, `CRC.indication`,
-  `UCI.indication` etc.)
-- signal completion via FIFO queue `L1_rx_out()`, which tells `ru_thread()`
-  that RX processing finished.
-
-The signalling of scheduler data is done through a variable `UL_INFO`, which is
-filled by `L1_nr_prach_proc()` (for PRACH) and `phy_procedures_gNB_uespec_RX()`
-(for PUCCH, PUSCH, SRS).
-
-After these steps, `rx_func()` returns to `L1_rx_thread()`, which will wait the
-next RX job.
-
-Note that while individual TX (RX) jobs are run sequentially through
-`L1_tx_thread()` (`L1_rx_thread()`), both TX and RX processing run in
-parallel.

doc/SW_archi.md

@@ -177,7 +177,7 @@ it would be better to call **NR_UL_indication()** now instead of before (on prev
 * nr_common_signal_procedures()  
 generate common signals
 {: .func4}
-* nr_generate_dci()
+* nr_generate_dci_top()
 generate DCI: the scheduling informtion for each UE in both DL and UL
 {: .func4}
 * nr_generate_pdsch()  

doc/environment-variables.md

@@ -9,8 +9,7 @@ OAI uses/supports a number of environment variables, documented in the following
 - `NVRAM_DIR`: directory to read/write NVRAM data in (5G) `nvram` tool; if not defined, will use `PWD` (working directory)
 - `OAI_CONFIGMODULE`: can be used to pass the configuration file instead of `-O`
 - `OAI_GDBSTACKS`: if defined when hitting an assertion (`DevAssert()`, `AssertFatal()`, ...), OAI will load `gdb` and provide a backtrace for every thread
-- `OAI_RNGSEED`: provide a fixed seed for random number generators (RNG). If
-  this variable is absent, a random seed will be read (from `/dev/urandom`).
+- `OAI_RNGSEED`: overwrites any seed for random number generators (RNG) in simulators
 - `USIM_DIR`: directory to read/write USIM data in (4G) `usim` tool; if not defined, will use `PWD` (working directory)
 
 Furthermore, these variables appear in code that is not maintained and maybe not even compiled anywhere:

doc/nfapi.md

@@ -1,5 +1,3 @@
-# FAPI/nFAPI split in OAI
-
 This document describes the SmallCellForum (SCF) (n)FAPI split in 5G, i.e.,
 between the MAC/L2 and PHY/L1. It also describes how to make use of the 
 multiple transport mechanisms between the 2.
@@ -12,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
@@ -31,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
@@ -56,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`
@@ -175,26 +173,6 @@ After installing WLS, you can run the build command as shown below:
 
 Refer to the above steps in [Quickstart](#quickstart), but run the PNF first as it is the WLS "master".
 
-To optimize the performance of your setup, you can provide the option
-`--thread-pool <list of allocated CPUs>` in the PNF command line. This allows
-you to pin PNF processing threads to specific CPU cores, as they might
-otherwise interfere with DPDK used by WLS.
-
-Before selecting which CPU cores to allocate: run `nr-softmodem` without the
-`--thread-pool` option and use a process monitoring tool such as htop to check
-CPU availability. Check for lightly loaded cores, and use them in the
-thread-pool for the PNF.
-
-Example commands for running an OTA test with USRP B200 on 40MHz:
-
-Run PNF
-
-    sudo NFAPI_TRACE_LEVEL=info ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf --nfapi PNF --continuous-tx -E --thread-pool 1,2,3,4,5
-
-Run VNF
-
-    sudo NFAPI_TRACE_LEVEL=info ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.106prb.nfapi.conf --nfapi VNF
-
 #### 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
@@ -216,19 +194,14 @@ Clone the Radisys repository (We're currently using the `oai_integration` branch
 
     git clone https://gerrit.o-ran-sc.org/r/o-du/l2 -b oai-integration
 
-Build the O-DU (More details can be found in O-RAN's documentation page [here](https://docs.o-ran-sc.org/projects/o-ran-sc-o-du-l2/en/latest/user-guide.html#i-execution-on-locally-compiling-o-du-high-source-code))
+Build the O-DU
 
     cd ~/l2/build/odu
     make clean_all;make odu PHY=INTEL_L1 MACHINE=BIT64 MODE=TDD;make cu_stub NODE=TEST_STUB MACHINE=BIT64 MODE=TDD;make ric_stub NODE=TEST_STUB MACHINE=BIT64 MODE=TDD
 
-The O-DU requires some virtual interfaces to be setup in order to enable communication between the O-DU, CU_stub and RIC_stub
 Setup local interfaces for the cu_stub, ric_stub and o_du
-The IP addresses shown match the ones specified in OSC ODU configuration file, found in <o-du directory>/build/config/tdd_odu_config.xml
-The parameters referenced are <DU_IP_V4_ADDR>, <CU_IP_V4_ADDR> and <RIC_IP_V4_ADDR>
 
-    sudo ifconfig <interface name>:ODU "192.168.130.81" 
-    sudo ifconfig <interface name>:CU_STUB "192.168.130.82"
-    sudo ifconfig <interface name>:RIC_STUB "192.168.130.80"
+    sudo ifconfig enp7s0:ODU "192.168.130.81" && sudo ifconfig enp7s0:CU_STUB "192.168.130.82" && sudo ifconfig enp7s0:RIC_STUB "192.168.130.80"
 
 Run cu_stu and ric_stub in separate terminals
 
@@ -258,7 +231,7 @@ 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;
@@ -269,10 +242,10 @@ To see the (any) periodical output at the PNF, define `NFAPI_TRACE_LEVEL=info`.
 This output shows:
 
 ```
-41056.739654 [I] 3556767424: nr_pnf_p7_get_msgs: [P7:1] msgs ontime 489 thr DL 0.06 UL 0.01 msg late 0 (vtime)
+41056.739654 [I] 3556767424: pnf_p7_slot_ind: [P7:1] msgs ontime 489 thr DL 0.06 UL 0.01 msg late 0 (vtime)
 ```
 
-The first numbers are timestamps. `nr_pnf_p7_get_msgs` is the name of the
+The first numbers are timestamps. `pnf_p7_slot_ind` is the name of the
 functions that prints the output. `[P7:1]` refers to the fact that these are
 information on P7, of PHY ID 1. Finally, `msgs ontime 489` means that in the
 last window (since the last print), 489 messages arrived at the PNF in total.
@@ -285,26 +258,3 @@ done over virtual time, i.e., frames/slots as executed by the 5G Systems. For
 instance, these numbers might be slightly higher or slower in RFsim than in
 wall-clock time, depending if the system advances faster or slower than
 wall-clock time.
-
-## Troubleshoot
-
-When operating using the FAPI split, the PNF needs to give the VNF extra time
-to schedule the next slot. Especially since the current nFAPI split still
-relies on slot indications, extra time due to transport delays need to be
-accounted for.  Currently, this delay is set conservatively, meaning that it
-should work for most systems, but can create problems during random access:
-
-    [NR_MAC] exceeded RA window: preamble at 411.19 now 413.0 (diff 21), ra_ResponseWindow 5/20 slots
-    [NR_MAC] sfn: 413.0 UE RA-RNTI 010b TC-RNTI 5d82: exceeded RA window, cannot schedule Msg2
-
-means that the VNF received a preamble (411.19), but the current slot to be
-scheduled (413.0) is beyond the random access response window (20 slots). In
-this case, try one of the following:
-
-- If the radio allows, reduce the L1 TX advance `RUs.[0].sl_ahead` by some
-  slots, but note that this could make the system less stable.
-- Change the code to reduce `sl_ahead` inside function `handle_nr_slot_ind()`,
-  to reduce the FAPI scheduling slot time budget.
-- Non-standard: You can manually increase the response window by setting
-  `gNBs.[0].servingCellConfigCommon.[0].ra_ResponseWindow` to, e.g., 6. Note
-  that the maximum allowed response window is 10ms.

doc/tutorial_resources/vrtsim/channel_modelling_basics.md

@@ -0,0 +1,100 @@
+# About
+
+In this step usage of channel modelling with `vrtsim` will be explained
+
+# Configure 
+
+Modify the gNB config file at `targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf`. Add the following at the end:
+
+```
+channelmod = { 
+  max_chan=10;
+  modellist="modellist_rfsimu_1";
+  modellist_rfsimu_1 = (
+    {
+        model_name                       = "server_tx_channel_model"
+      	type                             = "AWGN";			  
+      	ploss_dB                         = 0;
+        noise_power_dB                   = 0; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
+    }    
+  );
+};
+```
+
+# (Optional) Run UE with scope to visualize the impact
+
+```
+cmake ../../ -DENABLE_IMSCOPE=ON
+```
+
+```
+cmake --build . --target imscope
+```
+
+Add `--imscope` to UE command line
+
+# Run
+
+```
+sudo ./nr-softmodem -O ../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --device.name vrtsim --vrtsim.role server --vrtsim.chanmod 1
+```
+
+```
+sudo ./nr-uesoftmodem -C 3619200000 -r 106 --numerology 1 --ssb 516 --band 78 --device.name vrtsim
+```
+
+# Modifying the channel model
+
+Try the following settings:
+
+```
+  modellist_rfsimu_1 = (
+    {
+        model_name                       = "server_tx_channel_model"
+      	type                             = "Rayleigh8";			  
+      	ploss_dB                         = 0;
+        noise_power_dB                   = 0; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
+    }    
+  );
+```
+```
+  modellist_rfsimu_1 = (
+    {
+        model_name                       = "server_tx_channel_model"
+      	type                             = "AWGN";			  
+      	ploss_dB                         = -5;
+        noise_power_dB                   = 0; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
+    }    
+  );
+```
+```
+  modellist_rfsimu_1 = (
+    {
+        model_name                       = "server_tx_channel_model"
+      	type                             = "AWGN";			  
+      	ploss_dB                         = -10;
+        noise_power_dB                   = 0; 
+        forgetfact                       = 0;  
+        offset                           = 0;      
+        ds_tdl                           = 0;      
+    }    
+  );
+```
+
+Add noise:
+
+```
+channelmod = { 
+  max_chan=10;
+  modellist="modellist_rfsimu_1";
+  noise_power_dBFS = -42;
+```

doc/tutorial_resources/vrtsim/channel_modelling_external_channel.md

@@ -0,0 +1,59 @@
+# About
+
+Precomputed 3GPP 38.901 TDL profiles (A to E) with statistical MIMO channels, plus a Python emitter that publishes taps to VRTSIM over a nanomsg PUB socket using FlatBuffers. Supports multiple antenna shapes (up to 64x64), speed presets (walking about 1.5 m/s, car about 30 m/s), spatial correlation, mutual coupling, LOS steering for D and E, and time-varying lognormal shadowing. 
+
+---
+
+## 1) Setup
+
+    python3 -m pip install --user flatbuffers nanomsg numpy pyyaml
+    cd ~/raytracing-channel-emulator/server/api
+    flatc --python -o . taps.fbs    # generates ./Phy/Taps.py
+    export PYTHONPATH="$(pwd):$PYTHONPATH"
+
+    # switch to external_taps for the tools below
+    cd ~/raytracing-channel-emulator/server/external_taps
+
+---
+
+## 2) Generate the CIR file
+
+Default profiles, delay spreads, antenna shapes, and speed presets are embedded.  
+Shadowing is enabled by default, lognormal per link, time varying across snapshots via AR(1).
+
+This command writes:
+- binary taps file: ./cir_db.bin
+- YAML sidecar with per-entry metadata: ./cir_db.yaml (used by the emitter to resolve selections and offsets)
+
+    python3 CIR_generator.py --out ./cir_db.bin
+
+To change shadowing, pass --shadow-sigma-db and optionally --shadow-tau-c-s for the correlation time. Set sigma to 0 to disable.
+
+---
+
+## 3) Run the emitter
+
+Sequential replay, one snapshot every 0.5 s:
+
+    python3 emit_from_db.py --bind tcp://127.0.0.1:5555 --db ./cir_db.bin --model TDL-A --ds-ns 30 --nrx 1 --ntx 1 --interval 0.5
+
+List what is in the database:
+
+    python3 emit_from_db.py --db ./cir_db.bin --describe-db
+
+Optional, print the selected entry before streaming:
+
+    python3 emit_from_db.py --db ./cir_db.bin --print-selected
+
+
+---
+
+## 4) Run OAI with VRTSIM
+
+gNB (server role):
+
+    sudo ./nr-softmodem -O ../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --device.name vrtsim --vrtsim.role server --vrtsim.taps-socket tcp://127.0.0.1:5555 --gNBs.[0].min_rxtxtime 3
+
+UE (client role):
+
+    sudo ./nr-uesoftmodem -C 3619200000 -r 106 --numerology 1 --ssb 516 --band 78 --device.name vrtsim --vrtsim.role client

doc/tutorial_resources/vrtsim/first_steps.md

@@ -0,0 +1,145 @@
+# About
+
+In this step the basics of compiling and running `vrtsim` will be explained.
+
+# About vrtsim
+
+vrtsim is a realtime/fixed timescale split8 device emulator. The main difference between
+rfsim and vrtsim is the timing constraints vrtsim forces on the applications that use it.
+
+# Compiling
+
+Start by making a new directory under `cmake_targets`
+
+```bash
+mkdir -p cmake_targets/build/
+```
+
+Compile vrtsim + RAN elements
+
+```bash
+cd /cmake_targets/build
+cmake ../../ -GNinja
+cmake --build . --target vrtsim nr-softmodem nr-uesoftmodem ldpc params_libconfig params_yaml
+```
+
+# Running
+
+Run a basic testcase to verify connectivity, no core network present
+
+```bash
+sudo ./nr-softmodem -O ../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --device.name vrtsim --vrtsim.role server
+```
+
+```bash
+sudo ./nr-uesoftmodem -C 3619200000 -r 106 --numerology 1 --ssb 516 --band 78 --device.name vrtsim
+```
+
+# Verification
+
+Goal is to have the UE connect for now (i.e. enter RRC Connected mode). The success depends on your
+CPU speed.
+
+## Example NR UE output when UE is connected
+
+```
+[PHY]   Initial sync: pbch decoded sucessfully, ssb index 0
+[PHY]   pbch rx ok. rsrp:51 dB/RE, adjust_rxgain:-1 dB
+[NR_PHY]   Cell Detected with GSCN: 0, SSB SC offset: 516, SSB Ref: 0.000000, PSS Corr peak: 99 dB, PSS Corr Average: 61
+[PHY]   [UE0] In synch, rx_offset 444704 samples
+[PHY]   [UE 0] Measured Carrier Frequency offset 6 Hz
+[PHY]   Initial sync successful, PCI: 0
+[PHY]   HW: Configuring channel 0 (rf_chain 0): setting tx_freq 3619200006 Hz, rx_freq 3619200006 Hz, tune_offset 0
+[PHY]   Got synch: hw_slot_offset 29, carrier off 6 Hz, rxgain 110.000000 (DL 3619200006.000000 Hz, UL 3619200006.000000 Hz)
+[PHY]   UE synchronized! decoded_frame_rx=404 UE->init_sync_frame=0 trashed_frames=14
+[PHY]   Resynchronizing RX by 444704 samples
+[HW]   received write reorder clear context
+[NR_RRC]   SIB1 decoded
+[NR_MAC]   TDD period index = 6, based on the sum of dl_UL_TransmissionPeriodicity from Pattern1 (5.000000 ms) and Pattern2 (0.000000 ms): Total = 5.000000 ms
+[NR_MAC]   Set TDD configuration period to: 8 DL slots, 3 UL slots, 10 slots per period (NR_TDD_UL_DL_Pattern is 7 DL slots, 2 UL slots, 6 DL symbols, 4 UL symbols)
+[NR_MAC]   Configured 1 TDD patterns (total slots: pattern1 = 10, pattern2 = 0)
+[PHY]   N_TA_offset changed from 0 to 800
+[MAC]   Initialization of 4-Step CBRA procedure
+[NR_MAC]   PRACH scheduler: Selected RO Frame 421, Slot 19, Symbol 0, Fdm 0
+[PHY]   PRACH [UE 0] in frame.slot 421.19, placing PRACH in position 2828, Msg1/MsgA-Preamble frequency start 0 (k1 0), preamble_offset 6, first_nonzero_root_idx 0, preambleIndex = 27
+[PHY]   [UE 0] RAR-Msg2 decoded
+[NR_MAC]   [UE 0][RAPROC][RA-RNTI 010b] Got BI RAR subPDU 5 ms
+[NR_MAC]   [UE 0][RAPROC][RA-RNTI 010b] Got RAPID RAR subPDU
+[NR_MAC]   [UE 0][RAPROC][422.10] Found RAR with the intended RAPID 27
+[MAC]   received TA command 31
+[NR_MAC]   [RAPROC][422.19] RA-Msg3 transmitted
+[MAC]   [UE 0][423.10][RAPROC] 4-Step RA procedure succeeded. CBRA: Contention Resolution is successful.
+[NR_RRC]   [UE0][RAPROC] Logical Channel DL-CCCH (SRB0), Received NR_RRCSetup
+[RLC]   Added srb 1 to UE 0
+[NR_RRC]   State = NR_RRC_CONNECTED
+```
+
+## Example gNB output when connected
+
+```
+[NR_PHY]   [RAPROC] 421.19 Initiating RA procedure with preamble 27, energy 31.7 dB (I0 0, thres 120), delay 0 start symbol 0 freq index 0
+[NR_MAC]   421.19 UE RA-RNTI 010b TC-RNTI 2c32: initiating RA procedure
+[NR_MAC]   UE 2c32: Msg3 scheduled at 422.19 (422.10 TDA 0) start 0 RBs 8
+[NR_MAC]   UE 2c32: 422.10 Generating RA-Msg2 DCI, RA RNTI 0x10b, state 1, preamble_index(RAPID) 27, timing_offset = 0 (estimated distance 0.0 [m])
+[NR_MAC]   422.10 Send RAR to RA-RNTI 010b
+[NR_MAC]    422.19 PUSCH with TC_RNTI 0x2c32 received correctly
+[MAC]   [RAPROC] Received SDU for CCCH length 6 for UE 2c32
+[RLC]   Activated srb0 for UE 11314
+[RLC]   Added srb 1 to UE 11314
+[NR_MAC]   Activating scheduling Msg4 for TC_RNTI 0x2c32 (state WAIT_Msg3)
+[NR_RRC]   Decoding CCCH: RNTI 2c32, payload_size 6
+[NR_RRC]   [--] (cellID 0, UE ID 1 RNTI 2c32) Create UE context: CU UE ID 1 DU UE ID 11314 (rnti: 2c32, random ue id 1c14de2d3f000000)
+[RRC]   activate SRB 1 of UE 1
+[NR_RRC]   [DL] (cellID bc614e, UE ID 1 RNTI 2c32) Send RRC Setup
+[NR_MAC]   UE 2c32 Generate Msg4: feedback at  423.17, payload 225 bytes, next state nrRA_WAIT_Msg4_MsgB_ACK
+[NR_MAC]    423.17 UE 2c32: Received Ack of Msg4. CBRA procedure succeeded (UE Connected)
+[NR_MAC]   Adding new UE context with RNTI 0x2c32
+[NR_RRC]   [UL] (cellID bc614e, UE ID 1 RNTI 2c32) Received RRCSetupComplete (RRC_CONNECTED reached)
+```
+
+## Troubleshooting:
+In case the UE does not connect:
+
+Interrupt the process using `CTRL + C` and analyze `vrtsim` stdout at the end. You should see the histogram
+print from `vrtsim`
+
+Example from a working configuration:
+```
+[HW]   VRTSIM: Realtime issues: TX 0.00%, RX 0.00%
+[HW]   VRTSIM: Read/write too early (suspected radio implementaton error) TX: 0, RX: 0
+[HW]   VRTSIM: Average TX budget 913.111 uS (more is better)
+[HW]   VRTSIM: TX budget histogram: 6468 samples
+[HW]   Bin 0    [0.0 - 100.0uS]:                0
+[HW]   Bin 1    [100.0 - 200.0uS]:              0
+[HW]   Bin 2    [200.0 - 300.0uS]:              0
+[HW]   Bin 3    [300.0 - 400.0uS]:              0
+[HW]   Bin 4    [400.0 - 500.0uS]:              1
+[HW]   Bin 5    [500.0 - 600.0uS]:              0
+[HW]   Bin 6    [600.0 - 700.0uS]:              0
+[HW]   Bin 7    [700.0 - 800.0uS]:              1
+[HW]   Bin 8    [800.0 - 900.0uS]:              125
+[HW]   Bin 9    [900.0 - 1000.0uS]:             6242
+[HW]   Bin 10   [1000.0 - 1100.0uS]:            0
+[HW]   Bin 11   [1100.0 - 1200.0uS]:            0
+```
+
+The histogram above indicates if the application encountered any timing related issues. If the average TX budget
+is low (near ~0) or bin 0 is being filled that could mean that your CPU is too slow.
+
+Possible fixes: 
+ - Try disabling idle states
+ ```bash
+ sudo cpupower idle-set -D 0
+ ```
+ - Change cpu frequency scaling governor to performance
+ ```bash
+ sudo cpupower frequency-set --governor performance
+ ```
+ - Modify this line in the code of the UE and rebuild:
+```diff
+-#define NR_UE_CAPABILITY_SLOT_RX_TO_TX (3)
++#define NR_UE_CAPABILITY_SLOT_RX_TO_TX (6)
+```
+
+If that doesnt work, adjust `--vrtsim.timescale <timescale>` argument on `nr-softmodem`.
+Start lowering the timescale (e.g. to 0.2) to slow down time until the UE connects.

doc/tutorial_resources/vrtsim/ip_traffic.md

@@ -0,0 +1,95 @@
+# About
+
+In this step using `iperf` to test the modems performance is explained.
+
+# Running
+
+## Option 1: --noS1 mode
+
+Select this option on slower machines. This doesn't require core network.
+
+1. Run gNB
+
+```bash
+sudo ./nr-softmodem -O ../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --device.name vrtsim --vrtsim.role server --noS1 --do-ra
+```
+
+2. Create UE namespace
+
+```bash
+sudo ip netns add ue_ns
+```
+
+2. Run UE in the new namespace
+
+```bash
+sudo ip netns exec ue_ns bash
+sudo ./nr-uesoftmodem -C 3619200000 -r 106 --numerology 1 --ssb 516 --band 78 --device.name vrtsim --noS1 --do-ra
+```
+
+3. Run iperf server in the UE namespace
+
+```bash
+sudo ip netns exec ue_ns bash
+iperf -s -B 10.0.1.2
+```
+
+4. Run iperf client in host namespace
+
+```bash
+iperf -c 10.0.1.2 -B 10.0.1.1
+```
+
+## Option 2: with core network
+
+1. Start `cn` in `doc/tutorial_resources/oai-cn5g` with `docker compose up`
+
+2. Run gNB
+
+```bash
+sudo ./nr-softmodem -O ../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --device.name vrtsim --vrtsim.role server
+```
+
+3. Verify connection to core network in gNB stdout
+
+```
+[NGAP]   Send NGSetupRequest to AMF
+[NGAP]   3584 -> 0000e000
+[NGAP]   Served GUAMIs for AMF OAI-AMF (assoc_id=3):
+[NGAP]    GUAMI:
+[NGAP]      PLMN: MCC=001, MNC=01
+[NGAP]      AMF Region ID: 1
+[NGAP]      AMF Set ID: 1
+[NGAP]      AMF Pointer: 1
+[NGAP]   Supported PLMN 0: MCC=001 MNC=01
+[NGAP]   Supported slice (PLMN 0): SST=0x01 SD=000
+[NGAP]   Received NGSetupResponse from AMF
+```
+
+4. Connect the UE. 
+
+```bash
+sudo ./nr-uesoftmodem -C 3619200000 -r 106 --numerology 1 --ssb 516 --band 78 --device.name vrtsim  --uicc0.imsi 001010000000001
+```
+
+5. Verify interface is created
+
+```
+[OIP]   Interface oaitun_ue1 successfully configured, IPv4 10.0.0.2, IPv6 (null)
+```
+
+```bash
+ifconfig | grep tun   
+```
+
+6. Run iperf in oai-ext-dn container
+
+```bash
+docker exec -it oai-ext-dn bash
+iperf -c 10.0.0.2 -B 192.168.70.135
+```
+
+## Troubleshooting
+
+Use the same steps as from `first_steps.md`. This test adds additional requirements
+on the CPU which might cause the UE to fail.

doc/tutorial_resources/vrtsim/oru-demo.md

@@ -0,0 +1,17 @@
+# About
+
+Just a demonstration of what we need vrtsim for
+
+# Running
+
+```
+sudo -E LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu/:. -E ASAN_OPTIONS=detect_odr_violation=0  ./oainr_ru -O ~/ru.band77.106prb.fhi72.2x2.conf  --vrtsim.role server
+```
+
+```
+sudo -E LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu/:. -E ASAN_OPTIONS=detect_odr_violation=0 ./nr-softmodem -O ~/gnb.2x2.conf  --gNBs.[0].min_rxtxtime 6
+```
+
+```
+sudo -E LD_LIBRARY_PATH=. ./nr-uesoftmodem -C 4049760000 -r 106 --numerology 1 --ssb 516 --band 77  --device.name vrtsim
+```

doc/tutorial_resources/vrtsim/prep.md

@@ -0,0 +1,6 @@
+1. Clone https://gitlab.eurecom.fr/oai/raytracing-channel-emulator 
+2. Run: sudo apt install git-lfs
+3. In the cloned repository, run: git lfs fetch and git lfs checkout
+4. Install the required Python packages listed here
+5. sudo apt install -y llvm-dev libnanomsg-dev flatbuffers-compiler
+6. Godot 4.4 for the test platform (optional) https://godotengine.org/download/archive/4.4-stable/

doc/tutorial_resources/vrtsim/raytracing-ce.md

@@ -0,0 +1,30 @@
+# About
+
+This tutorial will showcase the usage fo channel emulation server to provide realistic ray-traced channel to the softmodems
+
+# Compiling
+
+Reuse the previous step binaries
+
+```
+cmake ../../ -DOAI_VRTSIM_TAPS_CLIENT=ON
+```
+
+# Running
+
+```
+sudo ./nr-softmodem -O ../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --device.name vrtsim --vrtsim.role server --vrtsim.taps-socket ipc:///tmp/ru_socket_0
+```
+
+```
+source .venv/bin/activate
+python main.py example_config.yaml 
+```
+
+```
+sudo ./nr-uesoftmodem  -C 3619200000 -r 106 --numerology 1 --ssb 516 --device.name vrtsim
+```
+
+```
+./move_ue.sh 
+```

docker/Dockerfile.base.rhel9

@@ -73,10 +73,6 @@ ENV TINI_VERSION=v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
 RUN chmod +x /tini
 
-ENV YQ_VERSION=v4.2.0
-RUN wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -O /usr/local/bin/yq &&\
-    chmod +x /usr/local/bin/yq
-
 # In some network environments, GIT proxy is required
 RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
 

docker/Dockerfile.base.rocky

@@ -66,10 +66,6 @@ ENV TINI_VERSION=v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
 RUN chmod +x /tini
 
-ENV YQ_VERSION=v4.2.0
-RUN wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -O /usr/local/bin/yq &&\
-    chmod +x /usr/local/bin/yq
-
 # Copying only the needed files to create ran-base
 WORKDIR /oai-ran/cmake_targets/tools
 COPY cmake_targets/tools/build_helper \

docker/Dockerfile.base.ubuntu

@@ -60,10 +60,6 @@ RUN apt-get update && \
 ENV TINI_VERSION=v0.19.0
 RUN wget https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} -O /tini && chmod +x /tini
 
-ENV YQ_VERSION=v4.2.0
-RUN wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -O /usr/local/bin/yq &&\
-    chmod +x /usr/local/bin/yq
-
 # In some network environments, GIT proxy is required
 RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
 

docker/Dockerfile.gNB.aerial.ubuntu

@@ -110,8 +110,6 @@ RUN ldconfig && \
         /usr/local/lib/libnvipc.so
 
 WORKDIR /opt/oai-gnb
-
-COPY --from=ran-build /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=ran-build /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem"]

docker/Dockerfile.gNB.aw2s.rhel9

@@ -101,7 +101,6 @@ RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_tra
 
 WORKDIR /opt/oai-gnb-aw2s
 
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem"]

docker/Dockerfile.gNB.aw2s.rocky

@@ -51,8 +51,7 @@ RUN dnf update -y && \
         lksctp-tools \
         tzdata \
         net-tools \
-        iputils \
-        yaml-cpp-devel && \
+        iputils && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
     echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
 
@@ -96,7 +95,6 @@ RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_tra
 
 WORKDIR /opt/oai-gnb-aw2s
 
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem"]

docker/Dockerfile.gNB.aw2s.ubuntu

@@ -95,7 +95,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/lib
 
 WORKDIR /opt/oai-gnb-aw2s
 
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem"]

docker/Dockerfile.gNB.fhi72.rhel9

@@ -126,8 +126,6 @@ RUN ldconfig && \
         /opt/phy/fhi_lib/lib/build/libxran.so
 
 WORKDIR /opt/oai-gnb
-
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem"]

docker/Dockerfile.gNB.fhi72.rocky

@@ -49,8 +49,7 @@ RUN dnf update -y && \
         python3 \
         python3-pip \
         net-tools \
-        iputils \
-        yaml-cpp-devel && \
+        iputils && \
     pip3 install six && \
     pip3 install requests && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
@@ -115,8 +114,6 @@ RUN ldconfig && \
         /opt/phy/fhi_lib/lib/build/libxran.so
 
 WORKDIR /opt/oai-gnb
-
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem"]

docker/Dockerfile.gNB.fhi72.ubuntu

@@ -111,8 +111,6 @@ RUN ldconfig && \
         /opt/phy/fhi_lib/lib/build/libxran.so
 
 WORKDIR /opt/oai-gnb
-
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem"]

docker/Dockerfile.gNB.rhel9

@@ -130,7 +130,6 @@ WORKDIR /opt/oai-gnb
 #EXPOSE 50000/udp # IF5 / ORI (control)
 #EXPOSE 50001/udp # IF5 / ECPRI (data)
 
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem"]

docker/Dockerfile.gNB.rocky

@@ -47,8 +47,7 @@ RUN dnf update -y && \
         python3 \
         python3-pip \
         net-tools \
-        iputils \
-        yaml-cpp-devel && \
+        iputils && \
     pip3 install six && \
     pip3 install requests && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
@@ -125,7 +124,6 @@ WORKDIR /opt/oai-gnb
 #EXPOSE 50000/udp # IF5 / ORI (control)
 #EXPOSE 50001/udp # IF5 / ECPRI (data)
 
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem"]

docker/Dockerfile.gNB.ubuntu

@@ -128,7 +128,6 @@ WORKDIR /opt/oai-gnb
 #EXPOSE 50000/udp # IF5 / ORI (control)
 #EXPOSE 50001/udp # IF5 / ECPRI (data)
 
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem"]

docker/Dockerfile.nr-cuup.rhel9

@@ -35,9 +35,6 @@ RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypo
 FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-nr-cuup
 ENV TZ=Europe/Paris
 
-# Install EPEL 
-RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
-
 RUN yum repolist --disablerepo=* && \
     yum update -y && \
     yum install -y \
@@ -45,8 +42,7 @@ RUN yum repolist --disablerepo=* && \
         lksctp-tools \
         tzdata \
         net-tools \
-        iputils \
-        yaml-cpp-devel && \
+        iputils && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
     echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
 
@@ -59,7 +55,6 @@ COPY --from=gnb-build \
 COPY --from=gnb-build \
     /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
     /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
-    /oai-ran/cmake_targets/ran_build/build/libparams_yaml.so \
     /usr/local/lib/
 
 COPY --from=gnb-base \
@@ -78,7 +73,6 @@ WORKDIR /opt/oai-gnb/etc
 
 WORKDIR /opt/oai-gnb
 
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-cuup", "-O", "/opt/oai-gnb/etc/gnb.conf"]

docker/Dockerfile.nr-cuup.rocky

@@ -43,8 +43,7 @@ RUN yum repolist --disablerepo=* && \
         lksctp-tools \
         tzdata \
         net-tools \
-        iputils \
-        yaml-cpp-devel && \
+        iputils && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
     echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
 
@@ -57,7 +56,6 @@ COPY --from=gnb-build \
 COPY --from=gnb-build \
     /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
     /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
-    /oai-ran/cmake_targets/ran_build/build/libparams_yaml.so \
     /usr/local/lib/
 
 COPY --from=gnb-base \
@@ -73,7 +71,6 @@ WORKDIR /opt/oai-gnb/etc
 
 WORKDIR /opt/oai-gnb
 
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-cuup", "-O", "/opt/oai-gnb/etc/gnb.conf"]

docker/Dockerfile.nr-cuup.ubuntu

@@ -42,8 +42,7 @@ RUN apt-get update && \
         libconfig9 \
         iproute2 \
         net-tools \
-        openssl \
-        libyaml-cpp-dev && \
+        openssl && \
 # if the --sanitize option was used to build, additional packages are required
     /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libasan8 \ 
@@ -62,7 +61,6 @@ COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh
 COPY --from=gnb-build \
     /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
     /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
-    /oai-ran/cmake_targets/ran_build/build/libparams_yaml.so \
     /usr/local/lib/
 
 RUN ldconfig && ldd /opt/oai-gnb/bin/nr-cuup
@@ -71,8 +69,6 @@ RUN ldconfig && ldd /opt/oai-gnb/bin/nr-cuup
 WORKDIR /opt/oai-gnb/etc
 
 WORKDIR /opt/oai-gnb
-
-COPY --from=gnb-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=gnb-base /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-cuup", "-O", "/opt/oai-gnb/etc/gnb.conf"]

docker/Dockerfile.nrUE.rhel9

@@ -122,8 +122,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
         /usr/local/lib64/libuhd.so.4.8.0
 
 WORKDIR /opt/oai-nr-ue
-
-COPY --from=nr-ue-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=nr-ue-base /tini /tini
 CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem"]
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-nr-ue/bin/entrypoint.sh"]

docker/Dockerfile.nrUE.rocky

@@ -48,8 +48,7 @@ RUN dnf update -y && \
         python3 \
         python3-pip \
         libXpm \
-        libX11 \
-        yaml-cpp-devel && \
+        libX11 && \
     pip3 install six && \
     pip3 install requests && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
@@ -120,8 +119,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
         /usr/local/lib64/libuhd.so.4.8.0
 
 WORKDIR /opt/oai-nr-ue
-
-COPY --from=nr-ue-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=nr-ue-base /tini /tini
 CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem"]
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-nr-ue/bin/entrypoint.sh"]

docker/Dockerfile.nrUE.ubuntu

@@ -119,8 +119,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
         /usr/local/lib/libuhd.so.4.8.0
 
 WORKDIR /opt/oai-nr-ue
-
-COPY --from=nr-ue-base /usr/local/bin/yq /usr/local/bin/yq
 COPY --from=nr-ue-base /tini /tini
 CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem"]
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-nr-ue/bin/entrypoint.sh"]

executables/lte-softmodem.c

@@ -194,7 +194,13 @@ void handle_nr_srs_measurements(const module_id_t module_id,
 void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]);
 
 /* TODO these declarations are to be removed */
+void nr_schedule_dl_tti_req(void) {};
+void nr_schedule_ul_dci_req() {};
+void nr_schedule_tx_req() {};
+void nr_schedule_ul_tti_req() {};
 void nr_slot_select() {};
+void NR_UL_indication(NR_UL_IND_t *UL_INFO) {};
+void gNB_dlsch_ulsch_scheduler() {};
 
 /*------------------------------------------------------------------------*/
 
@@ -405,6 +411,7 @@ int main ( int argc, char **argv )
 #if T_TRACER
   T_Config_Init();
 #endif
+  //randominit (0);
   set_taus_seed (0);
   printf("configuring for RAU/RRU\n");
 

executables/lte-uesoftmodem.c

@@ -156,6 +156,10 @@ extern char uecap_xer[1024];
 char uecap_xer_in=0;
 
 /* TODO these declarations are to be removed */
+void nr_schedule_dl_tti_req(void) {};
+void nr_schedule_ul_dci_req() {};
+void nr_schedule_tx_req() {};
+void nr_schedule_ul_tti_req() {};
 void nr_slot_select() {};
 
 /* see file openair2/LAYER2/MAC/main.c for why abstraction_flag is needed
@@ -492,6 +496,7 @@ int main( int argc, char **argv ) {
 #if T_TRACER
   T_Config_Init();
 #endif
+  //randominit (0);
   set_taus_seed (0);
   cpuf=get_cpu_freq_GHz();
   pthread_cond_init(&sync_cond,NULL);

executables/nr-cuup.c

@@ -51,9 +51,8 @@ static void initialize_agent(ngran_node_t node_type, e2_agent_args_t oai_args)
 
   printf("After RCconfig_NR_E2agent %s %s \n",oai_args.sm_dir, oai_args.ip  );
 
-  fr_args_t args = {0};
-  memcpy(args.ip, oai_args.ip, FR_IP_ADDRESS_LEN);
-  memcpy(args.libs_dir, oai_args.sm_dir, FR_CONF_FILE_LEN);
+  fr_args_t args = { .ip = oai_args.ip }; // init_fr_args(0, NULL);
+  memcpy(args.libs_dir, oai_args.sm_dir, 128);
 
   sleep(1);
 

executables/nr-gnb.c

@@ -55,6 +55,7 @@
 #include "PHY/defs_gNB.h"
 #include "PHY/defs_nr_common.h"
 #include "PHY/impl_defs_nr.h"
+#include "SCHED_NR/fapi_nr_l1.h"
 #include "SCHED_NR/phy_frame_config_nr.h"
 #include "SCHED_NR/sched_nr.h"
 #include "assertions.h"
@@ -64,6 +65,7 @@
 #include "nfapi/oai_integration/vendor_ext.h"
 #include "nfapi_nr_interface_scf.h"
 #include "notified_fifo.h"
+#include "openair2/NR_PHY_INTERFACE/nr_sched_response.h"
 #include "thread-pool.h"
 #include "time_meas.h"
 #include "utils.h"
@@ -80,6 +82,8 @@ static void tx_func(processingData_L1tx_t *info)
   int slot_rx = info->slot_rx;
   LOG_D(NR_PHY, "%d.%d running tx_func\n", frame_tx, slot_tx);
   PHY_VARS_gNB *gNB = info->gNB;
+  module_id_t module_id = gNB->Mod_id;
+  uint8_t CC_id = gNB->CC_id;
   NR_IF_Module_t *ifi = gNB->if_inst;
   nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
 
@@ -90,22 +94,15 @@ static void tx_func(processingData_L1tx_t *info)
     reset_active_ulsch(gNB, frame_rx);
   }
 
-  clear_slot_beamid(gNB, slot_tx);
-
-  nfapi_nr_slot_indication_scf_t ind = {.sfn = frame_tx, .slot = slot_tx};
   start_meas(&gNB->slot_indication_stats);
-  // this variable is very big (multiple MB), so we put it into static storage
-  // to not overflow the stack while still having it in local (function) scope
-  // also, tx_func() is only executed by one thread, serially
-  static NR_Sched_Rsp_t sched_response;
-  ifi->NR_slot_indication(&ind, &sched_response);
+  ifi->NR_slot_indication(module_id, CC_id, frame_tx, slot_tx);
   stop_meas(&gNB->slot_indication_stats);
-
+  gNB->msgDataTx->timestamp_tx = info->timestamp_tx;
+  info = gNB->msgDataTx;
   info->gNB = gNB;
 
   // At this point, MAC scheduler just ran, including scheduling
   // PRACH/PUCCH/PUSCH, so trigger RX chain processing
-  nr_save_ul_tti_req(gNB, &sched_response.UL_tti_req);
   LOG_D(NR_PHY, "Trigger RX for %d.%d\n", frame_rx, slot_rx);
   notifiedFIFO_elt_t *res = newNotifiedFIFO_elt(sizeof(processingData_L1_t), 0, &gNB->resp_L1, NULL);
   processingData_L1_t *syncMsg = NotifiedFifoData(res);
@@ -122,13 +119,7 @@ static void tx_func(processingData_L1tx_t *info)
   if (tx_slot_type == NR_DOWNLINK_SLOT || tx_slot_type == NR_MIXED_SLOT || get_softmodem_params()->continuous_tx || IS_SOFTMODEM_RFSIM 
     || cfg->analog_beamforming_ve.analog_beam_list) {
     start_meas(&info->gNB->phy_proc_tx);
-    phy_procedures_gNB_TX(info->gNB,
-                          &sched_response.DL_req,
-                          &sched_response.TX_req,
-                          &sched_response.UL_dci_req,
-                          frame_tx,
-                          slot_tx,
-                          1);
+    phy_procedures_gNB_TX(info, frame_tx, slot_tx, 1);
 
     PHY_VARS_gNB *gNB = info->gNB;
     processingData_RU_t syncMsgRU;
@@ -140,6 +131,14 @@ static void tx_func(processingData_L1tx_t *info)
     ru_tx_func((void *)&syncMsgRU);
     stop_meas(&info->gNB->phy_proc_tx);
   }
+
+  if (NFAPI_MODE == NFAPI_MONOLITHIC) {
+    /* this thread is done with the sched_info, decrease the reference counter.
+     * This only applies for monolithic; in the PNF, the memory is allocated in
+     * a ring buffer that should never be overwritten (one frame duration). */
+    LOG_D(NR_PHY, "Calling deref_sched_response for id %d (tx_func) in %d.%d\n", info->sched_response_id, frame_tx, slot_tx);
+    deref_sched_response(info->sched_response_id);
+  }
 }
 
 void *L1_rx_thread(void *arg) 
@@ -249,6 +248,7 @@ static size_t dump_L1_meas_stats(PHY_VARS_gNB *gNB, RU_t *ru, char *output, size
   output += print_meas_log(&gNB->ul_indication_stats, "UL Indication", NULL, NULL, output, end - output);
   output += print_meas_log(&gNB->slot_indication_stats, "Slot Indication", NULL, NULL, output, end - output);
   output += print_meas_log(&gNB->rx_pusch_stats, "PUSCH inner-receiver", NULL, NULL, output, end - output);
+  output += print_meas_log(&gNB->schedule_response_stats, "Schedule Response", NULL, NULL, output, end - output);
   output += print_meas_log(&gNB->rx_prach, "PRACH RX", NULL, NULL, output, end - output);
   if (ru->feprx)
     output += print_meas_log(&ru->ofdm_demod_stats, "feprx", NULL, NULL, output, end - output);
@@ -310,6 +310,7 @@ void *nrL1_stats_thread(void *param) {
   reset_meas(&gNB->ul_indication_stats);
   reset_meas(&gNB->slot_indication_stats);
   reset_meas(&gNB->rx_pusch_stats);
+  reset_meas(&gNB->schedule_response_stats);
   reset_meas(&gNB->dlsch_scrambling_stats);
   reset_meas(&gNB->dlsch_modulation_stats);
   reset_meas(&gNB->dlsch_resource_mapping_stats);
@@ -357,6 +358,14 @@ void init_gNB_Tpool(int inst)
   // create the TX thread responsible for TX processing start event (L1_tx_out msg queue), then launch tx_func()
   threadCreate(&gNB->L1_tx_thread, L1_tx_thread, (void *)gNB, "L1_tx_thread", gNB->L1_tx_thread_core, OAI_PRIORITY_RT_MAX);
 
+  notifiedFIFO_elt_t *msgL1Tx = newNotifiedFIFO_elt(sizeof(processingData_L1tx_t), 0, &gNB->L1_tx_out, NULL);
+  processingData_L1tx_t *msgDataTx = (processingData_L1tx_t *)NotifiedFifoData(msgL1Tx);
+  memset(msgDataTx, 0, sizeof(processingData_L1tx_t));
+  init_DLSCH_struct(gNB, msgDataTx);
+  memset(msgDataTx->ssb, 0, 64 * sizeof(NR_gNB_SSB_t));
+  // this will be removed when the msgDataTx is not necessary anymore
+  gNB->msgDataTx = msgDataTx;
+
   if (!IS_SOFTMODEM_NOSTATS)
     threadCreate(&proc->L1_stats_thread, nrL1_stats_thread, (void *)gNB, "L1_stats", -1, OAI_PRIORITY_RT_LOW);
 }
@@ -433,6 +442,7 @@ void init_gNB()
     AssertFatal((gNB->if_inst = NR_IF_Module_init(inst)) != NULL, "Cannot register interface");
 
     LOG_I(NR_PHY, "Registered with MAC interface module (%p)\n", gNB->if_inst);
+    gNB->if_inst->NR_Schedule_response = nr_schedule_response;
     gNB->if_inst->NR_PHY_config_req = nr_phy_config_request;
 
     gNB->prach_energy_counter = 0;

executables/nr-softmodem.c

@@ -423,6 +423,8 @@ int start_L1L2(module_id_t gnb_id)
   /* block threads */
   oai_exit = 0;
   sync_var = -1;
+  extern void init_sched_response(void);
+  init_sched_response();
 
   /* update config */
   gNB_MAC_INST *mac = RC.nrmac[0];
@@ -471,9 +473,8 @@ static void initialize_agent(ngran_node_t node_type, e2_agent_args_t oai_args)
 
   printf("After RCconfig_NR_E2agent %s %s \n",oai_args.sm_dir, oai_args.ip  );
 
-  fr_args_t args = {0};
-  memcpy(args.ip, oai_args.ip, FR_IP_ADDRESS_LEN);
-  memcpy(args.libs_dir, oai_args.sm_dir, FR_CONF_FILE_LEN);
+  fr_args_t args = { .ip = oai_args.ip }; // init_fr_args(0, NULL);
+  memcpy(args.libs_dir, oai_args.sm_dir, 128);
 
   sleep(1);
   const gNB_RRC_INST* rrc = RC.nrrrc[0];
@@ -546,6 +547,7 @@ int main( int argc, char **argv ) {
 #if T_TRACER
   T_Config_Init();
 #endif
+  //randominit (0);
   set_taus_seed (0);
 
   cpuf=get_cpu_freq_GHz();
@@ -719,8 +721,6 @@ int main( int argc, char **argv ) {
   itti_wait_tasks_end(NULL);
   printf("Returned from ITTI signal handler\n");
 
-  nfapi_stop_l1();
-
   if (RC.nb_nr_L1_inst > 0 || RC.nb_RU > 0)
     stop_L1(0);
 

executables/nr-uesoftmodem.c

@@ -340,6 +340,7 @@ int main(int argc, char **argv)
   T_Config_Init();
 #endif
   initTpool(get_softmodem_params()->threadPoolConfig, &(nrUE_params.Tpool), cpumeas(CPUMEAS_GETSTATE));
+  //randominit (0);
   set_taus_seed (0);
 
   if (!has_cap_sys_nice())

nfapi/oai_integration/aerial/fapi_nvIPC.c

@@ -63,20 +63,12 @@ char cpu_buf_recv[RECV_BUF_LEN];
 
 uint16_t sfn = 0, slot = 0;
 nv_ipc_t *ipc;
-void nvIPC_Stop()
+nfapi_vnf_config_t *vnf_config = 0;
+
+void set_config(nfapi_vnf_config_t *conf)
 {
-  LOG_I(NR_MAC, "Received STOP.indication\n");
-  ((vnf_t *)get_config())->terminate = true;
+  vnf_config = conf;
 }
-
-void nvIPC_send_stop_request()
-{
-  nfapi_nr_stop_request_scf_t req = {.header.message_id = NFAPI_NR_PHY_MSG_TYPE_STOP_REQUEST, .header.phy_id = 0};
-  LOG_I(NR_MAC, "Sending NFAPI STOP.request\n");
-  nfapi_nr_vnf_stop_req(get_config(), get_config()->pnf_list->p5_idx, &req);
-}
-
-
 static uint16_t old_sfn = 0;
 static uint16_t old_slot = 0;
 ////////////////////////////////////////////////////////////////////////
@@ -92,7 +84,6 @@ static int ipc_handle_rx_msg(nv_ipc_t *ipc, nv_ipc_msg_t *msg)
   uint8_t *end = msg->msg_buf + msg->msg_len;
 
   // unpack FAPI messages and handle them
-  nfapi_vnf_config_t * vnf_config = get_config();
   if (vnf_config != 0) {
     // first, unpack the header
     fapi_phy_api_msg fapi_msg;
@@ -488,6 +479,7 @@ static int aerial_recv_msg(nv_ipc_t *ipc, nv_ipc_msg_t *recv_msg)
   return 0;
 }
 
+bool recv_task_running = false;
 void *epoll_recv_task(void *arg)
 {
   struct epoll_event ev, events[MAX_EVENTS];
@@ -505,12 +497,11 @@ void *epoll_recv_task(void *arg)
   if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, ev.data.fd, &ev) == -1) {
     LOG_E(NFAPI_VNF, "%s epoll_ctl failed\n", __func__);
   }
-  // From here on out the thread is ready to receive data, simulate the reception
-  // of a PARAM.response to get the VNF to send a CONFIG.request
-  nfapi_nr_param_response_scf_t resp_msg = {.header.message_id = NFAPI_NR_PHY_MSG_TYPE_PARAM_RESPONSE};
-  nfapi_vnf_config_t * vnf_config = get_config();
-  vnf_config->nr_param_resp(vnf_config, 1, &resp_msg);
-  while (((vnf_t *)vnf_config)->terminate == false) {
+
+  while (1) {
+    if (!recv_task_running) {
+      recv_task_running = true;
+    }
     LOG_D(NFAPI_VNF, "%s: epoll_wait fd_rx=%d ...\n", __func__, ipc_rx_event_fd);
 
     int nfds;
@@ -533,7 +524,6 @@ void *epoll_recv_task(void *arg)
     }
   }
   close(epoll_fd);
-  ipc->ipc_destroy(ipc);
   return NULL;
 }
 
@@ -578,18 +568,21 @@ int nvIPC_Init(nvipc_params_t nvipc_params_s)
   LOG_I(NFAPI_VNF, "%s: create IPC interface successful\n", __func__);
   sleep(1);
   create_recv_thread(nvipc_params_s.nvipc_poll_core);
+  while(!recv_task_running){usleep(100000);}
+  nfapi_nr_param_response_scf_t resp_msg;
+  vnf_config->nr_param_resp(vnf_config, 1, &resp_msg);
   return 0;
 }
 
 int oai_fapi_ul_tti_req(nfapi_nr_ul_tti_request_t *ul_tti_req)
 {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = (((vnf_info *)vnf_config->user_data)->p7_vnfs[0].config);
 
   ul_tti_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
   ul_tti_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_UL_TTI_REQUEST;
 
   // int retval = nfapi_vnf_p7_ul_tti_req(p7_config, ul_tti_req);
-  int retval = p7_config->send_p7_msg(get_p7_vnf(), &ul_tti_req->header);
+  int retval = p7_config->send_p7_msg((vnf_p7_t *)p7_config, &ul_tti_req->header);
 
   if (retval != 0) {
     LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
@@ -605,11 +598,11 @@ int oai_fapi_ul_tti_req(nfapi_nr_ul_tti_request_t *ul_tti_req)
 
 int oai_fapi_ul_dci_req(nfapi_nr_ul_dci_request_t *ul_dci_req)
 {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = (((vnf_info *)vnf_config->user_data)->p7_vnfs[0].config);
   ul_dci_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
   ul_dci_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_UL_DCI_REQUEST;
   // int retval = nfapi_vnf_p7_ul_dci_req(p7_config, ul_dci_req);
-  int retval = p7_config->send_p7_msg(get_p7_vnf(), &ul_dci_req->header);
+  int retval = p7_config->send_p7_msg((vnf_p7_t *)p7_config, &ul_dci_req->header);
   if (retval != 0) {
     LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
   } else {
@@ -620,12 +613,12 @@ int oai_fapi_ul_dci_req(nfapi_nr_ul_dci_request_t *ul_dci_req)
 
 int oai_fapi_tx_data_req(nfapi_nr_tx_data_request_t *tx_data_req)
 {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = (((vnf_info *)vnf_config->user_data)->p7_vnfs[0].config);
   tx_data_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
   tx_data_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST;
   // LOG_D(PHY, "[VNF] %s() TX_REQ sfn_sf:%d number_of_pdus:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(tx_data_req->SFN),
   // tx_data_req->Number_of_PDUs); int retval = nfapi_vnf_p7_tx_data_req(p7_config, tx_data_req);
-  int retval = p7_config->send_p7_msg(get_p7_vnf(), &tx_data_req->header);
+  int retval = p7_config->send_p7_msg((vnf_p7_t *)p7_config, &tx_data_req->header);
   if (retval != 0) {
     LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
   } else {
@@ -637,10 +630,10 @@ int oai_fapi_tx_data_req(nfapi_nr_tx_data_request_t *tx_data_req)
 
 int oai_fapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req)
 {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = (((vnf_info *)vnf_config->user_data)->p7_vnfs[0].config);
   dl_config_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_DL_TTI_REQUEST;
   dl_config_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
-  int retval = p7_config->send_p7_msg(get_p7_vnf(), &dl_config_req->header);
+  int retval = p7_config->send_p7_msg((vnf_p7_t *)p7_config, &dl_config_req->header);
   dl_config_req->dl_tti_request_body.nPDUs = 0;
   dl_config_req->dl_tti_request_body.nGroup = 0;
 
@@ -651,9 +644,9 @@ int oai_fapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req)
 }
 
 int oai_fapi_send_end_request(int cell, uint32_t frame, uint32_t slot){
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = (((vnf_info *)vnf_config->user_data)->p7_vnfs[0].config);
   nfapi_nr_slot_indication_scf_t nr_slot_resp = {.header.message_id = 0x8F, .sfn = frame, .slot = slot};
-  int retval = p7_config->send_p7_msg(get_p7_vnf(), &nr_slot_resp.header);
+  int retval = p7_config->send_p7_msg((vnf_p7_t *)p7_config, &nr_slot_resp.header);
   if (retval != 0) {
     LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
   }

nfapi/oai_integration/aerial/fapi_nvIPC.h

@@ -56,13 +56,11 @@ bool aerial_send_P7_msg_with_data(void *packedBuf,
                                  void *dataBuf,
                                  uint32_t dataLength,
                                  nfapi_nr_p7_message_header_t *header);
-
+void set_config(nfapi_vnf_config_t *conf);
 int nvIPC_Init(nvipc_params_t nvipc_params_s);
 int oai_fapi_send_end_request(int cell_id, uint32_t frame, uint32_t slot);
 int oai_fapi_ul_tti_req(nfapi_nr_ul_tti_request_t *ul_tti_req);
 int oai_fapi_ul_dci_req(nfapi_nr_ul_dci_request_t *ul_dci_req);
 int oai_fapi_tx_data_req(nfapi_nr_tx_data_request_t *tx_data_req);
 int oai_fapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req);
-void nvIPC_Stop();
-void nvIPC_send_stop_request();
 #endif // OPENAIRINTERFACE_FAPI_NVIPC_H

nfapi/oai_integration/nfapi_pnf.c

@@ -55,6 +55,7 @@
 #include "PHY/INIT/phy_init.h"
 #include "PHY/INIT/nr_phy_init.h"
 #include "PHY/LTE_TRANSPORT/transport_proto.h"
+#include "openair1/SCHED_NR/fapi_nr_l1.h"
 #include "openair1/PHY/NR_TRANSPORT/nr_dlsch.h"
 #include "openair1/PHY/defs_gNB.h"
 #include <openair1/SCHED/fapi_l1.h>
@@ -1107,6 +1108,17 @@ void pnf_nr_phy_deallocate_p7_vendor_ext(void *header)
   free(header);
 }
 
+extern void nr_schedule_ul_dci_req(PHY_VARS_gNB *gNB, nfapi_nr_ul_dci_request_t *UL_dci_req);
+int pnf_phy_ul_dci_req(gNB_L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_nr_ul_dci_request_t *req)
+{
+  DevAssert(RC.gNB != NULL && RC.gNB[0] != NULL);
+  PHY_VARS_gNB *gNB = RC.gNB[0]; // phy_inst?
+  
+  nr_schedule_ul_dci_req(gNB, req);
+
+  return 0;
+}
+
 
 int pnf_phy_hi_dci0_req(L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_hi_dci0_request_t *req) {
   if (req->hi_dci0_request_body.number_of_dci == 0 && req->hi_dci0_request_body.number_of_hi == 0)
@@ -1137,6 +1149,21 @@ int pnf_phy_hi_dci0_req(L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfa
 }
 
 
+// from dl_tti_req_fn fptr
+extern void nr_schedule_dl_tti_req(PHY_VARS_gNB *gNB, nfapi_nr_dl_tti_request_t *DL_req);
+int pnf_phy_dl_tti_req(gNB_L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_nr_dl_tti_request_t *DL_req) 
+{
+  DevAssert(proc == NULL);
+  DevAssert(sync_var == 0);
+  DevAssert(RC.gNB != NULL && RC.gNB[0] != NULL);
+  PHY_VARS_gNB *gNB = RC.gNB[0]; // phy_inst?
+
+  nr_schedule_dl_tti_req(gNB, DL_req);
+
+  return 0;
+}
+
+
 int pnf_phy_dl_config_req(L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request_t *req) {
 
   if (RC.eNB == 0) {
@@ -1229,6 +1256,18 @@ int pnf_phy_dl_config_req(L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, n
 }
 
 
+extern void nr_schedule_tx_req(PHY_VARS_gNB *gNB, nfapi_nr_tx_data_request_t *TX_req);
+int pnf_phy_tx_data_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_nr_tx_data_request_t *req)
+{
+  DevAssert(RC.gNB != NULL && RC.gNB[0] != NULL);
+  PHY_VARS_gNB *gNB = RC.gNB[0]; // phy_inst?
+
+  nr_schedule_tx_req(gNB, req);
+
+  return 0;
+}
+
+
 int pnf_phy_tx_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_tx_request_t *req) {
   uint16_t sfn = NFAPI_SFNSF2SFN(req->sfn_sf);
   uint16_t sf = NFAPI_SFNSF2SF(req->sfn_sf);
@@ -1254,6 +1293,16 @@ int pnf_phy_tx_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_tx_request_t *req) {
   return 0;
 }
 
+extern void nr_schedule_ul_tti_req(PHY_VARS_gNB *gNB, nfapi_nr_ul_tti_request_t *UL_tti_req);
+int pnf_phy_ul_tti_req(gNB_L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_nr_ul_tti_request_t *req)
+{
+  DevAssert(RC.gNB != NULL && RC.gNB[0] != NULL);
+  PHY_VARS_gNB *gNB = RC.gNB[0]; // phy_inst?
+
+  nr_schedule_ul_tti_req(gNB, req);
+  return 0;
+}
+
 int pnf_phy_ul_config_req(L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t *pnf_p7, nfapi_ul_config_request_t *req) {
   if (0)LOG_D(PHY,"[PNF] UL_CONFIG_REQ %s() sfn_sf:%d pdu:%d rach_prach_frequency_resources:%d srs_present:%u\n",
                 __FUNCTION__,
@@ -1662,10 +1711,10 @@ int nr_start_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nf
   }
 
   // NR
-  p7_config->dl_tti_req_fn = NULL;
-  p7_config->ul_tti_req_fn = NULL;
-  p7_config->ul_dci_req_fn = NULL;
-  p7_config->tx_data_req_fn = NULL;
+  p7_config->dl_tti_req_fn = &pnf_phy_dl_tti_req;
+  p7_config->ul_tti_req_fn = &pnf_phy_ul_tti_req;
+  p7_config->ul_dci_req_fn = &pnf_phy_ul_dci_req;
+  p7_config->tx_data_req_fn = &pnf_phy_tx_data_req;
 
   // LTE
   p7_config->dl_config_req = &pnf_phy_dl_config_req;
@@ -1776,39 +1825,17 @@ int nr_start_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nf
   nfapi_nr_send_pnf_start_resp(config, p7_config->phy_id);
   printf("[PNF] Sending first P7 slot indication\n");
 #endif
+#if 1
+  nfapi_pnf_p7_slot_ind(p7_config, p7_config->phy_id, 0, 0);
+  printf("[PNF] Sent first P7 slot ind\n");
+#else
+  nfapi_pnf_p7_subframe_ind(p7_config, p7_config->phy_id, 0); // SFN_SF set to zero - correct???
+  printf("[PNF] Sent first P7 subframe ind\n");
+#endif
 
   return 0;
 }
 
-void stop_nr_nfapi_pnf()
-{
-#ifdef ENABLE_WLS
-  wls_fapi_nr_pnf_stop();
-#endif
-#ifdef ENABLE_SOCKET
-  socket_nfapi_nr_pnf_stop();
-#endif
-}
-static bool has_sent_stop_ind = false;
-int nr_stop_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi_nr_stop_request_scf_t *req)
-{
-  if (has_sent_stop_ind) {
-    // STOP.indication already sent, nothing to do
-    return 0;
-  }
-  NFAPI_TRACE(NFAPI_TRACE_INFO, "Send STOP.indication\n");
-  nfapi_nr_stop_indication_scf_t resp = {.header.message_id = NFAPI_NR_PHY_MSG_TYPE_STOP_INDICATION,
-                                         .header.phy_id = req->header.phy_id};
-  nfapi_nr_stop_indication(config, &resp);
-  has_sent_stop_ind = true;
-#ifdef ENABLE_WLS
-  wls_pnf_close(pnf_p5_init_and_receive_pthread);
-#endif
-  // raise the SIGTERM to simulate CTRL+C
-  raise(SIGTERM);
-  return 0;
-}
-
 int measurement_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi_measurement_request_t *req) {
   nfapi_measurement_response_t resp;
   memset(&resp, 0, sizeof(resp));
@@ -2164,7 +2191,6 @@ void configure_nr_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_add
   config->nr_param_req = &nr_param_request;
   config->nr_config_req = &nr_config_request;
   config->nr_start_req = &nr_start_request;
-  config->nr_stop_req = &nr_stop_request;
   config->rssi_req = &rssi_request;
   config->broadcast_detect_req = &broadcast_detect_request;
   config->system_information_schedule_req = &system_information_schedule_request;
@@ -2295,7 +2321,7 @@ static void maybe_slow_down_pnf(int mu)
   last_execution = current_execution;
 }
 
-void handle_nr_slot_ind(uint16_t sfn, uint16_t slot, NR_Sched_Rsp_t *sched_resp)
+void handle_nr_slot_ind(uint16_t sfn, uint16_t slot)
 {
   nfapi_pnf_p7_config_t *config = p7_config_g;
   pnf_p7_t *_this = (pnf_p7_t *)(config);
@@ -2315,7 +2341,7 @@ void handle_nr_slot_ind(uint16_t sfn, uint16_t slot, NR_Sched_Rsp_t *sched_resp)
 #ifndef ENABLE_WLS
   int slot_ahead = 2 << mu;
 #else
-  int slot_ahead = 1 << mu;
+  int slot_ahead = 1;
 #endif
   uint16_t sfn_tx = sfn;
   uint16_t slot_tx = slot;
@@ -2326,14 +2352,7 @@ void handle_nr_slot_ind(uint16_t sfn, uint16_t slot, NR_Sched_Rsp_t *sched_resp)
   oai_nfapi_nr_slot_indication(&ind);
 
   // copy data from appropriate p7 slot buffers into channel structures for PHY processing
-  nfapi_pnf_p7_get_msgs(config,
-                        config->phy_id,
-                        sfn,
-                        slot,
-                        &sched_resp->DL_req,
-                        &sched_resp->UL_tti_req,
-                        &sched_resp->UL_dci_req,
-                        &sched_resp->TX_req);
+  nfapi_pnf_p7_slot_ind(config, config->phy_id, sfn, slot);
 
   return;
 }

nfapi/oai_integration/nfapi_pnf.h

@@ -28,8 +28,7 @@ void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr,
 void configure_nr_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port);
 
 void oai_subframe_ind(uint16_t sfn, uint16_t sf);
-struct NR_Sched_Rsp;
-void handle_nr_slot_ind(uint16_t sfn, uint16_t slot, struct NR_Sched_Rsp *resp);
+void handle_nr_slot_ind(uint16_t sfn, uint16_t slot);
 void sfnslot_add_slot(int mu, uint16_t *sfn, uint16_t *slot, int offset);
 
 int oai_nfapi_nr_slot_indication(nfapi_nr_slot_indication_scf_t *ind);
@@ -38,5 +37,5 @@ int oai_nfapi_nr_crc_indication(nfapi_nr_crc_indication_t *ind);
 int oai_nfapi_nr_srs_indication(nfapi_nr_srs_indication_t *ind);
 int oai_nfapi_nr_uci_indication(nfapi_nr_uci_indication_t *ind);
 int oai_nfapi_nr_rach_indication(nfapi_nr_rach_indication_t *ind);
-void stop_nr_nfapi_pnf();
+
 #endif /* NFAPI_PNF_H_ */

nfapi/oai_integration/nfapi_vnf.c

@@ -70,25 +70,10 @@
 #endif
 
 #define TEST
-static nfapi_vnf_config_t *config;
+
 extern RAN_CONTEXT_t RC;
 extern UL_RCC_IND_t  UL_RCC_INFO;
 
-nfapi_vnf_config_t * get_config()
-{
-  return config;
-}
-vnf_p7_t *get_p7_vnf()
-{
-  vnf_info *vnf = config->user_data;
-  return (vnf_p7_t *)vnf->p7_vnfs->config;
-}
-
-nfapi_vnf_p7_config_t *get_p7_vnf_config()
-{
-  return &get_p7_vnf()->_public;
-}
-
 int vnf_pack_vendor_extension_tlv(void *ve, uint8_t **ppWritePackedMsg, uint8_t *end, nfapi_p4_p5_codec_config_t *codec) {
   //NFAPI_TRACE(NFAPI_TRACE_INFO, "vnf_pack_vendor_extension_tlv\n");
   nfapi_tl_t *tlv = (nfapi_tl_t *)ve;
@@ -139,6 +124,7 @@ int vnf_nr_unpack_vendor_extension_tlv(nfapi_tl_t *tl,
 {
   return -1;
 }
+void install_nr_schedule_handlers(NR_IF_Module_t *if_inst);
 void install_schedule_handlers(IF_Module_t *if_inst);
 extern int sf_ahead;
 
@@ -340,6 +326,71 @@ int pnf_config_resp_cb(nfapi_vnf_config_t *config, int p5_idx, nfapi_pnf_config_
   return 0;
 }
 
+int wake_gNB_rxtx(PHY_VARS_gNB *gNB, uint16_t sfn, uint16_t slot) {
+  struct timespec curr_t;
+  clock_gettime(CLOCK_MONOTONIC,&curr_t);
+ //NFAPI_TRACE(NFAPI_TRACE_INFO, "\n wake_gNB_rxtx before assignment sfn:%d slot:%d TIME %d.%d",sfn,slot,curr_t.tv_sec,curr_t.tv_nsec);
+  gNB_L1_proc_t *proc=&gNB->proc;
+  gNB_L1_rxtx_proc_t *L1_proc= (slot&1)? &proc->L1_proc : &proc->L1_proc_tx;
+
+  NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
+  //NFAPI_TRACE(NFAPI_TRACE_INFO, "%s(eNB:%p, sfn:%d, sf:%d)\n", __FUNCTION__, eNB, sfn, sf);
+  //int i;
+  struct timespec wait;
+  clock_gettime(CLOCK_REALTIME, &wait);
+  wait.tv_sec = 0;
+  wait.tv_nsec +=5000L;
+  //wait.tv_nsec = 0;
+  // wake up TX for subframe n+sf_ahead
+  // lock the TX mutex and make sure the thread is ready
+  AssertFatal(gNB->if_inst->sl_ahead==6,"gNB->if_inst->sl_ahead %d : This is hard-coded to 6 in nfapi P7!!!\n",gNB->if_inst->sl_ahead);
+  if (pthread_mutex_timedlock(&L1_proc->mutex,&wait) != 0) {
+    LOG_E( PHY, "[gNB] ERROR pthread_mutex_lock for gNB RXTX thread %d (IC %d)\n", L1_proc->slot_rx&1,L1_proc->instance_cnt );
+    exit_fun( "error locking mutex_rxtx" );
+    return(-1);
+  }
+
+  {
+    static uint16_t old_slot = 0;
+    static uint16_t old_sfn = 0;
+    proc->slot_rx = old_slot;
+    proc->frame_rx = old_sfn;
+    // Try to be 1 frame back
+    old_slot = slot;
+    old_sfn = sfn;
+    //NFAPI_TRACE(NFAPI_TRACE_INFO, "\n wake_gNB_rxtx after assignment sfn:%d slot:%d",proc->frame_rx,proc->slot_rx);
+    if (old_slot == 0 && old_sfn % 100 == 0) LOG_W( PHY,"[gNB] sfn/slot:%d%d old_sfn/slot:%d%d proc[rx:%d%d]\n", sfn, slot, old_sfn, old_slot, proc->frame_rx, proc->slot_rx);
+  }
+
+  ++L1_proc->instance_cnt;
+  //LOG_D( PHY,"[VNF-subframe_ind] sfn/sf:%d:%d proc[frame_rx:%d subframe_rx:%d] L1_proc->instance_cnt_rxtx:%d \n", sfn, sf, proc->frame_rx, proc->subframe_rx, L1_proc->instance_cnt_rxtx);
+  // We have just received and processed the common part of a subframe, say n.
+  // TS_rx is the last received timestamp (start of 1st slot), TS_tx is the desired
+  // transmitted timestamp of the next TX slot (first).
+  // The last (TS_rx mod samples_per_frame) was n*samples_per_tti,
+  // we want to generate subframe (n+N), so TS_tx = TX_rx+N*samples_per_tti,
+  // and proc->subframe_tx = proc->subframe_rx+sf_ahead
+  L1_proc->timestamp_tx = proc->timestamp_rx + (gNB->if_inst->sl_ahead *fp->samples_per_subframe);
+  L1_proc->frame_rx     = proc->frame_rx;
+  L1_proc->slot_rx      = proc->slot_rx;
+  L1_proc->frame_tx     = (L1_proc->slot_rx > (19-gNB->if_inst->sl_ahead)) ? (L1_proc->frame_rx+1)&1023 : L1_proc->frame_rx;
+  L1_proc->slot_tx      = (L1_proc->slot_rx + gNB->if_inst->sl_ahead)%20;
+
+  //LOG_D(PHY, "sfn/sf:%d%d proc[rx:%d%d] rx:%d%d] About to wake rxtx thread\n\n", sfn, slot, proc->frame_rx, proc->slot_rx, L1_proc->frame_rx, L1_proc->slot_rx);
+  //NFAPI_TRACE(NFAPI_TRACE_INFO, "\nEntering wake_gNB_rxtx sfn %d slot %d\n",L1_proc->frame_rx,L1_proc->slot_rx);
+  // the thread can now be woken up
+  if (pthread_cond_signal(&L1_proc->cond) != 0) {
+    LOG_E( PHY, "[gNB] ERROR pthread_cond_signal for gNB RXn-TXnp4 thread\n");
+    exit_fun( "ERROR pthread_clond_signal" );
+    return(-1);
+  }
+
+  //LOG_D(PHY,"%s() About to attempt pthread_mutex_unlock\n", __FUNCTION__);
+  pthread_mutex_unlock( &L1_proc->mutex );
+  //LOG_D(PHY,"%s() UNLOCKED pthread_mutex_unlock\n", __FUNCTION__);
+  return(0);
+}
+
 int wake_eNB_rxtx(PHY_VARS_eNB *eNB, uint16_t sfn, uint16_t sf) {
   L1_proc_t *proc=&eNB->proc;
   L1_rxtx_proc_t *L1_proc= (sf&1)? &proc->L1_proc : &proc->L1_proc_tx;
@@ -447,6 +498,28 @@ int phy_sync_indication(struct nfapi_vnf_p7_config *config, uint8_t sync) {
 }
 
 
+int phy_slot_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id, uint16_t sfn, uint16_t slot) {
+  static uint8_t first_time = 1;
+
+  if (first_time) {
+    NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] slot indication %d.%d\n", sfn, slot);
+    first_time = 0;
+  }
+
+  if (RC.gNB && RC.gNB[0]->configured) {
+    // uint16_t sfn = NFAPI_SFNSF2SFN(sfn_sf);
+    // uint16_t sf = NFAPI_SFNSF2SF(sfn_sf);
+    LOG_D(PHY,"[VNF] slot indication sfn:%d slot:%d\n", sfn, slot);
+    wake_gNB_rxtx(RC.gNB[0], sfn, slot); // DONE: find NR equivalent
+  } else {
+    NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] %s() RC.gNB:%p\n", __FUNCTION__, RC.gNB);
+
+    if (RC.gNB) NFAPI_TRACE(NFAPI_TRACE_INFO, "RC.gNB[0]->configured:%d\n", RC.gNB[0]->configured);
+  }
+
+  return 0;
+}
+
 int phy_subframe_indication(struct nfapi_vnf_p7_config *config, uint16_t phy_id, uint16_t sfn_sf) {
   static uint8_t first_time = 1;
 
@@ -898,63 +971,65 @@ int phy_cqi_indication(struct nfapi_vnf_p7_config *config, nfapi_cqi_indication_
 //NR phy indication
 
 
+NR_Sched_Rsp_t g_sched_resp;
+void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frame, slot_t slot, NR_Sched_Rsp_t* sched_info);
 int oai_nfapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req);
 int oai_nfapi_ul_tti_req(nfapi_nr_ul_tti_request_t *ul_tti_req);
 int oai_nfapi_tx_data_req(nfapi_nr_tx_data_request_t* tx_data_req);
 int oai_nfapi_ul_dci_req(nfapi_nr_ul_dci_request_t* ul_dci_req);
 
+int trigger_scheduler(nfapi_nr_slot_indication_scf_t *slot_ind)
+{
+  // Call into the scheduler (this is hardcoded and should be init properly!)
+  // memset(sched_resp, 0, sizeof(*sched_resp));
+  gNB_dlsch_ulsch_scheduler(0, slot_ind->sfn, slot_ind->slot, &g_sched_resp);
+
+#ifdef ENABLE_AERIAL
+    bool send_slt_resp = false;
+    if (g_sched_resp.DL_req.dl_tti_request_body.nPDUs> 0) {
+      oai_fapi_dl_tti_req(&g_sched_resp.DL_req);
+      send_slt_resp = true;
+    }
+    if (g_sched_resp.UL_tti_req.n_pdus > 0) {
+      oai_fapi_ul_tti_req(&g_sched_resp.UL_tti_req);
+      send_slt_resp = true;
+    }
+    if (g_sched_resp.TX_req.Number_of_PDUs > 0) {
+      oai_fapi_tx_data_req(&g_sched_resp.TX_req);
+      send_slt_resp = true;
+    }
+    if (g_sched_resp.UL_dci_req.numPdus > 0) {
+      oai_fapi_ul_dci_req(&g_sched_resp.UL_dci_req);
+      send_slt_resp = true;
+    }
+    if (send_slt_resp) {
+      oai_fapi_send_end_request(0,slot_ind->sfn, slot_ind->slot);
+    }
+#else
+  if (g_sched_resp.DL_req.dl_tti_request_body.nPDUs > 0)
+    oai_nfapi_dl_tti_req(&g_sched_resp.DL_req);
+
+  if (g_sched_resp.UL_tti_req.n_pdus > 0)
+    oai_nfapi_ul_tti_req(&g_sched_resp.UL_tti_req);
+
+  if (g_sched_resp.TX_req.Number_of_PDUs > 0)
+    oai_nfapi_tx_data_req(&g_sched_resp.TX_req);
+
+  if (g_sched_resp.UL_dci_req.numPdus > 0)
+    oai_nfapi_ul_dci_req(&g_sched_resp.UL_dci_req);
+#endif
+
+  NR_UL_IND_t ind = {.frame = slot_ind->sfn, .slot = slot_ind->slot, };
+  NR_UL_indication(&ind);
+
+  return 1;
+}
+
 int phy_nr_slot_indication(nfapi_nr_slot_indication_scf_t *ind)
 {
   LOG_D(MAC, "VNF SFN/Slot %d.%d \n", ind->sfn, ind->slot);
 
-  // this variable is very big (multiple MB), so we put it into static storage
-  // to not overflow the stack while still having it in local (function) scope
-  // also, phy_nr_slot_indication() is only executed by one thread, serially
-  static NR_Sched_Rsp_t sched_response;
-  NR_IF_Module_t *ifi = RC.nrmac[0]->if_inst;
-  ifi->NR_slot_indication(ind, &sched_response);
-
-#ifdef ENABLE_AERIAL
-    bool send_slt_resp = false;
-    if (sched_response.DL_req.dl_tti_request_body.nPDUs> 0) {
-      oai_fapi_dl_tti_req(&sched_response.DL_req);
-      send_slt_resp = true;
-    }
-    if (sched_response.UL_tti_req.n_pdus > 0) {
-      oai_fapi_ul_tti_req(&sched_response.UL_tti_req);
-      send_slt_resp = true;
-    }
-    if (sched_response.TX_req.Number_of_PDUs > 0) {
-      oai_fapi_tx_data_req(&sched_response.TX_req);
-      send_slt_resp = true;
-    }
-    if (sched_response.UL_dci_req.numPdus > 0) {
-      oai_fapi_ul_dci_req(&sched_response.UL_dci_req);
-      send_slt_resp = true;
-    }
-    if (send_slt_resp) {
-      oai_fapi_send_end_request(0, ind->sfn, ind->slot);
-    }
-#else
-  if (sched_response.DL_req.dl_tti_request_body.nPDUs > 0)
-    oai_nfapi_dl_tti_req(&sched_response.DL_req);
-
-  if (sched_response.UL_tti_req.n_pdus > 0)
-    oai_nfapi_ul_tti_req(&sched_response.UL_tti_req);
-
-  if (sched_response.TX_req.Number_of_PDUs > 0)
-    oai_nfapi_tx_data_req(&sched_response.TX_req);
-
-  if (sched_response.UL_dci_req.numPdus > 0)
-    oai_nfapi_ul_dci_req(&sched_response.UL_dci_req);
-#endif
-
-  /* the below works because the function behind the callback collects
-   * messages from queue into which messages have been copied.
-   * TODO we should have different callbacks for received messages and call
-   * into the scheduler separately for each message instead of one big one. */
-  NR_UL_IND_t ul_ind = {.frame = ind->sfn, .slot = ind->slot, };
-  ifi->NR_UL_indication(&ul_ind);
+  trigger_scheduler(ind);
 
   return 1;
 }
@@ -1230,7 +1305,7 @@ void *configure_nr_p7_vnf(void *ptr)
   p7_vnf->config->port = p7_vnf->local_port;
 #ifndef ENABLE_AERIAL
   p7_vnf->config->sync_indication = &phy_sync_indication;
-  p7_vnf->config->slot_indication = NULL;
+  p7_vnf->config->slot_indication = &phy_slot_indication;
   p7_vnf->config->harq_indication = &phy_harq_indication;
 #endif
   p7_vnf->config->nr_crc_indication = &phy_nr_crc_indication;
@@ -1266,6 +1341,7 @@ void *configure_nr_p7_vnf(void *ptr)
   p7_vnf->config->hdr_unpack_func = &fapi_nr_p7_message_header_unpack;
   p7_vnf->config->pack_func = &fapi_nr_p7_message_pack;
   p7_vnf->config->send_p7_msg = &wls_vnf_nr_send_p7_message;
+  wls_vnf_set_p7_config(p7_vnf->config);
 #endif
 
 #ifdef ENABLE_SOCKET
@@ -1291,7 +1367,7 @@ void *vnf_p7_thread_start(void *ptr) {
   p7_vnf->config->port = p7_vnf->local_port;
   p7_vnf->config->sync_indication = &phy_sync_indication;
   p7_vnf->config->subframe_indication = &phy_subframe_indication;
-  p7_vnf->config->slot_indication = NULL;
+  p7_vnf->config->slot_indication = &phy_slot_indication;
 
   p7_vnf->config->harq_indication = &phy_harq_indication;
   p7_vnf->config->crc_indication = &phy_crc_indication;
@@ -1659,86 +1735,32 @@ void vnf_start_thread(void *ptr) {
   nfapi_vnf_start((nfapi_vnf_config_t *)ptr);
 }
 
-static bool has_stop_ind = false;
-static bool waiting_stop_ind = false;
-int nr_stop_ind_cb(nfapi_vnf_config_t *config, int p5_idx, nfapi_nr_stop_indication_scf_t *resp)
-{
-  NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] Received NFAPI_STOP_IND idx:%d phy_id:%d\n", p5_idx, resp->header.phy_id);
-  has_stop_ind = true;
-#ifdef ENABLE_AERIAL
-  nvIPC_Stop();
-#endif
-#ifdef ENABLE_SOCKET
-  nfapi_vnf_p7_stop(get_p7_vnf_config());
-#endif
-#ifdef ENABLE_WLS
-  wls_vnf_stop();
-#endif
-  if (!waiting_stop_ind) {
-    // hasn't been initialized yet, means the PNF stopped before the VNF did
-    // raise a SIGINT to stop the VNF
-    raise(SIGINT);
-  }
-  return 0;
-}
-
-void stop_nr_nfapi_vnf()
-{
-  if (has_stop_ind) {
-    // If it got here with the STOP.indication flag already set, it means it was triggered by the PNF,
-    // no need to send a STOP.request
-    return;
-  }
-#ifdef ENABLE_WLS
-  wls_vnf_send_stop_request();
-#endif
-#ifdef ENABLE_AERIAL
-  nvIPC_send_stop_request();
-#endif
-#ifdef ENABLE_SOCKET
-  socket_nfapi_send_stop_request((vnf_t *)config);
-#endif
-  waiting_stop_ind = true;
-  uint64_t counter = 0;
-  vnf_p7_t *p7_vnf = get_p7_vnf();
-  while (p7_vnf->terminate == 0 && counter < 50) {
-    NFAPI_TRACE(NFAPI_TRACE_DEBUG, "Not terminated yet, counter %ld\n", counter);
-    usleep(1000);
-    counter++;
-  }
-  if (p7_vnf->terminate == 0) {
-    NFAPI_TRACE(NFAPI_TRACE_ERROR, "STOP.indication timed out, exiting\n");
-    nfapi_nr_stop_indication_scf_t msg = {.header.message_id = NFAPI_NR_PHY_MSG_TYPE_STOP_INDICATION, .header.phy_id = 0};
-    config->nr_stop_ind(config, 0, &msg);
-  } else {
-    NFAPI_TRACE(NFAPI_TRACE_DEBUG, "Terminated, exiting\n");
-  }
-}
+static vnf_info vnf;
 
 void configure_nr_nfapi_vnf(eth_params_t params)
 {
 #ifndef ENABLE_AERIAL
   nfapi_setmode(NFAPI_MODE_VNF);
 #endif
-  vnf_info *vnf = calloc(1, sizeof(vnf_info));
-  memset(vnf->p7_vnfs, 0, sizeof(vnf->p7_vnfs));
-  vnf->p7_vnfs[0].timing_window = 30;
-  vnf->p7_vnfs[0].periodic_timing_enabled = 0;
-  vnf->p7_vnfs[0].aperiodic_timing_enabled = 0;
-  vnf->p7_vnfs[0].periodic_timing_period = 1;
-  vnf->p7_vnfs[0].config = nfapi_vnf_p7_config_create();
+  memset(&vnf, 0, sizeof(vnf));
+  memset(vnf.p7_vnfs, 0, sizeof(vnf.p7_vnfs));
+  vnf.p7_vnfs[0].timing_window = 30;
+  vnf.p7_vnfs[0].periodic_timing_enabled = 0;
+  vnf.p7_vnfs[0].aperiodic_timing_enabled = 0;
+  vnf.p7_vnfs[0].periodic_timing_period = 1;
+  vnf.p7_vnfs[0].config = nfapi_vnf_p7_config_create();
 #ifndef ENABLE_AERIAL
   NFAPI_TRACE(NFAPI_TRACE_INFO,
-              "[VNF] %s() vnf->p7_vnfs[0].config:%p VNF ADDRESS:%s:%d\n",
+              "[VNF] %s() vnf.p7_vnfs[0].config:%p VNF ADDRESS:%s:%d\n",
               __FUNCTION__,
-              vnf->p7_vnfs[0].config,
+              vnf.p7_vnfs[0].config,
               params.my_addr,
               params.my_portc);
-  strcpy(vnf->p7_vnfs[0].local_addr, params.my_addr);
-  vnf->p7_vnfs[0].local_port = params.my_portd;
+  strcpy(vnf.p7_vnfs[0].local_addr, params.my_addr);
+  vnf.p7_vnfs[0].local_port = params.my_portd;
 #endif
-  vnf->p7_vnfs[0].mac = malloc(sizeof(mac_t));
-  config = nfapi_vnf_config_create();
+  vnf.p7_vnfs[0].mac = (mac_t *)malloc(sizeof(mac_t));
+  nfapi_vnf_config_t *config = nfapi_vnf_config_create();
   config->malloc = malloc;
   config->free = free;
   config->vnf_p5_port = params.my_portc;
@@ -1756,10 +1778,9 @@ void configure_nr_nfapi_vnf(eth_params_t params)
   config->nr_param_resp = &nr_param_resp_cb;
   config->nr_config_resp = &nr_config_resp_cb;
   config->nr_start_resp = &nr_start_resp_cb;
-  config->nr_stop_ind = &nr_stop_ind_cb;
   config->nr_error_ind = &nr_error_ind_cb;
   config->vendor_ext = &vendor_nr_ext_cb;
-  config->user_data = vnf;
+  config->user_data = &vnf;
   // To allow custom vendor extentions to be added to nfapi
   config->codec_config.unpack_vendor_extension_tlv = &vnf_nr_unpack_vendor_extension_tlv;
   config->codec_config.pack_vendor_extension_tlv = &vnf_nr_pack_vendor_extension_tlv;
@@ -1796,6 +1817,7 @@ void configure_nr_nfapi_vnf(eth_params_t params)
   config->hdr_unpack_func = &fapi_nr_message_header_unpack;
   config->pack_func = &fapi_nr_p5_message_pack;
   config->send_p5_msg = &aerial_nr_send_p5_message;
+  set_config(config);
   NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] Created VNF NFAPI start thread %s\n", __FUNCTION__);
   nfapi_vnf_pnf_info_t *pnf = (nfapi_vnf_pnf_info_t *)malloc(sizeof(nfapi_vnf_pnf_info_t));
   NFAPI_TRACE(NFAPI_TRACE_INFO, "MALLOC nfapi_vnf_pnf_info_t for pnf_list pnf:%p\n", pnf);
@@ -1804,6 +1826,7 @@ void configure_nr_nfapi_vnf(eth_params_t params)
   pnf->connected = 1;
   // Add needed parameters
 
+  vnf_info *vnf = (vnf_info *)(config->user_data);
   pnf_info *pnf_info = vnf->pnfs;
 
   for (int i = 0; i < 1; ++i) {
@@ -1840,23 +1863,18 @@ void configure_nr_nfapi_vnf(eth_params_t params)
 
 void configure_nfapi_vnf(char *vnf_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port) {
   nfapi_setmode(NFAPI_MODE_VNF);
-  vnf_info *vnf = calloc(1, sizeof(vnf_info));
-  memset(vnf->p7_vnfs, 0, sizeof(vnf->p7_vnfs));
-  vnf->p7_vnfs[0].timing_window = 32;
-  vnf->p7_vnfs[0].periodic_timing_enabled = 1;
-  vnf->p7_vnfs[0].aperiodic_timing_enabled = 0;
-  vnf->p7_vnfs[0].periodic_timing_period = 10;
-  vnf->p7_vnfs[0].config = nfapi_vnf_p7_config_create();
-  NFAPI_TRACE(NFAPI_TRACE_INFO,
-              "[VNF] %s() vnf.p7_vnfs[0].config:%p VNF ADDRESS:%s:%d\n",
-              __FUNCTION__,
-              vnf->p7_vnfs[0].config,
-              vnf_addr,
-              vnf_p5_port);
-  strcpy(vnf->p7_vnfs[0].local_addr, vnf_addr);
-  vnf->p7_vnfs[0].local_port = vnf_p7_port;
-  vnf->p7_vnfs[0].mac = malloc(sizeof(mac_t));
-  config = nfapi_vnf_config_create();
+  memset(&vnf, 0, sizeof(vnf));
+  memset(vnf.p7_vnfs, 0, sizeof(vnf.p7_vnfs));
+  vnf.p7_vnfs[0].timing_window = 32;
+  vnf.p7_vnfs[0].periodic_timing_enabled = 1;
+  vnf.p7_vnfs[0].aperiodic_timing_enabled = 0;
+  vnf.p7_vnfs[0].periodic_timing_period = 10;
+  vnf.p7_vnfs[0].config = nfapi_vnf_p7_config_create();
+  NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] %s() vnf.p7_vnfs[0].config:%p VNF ADDRESS:%s:%d\n", __FUNCTION__, vnf.p7_vnfs[0].config, vnf_addr, vnf_p5_port);
+  strcpy(vnf.p7_vnfs[0].local_addr, vnf_addr);
+  vnf.p7_vnfs[0].local_port = vnf_p7_port;
+  vnf.p7_vnfs[0].mac = (mac_t *)malloc(sizeof(mac_t));
+  nfapi_vnf_config_t *config = nfapi_vnf_config_create();
   config->malloc = malloc;
   config->free = free;
   config->vnf_p5_port = vnf_p5_port;
@@ -1875,7 +1893,7 @@ void configure_nfapi_vnf(char *vnf_addr, int vnf_p5_port, char *pnf_ip_addr, int
   config->config_resp = &config_resp_cb;
   config->start_resp = &start_resp_cb;
   config->vendor_ext = &vendor_ext_cb;
-  config->user_data = vnf;
+  config->user_data = &vnf;
   // To allow custom vendor extentions to be added to nfapi
   config->codec_config.unpack_vendor_extension_tlv = &vnf_unpack_vendor_extension_tlv;
   config->codec_config.pack_vendor_extension_tlv = &vnf_pack_vendor_extension_tlv;
@@ -1892,7 +1910,7 @@ void configure_nfapi_vnf(char *vnf_addr, int vnf_p5_port, char *pnf_ip_addr, int
 }
 
 int oai_nfapi_dl_config_req(nfapi_dl_config_request_t *dl_config_req) {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
   dl_config_req->header.phy_id = 1; // HACK TODO FIXME - need to pass this around!!!!
   dl_config_req->header.message_id = NFAPI_DL_CONFIG_REQUEST;
   LOG_D(PHY, "[VNF] %s() DL_CONFIG_REQ sfn_sf:%d_%d number_of_pdus:%d\n", __FUNCTION__,
@@ -1928,7 +1946,7 @@ int oai_nfapi_dl_config_req(nfapi_dl_config_request_t *dl_config_req) {
 int oai_nfapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req)
 {
   LOG_D(NR_PHY, "Entering oai_nfapi_nr_dl_config_req sfn:%d,slot:%d\n", dl_config_req->SFN, dl_config_req->Slot);
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
   dl_config_req->header.message_id= NFAPI_NR_PHY_MSG_TYPE_DL_TTI_REQUEST;
   dl_config_req->header.phy_id = 1; // HACK TODO FIXME - need to pass this around!!!!
 
@@ -1947,7 +1965,7 @@ int oai_nfapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req)
 int oai_nfapi_tx_data_req(nfapi_nr_tx_data_request_t *tx_data_req)
 {
   LOG_D(NR_PHY, "Entering oai_nfapi_nr_tx_data_req sfn:%d,slot:%d\n", tx_data_req->SFN, tx_data_req->Slot);
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
   tx_data_req->header.phy_id = 1; // HACK TODO FIXME - need to pass this around!!!!
   tx_data_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST;
   //LOG_D(PHY, "[VNF] %s() TX_REQ sfn_sf:%d number_of_pdus:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(tx_req->sfn_sf), tx_req->tx_request_body.number_of_pdus);
@@ -1964,7 +1982,7 @@ int oai_nfapi_tx_data_req(nfapi_nr_tx_data_request_t *tx_data_req)
 
 int oai_nfapi_tx_req(nfapi_tx_request_t *tx_req)
 {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
   tx_req->header.phy_id = 1; // HACK TODO FIXME - need to pass this around!!!!
   tx_req->header.message_id = NFAPI_TX_REQUEST;
   //LOG_D(PHY, "[VNF] %s() TX_REQ sfn_sf:%d number_of_pdus:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(tx_req->sfn_sf), tx_req->tx_request_body.number_of_pdus);
@@ -1980,7 +1998,7 @@ int oai_nfapi_tx_req(nfapi_tx_request_t *tx_req)
 }
 
 int oai_nfapi_ul_dci_req(nfapi_nr_ul_dci_request_t *ul_dci_req) {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
   ul_dci_req->header.phy_id = 1; // HACK TODO FIXME - need to pass this around!!!!
   ul_dci_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_UL_DCI_REQUEST;
   //LOG_D(PHY, "[VNF] %s() HI_DCI0_REQ sfn_sf:%d dci:%d hi:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(hi_dci0_req->sfn_sf), hi_dci0_req->hi_dci0_request_body.number_of_dci, hi_dci0_req->hi_dci0_request_body.number_of_hi);
@@ -1996,7 +2014,7 @@ int oai_nfapi_ul_dci_req(nfapi_nr_ul_dci_request_t *ul_dci_req) {
 }
 
 int oai_nfapi_hi_dci0_req(nfapi_hi_dci0_request_t *hi_dci0_req) {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
   hi_dci0_req->header.phy_id = 1; // HACK TODO FIXME - need to pass this around!!!!
   hi_dci0_req->header.message_id = NFAPI_HI_DCI0_REQUEST;
   //LOG_D(PHY, "[VNF] %s() HI_DCI0_REQ sfn_sf:%d dci:%d hi:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(hi_dci0_req->sfn_sf), hi_dci0_req->hi_dci0_request_body.number_of_dci, hi_dci0_req->hi_dci0_request_body.number_of_hi);
@@ -2032,7 +2050,7 @@ static void remove_ul_config_req_pdu(int index, nfapi_ul_config_request_t *ul_co
 }
 
 int oai_nfapi_ul_tti_req(nfapi_nr_ul_tti_request_t *ul_tti_req) {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
 
   ul_tti_req->header.phy_id = 1; // HACK TODO FIXME - need to pass this around!!!!
   ul_tti_req->header.message_id = NFAPI_NR_PHY_MSG_TYPE_UL_TTI_REQUEST;
@@ -2052,7 +2070,7 @@ int oai_nfapi_ul_tti_req(nfapi_nr_ul_tti_request_t *ul_tti_req) {
 }
 
 int oai_nfapi_ul_config_req(nfapi_ul_config_request_t *ul_config_req) {
-  nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+  nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
   ul_config_req->header.phy_id = 1; // HACK TODO FIXME - need to pass this around!!!!
   ul_config_req->header.message_id = NFAPI_UL_CONFIG_REQUEST;
   //LOG_D(PHY, "[VNF] %s() header message_id:%02x\n", __FUNCTION__, ul_config_req->header.message_id);
@@ -2112,7 +2130,7 @@ int oai_nfapi_ul_config_req(nfapi_ul_config_request_t *ul_config_req) {
 int oai_nfapi_ue_release_req(nfapi_ue_release_request_t *release_req){
     if(release_req->ue_release_request_body.number_of_TLVs <= 0)
         return 0;
-    nfapi_vnf_p7_config_t *p7_config = get_p7_vnf_config();
+    nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
 
     release_req->header.phy_id = 1; // HACK TODO FIXME - need to pass this around!!!!
     release_req->header.message_id = NFAPI_UE_RELEASE_REQUEST;

nfapi/oai_integration/nfapi_vnf.h

@@ -148,8 +148,5 @@ typedef struct {
 
 void configure_nfapi_vnf(char *vnf_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port);
 void configure_nr_nfapi_vnf(eth_params_t params);
-void stop_nr_nfapi_vnf();
-nfapi_vnf_config_t *get_config();
-vnf_p7_t *get_p7_vnf();
-nfapi_vnf_p7_config_t *get_p7_vnf_config();
+
 #endif /* NFAPI_VNF_H_ */

nfapi/oai_integration/socket/include/socket_pnf.h

@@ -36,5 +36,4 @@ bool pnf_nr_send_p5_message(pnf_t *pnf, nfapi_nr_p4_p5_message_header_t *msg, ui
 bool pnf_nr_send_p7_message(pnf_p7_t* pnf_p7, nfapi_nr_p7_message_header_t* header, uint32_t msg_len);
 void *pnf_start_p5_thread(void *ptr);
 void *pnf_nr_p7_thread_start(void *ptr);
-void socket_nfapi_nr_pnf_stop();
 #endif // SOCKET_PNF_H

nfapi/oai_integration/socket/include/socket_vnf.h

@@ -31,5 +31,4 @@ bool vnf_nr_send_p5_msg(vnf_t *vnf, uint16_t p5_idx, nfapi_nr_p4_p5_message_head
 bool vnf_nr_send_p7_msg(vnf_p7_t *vnf_p7, nfapi_nr_p7_message_header_t* header);
 void vnf_start_p5_thread(void* ptr);
 void* vnf_nr_start_p7_thread(void* ptr);
-void socket_nfapi_send_stop_request(vnf_t *vnf);
 #endif // SOCKET_VNF_H

nfapi/oai_integration/socket/socket_pnf.c

@@ -20,15 +20,6 @@
  */
 #include "socket_pnf.h"
 #include "nfapi.h"
-static nfapi_pnf_config_t *config;
-void socket_nfapi_nr_pnf_stop()
-{
-  AssertFatal(config->nr_stop_req, "STOP.request Handler should be set!");
-  nfapi_nr_stop_request_scf_t req = {0};
-  req.header.phy_id = 0;
-  req.header.message_id = NFAPI_NR_PHY_MSG_TYPE_PNF_STOP_REQUEST;
-  config->nr_stop_req(config, 0, &req);
-}
 
 bool pnf_nr_send_p5_message(pnf_t *pnf, nfapi_nr_p4_p5_message_header_t *msg, uint32_t msg_len)
 {
@@ -157,7 +148,7 @@ bool pnf_nr_send_p7_message(pnf_p7_t *pnf_p7, nfapi_nr_p7_message_header_t *head
 void *pnf_start_p5_thread(void *ptr)
 {
   NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF] IN PNF NFAPI start thread %s\n", __FUNCTION__);
-  config = (nfapi_pnf_config_t *)ptr;
+  nfapi_pnf_config_t *config = (nfapi_pnf_config_t *)ptr;
   struct sched_param sp;
   sp.sched_priority = 20;
   pthread_setschedparam(pthread_self(), SCHED_FIFO, &sp);

nfapi/oai_integration/socket/socket_vnf.c

@@ -20,26 +20,9 @@
  */
 #include "socket_vnf.h"
 
-#include "common/utils/LOG/log.h"
 #include "nfapi.h"
-#include "nfapi_vnf.h"
-#include <common/platform_constants.h>
 #include "nfapi/oai_integration/vendor_ext.h" //TODO: Remove this include when removing the Aerial transport stuff
 
-
-void socket_stop_nfapi_p5_p7()
-{
-  get_p7_vnf()->terminate = 1;
-  get_config()->pnf_disconnect_indication = NULL;
-}
-
-void socket_nfapi_send_stop_request(vnf_t *vnf)
-{
-  nfapi_nr_stop_request_scf_t req = {.header.message_id = NFAPI_NR_PHY_MSG_TYPE_STOP_REQUEST, .header.phy_id = 0};
-  nfapi_nr_vnf_stop_req(&vnf->_public, 0, &req);
-  NFAPI_TRACE(NFAPI_TRACE_INFO, "Sent NFAPI STOP.request\n");
-}
-
 static bool send_p5_msg(vnf_t *vnf, nfapi_vnf_pnf_info_t *pnf, const void *msg, int len, uint8_t stream)
 {
   int result = socket_send_p5_msg(vnf->sctp, pnf->p5_sock, &pnf->p5_pnf_sockaddr, msg, len, stream);
@@ -296,6 +279,7 @@ static int nfapi_nr_vnf_p5_start(nfapi_vnf_config_t *config)
   // Verify that config is not null
   if (config == 0)
     return -1;
+
   NFAPI_TRACE(NFAPI_TRACE_INFO, "%s()\n", __FUNCTION__);
 
   int p5ListenSock, p5Sock;
@@ -309,7 +293,7 @@ static int nfapi_nr_vnf_p5_start(nfapi_vnf_config_t *config)
   struct sctp_initmsg initMsg = {0};
   int noDelay;
 
-  vnf_t *vnf = (vnf_t *)(get_config());
+  vnf_t *vnf = (vnf_t *)(config);
 
   NFAPI_TRACE(NFAPI_TRACE_INFO, "Starting P5 VNF connection on port %u\n", config->vnf_p5_port);
 
@@ -763,8 +747,8 @@ static int nfapi_nr_vnf_p7_start(nfapi_vnf_p7_config_t *config)
     return -1;
 
   NFAPI_TRACE(NFAPI_TRACE_INFO, "%s()\n", __FUNCTION__);
-  vnf_p7_t *vnf_p7 = get_p7_vnf();
-  vnf_p7 = (vnf_p7_t *)config;
+
+  vnf_p7_t *vnf_p7 = (vnf_p7_t *)config;
 
   // Create p7 receive udp port
   // todo : this needs updating for Ipv6

nfapi/oai_integration/wls_integration/include/wls_common.h

@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include "wls_lib.h"
 #include "nfapi/open-nFAPI/fapi/inc/nr_fapi_p5_utils.h"
 #include "nfapi/open-nFAPI/fapi/inc/nr_fapi_p7_utils.h"
 

nfapi/oai_integration/wls_integration/include/wls_pnf.h

@@ -30,6 +30,4 @@ bool wls_pnf_nr_send_p7_message(pnf_p7_t* pnf_p7,nfapi_nr_p7_message_header_t *m
 void *wls_fapi_pnf_nr_start_thread(void *ptr);
 int wls_fapi_nr_pnf_start();
 void wls_pnf_set_p7_config(void *p7_config);
-void wls_fapi_nr_pnf_stop();
-void wls_pnf_close(pthread_t p5_thread);
 #endif // OPENAIRINTERFACE_WLS_PNF_H

nfapi/oai_integration/wls_integration/include/wls_vnf.h

@@ -27,8 +27,7 @@
 
 void *wls_fapi_vnf_nr_start_thread(void *ptr);
 int wls_fapi_nr_vnf_start();
+void wls_vnf_set_p7_config(void *p7_config);
 bool wls_vnf_nr_send_p5_message(vnf_t *vnf,uint16_t p5_idx, nfapi_nr_p4_p5_message_header_t* msg, uint32_t msg_len);
 bool wls_vnf_nr_send_p7_message(vnf_p7_t* vnf_p7,nfapi_nr_p7_message_header_t* msg);
-void wls_vnf_send_stop_request();
-void wls_vnf_stop();
 #endif //OPENAIRINTERFACE_WLS_VNF_H

nfapi/oai_integration/wls_integration/wls_common.c

@@ -20,7 +20,7 @@
  */
 
 #include "wls_common.h"
-#include "wls_lib.h"
+
 void fill_fapi_list_elem(p_fapi_api_queue_elem_t currElem, p_fapi_api_queue_elem_t nextElem, const uint8_t msgType, const uint8_t numMsgInBlock, const uint32_t alignOffset)
 {
     currElem->msg_type             = msgType;
@@ -90,19 +90,9 @@ uint8_t wls_send_fapi_msg(PWLS_MAC_CTX pWls, const uint16_t message_id, const in
 {
   int num_avail_blocks = WLS_NumBlocks(pWls->hWls);
   NFAPI_TRACE(NFAPI_TRACE_DEBUG,"num_avail_blocks is %d\n", num_avail_blocks);
-  int counter = 0;
   while (num_avail_blocks < 2) {
     num_avail_blocks = WLS_NumBlocks(pWls->hWls);
     NFAPI_TRACE(NFAPI_TRACE_DEBUG,"num_avail_blocks is %d\n", num_avail_blocks);
-    if (message_id == NFAPI_NR_PHY_MSG_TYPE_STOP_INDICATION) {
-      // In the case of the STOP.indication, it can happen that this is called after the VNF stopped
-      // For example, if it crashed for some reason, in that case, implement a timeout and return
-      usleep(10 * 1000);
-      counter++;
-      if (counter == 10) {
-        return true;
-      }
-    }
   }
   /* get PA blocks for header and msg */
   uint64_t pa_hdr = dequeueBlock(pWls);