Merge branch 'integration_2024_w09' into 'develop'

Integration: 2024.w09 See merge request oai/openairinterface5g!2593 * !2558 Fixed for the PRB allocation issue assert in DLSCH scheduler * !2562 Fix FR2 SSB start subcarrier * !2582 BugFix "PDCP: Handle sdap header." * !2584 NGAP: Fix byte order of NSSAI SD * !2590 T tracer: textlog: remove GUI code * !2572 Harmonize computation of RA-RNTI * !2577 Fix name clashes between OAI and E2 Agent * !2545 E1 Re-establishment * !2553 fix issues related to tx timing advance for HW RF board unpaired RX/TX timestaps and for 5G UE TA algorithm * !2571 Add SDAP reconfiguration, fixes, and documentation updates * !2576 RFSIM: cleanup and documentation * !2586 Better dci decoding * !2596 CI: maintenance/stability fixes * !2601 CI: use tini for container process mgmt, describe core dump recovery * !2589 gNB: increase some configuration defaults * !2521 CI: Modifs of UndeployObject - log collection

Merge branch 'integration_2024_w09' into 'develop'
Integration: 2024.w09 See merge request oai/openairinterface5g!2593 * !2558 Fixed for the PRB allocation issue assert in DLSCH scheduler * !2562 Fix FR2 SSB start subcarrier * !2582 BugFix "PDCP: Handle sdap header." * !2584 NGAP: Fix byte order of NSSAI SD * !2590 T tracer: textlog: remove GUI code * !2572 Harmonize computation of RA-RNTI * !2577 Fix name clashes between OAI and E2 Agent * !2545 E1 Re-establishment * !2553 fix issues related to tx timing advance for HW RF board unpaired RX/TX timestaps and for 5G UE TA algorithm * !2571 Add SDAP reconfiguration, fixes, and documentation updates * !2576 RFSIM: cleanup and documentation * !2586 Better dci decoding * !2596 CI: maintenance/stability fixes * !2601 CI: use tini for container process mgmt, describe core dump recovery * !2589 gNB: increase some configuration defaults * !2521 CI: Modifs of UndeployObject - log collection
b99e8567 · Robert Schmidt · c99db698 · 543250e9 · b99e8567 · b99e8567
Commit b99e8567 authored Mar 05, 2024 by Robert Schmidt
210 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1436,8 +1436,7 @@ target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 if(E2_AGENT)
  target_link_libraries(L2 PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
-  target_compile_definitions(L2 PRIVATE E2_AGENT)
-  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
+  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()


@@ -1463,8 +1462,7 @@ target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap
 target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc)
 if(E2_AGENT)
  target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
-  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
-  target_compile_definitions(L2_NR PRIVATE E2_AGENT)
+  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()

 add_library(L2_LTE_NR
@@ -1983,8 +1981,7 @@ target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 if(E2_AGENT)
-  target_compile_definitions(lte-softmodem PRIVATE E2_AGENT)
-  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
+  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()

 add_executable(oairu
@@ -2082,7 +2079,7 @@ target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 if(E2_AGENT)
-  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
+  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()


@@ -2095,10 +2092,6 @@ endif()
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-softmodem PRIVATE
  asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
-if(E2_AGENT)
-  target_compile_definitions(nr-softmodem PRIVATE E2_AGENT)
-endif()
-

 add_executable(nr-cuup
  executables/nr-cuup.c

--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -86,6 +86,12 @@ class Cmd(metaclass=abc.ABCMeta):
 		return

 class LocalCmd(Cmd):
+	def __enter__(self):
+		return self
+
+	def __exit__(self, exc_type, exc_value, exc_traceback):
+		self.close()
+
 	def __init__(self, d = None):
 		self.cwd = d
 		if self.cwd is not None:
@@ -122,12 +128,40 @@ class LocalCmd(Cmd):
 		if src[0] != '/' or tgt[0] != '/':
 			raise Exception('support only absolute file paths!')
 		opt = '-r' if recursive else ''
-		self.run(f'cp {opt} {src} {tgt}')
+		return self.run(f'cp {opt} {src} {tgt}').returncode == 0

 	def copyout(self, src, tgt, recursive=False):
-		self.copyin(src, tgt, recursive)
+		return self.copyin(src, tgt, recursive)
+
+def PutFile(client, src, tgt):
+	success = True
+	sftp = client.open_sftp()
+	try:
+		sftp.put(src, tgt)
+	except FileNotFoundError as error:
+		logging.error(f"error while putting {src}: {error}")
+		success = False
+	sftp.close()
+	return success
+
+def GetFile(client, src, tgt):
+	success = True
+	sftp = client.open_sftp()
+	try:
+		sftp.get(src, tgt)
+	except FileNotFoundError as error:
+		logging.error(f"error while getting {src}: {error}")
+		success = False
+	sftp.close()
+	return success

 class RemoteCmd(Cmd):
+	def __enter__(self):
+		return self
+
+	def __exit__(self, exc_type, exc_value, exc_traceback):
+		self.close()
+
 	def __init__(self, hostname, d=None):
 		cIdx = 0
 		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
@@ -193,36 +227,38 @@ class RemoteCmd(Cmd):
 	def getBefore(self):
 		return self.cp.stdout

+	# if recursive is True, tgt must be a directory (and src is file or directory)
+	# if recursive is False, tgt and src must be a file name
 	def copyout(self, src, tgt, recursive=False):
 		logging.debug(f"copyout: local:{src} -> remote:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			cmd = LocalCmd()
-			cmd.run(f"tar -cf {abstmpfile} {src}")
-			sftp = self.client.open_sftp()
-			sftp.put(abstmpfile, abstmpfile)
-			sftp.close()
-			cmd.run(f"rm {abstmpfile}")
-			self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+			with LocalCmd() as cmd:
+				if cmd.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
+					return False
+				if not PutFile(self.client, abstmpfile, abstmpfile):
+					return False
+				cmd.run(f"rm {abstmpfile}")
+				ret = self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+				return ret.returncode == 0
 		else:
-			sftp = self.client.open_sftp()
-			sftp.put(src, tgt)
-			sftp.close()
+			return PutFile(self.client, src, tgt)

+	# if recursive is True, tgt must be a directory (and src is file or directory)
+	# if recursive is False, tgt and src must be a file name
 	def copyin(self, src, tgt, recursive=False):
 		logging.debug(f"copyin: remote:{src} -> local:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			self.run(f"tar -cf {abstmpfile} {src}")
-			sftp = self.client.open_sftp()
-			sftp.get(abstmpfile, abstmpfile)
-			sftp.close()
+			if self.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
+				return False
+			if not GetFile(self.client, abstmpfile, abstmpfile):
+				return False
 			self.run(f"rm {abstmpfile}")
-			cmd = LocalCmd()
-			cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+			with LocalCmd() as cmd:
+				ret = cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+				return ret.returncode == 0
 		else:
-			sftp = self.client.open_sftp()
-			sftp.get(src, tgt)
-			sftp.close()
+			return GetFile(self.client, src, tgt)
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -662,22 +662,26 @@ class Containerize():
 		collectInfo['proxy'] = files
 		mySSH.command('docker image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
 		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
+		# Cleaning any created tmp volume
+		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
+		mySSH.close()
+
 		allImagesSize = {}
 		if result is not None:
 			imageSize = float(result.group('size')) / 1000000
 			logging.debug('\u001B[1m   proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
 			allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes'
+			logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
+			HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
+			return True
 		else:
-			logging.debug('proxy size is unknown')
+			logging.error('proxy size is unknown')
 			allImagesSize['proxy'] = 'unknown'
-
-		# Cleaning any created tmp volume
-		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
-		mySSH.close()
-
-		logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
-		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
-		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
+			logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
+			HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTabFooter(False)
+			return False

 	def BuildRunTests(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
@@ -951,12 +955,12 @@ class Containerize():
 		if svcName == '':
 			logging.warning('no service name given: starting all services in ci-docker-compose.yml!')

-		mySSH.command(f'docker-compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)
+		mySSH.command(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)

 		# Checking Status
 		grep = ''
 		if svcName != '': grep = f' | grep -A3 {svcName}'
-		mySSH.command(f'docker-compose --file ci-docker-compose.yml config {grep}', '\$', 5)
+		mySSH.command(f'docker compose --file ci-docker-compose.yml config {grep}', '\$', 5)
 		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
 		unhealthyNb = 0
 		healthyNb = 0
@@ -1058,55 +1062,55 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('\u001B[1m Undeploying OAI Object from server: ' + lIpAddr + '\u001B[0m')
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
-
-		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
-
+		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {lIpAddr}\u001B[0m')
+		mySSH = cls_cmd.getConnection(lIpAddr)
+		yamlDir = f'{lSourcePath}/{self.yamlPath[self.eNB_instance]}'
+		mySSH.run(f'cd {yamlDir}')
 		svcName = self.services[self.eNB_instance]
 		forceDown = False
 		if svcName != '':
 			logging.warning(f'service name given, but will stop all services in ci-docker-compose.yml!')
 			svcName = ''

-		mySSH.command(f'docker-compose -f ci-docker-compose.yml config --services', '\$', 5)
+		ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml config --services')
+		if ret.returncode != 0:
+			HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', "cannot enumerate running services")
+			self.exitStatus = 1
+			return
 		# first line has command, last line has next command prompt
-		allServices = mySSH.getBefore().split('\r\n')[1:-1]
+		allServices = ret.stdout.splitlines()
 		services = []
 		for s in allServices:
-			mySSH.command(f'docker-compose -f ci-docker-compose.yml ps --all -- {s}', '\$', 5, silent=False)
-			running = mySSH.getBefore().split('\r\n')[2:-1]
+			# outputs the hash if the container is running
+			ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml ps --all --quiet -- {s}')
+			running = ret.stdout.splitlines()
 			logging.debug(f'running services: {running}')
-			if len(running) > 0: # something is running for that service
+			if ret.stdout != "" and ret.returncode == 0: # something is running for that service
 				services.append(s)
 		logging.info(f'stopping services {services}')

-		mySSH.command(f'docker-compose -f ci-docker-compose.yml stop -t3', '\$', 30)
-		time.sleep(5)  # give some time to running containers to stop
+		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml stop -t3')
+		copyin_res = True
 		for svcName in services:
 			# head -n -1 suppresses the final "X exited with status code Y"
 			filename = f'{svcName}-{HTML.testCase_id}.log'
-			mySSH.command(f'docker-compose -f ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}', '\$', 120)
+			mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}')
+			copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', f'{filename}') and copyin_res
+		# when nv-cubb container is available, copy L1 pcap, OAI Aerial pipeline
+		if 'nv-cubb' in allServices:
+			mySSH.run(f'cp {lSourcePath}/cmake_targets/share/gnb_nvipc.pcap {lSourcePath}/cmake_targets/gnb_nvipc.pcap')

-		mySSH.command('docker-compose -f ci-docker-compose.yml down -v', '\$', 5)
-		mySSH.close()
+		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml down -v')

 		# Analyzing log file!
-		files = ','.join([f'{s}-{HTML.testCase_id}' for s in services])
-		if len(services) > 1:
-			files = '{' + files + '}'
-		copyin_res = 0
-		if len(services) > 0:
-			copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, f'{lSourcePath}/cmake_targets/log/{files}.log', '.')
-		if copyin_res == -1:
-			HTML.htmleNBFailureMsg='Could not copy logfile to analyze it!'
+		if not copyin_res:
+			HTML.htmleNBFailureMsg='Could not copy logfile(s) to analyze it!'
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
 		# use function for UE log analysis, when oai-nr-ue container is used
 		elif 'oai-nr-ue' in services or 'lte_ue0' in services:
 			self.exitStatus == 0
-			logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
+			logging.debug(f'Analyzing UE logfile {filename}')
 			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
 			if (logStatus < 0):
 				fullStatus = False
@@ -1125,11 +1129,12 @@ class Containerize():
 					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
 			# all the xNB run logs shall be on the server 0 for logCollecting
 			if self.eNB_serverId[self.eNB_instance] != '0':
-				mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, f'./{files}.log', f'{self.eNBSourceCodePath}/cmake_targets/')
+				mySSH.copyout(f'./*.log', f'{lSourcePath}/cmake_targets/', recursive=True)
 		if self.exitStatus == 0:
 			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
 		else:
 			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
+		mySSH.close()

 	def DeployGenObject(self, HTML, RAN, UE):
 		self.exitStatus = 0

--- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
@@ -171,7 +171,6 @@ MACRLCs = (
    remote_n_portd  = 2153;
    pusch_TargetSNRx10          = 200;
    pucch_TargetSNRx10          = 200;
-    ulsch_max_frame_inactivity = 1;
  }
 );


--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -178,7 +178,6 @@ MACRLCs = (
    remote_n_portd  = 2153;
    pusch_TargetSNRx10          = 200;
    pucch_TargetSNRx10          = 200;
-    ulsch_max_frame_inactivity = 1;
  }
 );


--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -200,7 +200,6 @@ MACRLCs = (
    tr_n_preference     = "local_RRC";
    pusch_TargetSNRx10  = 200;
    pucch_TargetSNRx10  = 200;
-    ulsch_max_frame_inactivity = 0;
  }
 );


--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf
@@ -202,7 +202,6 @@ MACRLCs = (
  num_cc                     = 1;
  tr_s_preference            = "local_L1";
  tr_n_preference            = "local_RRC";
-  ulsch_max_frame_inactivity = 0;
 }
 );


--- a/ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf
-Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

+sa = 1;
+
 gNBs =
 (
 {
    ////////// Identification parameters:
    gNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-5GNRBox";
+    gNB_name  =  "gNB-OAI";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+    nr_cellid = 12345678L;

    tr_s_preference     = "local_mac"

    ////////// Physical parameters:

+    sib1_tda                                                  = 15;
    min_rxtxtime                                              = 6;
 	
    servingCellConfigCommon = (
    {
 #spCellConfigCommon

-      physCellId                                                    = 0;
+      physCellId                                                    = 10;

 #  downlinkConfigCommon
    #frequencyInfoDL
-      # this is pointA + 23 PRBs@120kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 2071241;
+      # this is pointA + 16 PRBs@120kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 2071387;
      dl_frequencyBand                                                 = 261;
      # this is 27.900 GHz
-      dl_absoluteFrequencyPointA                                       = 2070833;
+      dl_absoluteFrequencyPointA                                       = 2071001;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -50,7 +51,7 @@ gNBs =
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 3;
      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
+        initialDLBWPcontrolResourceSetZero                                      = 1;
        initialDLBWPsearchSpaceZero                                             = 0;

  #uplinkConfigCommon 
@@ -85,12 +86,12 @@ gNBs =
        powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 7;
+        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
 #oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 7;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
        ra_ContentionResolutionTimer                                = 7;
@@ -101,8 +102,7 @@ gNBs =
        prach_RootSequenceIndex                                     = 1;
        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
        #  
-        msg1_SubcarrierSpacing                                      = 3,
-
+        msg1_SubcarrierSpacing                                      = 3;
 # restrictedSetConfig
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
        restrictedSetConfig                                         = 0,
@@ -119,7 +119,7 @@ gNBs =
 # ssb_PositionsInBurs_BitmapPR
 # 1=short, 2=medium, 3=long
      ssb_PositionsInBurst_PR                                       = 3;
-      ssb_PositionsInBurst_Bitmap                                   = 0x0001000100010001L;
+      ssb_PositionsInBurst_Bitmap                                   = 1;

 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
@@ -152,7 +152,6 @@ gNBs =

  );

-
    # ------- SCTP definitions
    SCTP :
    {
@@ -162,91 +161,58 @@ gNBs =
    };


-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.18.99";
+    ////////// AMF parameters:
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
                            }
                          );

-    ///X2
-    enable_x2 = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address      = (
-                                     { ipv4       = "192.168.18.199";
-                                       ipv6       = "192:168:30::17";
-                                       preference = "ipv4";
-                                     }
-                                    );
-
    NETWORK_INTERFACES :
    {
-
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.18.198/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.18.198/24";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        GNB_IPV4_ADDRESS_FOR_X2C                 = "192.168.18.198/24";
-        GNB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }
 );

-MACRLCs = (
-	{
-	    num_cc                      = 1;
-	    tr_s_preference             = "local_L1";
-	    tr_n_preference             = "local_RRC";
-	    pusch_TargetSNRx10          = 200;
-            pucch_TargetSNRx10          = 200;
-    }
-);
+MACRLCs = ({
+  num_cc                      = 1;
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 200;
+  pucch_TargetSNRx10          = 200;
+});

 L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+  prach_dtx_threshold   = 120;
+  #pucch0_dtx_threshold = 120;
 }
 );

-RUs = (
-    {		  
-       local_rf       = "yes"
-         nb_tx          = 1;
-         nb_rx          = 1;
-         att_tx         = 0;
-         att_rx         = 0;
-         bands          = [7];
-         sl_ahead       = 12;
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 75;
-         eNB_instances  = [0];
-	 sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
-         if_freq = 5124520000L;
-	 clock_src = "external";
-	 time_src = "external";
-    }
-);  
+RUs = ({
+  local_rf       = "yes"
+  nb_tx          = 1;
+  nb_rx          = 1;
+  att_tx         = 0;
+  att_rx         = 0;
+  sl_ahead       = 12;
+  bands          = [261];
+  max_pdschReferenceSignalPower = -27;
+  eNB_instances  = [0];
+});

 rfsimulator: {
    serveraddr = "server";
 };

-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
 security = {
  # preferred ciphering algorithms
  # the first one of the list that an UE supports in chosen
@@ -264,14 +230,6 @@ security = {
  drb_integrity = "no";
 };

-     log_config :
-     {
-       global_log_level                      ="info";
-       hw_log_level                          ="info";
-       phy_log_level                         ="info";
-       mac_log_level                         ="info";
-       rlc_log_level                         ="info";
-       pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-    };
-
+log_config: {
+  global_log_level                      ="info";
+};
--- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
@@ -187,7 +187,6 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
  pucch_TargetSNRx10          = 200;
-  ulsch_max_frame_inactivity  = 0;
 }
 );


--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -197,8 +197,6 @@ MACRLCs = (
  tr_n_preference  = "local_RRC";
  pusch_TargetSNRx10 = 180;
  pucch_TargetSNRx10 = 200;
-  ulsch_max_frame_inactivity = 1;
-  ul_max_mcs = 16;
 }
 );


--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
@@ -188,7 +188,6 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  #pusch_TargetSNRx10         = 150;
  #pucch_TargetSNRx10         = 200;
-  ulsch_max_frame_inactivity  = 0;
  dl_max_mcs                  = 16; # there are retransmissions if more
 }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
@@ -190,7 +190,6 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 220;
    pucch_TargetSNRx10 = 200;
-     ulsch_max_frame_inactivity = 0;
  }
 );


--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
@@ -184,7 +184,6 @@ MACRLCs = (
  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
  ul_prbblack_SNR_threshold   = 10;
-  ulsch_max_frame_inactivity  = 10;
  ul_max_mcs                  = 9;
 }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
@@ -203,7 +203,6 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 220;
    pucch_TargetSNRx10 = 200;
-     ulsch_max_frame_inactivity = 0;
  }
 );


--- a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf
@@ -204,7 +204,6 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
 #    pusch_TargetSNRx10 = 200;
 #    pucch_TargetSNRx10 = 150;
-     ulsch_max_frame_inactivity = 0;
  }
 );


--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -186,7 +186,6 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
  pucch_TargetSNRx10          = 200;
-  ulsch_max_frame_inactivity  = 1;
 }
 );


--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -192,8 +192,6 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
    pucch_TargetSNRx10 = 200;
-    ulsch_max_frame_inactivity = 10;
-    ul_max_mcs         = 28;
  }
 );


--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -184,7 +184,6 @@ MACRLCs = (
  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
  ul_prbblack_SNR_threshold   = 10;
-  ulsch_max_frame_inactivity  = 0;
 }
 );


--- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -208,7 +208,6 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
    pucch_TargetSNRx10 = 200;
-     ulsch_max_frame_inactivity = 1;
  }
 );


--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
@@ -199,7 +199,6 @@ MACRLCs = (
    tr_n_preference     = "local_RRC";
    pusch_TargetSNRx10  = 200;
    pucch_TargetSNRx10  = 200;
-    ulsch_max_frame_inactivity = 0;
  }
 );


--- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -186,7 +186,6 @@ MACRLCs = (
  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
  ul_prbblack_SNR_threshold   = 10;
-  ulsch_max_frame_inactivity  = 0;
 }
 );


--- a/ci-scripts/datalog_rt_stats.100.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.100.2x2.yaml
@@ -12,8 +12,8 @@ Ref :
  feptx_ofdm : 65.0
  feptx_total : 177.0
  L1 Tx processing : 700.0
-  DLSCH encoding : 179.0
-  L1 Rx processing : 526.0
+  DLSCH encoding : 226.0
+  L1 Rx processing : 640.0
  PUSCH inner-receiver : 400.0
  Schedule Response : 3.0
  DL & UL scheduling timing : 15.0

--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -11,10 +11,10 @@ Ref :
  feptx_prec : 15.0
  feptx_ofdm : 35.0
  feptx_total : 57.0
-  L1 Tx processing : 210.0
-  DLSCH encoding : 137.0
-  L1 Rx processing : 345.0
-  PUSCH inner-receiver : 210.0
+  L1 Tx processing : 260.0
+  DLSCH encoding : 160.0
+  L1 Rx processing : 420.0
+  PUSCH inner-receiver : 170.0
  Schedule Response : 3.0
  DL & UL scheduling timing : 8.0
  UL Indication : 3.0

--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -11,9 +11,9 @@ Ref :
  feptx_prec : 13.0
  feptx_ofdm : 33.0
  feptx_total : 55.0
-  L1 Tx processing : 170.0
-  DLSCH encoding : 118.0
-  L1 Rx processing : 305.0
+  L1 Tx processing : 220.0
+  DLSCH encoding : 130.0
+  L1 Rx processing : 387.0
  PUSCH inner-receiver : 150.0
  Schedule Response : 3.0
  DL & UL scheduling timing : 6.0

--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -30,6 +30,7 @@
 000021
 000022
 000023
+ 000024
 020021
 100021
        </TestCaseRequestedList>
@@ -66,6 +67,12 @@
                <nb_healthy>14</nb_healthy>
        </testCase>

+        <testCase id="000024">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+        </testCase>
+
        <testCase id="020021">
                <class>Ping</class>
                <desc>Ping ext-dn from all NR-UEs</desc>

--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -29,6 +29,7 @@
 100021
 000021
 000022
+ 000023
 020021
 030021
 030022
@@ -59,6 +60,12 @@
                <nb_healthy>8</nb_healthy>
        </testCase>

+        <testCase id="000023">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
+        </testCase>
+
        <testCase id="020021">
                <class>Ping</class>
                <desc>Ping ext-dn from all NR-UEs</desc>

--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100011
- 000010
 000011
 000012
 000013
@@ -47,36 +46,26 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-        <testCase id="000010">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
        <testCase id="000011">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000012">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-gnb oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000013">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020011">

--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100001
- 000000
 000001
 000002
 000003
@@ -47,36 +46,26 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000002">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+UE RFsim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-gnb oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020001">

--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100001
- 000000
 000001
 000002
 000003
@@ -47,36 +46,26 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000002">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-gnb oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020001">

--- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
@@ -43,18 +43,16 @@

        <testCase id="000020">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI-DU</desc>
+                <desc>Deploy OAI-DU+nrUE</desc>
                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <services>oai-du</services>
-                <nb_healthy>1</nb_healthy>
+                <services>oai-du oai-nr-ue</services>
+                <nb_healthy>2</nb_healthy>
        </testCase>

        <testCase id="000021">
-                <class>DeployGenObject</class>
-                <desc>Deploy nrUE</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>2</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020021">

--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
@@ -50,7 +50,7 @@
            <class>Custom_Command</class>
            <desc>Clean-Up any residual volume</desc>
            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config</command>
+            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
        </testCase>

        <testCase id="000010">

--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
@@ -22,13 +22,12 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Monolithic FR2 do-ra gNB</htmlTabName>
+        <htmlTabName>Monolithic FR2 gNB</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
 111111
 100001
- 004000
 000000
 000001
 020001
@@ -44,42 +43,35 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-	<testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fr2_32prb_rrc.config</command>
-        </testCase>
-
        <testCase id="000000">
                <class>DeployGenObject</class>
                <desc>Deploy OAI gNB</desc>
                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>1</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI NR-UE</desc>
                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>2</nb_healthy>
+                <services>oai-gnb oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
-                <desc>Ping gNB from NR-UE</desc>
+                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
+                <ping_args>-c 20 -i0.2 192.168.72.135</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>

        <testCase id="020002">
                <class>Ping</class>
-                <desc>Ping NR-UE from gNB</desc>
-                <id>rfsim5g_gnb_nos1</id>
-                <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
+                <desc>Ping NR-UE from ext-dn</desc>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>

@@ -87,8 +79,8 @@
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <d_retx_th>0,0,0,0</d_retx_th>
-                <u_retx_th>0,0,0,0</u_retx_th>
+                <d_retx_th>10,0,0,0</d_retx_th>
+                <u_retx_th>10,0,0,0</u_retx_th>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
@@ -26,7 +26,6 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100002
- 004000
 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -37,13 +36,6 @@
                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
        </testCase>

-	<testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fr2_32prb_rrc.config</command>
-        </testCase>
-
        <testCase id="222222">
                <class>Clean_Test_Server_Images</class>
                <desc>Clean Test Images on Test Server</desc>

--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
@@ -48,7 +48,7 @@
            <class>Custom_Command</class>
            <desc>Clean-Up any residual volume</desc>
            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
+            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
        </testCase>

        <testCase id="000000">

--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100001
- 000000
 000001
 000002
 000003
@@ -47,36 +46,26 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000002">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-gnb oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020001">

--- a/ci-scripts/xml_files/container_nsa_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_terminate.xml
@@ -26,6 +26,8 @@
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
+ 010001
+ 010002
 030202
 030201
 222220
@@ -33,6 +35,17 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>

+    <testCase id= "010001">
+      <class>Detach_UE</class>
+      <desc>Detach UE</desc>
+      <id>idefix</id>
+    </testCase>
+    <testCase id="010002">
+      <class>Terminate_UE</class>
+      <desc>Terminate Quectel</desc>
+      <id>idefix</id>
+    </testCase>
+
    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>

--- a/ci-scripts/xml_files/container_sa_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_b200_terminate.xml
@@ -26,10 +26,23 @@
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
+  010001
+  010002
  030201
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

+  <testCase id= "010001">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
  <testCase id="030201">
    <class>Undeploy_Object</class>
    <desc>Undeploy gNB</desc>

--- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
@@ -37,6 +37,10 @@
    370001
    370000
    370002
+    360001
+    100002
+    360002
+    350000
    310011
    310002
    330201
@@ -114,9 +118,9 @@

  <testCase id="350000">
    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
+    <desc>Ping: 50pings in 10sec</desc>
    <id>idefix</id>
-    <ping_args>-c 20 %cn_ip%</ping_args>
+    <ping_args>-c 20 -i 0.2 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>25</ping_rttavg_threshold>
  </testCase>
@@ -152,6 +156,27 @@
    <iperf_profile>single-ue</iperf_profile>
  </testCase>

+  <testCase id="360001">
+    <class>Custom_Command</class>
+    <desc>Trigger Reestablishment (on DU)</desc>
+    <node>ofqot</node>
+    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+  <testCase id="360002">
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment (on CU)</desc>
+    <node>ofqot</node>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+  <testCase id="100002">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
  <testCase id="330201">
    <class>Undeploy_Object</class>
    <desc>Undeploy CU-DU</desc>

--- a/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
@@ -26,11 +26,24 @@
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
+  010001
+  010002
  330201
  222222
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

+  <testCase id= "010001">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
  <testCase id="330201">
    <class>Undeploy_Object</class>
    <desc>Undeploy CU-CP/CU-UP/DU</desc>

--- a/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
@@ -26,10 +26,23 @@
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
+  010001
+  010002
  230201
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

+  <testCase id= "010001">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
  <testCase id="230201">
    <class>Undeploy_Object</class>
    <desc>Undeploy CU-DU</desc>

--- a/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
@@ -26,10 +26,23 @@
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
+  010001
+  010002
  030201
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

+  <testCase id= "010001">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
  <testCase id="030201">
    <class>Undeploy_Object</class>
    <desc>Undeploy gNB</desc>

--- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
 version: '3.8'
 services:
+    mysql:
+        container_name: "rfsim5g-mysql"
+        image: mysql:8.0
+        volumes:
+            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+        environment:
+            - TZ=Europe/Paris
+            - MYSQL_DATABASE=oai_db
+            - MYSQL_USER=test
+            - MYSQL_PASSWORD=test
+            - MYSQL_ROOT_PASSWORD=linux
+        healthcheck:
+            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
+            interval: 10s
+            timeout: 5s
+            retries: 30
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.131
+    oai-amf:
+        container_name: "rfsim5g-oai-amf"
+        image: oaisoftwarealliance/oai-amf:v2.0.0
+        environment:
+            - TZ=Europe/paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+        depends_on:
+            - mysql
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.132
+    oai-smf:
+        container_name: "rfsim5g-oai-smf"
+        image: oaisoftwarealliance/oai-smf:v2.0.0
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+        depends_on:
+            - oai-amf
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.133
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
+        environment:
+            - TZ=Europe/Paris
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+        depends_on:
+            - oai-smf
+        cap_add:
+            - NET_ADMIN
+            - SYS_ADMIN
+        cap_drop:
+            - ALL
+        privileged: true
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.134
+            traffic_net:
+                ipv4_address: 192.168.72.134
+    oai-ext-dn:
+        privileged: true
+        container_name: rfsim5g-oai-ext-dn
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        entrypoint: /bin/bash -c \
+              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
+              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
+        depends_on:
+            - oai-upf
+        networks:
+            traffic_net:
+                ipv4_address: 192.168.72.135
+        healthcheck:
+            test: /bin/bash -c "ping -c 2 192.168.72.134"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
        privileged: true
        container_name: rfsim5g-oai-gnb
        environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        networks:
            public_net:
                ipv4_address: 192.168.71.140
        volumes:
-            - ../../conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf
-            - rrc.config:/opt/oai-gnb/
+            - ../../conf_files/gnb.sa.band261.u3.32prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
        healthcheck:
            test: /bin/bash -c "pgrep nr-softmodem"
            interval: 10s
@@ -24,11 +105,12 @@ services:
        privileged: true
        container_name: rfsim5g-oai-nr-ue
        environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim
+                                    --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+                                    -r 32 --numerology 3 --band 261 -C 27533160000 --ssb 73
            ASAN_OPTIONS: detect_leaks=0
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-            - rrc.config:/opt/oai-nr-ue/etc/rrc/
        depends_on:
            - oai-gnb
        networks:
@@ -40,9 +122,6 @@ services:
            timeout: 5s
            retries: 5

-volumes:
-    rrc.config:
-
 networks:
    public_net:
        driver: bridge
@@ -52,3 +131,11 @@ networks:
                - subnet: 192.168.71.128/26
        driver_opts:
            com.docker.network.bridge.name: "rfsim5g-public"
+    traffic_net:
+        driver: bridge
+        name: rfsim5g-oai-traffic-net
+        ipam:
+            config:
+                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-traffic"
--- a/ci-scripts/yaml_files/5g_sa_n310_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/5g_sa_n310_gnb/docker-compose.yml
@@ -5,6 +5,8 @@ services:
        privileged: true
        network_mode: "host"
        container_name: oai-gnb
+        ulimits:
+          core: -1 # for core dumps
        environment:
            TZ: Europe/Paris
            USE_ADDITIONAL_OPTIONS: --sa --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time

--- a/ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml
+++ b/ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml
@@ -5,6 +5,8 @@ services:
        privileged: true
        network_mode: host
        container_name: oai-nr-ue
+        ulimits:
+          core: -1 # for core dumps
        #entrypoint: /bin/bash -c "sleep infinity"
        environment:
            TZ: Europe/Paris

--- a/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
+++ b/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
@@ -5,6 +5,8 @@ services:
        image: oai-enb:latest
        privileged: true
        container_name: nsa-b200-enb
+        ulimits:
+          core: -1 # for core dumps
        environment:
            USE_B2XX: 'yes'
            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function

--- a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
@@ -5,6 +5,8 @@ services:
        image: oai-gnb:latest
        privileged: true
        container_name: nsa-b200-gnb
+        ulimits:
+          core: -1 # for core dumps
        environment:
            USE_B2XX: 'yes'
            USE_ADDITIONAL_OPTIONS: -E -q --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function

--- a/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
@@ -5,6 +5,8 @@ services:
        privileged: true
        network_mode: "host"
        container_name: oai-gnb-aw2s
+        ulimits:
+          core: -1 # for core dumps
        environment:
            TZ: Europe/Paris
            USE_ADDITIONAL_OPTIONS: --sa

--- a/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
@@ -5,6 +5,8 @@ services:
        image: oai-gnb:latest
        privileged: true
        container_name: sa-b200-gnb
+        ulimits:
+          core: -1 # for core dumps
        environment:
            USE_B2XX: 'yes'
            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function

--- a/ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml
@@ -5,8 +5,10 @@ services:
        image: oai-gnb:latest
        privileged: true
        container_name: sa-cucp-gnb
+        ulimits:
+          core: -1 # for core dumps
        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
        volumes:
            - ../../conf_files/gnb-cucp.sa.f1.quectel.conf:/opt/oai-gnb/etc/gnb.conf
        networks:
@@ -23,6 +25,8 @@ services:
        image: oai-nr-cuup:latest
        privileged: true
        container_name: sa-cuup-gnb
+        ulimits:
+          core: -1 # for core dumps
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
        volumes:
@@ -41,9 +45,17 @@ services:
        image: oai-gnb:latest
        privileged: true
        container_name: sa-du-b200-gnb
+        ulimits:
+          core: -1 # for core dumps
        environment:
            USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx -E --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1 --RUs.[0].att_rx 18 --RUs.[0].att_tx 18
+            USE_ADDITIONAL_OPTIONS: --sa
+                                    --RUs.[0].sdr_addrs serial=30C51D4
+                                    --continuous-tx -E
+                                    --telnetsrv --telnetsrv.shrmod ci
+                                    --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1
+                                    --RUs.[0].att_rx 18 --RUs.[0].att_tx 18
+                                    --log_config.global_log_options level,nocolor,time,line_num,function
        volumes:
            - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
            - /dev:/dev

--- a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
@@ -5,6 +5,8 @@ services:
        image: oai-gnb:latest
        privileged: true
        container_name: sa-cu-gnb
+        ulimits:
+          core: -1 # for core dumps
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
        volumes:
@@ -24,9 +26,11 @@ services:
        image: oai-gnb:latest
        privileged: true
        container_name: sa-du-b200-gnb
+        ulimits:
+          core: -1 # for core dumps
        environment:
            USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --MACRLCs.[0].ul_max_mcs 28 --L1s.[0].max_ldpc_iterations 20
+            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --L1s.[0].max_ldpc_iterations 20
        volumes:
            - ../../conf_files/gnb-du.sa.band1.52prb.usrpb210.conf:/opt/oai-gnb/etc/gnb.conf
            - /dev:/dev

--- a/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml
@@ -5,6 +5,8 @@ services:
        image: oai-gnb:latest
        privileged: true
        container_name: sa-b200-gnb
+        ulimits:
+          core: -1 # for core dumps
        environment:
            USE_B2XX: 'yes'
            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function -E

--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -666,10 +666,7 @@ install_asn1c_from_source(){
    # GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c
    git clone https://github.com/mouse07410/asn1c /tmp/asn1c
    cd /tmp/asn1c
-    # 2024-02-06: problem compatibility between E2-agent and 4cfcd4f191c3fa41f6ac1b15cb2ad3acc1520af5 from asn1c
-    # Reverting to previous commit that works
-    # TODO : revert to vlm_master once FlexRic and E2-agent are fixed
-    git checkout -f a6bdcd22658d6b7c3ed218d8c1375907ac532b64
+    git checkout vlm_master
    # Showing which version is used
    git log -n1
    autoreconf -iv

--- a/common/ngran_types.h
+++ b/common/ngran_types.h
@@ -56,5 +56,4 @@ typedef enum { CPtype = 0, UPtype } E1_t;
 #define GTPV1_U_PORT_NUMBER (2152)

 typedef enum { non_dynamic, dynamic } fiveQI_type_t;
-#define maxSRBs 4
 #endif
--- a/common/utils/LOG/log.c
+++ b/common/utils/LOG/log.c
@@ -497,6 +497,8 @@ int logInit (void)
  register_log_component("GNB_APP","log",GNB_APP);
  register_log_component("NR_RRC","log",NR_RRC);
  register_log_component("NR_MAC","log",NR_MAC);
+  register_log_component("NR_MAC_DCI", "log", NR_MAC_DCI);
+  register_log_component("NR_PHY_DCI", "log", NR_PHY_DCI);
  register_log_component("NR_PHY","log",NR_PHY);
  register_log_component("NGAP","",NGAP);
  register_log_component("ITTI","log",ITTI);

--- a/common/utils/LOG/log.h
+++ b/common/utils/LOG/log.h
--- a/common/utils/T/T_messages.txt
+++ b/common/utils/T/T_messages.txt
@@ -361,6 +361,48 @@ ID = LEGACY_NR_MAC_TRACE
    GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log

+ID = LEGACY_NR_PHY_DCI_INFO
+    DESC = NR_PHY_DCI legacy logs - info level
+    GROUP = ALL:LEGACY_NR_PHY_DCI:LEGACY_GROUP_INFO:LEGACY
+    FORMAT = string,log
+ID = LEGACY_NR_PHY_DCI_ERROR
+    DESC = NR_PHY_DCI legacy logs - error level
+    GROUP = ALL:LEGACY_NR_PHY_DCI:LEGACY_GROUP_ERROR:LEGACY
+    FORMAT = string,log
+ID = LEGACY_NR_PHY_DCI_WARNING
+    DESC = NR_PHY_DCI legacy logs - warning level
+    GROUP = ALL:LEGACY_NR_PHY_DCI:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
+ID = LEGACY_NR_PHY_DCI_DEBUG
+    DESC = NR_PHY_DCI legacy logs - debug level
+    GROUP = ALL:LEGACY_NR_PHY_DCI:LEGACY_GROUP_DEBUG:LEGACY
+    FORMAT = string,log
+ID = LEGACY_NR_PHY_DCI_TRACE
+    DESC = NR_PHY_DCI legacy logs - trace level
+    GROUP = ALL:LEGACY_NR_PHY_DCI:LEGACY_GROUP_TRACE:LEGACY
+    FORMAT = string,log
+
+ID = LEGACY_NR_MAC_DCI_INFO
+    DESC = NR_MAC_DCI legacy logs - info level
+    GROUP = ALL:LEGACY_NR_MAC_DCI:LEGACY_GROUP_INFO:LEGACY
+    FORMAT = string,log
+ID = LEGACY_NR_MAC_DCI_ERROR
+    DESC = NR_MAC_DCI legacy logs - error level
+    GROUP = ALL:LEGACY_NR_MAC_DCI:LEGACY_GROUP_ERROR:LEGACY
+    FORMAT = string,log
+ID = LEGACY_NR_MAC_DCI_WARNING
+    DESC = NR_MAC_DCI legacy logs - warning level
+    GROUP = ALL:LEGACY_NR_MAC_DCI:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
+ID = LEGACY_NR_MAC_DCI_DEBUG
+    DESC = NR_MAC_DCI legacy logs - debug level
+    GROUP = ALL:LEGACY_NR_MAC_DCI:LEGACY_GROUP_DEBUG:LEGACY
+    FORMAT = string,log
+ID = LEGACY_NR_MAC_DCI_TRACE
+    DESC = NR_MAC_DCI legacy logs - trace level
+    GROUP = ALL:LEGACY_NR_MAC_DCI:LEGACY_GROUP_TRACE:LEGACY
+    FORMAT = string,log
+    
 ID = LEGACY_PHY_INFO
    DESC = PHY legacy logs - info level
    GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_INFO:LEGACY

--- a/common/utils/T/tracer/CMakeLists.txt
+++ b/common/utils/T/tracer/CMakeLists.txt
 add_library(tracer_utils OBJECT configuration.c database.c event.c handler.c utils.c)
 target_link_libraries(tracer_utils PUBLIC m pthread)

-add_library(tracer_events OBJECT event_selector.c)
-
 add_executable(record record.c)
 target_link_libraries(record PRIVATE tracer_utils)

@@ -28,10 +26,19 @@ add_executable(multi multi.c)
 target_link_libraries(multi PRIVATE tracer_utils T)
 target_include_directories(multi PRIVATE ..)

+add_executable(textlog textlog.c)
+target_link_libraries(textlog PRIVATE tracer_utils tracer_filter
+                      tracer_logger tracer_view)
+
+add_subdirectory(filter)
+add_subdirectory(logger)
+add_subdirectory(view)
+
 add_custom_target(T_tools)
 add_dependencies(T_tools
                 record replay extract_config extract_input_subframe
-                 extract_output_subframe extract macpdu2wireshark multi)
+                 extract_output_subframe extract macpdu2wireshark multi
+                 textlog)
 add_dependencies(nr-softmodem T_tools)
 add_dependencies(nr-uesoftmodem T_tools)
 add_dependencies(lte-softmodem T_tools)
@@ -42,9 +49,7 @@ add_dependencies(lte-uesoftmodem T_tools)
 # GUI-related tools so they can be added on demand, if necessary.
 add_boolean_option(T_TRACER_GUI OFF  "Compile T tracer GUI tools" OFF)
 if(T_TRACER_GUI)
-  add_executable(textlog textlog.c)
-  target_link_libraries(textlog PRIVATE tracer_utils tracer_filter tracer_gui
-                        tracer_logger tracer_view tracer_events)
+  add_library(tracer_events OBJECT event_selector.c)

  find_library(png png REQUIRED)
  add_executable(enb enb.c)
@@ -71,9 +76,6 @@ if(T_TRACER_GUI)
                        tracer_logger tracer_view tracer_events)

  add_subdirectory(gui)
-  add_subdirectory(filter)
-  add_subdirectory(logger)
-  add_subdirectory(view)

-  add_dependencies(T_tools textlog enb gnb ue vcd to_vcd)
+  add_dependencies(T_tools enb gnb ue vcd to_vcd)
 endif()
--- a/common/utils/T/tracer/Makefile
+++ b/common/utils/T/tracer/Makefile
@@ -31,9 +31,8 @@ extract: extract.o database.o event.o utils.o configuration.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)

 textlog: utils.o textlog.o database.o event.o handler.o configuration.o \
-         event_selector.o view/view.a gui/gui.a logger/logger.a \
-         filter/filter.a
-	$(CC) $(CFLAGS) -o textlog $^ $(LIBS) $(XLIBS)
+         view/view.a logger/logger.a filter/filter.a
+	$(CC) $(CFLAGS) -o textlog $^ $(LIBS)

 enb: utils.o enb.o database.o event.o handler.o configuration.o \
         event_selector.o view/view.a gui/gui.a logger/logger.a \

--- a/common/utils/T/tracer/textlog.c
+++ b/common/utils/T/tracer/textlog.c
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 #include <signal.h>
 #include "database.h"
 #include "event.h"
 #include "handler.h"
 #include "logger/logger.h"
 #include "view/view.h"
-#include "gui/gui.h"
 #include "utils.h"
-#include "event_selector.h"
 #include "configuration.h"

-typedef struct {
-  int socket;
-  int *is_on;
-  int nevents;
-  pthread_mutex_t lock;
-} textlog_data;
-
-void is_on_changed(void *_d)
+void activate_traces(int socket, int *is_on, int nevents)
 {
-  textlog_data *d = _d;
  char t;

-  if (pthread_mutex_lock(&d->lock)) abort();
-
-  if (d->socket == -1) goto no_connection;
-
  t = 1;
-  if (socket_send(d->socket, &t, 1) == -1 ||
-      socket_send(d->socket, &d->nevents, sizeof(int)) == -1 ||
-      socket_send(d->socket, d->is_on, d->nevents * sizeof(int)) == -1)
+  if (socket_send(socket, &t, 1) == -1 ||
+      socket_send(socket, &nevents, sizeof(int)) == -1 ||
+      socket_send(socket, is_on, nevents * sizeof(int)) == -1)
    abort();
-
-no_connection:
-  if (pthread_mutex_unlock(&d->lock)) abort();
 }

 void usage(void)
@@ -54,28 +36,18 @@ void usage(void)
 "    -full                     also dump buffers' content\n"
 "    -raw-time                 also prints 'raw time'\n"
 "    -ip <host>                connect to given IP address (default %s)\n"
-"    -p <port>                 connect to given port (default %d)\n"
-"    -x                        GUI output\n"
-"    -debug-gui                activate GUI debug logs\n"
-"    -no-gui                   disable GUI entirely\n",
+"    -p <port>                 connect to given port (default %d)\n",
  DEFAULT_REMOTE_IP,
  DEFAULT_REMOTE_PORT
  );
  exit(1);
 }

-static void *gui_thread(void *_g)
-{
-  gui *g = _g;
-  gui_loop(g);
-  return NULL;
-}
-
 int main(int n, char **v)
 {
-  extern int volatile gui_logd;
  char *database_filename = NULL;
  void *database;
+  int socket;
  char *ip = DEFAULT_REMOTE_IP;
  int port = DEFAULT_REMOTE_PORT;
  char **on_off_name;
@@ -86,11 +58,7 @@ int main(int n, char **v)
  int i;
  event_handler *h;
  logger *textlog;
-  gui *g = NULL;    /* initialization not necessary but gcc is not happy */
-  int gui_mode = 0;
  view *out;
-  int gui_active = 1;
-  textlog_data textlog_data;
  int full = 0;
  int raw_time = 0;

@@ -115,16 +83,11 @@ int main(int n, char **v)
      { on_off_name[on_off_n]=NULL; on_off_action[on_off_n++]=1; continue; }
    if (!strcmp(v[i], "-OFF"))
      { on_off_name[on_off_n]=NULL; on_off_action[on_off_n++]=0; continue; }
-    if (!strcmp(v[i], "-x")) { gui_mode = 1; continue; }
-    if (!strcmp(v[i], "-debug-gui")) { gui_logd = 1; continue; }
-    if (!strcmp(v[i], "-no-gui")) { gui_active = 0; continue; }
    if (!strcmp(v[i], "-full")) { full = 1; continue; }
    if (!strcmp(v[i], "-raw-time")) { raw_time = 1; continue; }
    usage();
  }

-  if (gui_active == 0) gui_mode = 0;
-
  if (database_filename == NULL) {
    printf("ERROR: provide a database file (-d)\n");
    exit(1);
@@ -140,29 +103,12 @@ int main(int n, char **v)

  h = new_handler(database);

-  if (gui_active) {
-    g = gui_init();
-    new_thread(gui_thread, g);
-  }
-
-  if (gui_mode) {
-    widget *w, *win;
-//    w = new_textlist(g, 600, 20, 0);
-    w = new_textlist(g, 800, 50, BACKGROUND_COLOR);
-    win = new_toplevel_window(g, 800, 50*12, "textlog");
-    widget_add_child(g, win, w, -1);
-    out = new_view_textlist(1000, 10, g, w);
-    //tout = new_view_textlist(7, 4, g, w);
-  } else {
-    out = new_view_stdout();
-  }
+  out = new_view_stdout();

  for (i = 0; i < number_of_events; i++) {
    char *name, *desc;
    database_get_generic_description(database, i, &name, &desc);
    textlog = new_textlog(h, database, name, desc);
-//        "ENB_PHY_UL_CHANNEL_ESTIMATE",
-//        "ev: {} eNB_id [eNB_ID] frame [frame] subframe [subframe]");
    logger_add_view(textlog, out);
    if (full) textlog_dump_buffer(textlog, 1);
    if (raw_time) textlog_raw_time(textlog, 1);
@@ -173,24 +119,21 @@ int main(int n, char **v)
  for (i = 0; i < on_off_n; i++)
    on_off(database, on_off_name[i], is_on, on_off_action[i]);

-  textlog_data.socket = -1;
-  textlog_data.is_on = is_on;
-  textlog_data.nevents = number_of_events;
-  if (pthread_mutex_init(&textlog_data.lock, NULL)) abort();
-  if (gui_active)
-    setup_event_selector(g, database, is_on, is_on_changed, &textlog_data);
-
-  textlog_data.socket = connect_to(ip, port);
+  socket = connect_to(ip, port);
+  if (socket == -1) {
+    printf("fatal: connection failed\n");
+    return 1;
+  }

  /* send the first message - activate selected traces */
-  is_on_changed(&textlog_data);
+  activate_traces(socket, is_on, number_of_events);

  OBUF ebuf = { osize: 0, omaxsize: 0, obuf: NULL };

  /* read messages */
  while (1) {
    event e;
-    e = get_event(textlog_data.socket, &ebuf, database);
+    e = get_event(socket, &ebuf, database);
    if (e.type == -1) break;
    handle_event(h, e);
  }

--- a/common/utils/telnetsrv/DOC/telnetarch.md
+++ b/common/utils/telnetsrv/DOC/telnetarch.md
@@ -21,11 +21,11 @@ The telnet server provides an API which can be used by any oai component to add

 telnet server source files are located in [common/utils/telnetsrv](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/telnetsrv)

-1. [telnetsrv.c](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/telnetsrv/telnetsrv.c) contains the telnet server implementation, including the implementation of the `telnet` CLI command. This implementation is compatible with all softmodem executables and is in charge of loading any additional `libtelnetsrv_<app> .so` containing code specific to the running executables.
-1.  [telnetsrv.h](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/telnetsrv/telnetsrv.h) is the telnet server include file containing both private and public data type definitions. It also contains API prototypes for functions that are used to register a new command in the server.
+1. [telnetsrv.c](../telnetsrv.c) contains the telnet server implementation, including the implementation of the `telnet` CLI command. This implementation is compatible with all softmodem executables and is in charge of loading any additional `libtelnetsrv_<app> .so` containing code specific to the running executables.
+1.  [telnetsrv.h](../telnetsrv.h) is the telnet server include file containing both private and public data type definitions. It also contains API prototypes for functions that are used to register a new command in the server.
 1.  `telnetsrv_<XXX\>.c`: implementation of \<XXX\> CLI command which are delivered with the telnet server and are common to all softmodem executables. 
 1. `telnetsrv_<XXX\>.h`: include file for the implementation of XXX CLI command. Usually included only in the corresponding `.c`file
 1.  `telnetsrv_<app>_<XXX>.c`: implementation of \<XXX\> CLI command specific to the executable identified by \<app\>.These sources are used to create `libtelnetsrv_<app>.so` at build time.
-1.  [telnetsrv_CMakeLists.txt](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/common/utils/telnetsrv/telnetsrv_CMakeLists.txt): CMakelists file containing the cmake instructions to build the telnet server. this file is included in the [global oai CMakelists](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/cmake_targets/CMakeLists.txt).
+1.  [telnetsrv_CMakeLists.txt](../CMakeLists.txt): CMakelists file containing the cmake instructions to build the telnet server. this file is included in the [global oai CMakelists](../../../../cmake_targets/CMakeLists.txt).

 [oai telnet server home](telnetsrv.md)
--- a/common/utils/telnetsrv/DOC/telnetusage.md
+++ b/common/utils/telnetsrv/DOC/telnetusage.md
@@ -26,7 +26,7 @@ Below are  examples of telnet sessions:
 *  [measur command](telnetmeasur.md)

 # telnet server parameters
-The telnet server is using the [oai configuration module](Config/Rtusage). Telnet parameters must be specified in the `telnetsrv` section. Some parameters can be modified via the telnet telnet server command, as specified in the last column of the following table.
+The telnet server is using the [oai configuration module](../../../../common/config/DOC/config/rtusage.md). Telnet parameters must be specified in the `telnetsrv` section. Some parameters can be modified via the telnet telnet server command, as specified in the last column of the following table.

 | name | type | default | description | dynamic |
 |:---:|:---:|:---:|:----|:----:|

--- a/doc/E1-design.md
+++ b/doc/E1-design.md
@@ -75,11 +75,11 @@ sequenceDiagram
  Note over u: E1AP_CUUP_task (SCTP Handler)
  Note over u: ASN1 decoder
 ```
-
+More details about the E1AP procedures in OAI are available in this document: [E1 Procedures](./e1ap_procedures.md).

 # 2. Running the E1 Split

-The setup is assuming that all modules are running on the same machine. The user can refer to the [F1 design document](./F1-design.md) for local deployment of the DU.
+The setup is assuming that all modules are running on the same machine. The user can refer to the [F1 design document](./../F1-design.md) for local deployment of the DU.

 ## 2.1 Configuration File


--- a/doc/E1AP/e1ap_procedures.md
+++ b/doc/E1AP/e1ap_procedures.md
+<table style="border-collapse: collapse; border: none;">
+  <tr style="border-collapse: collapse; border: none;">
+    <td style="border-collapse: collapse; border: none;">
+      <a href="http://www.openairinterface.org/">
+         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
+         </img>
+      </a>
+    </td>
+    <td style="border-collapse: collapse; border: none; vertical-align: center;">
+      <b><font size = "5">E1AP Procedures</font></b>
+    </td>
+  </tr>
+</table>
+
+[[_TOC_]]
+
+# Introduction
+The E1 interface is between the gNB-CU-CP (Central Unit - Control Plane) and gNB-CU-UP (Central Unit - User Plane) nodes. This interface is governed by the E1 Application Protocol (E1AP) outlined in the 3GPP release 16 specifications, specifically in the documents:
+* 3GPP TS 38.463 - E1 Application Protocol (E1AP)
+* 3GPP TS 38.460 - E1 general aspects and principles
+* 3GPP TS 38.461 - E1 interface: layer 1 
+* 3GPP TS 38.462 - E1 interface: signaling transport
+
+The E1AP protocol consists of the following sets of functions:
+* E1 Interface Management functions
+* E1 Bearer Context Management functions
+* TEID allocation function
+
+## E1 Bearer Context Management function
+This function handles the establishment, modification, and release of E1 bearer contexts.
+* E1 Bearer Context Establishment: initiation of E1 bearer context is by gNB-CU-CP and acceptance or rejection is determined by gNB-CU-UP based on admission control criteria (e.g., resource availability).
+* E1 Bearer Context Modification: can be initiated by either gNB-CU-CP or gNB-CU-UP, with the receiving node having the authority to accept or reject the modification.
+* Release of Bearer Context: can be triggered either directly by gNB-CU-CP or following a request from gNB-CU-UP.
+* QoS-Flow to DRB Mapping Configuration: responsible for setting up and modifying the QoS-flow to DRB mapping configuration. gNB-CU-CP decides the flow-to-DRB mapping, generates SDAP and PDCP configurations, and provides them to gNB-CU-UP.
+
+# OAI implementation
+
+For the E1AP design in OAI, please refer to the [E1 Design](./E1-design.md) document.
+
+## E1 re-establishment
+
+The purpose of this procedure is to follow-up the re-establishment of RRC connection over the E1 interface. For all activated DRBs a Bearer Context Modification from CU-CP to CU-UP is necessary, according to clause 9.2.2.4 of 3GPP TS 38.463. If any modification to the bearer context is required, the CU-CP informs the CU-UP with the relevant IEs (e.g. in case of PDCP re-establishment, PDCP Configuration IE clause 9.3.1.38), Current implementation in OAI:
+
+```mermaid
+sequenceDiagram
+  participant e as UE
+  participant d as DU
+  participant c as CUCP
+  participant u as CUUP
+
+  Note over e,c: RRCReestablishment Procedure
+  e->>d: RRCReestablishmentRequest
+  Note over d: initial_ul_rrc_message_transfer_f1ap
+  d->>+c: Initial UL RRC Message Transfer (CCCH, new C-RNTI)
+  Note over c: rrc_gNB_process_initial_ul_rrc_message
+  Note over c: rrc_handle_RRCReestablishmentRequests
+  c-->>+d: DL RRC Message Transfer
+  note right of d: fallback to RRC establishment
+  d-->>-e: RRCSetup
+  e-->>d: RRCSetupComplete
+  Note over c: rrc_gNB_generate_RRCReestablishment
+  Note over c: cuup_notify_reestablishment
+  Note over c: e1apCUCP_send_BEARER_CONTEXT_MODIFICATION_REQUEST
+  c->>u: BEARER CONTEXT MODIFICATION REQUEST
+  Note over u: e1apCUUP_handle_BEARER_CONTEXT_MODIFICATION_REQUEST
+  Note over u: e1_bearer_context_modif
+  Note over u: nr_pdcp_reestablishment
+  c->>-d: DL RRC Message Transfer (old gNB DU F1AP UE ID)
+  d->>e: RRCReestablishment
+  Note over d: Fetch UE Context with old gNB DU F1AP UE ID and update C-RNTI
+  e->>d: RRCReestablishmentComplete
+  u->>c: BEARER CONTEXT MODIFICATION RESPONSE
+  Note over c: e1apCUCP_handle_BEARER_CONTEXT_MODIFICATION_RESPONSE
+```
--- a/doc/NR_SA_Tutorial_COTS_UE.md
+++ b/doc/NR_SA_Tutorial_COTS_UE.md
@@ -188,6 +188,10 @@ sudo ethtool -G enp1s0f0 tx 4096 rx 4096
 ## 6.2 Real-time performance workarounds
 - Enable Performance Mode `sudo cpupower idle-set -D 0`
 - If you get real-time problems on heavy UL traffic, reduce the maximum UL MCS using an additional command-line switch: `--MACRLCs.[0].ul_max_mcs 14`.
+- You can also reduce the number of LDPC decoder iterations, which will make the LDPC decoder take less time: `--L1s.[0].max_ldpc_iterations 4`.

 ## 6.3 Uplink issues related with noise on the DC carriers
 - There is noise on the DC carriers on N300 and especially the X300 in UL. To avoid their use or shift them away from the center to use more UL spectrum, use the `--tune-offset <Hz>` command line switch, where `<Hz>` is ideally half the bandwidth, or possibly less.
+
+## 6.4 Lower latency on user plane
+- To lower latency on the user plane, you can force the UE to be scheduled constantly in uplink: `--MACRLCs.[0].ulsch_max_frame_inactivity 0` .
--- a/doc/NR_SA_Tutorial_OAI_nrUE.md
+++ b/doc/NR_SA_Tutorial_OAI_nrUE.md
@@ -192,6 +192,7 @@ sudo ethtool -G enp1s0f0 tx 4096 rx 4096
 ## 6.2 Real-time performance workarounds
 - Enable Performance Mode `sudo cpupower idle-set -D 0`
 - If you get real-time problems on heavy UL traffic, reduce the maximum UL MCS using an additional command-line switch: `--MACRLCs.[0].ul_max_mcs 14`.
+- You can also reduce the number of LDPC decoder iterations, which will make the LDPC decoder take less time: `--L1s.[0].max_ldpc_iterations 4`.

 ## 6.3 Uplink issues related with noise on the DC carriers
 - There is noise on the DC carriers on N300 and especially the X300 in UL. To avoid their use or shift them away from the center to use more UL spectrum, use the `--tune-offset <Hz>` command line switch, where `<Hz>` is ideally half the bandwidth, or possibly less.
@@ -200,3 +201,6 @@ sudo ethtool -G enp1s0f0 tx 4096 rx 4096
 - Sometimes, the nrUE would keep repeating RA procedure because of Msg3 failure at the gNB. If it happens, add the `-A` option at the nrUE and/or gNB side, e.g., `-A 45`. This modifies the timing advance (in samples). Adjust +/-5 if the issue persists.
 - This can be necessary since certain USRPs have larger signal delays than others; it is therefore specific to the used USRP model.
 - The x310 and B210 are found to work with the default configuration; N310 and x410 can benefit from setting this timing advance.
+
+## 6.5 Lower latency on user plane
+- To lower latency on the user plane, you can force the UE to be scheduled constantly in uplink: `--MACRLCs.[0].ulsch_max_frame_inactivity 0` .
--- a/doc/README.md
+++ b/doc/README.md
@@ -43,6 +43,7 @@ There is some general information in the [OpenAirInterface Gitlab Wiki](https://
 - [How to run a 5G-NSA setup](./TESTING_GNB_W_COTS_UE.md)
 - [How to run a 4G setup using L1 simulator](./L1SIM.md) _Note: we recommend the RFsimulator_
 - [How to use the L2 simulator](./L2NFAPI.md)
+- [How to use the OAI channel simulator](../openair1/SIMULATION/TOOLS/DOC/channel_simulation.md)
 - [How to use multiple BWPs](./RUN_NR_multiple_BWPs.md)
 - [How to run OAI-VNF and OAI-PNF](./RUN_NR_NFAPI.md) _Note: does not work currently_
 - [How to use the positioning reference signal (PRS)](./RUN_NR_PRS.md)
@@ -57,7 +58,7 @@ Legacy unmaintained files:
 # Designs

 - General software architecture notes: [SW_archi.md](./SW_archi.md)
- [Information on E1](./E1-design.md)
+- [Information on E1](./E1AP/E1-design.md)
 - [Information on F1](./F1-design.md)
 - [Information on how NR nFAPI works](./NR_NFAPI_archi.md)
 - [Flow graph of the L1 in gNB](SW-archi-graph.md)

--- a/doc/TESTBenches.md
+++ b/doc/TESTBenches.md
@@ -249,3 +249,71 @@ steps](../docker/README.md) and then use the docker-compose file directly.
 Some tests are run from source (e.g.
 `ci-scripts/xml_files/gnb_phytest_usrp_run.xml`), which directly give the
 options they are run with.
+
+## How to retrieve core dumps (for CI team members)
+
+The entrypoint scripts of all containers print the core pattern that is used on
+the running machine. Search for `core_pattern` at the start of the container
+logs to retrieve the possible location. Possible locations might be:
+
+- a path: the corresponding directory must be mounted in the container to be
+  writable
+- systemd-coredumpd: see [documentation](https://systemd.io/COREDUMP/)
+- abrt: see [documentation](https://abrt.readthedocs.io/en/latest/usage.html)
+- apport: see [documentation](https://wiki.ubuntu.com/Apport)
+
+You furthermore have to extract the executable that caused the core dump.
+Download the container image, and extract, e.g.:
+
+```
+docker create --name c1 porcepix.sboai.cs.eurecom.fr/oai-gnb:develop-c99db698
+docker cp c1:/opt/oai-gnb/bin/nr-softmodem /tmp
+docker rm c1
+```
+
+### Core dump in a file
+
+**This is not recommended, as files could pile up and fill the system disk
+completely!** Prefer systemd or abrt instead.
+
+If the core pattern is a path: it should at least include the time in the
+pattern name (suggested pattern: `/tmp/core.%e.%p.%t`) to correlate the time
+the segfault occurred with the CI logs. If you identified the core dump,
+copy the core dump from that machine; if identification is difficult, consider
+rerunning the pipeline.
+
+### Core dump via systemd
+
+Run this command to list all core dumps:
+
+```
+sudo coredumpctl list
+```
+
+Scroll to the end and find the core dump of interest (it lists the executables
+in the last column; use the time to correlate the segfault and the CI run).
+Take the PID of the executable (first column after the time). Dump the core
+dump to a location of your choice:
+
+```
+sudo coredumpctl dump <PID> > /tmp/coredump
+```
+
+### Core dump via abrt (automatic bug reporting tool)
+
+TBD: use the documentation page for the moment.
+
+### Core dump via apport
+
+On Ubuntu machines, apport first needs to be enabled to collect core dumps:
+
+```
+sudo systemctl enable apport.service
+```
+
+and [needs to be enabled](https://wiki.ubuntu.com/Apport#How_to_enable_apport).
+Then, show a list of core dumps using
+
+```
+sudo apport-cli
+```
--- a/docker/Dockerfile.base.rhel9
+++ b/docker/Dockerfile.base.rhel9
@@ -58,6 +58,12 @@ RUN rm -f /etc/rhsm-host && \
    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf

+# Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini
+# it will be copied into target containers, to print exit numbers and handle signals properly
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
 # 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"


--- a/docker/Dockerfile.base.rocky
+++ b/docker/Dockerfile.base.rocky
@@ -46,6 +46,12 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
       python3-pip && \
    pip3 install --ignore-installed pyyaml

+# Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini
+# it will be copied into target containers, to print exit numbers and handle signals properly
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
 #create the WORKDIR
 WORKDIR /oai-ran
 COPY . .

--- a/docker/Dockerfile.base.ubuntu20
+++ b/docker/Dockerfile.base.ubuntu20
@@ -46,6 +46,12 @@ RUN apt-get update && \
       python3-pip && \
    pip3 install --ignore-installed pyyaml

+# Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini
+# it will be copied into target containers, to print exit numbers and handle signals properly
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
 # 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"


--- a/docker/Dockerfile.base.ubuntu20.cross-arm64
+++ b/docker/Dockerfile.base.ubuntu20.cross-arm64
@@ -73,6 +73,12 @@ RUN apt-get update && \
      g++-9-aarch64-linux-gnu && \
    apt-get clean

+# Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini
+# it will be copied into target containers, to print exit numbers and handle signals properly
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
 # create the WORKDIR
 WORKDIR /oai-ran
 COPY . .

--- a/docker/Dockerfile.eNB.rhel9
+++ b/docker/Dockerfile.eNB.rhel9
@@ -112,5 +112,6 @@ WORKDIR /opt/oai-enb
 # 36422 --> X2C, SCTP/UDP
 EXPOSE 2152/udp 36412/udp 36422/udp

-ENTRYPOINT ["/opt/oai-enb/bin/entrypoint.sh"]
+COPY --from=enb-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-enb/bin/entrypoint.sh"]
 CMD ["/opt/oai-enb/bin/lte-softmodem", "-O", "/opt/oai-enb/etc/enb.conf"]
--- a/docker/Dockerfile.eNB.rocky
+++ b/docker/Dockerfile.eNB.rocky
@@ -122,5 +122,6 @@ WORKDIR /opt/oai-enb
 # 36422 --> X2C, SCTP/UDP
 EXPOSE 2152/udp 36412/udp 36422/udp

-ENTRYPOINT ["/opt/oai-enb/bin/entrypoint.sh"]
+COPY --from=enb-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-enb/bin/entrypoint.sh"]
 CMD ["/opt/oai-enb/bin/lte-softmodem", "-O", "/opt/oai-enb/etc/enb.conf"]
--- a/docker/Dockerfile.eNB.ubuntu20
+++ b/docker/Dockerfile.eNB.ubuntu20
@@ -112,5 +112,6 @@ EXPOSE 2152/udp 36412/udp 36422/udp
 #EXPOSE 50000/udp # IF5 / ORI (control)
 #EXPOSE 50001/udp # IF5 / ECPRI (data)

-ENTRYPOINT ["/opt/oai-enb/bin/entrypoint.sh"]
+COPY --from=enb-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-enb/bin/entrypoint.sh"]
 CMD ["/opt/oai-enb/bin/lte-softmodem", "-O", "/opt/oai-enb/etc/enb.conf"]
--- a/docker/Dockerfile.gNB.aw2s.rhel9
+++ b/docker/Dockerfile.gNB.aw2s.rhel9
@@ -86,5 +86,6 @@ RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_tra

 WORKDIR /opt/oai-gnb-aw2s

-ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
+COPY --from=gnb-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem", "-O", "/opt/oai-gnb-aw2s/etc/gnb.conf"]
--- a/docker/Dockerfile.gNB.aw2s.rocky
+++ b/docker/Dockerfile.gNB.aw2s.rocky
@@ -95,5 +95,6 @@ RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_tra

 WORKDIR /opt/oai-gnb-aw2s

-ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
+COPY --from=gnb-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem", "-O", "/opt/oai-gnb-aw2s/etc/gnb.conf"]
--- a/docker/Dockerfile.gNB.aw2s.ubuntu20
+++ b/docker/Dockerfile.gNB.aw2s.ubuntu20
@@ -81,5 +81,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/lib

 WORKDIR /opt/oai-gnb-aw2s

-ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
+COPY --from=gnb-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem", "-O", "/opt/oai-gnb-aw2s/etc/gnb.conf"]
--- a/docker/Dockerfile.gNB.rhel9
+++ b/docker/Dockerfile.gNB.rhel9
@@ -111,5 +111,6 @@ WORKDIR /opt/oai-gnb
 #EXPOSE 50000/udp # IF5 / ORI (control)
 #EXPOSE 50001/udp # IF5 / ECPRI (data)

-ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+COPY --from=gnb-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]
--- a/docker/Dockerfile.gNB.rocky
+++ b/docker/Dockerfile.gNB.rocky
@@ -121,5 +121,6 @@ WORKDIR /opt/oai-gnb
 #EXPOSE 50000/udp # IF5 / ORI (control)
 #EXPOSE 50001/udp # IF5 / ECPRI (data)

-ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+COPY --from=gnb-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]
--- a/docker/Dockerfile.gNB.ubuntu20
+++ b/docker/Dockerfile.gNB.ubuntu20
@@ -108,5 +108,6 @@ WORKDIR /opt/oai-gnb
 #EXPOSE 50000/udp # IF5 / ORI (control)
 #EXPOSE 50001/udp # IF5 / ECPRI (data)

-ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+COPY --from=gnb-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]
--- a/docker/Dockerfile.lteRU.rhel9
+++ b/docker/Dockerfile.lteRU.rhel9
@@ -95,5 +95,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai

 WORKDIR /opt/oai-lte-ru

-ENTRYPOINT ["/opt/oai-lte-ru/bin/entrypoint.sh"]
+COPY --from=ru-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-lte-ru/bin/entrypoint.sh"]
 CMD ["/opt/oai-lte-ru/bin/oairu", "-O", "/opt/oai-lte-ru/etc/rru.conf"]
--- a/docker/Dockerfile.lteRU.ubuntu20
+++ b/docker/Dockerfile.lteRU.ubuntu20
@@ -88,5 +88,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai

 WORKDIR /opt/oai-lte-ru

-ENTRYPOINT ["/opt/oai-lte-ru/bin/entrypoint.sh"]
+COPY --from=ru-base /tini /tini
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-lte-ru/bin/entrypoint.sh"]
 CMD ["/opt/oai-lte-ru/bin/oairu", "-O", "/opt/oai-lte-ru/etc/rru.conf"]
--- a/docker/Dockerfile.lteUE.rhel9
+++ b/docker/Dockerfile.lteUE.rhel9
@@ -104,5 +104,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
    ldconfig

 WORKDIR /opt/oai-lte-ue
+COPY --from=lte-ue-base /tini /tini
 CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"]
-ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-lte-ue/bin/entrypoint.sh"]
--- a/docker/Dockerfile.lteUE.rocky
+++ b/docker/Dockerfile.lteUE.rocky
@@ -116,5 +116,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
    echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so

 WORKDIR /opt/oai-lte-ue
+COPY --from=lte-ue-base /tini /tini
 CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"]
-ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-lte-ue/bin/entrypoint.sh"]
--- a/docker/Dockerfile.lteUE.ubuntu20
+++ b/docker/Dockerfile.lteUE.ubuntu20
@@ -104,5 +104,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
    ldd /opt/oai-lte-ue/bin/lte-uesoftmodem

 WORKDIR /opt/oai-lte-ue
+COPY --from=lte-ue-base /tini /tini
 CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"]
-ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-lte-ue/bin/entrypoint.sh"]
--- a/docker/Dockerfile.nr-cuup.rhel9
+++ b/docker/Dockerfile.nr-cuup.rhel9
@@ -75,5 +75,6 @@ WORKDIR /opt/oai-gnb/etc

 WORKDIR /opt/oai-gnb

-ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+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"]
--- a/docker/Dockerfile.nr-cuup.rocky
+++ b/docker/Dockerfile.nr-cuup.rocky
@@ -76,5 +76,6 @@ WORKDIR /opt/oai-gnb/etc

 WORKDIR /opt/oai-gnb

-ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+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"]
--- a/docker/Dockerfile.nr-cuup.ubuntu20
+++ b/docker/Dockerfile.nr-cuup.ubuntu20
@@ -66,5 +66,6 @@ RUN ldconfig && ldd /opt/oai-gnb/bin/nr-cuup
 WORKDIR /opt/oai-gnb/etc

 WORKDIR /opt/oai-gnb
-ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+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"]
--- a/docker/Dockerfile.nrUE.rhel9
+++ b/docker/Dockerfile.nrUE.rhel9
@@ -108,5 +108,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai


 WORKDIR /opt/oai-nr-ue
+COPY --from=nr-ue-base /tini /tini
 CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
-ENTRYPOINT ["/opt/oai-nr-ue/bin/entrypoint.sh"]
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-nr-ue/bin/entrypoint.sh"]
--- a/docker/Dockerfile.nrUE.rocky
+++ b/docker/Dockerfile.nrUE.rocky
@@ -117,5 +117,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
    echo "ldd on libtelnetsrv_5Gue.so" && ldd /usr/local/lib/libtelnetsrv_5Gue.so

 WORKDIR /opt/oai-nr-ue
+COPY --from=nr-ue-base /tini /tini
 CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
-ENTRYPOINT ["/opt/oai-nr-ue/bin/entrypoint.sh"]
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-nr-ue/bin/entrypoint.sh"]
--- a/docker/Dockerfile.nrUE.ubuntu20
+++ b/docker/Dockerfile.nrUE.ubuntu20
@@ -104,5 +104,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
    ldd /opt/oai-nr-ue/bin/nr-uesoftmodem

 WORKDIR /opt/oai-nr-ue
+COPY --from=nr-ue-base /tini /tini
 CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
-ENTRYPOINT ["/opt/oai-nr-ue/bin/entrypoint.sh"]
+ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-nr-ue/bin/entrypoint.sh"]
--- a/docker/scripts/enb_entrypoint.sh
+++ b/docker/scripts/enb_entrypoint.sh
@@ -5,6 +5,9 @@ set -uo pipefail
 PREFIX=/opt/oai-enb
 CONFIGFILE=$PREFIX/etc/enb.conf

+echo "=================================="
+echo "/proc/sys/kernel/core_pattern=$(cat /proc/sys/kernel/core_pattern)"
+
 if [ ! -f $CONFIGFILE ]; then
  echo "No configuration file found: please mount at $CONFIGFILE"
  exit 255

--- a/docker/scripts/gnb-aw2s_entrypoint.sh
+++ b/docker/scripts/gnb-aw2s_entrypoint.sh
@@ -5,6 +5,9 @@ set -uo pipefail
 PREFIX=/opt/oai-gnb-aw2s
 CONFIGFILE=$PREFIX/etc/gnb.conf

+echo "=================================="
+echo "/proc/sys/kernel/core_pattern=$(cat /proc/sys/kernel/core_pattern)"
+
 if [ ! -f $CONFIGFILE ]; then
  echo "No configuration file found: please mount at $CONFIGFILE"
  exit 255

--- a/docker/scripts/gnb_entrypoint.sh
+++ b/docker/scripts/gnb_entrypoint.sh
@@ -5,6 +5,8 @@ set -uo pipefail
 PREFIX=/opt/oai-gnb
 CONFIGFILE=$PREFIX/etc/gnb.conf

+echo "=================================="
+echo "/proc/sys/kernel/core_pattern=$(cat /proc/sys/kernel/core_pattern)"

 if [ ! -f $CONFIGFILE ]; then
  echo "No configuration file found: please mount at $CONFIGFILE"

--- a/docker/scripts/lte_ru_entrypoint.sh
+++ b/docker/scripts/lte_ru_entrypoint.sh
@@ -5,6 +5,9 @@ set -uo pipefail
 PREFIX=/opt/oai-lte-ru
 CONFIGFILE=$PREFIX/etc/rru.conf

+echo "=================================="
+echo "/proc/sys/kernel/core_pattern=$(cat /proc/sys/kernel/core_pattern)"
+
 if [ ! -f $CONFIGFILE ]; then
  echo "No configuration file found: please mount at $CONFIGFILE"
  exit 255

--- a/docker/scripts/lte_ue_entrypoint.sh
+++ b/docker/scripts/lte_ue_entrypoint.sh
@@ -5,6 +5,9 @@ set -uo pipefail
 PREFIX=/opt/oai-lte-ue
 USIM_CONFIGFILE=$PREFIX/etc/ue_usim.conf

+echo "=================================="
+echo "/proc/sys/kernel/core_pattern=$(cat /proc/sys/kernel/core_pattern)"
+
 if [ ! -f $USIM_CONFIGFILE ]; then
  echo "No ue_usim.conf configuration file found: please mount at $USIM_CONFIGFILE"
  exit 255

--- a/docker/scripts/nr_ue_entrypoint.sh
+++ b/docker/scripts/nr_ue_entrypoint.sh
@@ -5,6 +5,9 @@ set -uo pipefail
 PREFIX=/opt/oai-nr-ue
 CONFIGFILE=$PREFIX/etc/nr-ue.conf

+echo "=================================="
+echo "/proc/sys/kernel/core_pattern=$(cat /proc/sys/kernel/core_pattern)"
+
 if [ ! -f $CONFIGFILE ]; then
  echo "No configuration file found: please mount at $CONFIGFILE"
  exit 255

--- a/executables/lte-enb.c
+++ b/executables/lte-enb.c
@@ -103,7 +103,6 @@ struct timing_info_t {
 } timing_info;

 // Fix per CC openair rf/if device update
-// extern openair0_device openair0;

 extern int oai_exit;


--- a/executables/lte-ru.c
+++ b/executables/lte-ru.c
@@ -808,26 +808,31 @@ void tx_rf(RU_t *ru,
    /* add fail safe for late command end */
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 );
    // prepare tx buffer pointers
-    txs = ru->rfdevice.trx_write_func(&ru->rfdevice,
-                                      timestamp+ru->ts_offset-ru->openair0_cfg.tx_sample_advance-sf_extension,
-                                      txp,
-                                      siglen+sf_extension,
-                                      ru->nb_tx,
-                                      flags);
-    ru->south_out_cnt++;
-    LOG_D(PHY,"south_out_cnt %d\n",ru->south_out_cnt);
-    int se = dB_fixed(signal_energy(txp[0],siglen+sf_extension));
-
-    if (SF_type == SF_S) LOG_D(PHY,"[TXPATH] RU %d tx_rf (en %d,len %d), writing to TS %llu, frame %d, unwrapped_frame %d, subframe %d\n",ru->idx, se,
-                                 siglen+sf_extension, (long long unsigned int)timestamp, frame, proc->frame_tx_unwrap, subframe);
-
-    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
-
-    //    AssertFatal(txs ==  siglen+sf_extension,"TX : Timeout (sent %d/%d)\n",txs, siglen);
-    if( usrp_tx_thread == 0 && (txs !=  siglen+sf_extension) && (late_control==STATE_BURST_NORMAL) ) { /* add fail safe for late command */
-      late_control=STATE_BURST_TERMINATE;
-      LOG_E(PHY,"TX : Timeout (sent %d/%d) state =%d\n",txs, siglen,late_control);
-    }
+   txs = ru->rfdevice
+             .trx_write_func(&ru->rfdevice, timestamp + ru->ts_offset - sf_extension, txp, siglen + sf_extension, ru->nb_tx, flags);
+   ru->south_out_cnt++;
+   LOG_D(PHY, "south_out_cnt %d\n", ru->south_out_cnt);
+   int se = dB_fixed(signal_energy(txp[0], siglen + sf_extension));
+
+   if (SF_type == SF_S)
+     LOG_D(PHY,
+           "[TXPATH] RU %d tx_rf (en %d,len %d), writing to TS %llu, frame %d, unwrapped_frame %d, subframe %d\n",
+           ru->idx,
+           se,
+           siglen + sf_extension,
+           (long long unsigned int)timestamp,
+           frame,
+           proc->frame_tx_unwrap,
+           subframe);
+
+   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0);
+
+   //    AssertFatal(txs ==  siglen+sf_extension,"TX : Timeout (sent %d/%d)\n",txs, siglen);
+   if (usrp_tx_thread == 0 && (txs != siglen + sf_extension)
+       && (late_control == STATE_BURST_NORMAL)) { /* add fail safe for late command */
+     late_control = STATE_BURST_TERMINATE;
+     LOG_E(PHY, "TX : Timeout (sent %d/%d) state =%d\n", txs, siglen, late_control);
+   }
  } else if (IS_SOFTMODEM_RFSIM ) {
    // in case of rfsim, we always enable tx because we need to feed rx of the opposite side
    // we write 1 single I/Q sample to trigger Rx (rfsim will fill gaps with 0 I/Q)
@@ -836,15 +841,15 @@ void tx_rf(RU_t *ru,
    memset(dummy_tx_data,0,sizeof(dummy_tx_data));
    for (int i=0; i<ru->frame_parms->nb_antennas_tx; i++)
      dummy_tx[i]= dummy_tx_data[i];
-    
-    AssertFatal( 1 ==
-                 ru->rfdevice.trx_write_func(&ru->rfdevice,
-                                             timestamp+ru->ts_offset-ru->openair0_cfg.tx_sample_advance-sf_extension,
-                                             dummy_tx,
-                                             1,
-                                             ru->frame_parms->nb_antennas_tx,
-                                             4),"");
-    
+
+    AssertFatal(1
+                    == ru->rfdevice.trx_write_func(&ru->rfdevice,
+                                                   timestamp + ru->ts_offset - sf_extension,
+                                                   dummy_tx,
+                                                   1,
+                                                   ru->frame_parms->nb_antennas_tx,
+                                                   4),
+                "");
  }
 }


--- a/executables/lte-softmodem.h
+++ b/executables/lte-softmodem.h
@@ -74,15 +74,7 @@
 #define CONFIG_HLP_DLSHIFT       "dynamic shift for LLR compuation for TM3/4 (default 0)\n"
 #define CONFIG_HLP_USRP_ARGS     "set the arguments to identify USRP (same syntax as in UHD)\n"
 #define CONFIG_HLP_DMAMAP        "use DMA memory mapping\n"
-#define CONFIG_HLP_TDD           "Set hardware to TDD mode (default: FDD). Used only with -U (otherwise set in config file).\n"
-#define CONFIG_HLP_TADV          "Set timing_advance\n"
-
-
-
-
-
-
-
+#define CONFIG_HLP_TDD "Set hardware to TDD mode (default: FDD). Used only with -U (otherwise set in config file).\n"

 /*-------------------------------------------------------------------------------------------------------------------------------------------------------*/
 /*                                            command line parameters specific to UE                                                                     */
@@ -106,7 +98,6 @@
    {"usrp-args",         CONFIG_HLP_USRP_ARGS,   0,               .strptr=&usrp_args,         .defstrval="type=b200",TYPE_STRING,   0},   \
    {"mmapped-dma",       CONFIG_HLP_DMAMAP,      PARAMFLAG_BOOL,  .uptr=&mmapped_dma,                  .defintval=0,          TYPE_INT,      0},   \
    {"T" ,                CONFIG_HLP_TDD,         PARAMFLAG_BOOL,  .iptr=&tddflag,                      .defintval=0,          TYPE_INT,      0},   \
-    {"A",                 CONFIG_HLP_TADV,        0,               .iptr=&(timingadv),                  .defintval=0,          TYPE_INT,      0},   \
    {"ue-idx-standalone", NULL,                   0,               .u16ptr=&ue_idx_standalone,          .defuintval=0xFFFF,    TYPE_UINT16,   0},   \
    {"node-number",       NULL,                   0,               .u16ptr=&node_number,                .defuintval=2,         TYPE_UINT16,   0},   \
  }
@@ -179,9 +170,6 @@ extern void init_UE(int nb_inst,

 extern void init_thread(int sched_runtime, int sched_deadline, int sched_fifo, cpu_set_t *cpuset, char *name);

-extern void init_ocm(void);
-extern void init_ue_devices(PHY_VARS_UE *);
-
 PHY_VARS_UE *init_ue_vars(LTE_DL_FRAME_PARMS *frame_parms, uint8_t UE_id, uint8_t abstraction_flag);

 void init_eNB_afterRU(void);

--- a/executables/lte-ue.c
+++ b/executables/lte-ue.c
--- a/executables/lte-uesoftmodem.c
+++ b/executables/lte-uesoftmodem.c
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
--- a/executables/nr-softmodem-common.h
+++ b/executables/nr-softmodem-common.h
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
--- a/executables/nr-softmodem.h
+++ b/executables/nr-softmodem.h
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
--- a/executables/nr-uesoftmodem.h
+++ b/executables/nr-uesoftmodem.h
--- a/executables/rfsim.c
+++ b/executables/rfsim.c
--- a/executables/softmodem-common.c
+++ b/executables/softmodem-common.c
--- a/executables/softmodem-common.h
+++ b/executables/softmodem-common.h
--- a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
--- a/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
--- a/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
+++ b/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
--- a/openair1/PHY/NR_TRANSPORT/nr_dci.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c
--- a/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h
--- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
--- a/openair1/PHY/TOOLS/calibration_test.c
+++ b/openair1/PHY/TOOLS/calibration_test.c
--- a/openair1/PHY/defs_L1_NB_IoT.h
+++ b/openair1/PHY/defs_L1_NB_IoT.h
--- a/openair1/PHY/defs_UE.h
+++ b/openair1/PHY/defs_UE.h
--- a/openair1/PHY/defs_eNB.h
+++ b/openair1/PHY/defs_eNB.h
--- a/openair1/PHY/defs_nr_UE.h
+++ b/openair1/PHY/defs_nr_UE.h
--- a/openair1/PHY/defs_nr_common.h
+++ b/openair1/PHY/defs_nr_common.h
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
--- a/openair1/SCHED_NR_UE/defs.h
+++ b/openair1/SCHED_NR_UE/defs.h
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
--- a/openair1/SCHED_UE/phy_procedures_lte_ue.c
+++ b/openair1/SCHED_UE/phy_procedures_lte_ue.c
--- a/openair1/SIMULATION/NR_PHY/pbchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pbchsim.c
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
--- a/openair1/SIMULATION/TOOLS/DOC/arch.md
+++ b/openair1/SIMULATION/TOOLS/DOC/arch.md
--- a/openair1/SIMULATION/TOOLS/DOC/channel_simulation.md
+++ b/openair1/SIMULATION/TOOLS/DOC/channel_simulation.md
--- a/openair1/SIMULATION/TOOLS/DOC/devusage.md
+++ b/openair1/SIMULATION/TOOLS/DOC/devusage.md
--- a/openair1/SIMULATION/TOOLS/DOC/rtusage.md
+++ b/openair1/SIMULATION/TOOLS/DOC/rtusage.md
--- a/openair1/SIMULATION/TOOLS/random_channel.c
+++ b/openair1/SIMULATION/TOOLS/random_channel.c
--- a/openair1/SIMULATION/TOOLS/sim.h
+++ b/openair1/SIMULATION/TOOLS/sim.h
--- a/openair2/COMMON/e1ap_messages_def.h
+++ b/openair2/COMMON/e1ap_messages_def.h
--- a/openair2/COMMON/e1ap_messages_types.h
+++ b/openair2/COMMON/e1ap_messages_types.h
--- a/openair2/COMMON/ngap_messages_types.h
+++ b/openair2/COMMON/ngap_messages_types.h
--- a/openair2/E1AP/e1ap.c
+++ b/openair2/E1AP/e1ap.c
--- a/openair2/E2AP/RAN_FUNCTION/CMakeLists.txt
+++ b/openair2/E2AP/RAN_FUNCTION/CMakeLists.txt
--- a/openair2/E2AP/RAN_FUNCTION/read_setup_ran.c
+++ b/openair2/E2AP/RAN_FUNCTION/read_setup_ran.c
--- a/flexric @ 7c424e88
+++ b/flexric @ 7c424e88
--- a/openair2/GNB_APP/L1_nr_paramdef.h
+++ b/openair2/GNB_APP/L1_nr_paramdef.h
--- a/openair2/GNB_APP/MACRLC_nr_paramdef.h
+++ b/openair2/GNB_APP/MACRLC_nr_paramdef.h
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
--- a/openair2/LAYER2/NR_MAC_UE/mac_defs.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_defs.h
--- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
--- a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
--- a/openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c
+++ b/openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h
--- a/openair2/RRC/NR/cucp_cuup_direct.c
+++ b/openair2/RRC/NR/cucp_cuup_direct.c
--- a/openair2/RRC/NR/cucp_cuup_e1ap.c
+++ b/openair2/RRC/NR/cucp_cuup_e1ap.c
--- a/openair2/RRC/NR/nr_rrc_common.h
+++ b/openair2/RRC/NR/nr_rrc_common.h
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
--- a/openair2/RRC/NR/rrc_gNB_nsa.c
+++ b/openair2/RRC/NR/rrc_gNB_nsa.c
--- a/openair2/RRC/NR/rrc_gNB_radio_bearers.c
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
--- a/openair2/RRC/NR/rrc_gNB_radio_bearers.h
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.h
--- a/openair2/RRC/NR_UE/rrc_UE.c
+++ b/openair2/RRC/NR_UE/rrc_UE.c
--- a/openair2/SDAP/nr_sdap/nr_sdap_entity.c
+++ b/openair2/SDAP/nr_sdap/nr_sdap_entity.c
--- a/openair2/SDAP/nr_sdap/nr_sdap_entity.h
+++ b/openair2/SDAP/nr_sdap/nr_sdap_entity.h
--- a/openair2/UTIL/OPT/probe.c
+++ b/openair2/UTIL/OPT/probe.c
--- a/openair3/NGAP/ngap_gNB_handlers.c
+++ b/openair3/NGAP/ngap_gNB_handlers.c
--- a/radio/BLADERF/bladerf_lib.c
+++ b/radio/BLADERF/bladerf_lib.c
--- a/radio/COMMON/common_lib.c
+++ b/radio/COMMON/common_lib.c
--- a/radio/COMMON/common_lib.h
+++ b/radio/COMMON/common_lib.h
--- a/radio/IRIS/iris_lib.cpp
+++ b/radio/IRIS/iris_lib.cpp
--- a/radio/LMSSDR/lms_lib.cpp
+++ b/radio/LMSSDR/lms_lib.cpp
--- a/radio/USRP/usrp_lib.cpp
+++ b/radio/USRP/usrp_lib.cpp
--- a/radio/rfsimulator/README.md
+++ b/radio/rfsimulator/README.md
--- a/radio/rfsimulator/simulator.c
+++ b/radio/rfsimulator/simulator.c
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf