modified: openair2/RRC/NR/nr_rrc_config.c

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

CMakeLists.txt

@@ -500,10 +500,10 @@ target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)
 add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)
 set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/x86_64-linux-gnu/pkgconfig")
 if (ENABLE_LDPC_T2)
-  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.7)
-  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS "/opt/dpdk-t2/lib/x86_64-linux-gnu/")
+  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.9)
+  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS ${LIBDPDK_T2_LIBRARY_DIRS})
   if (NOT PMD_T2)
-    message(FATAL_ERROR "could not find PMD T2")
+    message(FATAL_ERROR "could not find poll-mode driver for AccelerComm T2 LDPC Offload (rte_baseband_accl_ldpc.so)")
   endif()
   message(STATUS "T2 build: use ${PMD_T2}")
   add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
@@ -1366,7 +1366,6 @@ set (MAC_NR_SRC
   ${NR_GNB_MAC_DIR}/mac_rrc_dl_handler.c
   ${NR_GNB_MAC_DIR}/mac_rrc_ul_direct.c
   ${NR_GNB_MAC_DIR}/mac_rrc_ul_f1ap.c
-  ${NR_GNB_MAC_DIR}/slicing/nr_slicing.c
  )
 
 
@@ -1434,7 +1433,7 @@ target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 if(E2_AGENT)
-  target_link_libraries(L2 PUBLIC e2_agent e2_ran_func)
+  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})
 endif()
@@ -1461,7 +1460,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_ran_func)
+  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)
 endif()
@@ -1688,7 +1687,7 @@ set(libnas_ies_OBJS
 
 set (libnas_utils_OBJS
   ${NAS_SRC}COMMON/UTIL/device.c
-  ${NAS_SRC}COMMON/UTIL/memory.c
+  common/utils/mem/memory.c
   ${NAS_SRC}COMMON/UTIL/nas_timer.c
   ${NAS_SRC}COMMON/UTIL/socket.c
   ${NAS_SRC}COMMON/UTIL/stty.c
@@ -2053,7 +2052,6 @@ add_executable(nr-softmodem
   ${rrc_h}
   ${nr_rrc_h}
   ${s1ap_h}
-#  ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_DIR}/executables/nr-gnb.c
   ${OPENAIR_DIR}/executables/nr-ru.c
   ${OPENAIR_DIR}/executables/nr-softmodem.c
@@ -2115,6 +2113,10 @@ target_link_libraries(nr-cuup PRIVATE
                       GTPV1U e1ap f1ap SIMU_ETH
                       z sctp dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+if(E2_AGENT)
+  target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
+  target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
                      
 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2122,7 +2124,6 @@ target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 add_executable(nr-uesoftmodem
   ${rrc_h}
   ${s1ap_h}
-#  ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
   ${OPENAIR_DIR}/executables/nr-ue.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
@@ -2440,9 +2441,6 @@ make_driver(nasmesh  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH ${nasmesh_src})
 # user space tool for configuring MESH IP driver
 ################
 add_executable(rb_tool
-  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/constant.h
-  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/ioctl.h
-  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/rrc_nas_primitives.h
   ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/RB_TOOL/rb_tool.c
 )
 target_include_directories(rb_tool PRIVATE ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/)

ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg

@@ -0,0 +1,281 @@
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 2
+#define N_ANTENNA_UL 2
+#define TDD 1
+
+log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_filename: "/tmp/ue.log",
+
+/* Enable remote API and Web interface */
+com_addr: "0.0.0.0:9002",
+
+include "rf_driver/1chan.cfg",
+
+/* If true, allow the simulation of several UEs at the same time and
+allow dynamic UE creation from remote API */
+
+  cell_groups: [{
+      group_type: "nr",
+      multi_ue: true,
+      cells: [{
+      rf_port: 0,
+      bandwidth: 20,
+      band: 78,
+      dl_nr_arfcn:627360,
+      ssb_nr_arfcn:627360,
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: N_ANTENNA_UL,
+      rx_to_tx_latency:2,
+    }],
+  }],
+
+  /* UE capabilities */
+  /* USIM data */
+  ue_list: [
+    {
+      "ue_id" : 1,
+      "imsi": "208970000000111",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 2,
+      "imsi": "208970000000112",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 3,
+      "imsi": "208970000000113",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 4,
+      "imsi": "208970000000114",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 5,
+      "imsi": "208970000000115",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 6,
+      "imsi": "208970000000116",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 7,
+      "imsi": "208970000000100",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 8,
+      "imsi": "208970000000102",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 9,
+      "imsi": "208970000000103",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 10,
+      "imsi": "208970000000104",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 11,
+      "imsi": "208970000000110",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 12,
+      "imsi": "208970000000105",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 13,
+      "imsi": "208970000000106",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+        {
+      "ue_id" : 14,
+      "imsi": "208970000000107",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 15,
+      "imsi": "208970000000108",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 16,
+      "imsi": "208970000000109",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+ ],
+}

ci-scripts/ci_ueinfra.yaml

@@ -49,7 +49,7 @@ adb_ue_2:
 
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897-2x2.cfg &
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-20897-2x2.cfg &
   TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_1:
   Host: amariue

ci-scripts/cls_cluster.py

@@ -132,7 +132,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-file={self.eNBSourceCodePath}')
+		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")

ci-scripts/cls_containerize.py

@@ -357,11 +357,11 @@ class Containerize():
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
 			self.dockerfileprefix = '.ubuntu20'
-			self.cliBuildOptions = '--no-cache'
+			self.cliBuildOptions = ''
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
 			self.dockerfileprefix = '.rhel9'
-			self.cliBuildOptions = '--no-cache --disable-compression'
+			self.cliBuildOptions = '--disable-compression'
 
 		# we always build the ran-build image with all targets
 		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
@@ -424,14 +424,13 @@ class Containerize():
 
 		# Let's remove any previous run artifacts if still there
 		cmd.run(f"{self.cli} image prune --force")
-		if forceBaseImageBuild:
-			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 		for image,pattern,name,option in imageNames:
 			cmd.run(f"{self.cli} image rm {name}:{imageTag}")
 
 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} . &> cmake_targets/log/ran-base.log", timeout=1600)
 		# First verify if the base image was properly created.
 		ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
@@ -445,7 +444,7 @@ class Containerize():
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlTabFooter(False)
-			sys.exit(1)
+			return False
 		else:
 			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 			if result is not None:
@@ -506,10 +505,11 @@ class Containerize():
 			cmd.run(f"{self.cli} image prune --force")
 
 		# Remove all intermediate build images and clean up
-		if self.ranAllowMerge and forceBaseImageBuild:
-			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")
+		# Remove any cached artifacts: we don't use the cache for now, prevent
+		# out of diskspace problem
+		cmd.run(f"{self.cli} buildx prune --filter=until=6h --force")
 
 		# create a zip with all logs
 		build_log_name = f'build_log_{self.testCase_id}'
@@ -523,12 +523,13 @@ class Containerize():
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'OK', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
+			return True
 		else:
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 			HTML.CreateHtmlTabFooter(False)
-			sys.exit(1)
+			return False
 
 	def BuildProxy(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
@@ -569,7 +570,7 @@ class Containerize():
 			sys.exit(1)
 
 		self.cli = 'docker'
-		self.cliBuildOptions = '--no-cache'
+		self.cliBuildOptions = ''
 
 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
@@ -611,7 +612,7 @@ class Containerize():
 				mySSH.close()
 				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
 				HTML.CreateHtmlTabFooter(False)
-				sys.exit(1)
+				return False
 		else:
 			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')
 
@@ -673,6 +674,87 @@ class Containerize():
 		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
 		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 
+	def BuildRunTests(self, HTML):
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug('Building on server: ' + lIpAddr)
+		cmd = cls_cmd.RemoteCmd(lIpAddr)
+		cmd.cd(lSourcePath)
+
+		ret = cmd.run('hostnamectl')
+		result = re.search('Ubuntu', ret.stdout)
+		host = result.group(0)
+		if host != 'Ubuntu':
+			cmd.close()
+			raise Exception("Can build unit tests only on Ubuntu server")
+		logging.debug('running on Ubuntu as expected')
+
+		if self.forcedWorkspaceCleanup:
+			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
+		self.testCase_id = HTML.testCase_id
+	
+		# check that ran-base image exists as we expect it
+		baseImage = 'ran-base'
+		baseTag = 'develop'
+		if self.ranAllowMerge:
+			if self.ranTargetBranch == 'develop':
+				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
+				result = re.search('index', cmd.getBefore())
+				if result is not None:
+					baseTag = 'develop'
+		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
+		if ret.returncode != 0:
+			logging.error(f'No {baseImage} image present, cannot build tests')
+			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTabFooter(False)
+			return False
+
+		# build ran-unittests image
+		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu20"
+		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {lSourcePath}/cmake_targets/log/unittest-build.log')
+		if ret.returncode != 0:
+			logging.error(f'Cannot build unit tests')
+			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
+			HTML.CreateHtmlTabFooter(False)
+			return False
+
+		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
+
+		# it worked, build and execute tests, and close connection
+		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:develop ctest --output-on-failure --no-label-summary -j$(nproc)')
+		cmd.run(f'docker rmi ran-unittests:develop')
+		build_log_name = f'build_log_{self.testCase_id}'
+		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
+		cmd.close()
+
+		if ret.returncode == 0:
+			HTML.CreateHtmlTestRowQueue('Unit tests succeeded', 'OK', [ret.stdout])
+			HTML.CreateHtmlTabFooter(True)
+			return True
+		else:
+			HTML.CreateHtmlTestRowQueue('Unit tests failed (see also doc/UnitTests.md)', 'KO', [ret.stdout])
+			HTML.CreateHtmlTabFooter(False)
+			return False
+
 	def Push_Image_to_Local_Registry(self, HTML):
 		if self.registrySvrId == '0':
 			lIpAddr = self.eNBIPAddress

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

@@ -23,8 +23,8 @@ gNBs =
     tr_s_preference = "f1";
 
     local_s_if_name = "eth0";
-    local_s_address = "192.168.71.140";
-    remote_s_address = "192.168.71.142";
+    local_s_address = "192.168.71.150";
+    remote_s_address = "192.168.71.171";
     local_s_portc   = 501;
     local_s_portd   = 2153;
     remote_s_portc  = 500;
@@ -51,9 +51,9 @@ gNBs =
     {
 
         GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
         GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.150";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }

ci-scripts/conf_files/gnb-cucp.sa.f1.conf

@@ -16,7 +16,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }, { sst = 2 }, { sst = 3 }) });
 
 
     nr_cellid = 12345678L;
@@ -24,8 +24,8 @@ gNBs =
     tr_s_preference = "f1";
 
     local_s_if_name = "lo";
-    local_s_address = "192.168.72.140";
-    remote_s_address = "192.168.72.143";
+    local_s_address = "192.168.71.150";
+    remote_s_address = "0.0.0.0"; # multiple DUs
     local_s_portc   = 501;
     local_s_portd   = 2152;
     remote_s_portc  = 500;
@@ -52,9 +52,9 @@ gNBs =
     (
       {
         type = "cp";
-        ipv4_cucp = "192.168.72.140";
+        ipv4_cucp = "192.168.71.150";
         port_cucp = 38462;
-        ipv4_cuup = "192.168.72.141";
+        ipv4_cuup = "0.0.0.0"; # multiple CU-UPs
         port_cuup = 38462;
       }
     )

ci-scripts/conf_files/gnb-cuup.sa.f1.conf

@@ -22,12 +22,12 @@ gNBs =
     tr_s_preference = "f1";
 
     local_s_if_name = "lo";
-    local_s_address = "192.168.72.141";
-    remote_s_address = "192.168.72.142";
+    local_s_address = "192.168.72.161";
+    remote_s_address = "192.168.72.171";
     local_s_portc   = 501;
-    local_s_portd   = 2152;
+    local_s_portd   = 2153;
     remote_s_portc  = 500;
-    remote_s_portd  = 2152;
+    remote_s_portd  = 2153;
 
     # ------- SCTP definitions
     SCTP :
@@ -41,17 +41,17 @@ gNBs =
     (
       {
         type = "up";
-        ipv4_cucp = "192.168.72.140";
-        ipv4_cuup = "192.168.72.141";
+        ipv4_cucp = "192.168.71.150";
+        ipv4_cuup = "192.168.71.161";
       }
     )
 
     NETWORK_INTERFACES :
     {
         GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.141/24";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.161/24";
         GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.141/24";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.161/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }

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

@@ -15,7 +15,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }, { sst = 2 }, { sst = 3 } ) });
 
 
     nr_cellid = 12345678L;
@@ -23,7 +23,6 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 6;
-    force_256qam_off = 1;
 
     servingCellConfigCommon = (
     {
@@ -170,8 +169,8 @@ MACRLCs = (
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
     local_n_if_name = "eth0";
-    local_n_address = "192.168.71.142";
-    remote_n_address = "192.168.71.140";
+    local_n_address = "192.168.71.171";
+    remote_n_address = "192.168.71.150";
     local_n_portc   = 500;
     local_n_portd   = 2153;
     remote_n_portc  = 501;

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf

@@ -22,9 +22,9 @@ gNBs =
 
     ////////// Physical parameters:
     pdsch_AntennaPorts_XP                                     = 2;
-    pusch_AntennaPorts                                        = 1;
+    pusch_AntennaPorts                                        = 2;
     do_CSIRS                                                  = 1;
-    do_SRS                                                    = 0;
+    do_SRS                                                    = 1;
 
     servingCellConfigCommon = (
     {

ci-scripts/docker/Dockerfile.unittest.ubuntu20

@@ -0,0 +1,35 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Ubuntu 20.04
+#
+#---------------------------------------------------------------------
+
+FROM ran-base:develop as ran-tests
+
+RUN rm -Rf /oai-ran
+WORKDIR /oai-ran
+COPY . .
+
+WORKDIR /oai-ran/build
+RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug .. && ninja tests

ci-scripts/main.py

@@ -65,6 +65,7 @@ import logging
 import datetime
 import signal
 import subprocess
+import traceback
 from multiprocessing import Process, Lock, SimpleQueue
 logging.basicConfig(
 	level=logging.DEBUG,
@@ -102,7 +103,7 @@ def AssignParams(params_dict):
 
 
 def GetParametersFromXML(action):
-	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image":
+	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
 		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
@@ -745,142 +746,157 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					continue
 				CiTestObj.ShowTestID()
 				GetParametersFromXML(action)
-				if action == 'Build_eNB':
-					RAN.BuildeNB(HTML)
-				elif action == 'WaitEndBuild_eNB':
-					RAN.WaitBuildeNBisFinished(HTML)
-				elif action == 'Custom_Command':
-					RAN.CustomCommand(HTML)
-					if RAN.prematureExit:
-						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-				elif action == 'Initialize_eNB':
-					RAN.InitializeeNB(HTML, EPC)
-					if RAN.prematureExit:
-						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-				elif action == 'Terminate_eNB':
-					RAN.TerminateeNB(HTML, EPC)
-				elif action == 'Initialize_UE':
-					CiTestObj.InitializeUE(HTML)
-				elif action == 'Terminate_UE':
-					CiTestObj.TerminateUE(HTML)
-				elif action == 'Attach_UE':
-					CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
-				elif action == 'Detach_UE':
-					CiTestObj.DetachUE(HTML)
-				elif action == 'DataDisable_UE':
-					CiTestObj.DataDisableUE(HTML)
-				elif action == 'DataEnable_UE':
-					CiTestObj.DataEnableUE(HTML)
-				elif action == 'CheckStatusUE':
-					CiTestObj.CheckStatusUE(HTML)
-				elif action == 'Build_OAI_UE':
-					CiTestObj.BuildOAIUE(HTML)
-				elif action == 'Initialize_OAI_UE':
-					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
-				elif action == 'Terminate_OAI_UE':
-					CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
-				elif action == 'Ping':
-					CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
-				elif action == 'Iperf':
-					CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
-				elif action == 'Initialize_HSS':
-					EPC.InitializeHSS(HTML)
-				elif action == 'Terminate_HSS':
-					EPC.TerminateHSS(HTML)
-				elif action == 'Initialize_MME':
-					EPC.InitializeMME(HTML)
-				elif action == 'Terminate_MME':
-					EPC.TerminateMME(HTML)
-				elif action == 'Initialize_SPGW':
-					EPC.InitializeSPGW(HTML)
-				elif action == 'Terminate_SPGW':
-					EPC.TerminateSPGW(HTML)
-				elif action == 'Initialize_5GCN':
-					EPC.Initialize5GCN(HTML)
-				elif action == 'Terminate_5GCN':
-					EPC.Terminate5GCN(HTML)
-				elif action == 'Deploy_EPC':
-					EPC.DeployEpc(HTML)
-				elif action == 'Undeploy_EPC':
-					EPC.UndeployEpc(HTML)
-				elif action == 'IdleSleep':
-					CiTestObj.IdleSleep(HTML)
-				elif action == 'Perform_X2_Handover':
-					CiTestObj.Perform_X2_Handover(HTML,RAN,EPC)
-				elif action == 'Build_PhySim':
-					HTML=ldpc.Build_PhySim(HTML,CONST)
-					if ldpc.exitStatus==1:
-						RAN.prematureExit = True
-				elif action == 'Run_LDPCTest':
-					HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
-					if ldpc.exitStatus==1:
-						RAN.prematureExit = True
-				elif action == 'Run_LDPCt1Test':
-					HTML=ldpc.Run_LDPCt1Test(HTML,CONST,id)
-					if ldpc.exitStatus==1:
-						RAN.prematureExit = True
-				elif action == 'Run_NRulsimTest':
-					HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
-					if ldpc.exitStatus==1:
-						RAN.prematureExit = True
-				elif action == 'Pull_Cluster_Image':
-					if not CLUSTER.PullClusterImage(HTML,RAN):
-						RAN.prematureExit = True
-				elif action == 'Build_Cluster_Image':
-					if not CLUSTER.BuildClusterImage(HTML):
-						RAN.prematureExit = True
-				elif action == 'Build_Image':
-					CONTAINERS.BuildImage(HTML)
-				elif action == 'Build_Proxy':
-					CONTAINERS.BuildProxy(HTML)
-				elif action == 'Push_Local_Registry':
-					success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
-					if not success:
-						RAN.prematureExit = True
-				elif action == 'Pull_Local_Registry':
-					success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
-					if not success:
-						RAN.prematureExit = True
-				elif action == 'Clean_Test_Server_Images':
-					success = CONTAINERS.Clean_Test_Server_Images(HTML)
-					if not success:
-						RAN.prematureExit = True
-				elif action == 'Deploy_Object':
-					CONTAINERS.DeployObject(HTML, EPC)
-					if CONTAINERS.exitStatus==1:
-						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-						RAN.prematureExit = True
-				elif action == 'Undeploy_Object':
-					CONTAINERS.UndeployObject(HTML, RAN)
-					if CONTAINERS.exitStatus == 1:
-						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-						RAN.prematureExit = True
-				elif action == 'Cppcheck_Analysis':
-					SCA.CppCheckAnalysis(HTML)
-				elif action == 'LicenceAndFormattingCheck':
-					ret = SCA.LicenceAndFormattingCheck(HTML)
-					if ret != 0:
-						RAN.prematureExit = True
-				elif action == 'Deploy_Run_PhySim':
-					PHYSIM.Deploy_PhySim(HTML, RAN)
-				elif action == 'DeployGenObject':
-					CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
-					if CONTAINERS.exitStatus==1:
-						RAN.prematureExit = True
-				elif action == 'UndeployGenObject':
-					CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
-					if CONTAINERS.exitStatus==1:
-						RAN.prematureExit = True
-				elif action == 'IperfFromContainer':
-					CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
-					if CONTAINERS.exitStatus==1:
-						RAN.prematureExit = True
-				elif action == 'StatsFromGenObject':
-					CONTAINERS.StatsFromGenObject(HTML)
-				elif action == 'Push_Images_To_Test_Servers':
-					logging.debug('To be implemented')
-				else:
-					sys.exit('Invalid class (action) from xml')
+				try:
+					if action == 'Build_eNB':
+						RAN.BuildeNB(HTML)
+					elif action == 'WaitEndBuild_eNB':
+						RAN.WaitBuildeNBisFinished(HTML)
+					elif action == 'Custom_Command':
+						RAN.CustomCommand(HTML)
+						if RAN.prematureExit:
+							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+					elif action == 'Initialize_eNB':
+						RAN.InitializeeNB(HTML, EPC)
+						if RAN.prematureExit:
+							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+					elif action == 'Terminate_eNB':
+						RAN.TerminateeNB(HTML, EPC)
+					elif action == 'Initialize_UE':
+						CiTestObj.InitializeUE(HTML)
+					elif action == 'Terminate_UE':
+						CiTestObj.TerminateUE(HTML)
+					elif action == 'Attach_UE':
+						CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
+					elif action == 'Detach_UE':
+						CiTestObj.DetachUE(HTML)
+					elif action == 'DataDisable_UE':
+						CiTestObj.DataDisableUE(HTML)
+					elif action == 'DataEnable_UE':
+						CiTestObj.DataEnableUE(HTML)
+					elif action == 'CheckStatusUE':
+						CiTestObj.CheckStatusUE(HTML)
+					elif action == 'Build_OAI_UE':
+						CiTestObj.BuildOAIUE(HTML)
+					elif action == 'Initialize_OAI_UE':
+						CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
+					elif action == 'Terminate_OAI_UE':
+						CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
+					elif action == 'Ping':
+						CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
+					elif action == 'Iperf':
+						CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
+					elif action == 'Initialize_HSS':
+						EPC.InitializeHSS(HTML)
+					elif action == 'Terminate_HSS':
+						EPC.TerminateHSS(HTML)
+					elif action == 'Initialize_MME':
+						EPC.InitializeMME(HTML)
+					elif action == 'Terminate_MME':
+						EPC.TerminateMME(HTML)
+					elif action == 'Initialize_SPGW':
+						EPC.InitializeSPGW(HTML)
+					elif action == 'Terminate_SPGW':
+						EPC.TerminateSPGW(HTML)
+					elif action == 'Initialize_5GCN':
+						EPC.Initialize5GCN(HTML)
+					elif action == 'Terminate_5GCN':
+						EPC.Terminate5GCN(HTML)
+					elif action == 'Deploy_EPC':
+						EPC.DeployEpc(HTML)
+					elif action == 'Undeploy_EPC':
+						EPC.UndeployEpc(HTML)
+					elif action == 'IdleSleep':
+						CiTestObj.IdleSleep(HTML)
+					elif action == 'Perform_X2_Handover':
+						CiTestObj.Perform_X2_Handover(HTML,RAN,EPC)
+					elif action == 'Build_PhySim':
+						HTML=ldpc.Build_PhySim(HTML,CONST)
+						if ldpc.exitStatus==1:
+							RAN.prematureExit = True
+					elif action == 'Run_LDPCTest':
+						HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
+						if ldpc.exitStatus==1:
+							RAN.prematureExit = True
+					elif action == 'Run_LDPCt1Test':
+						HTML=ldpc.Run_LDPCt1Test(HTML,CONST,id)
+						if ldpc.exitStatus==1:
+							RAN.prematureExit = True
+					elif action == 'Run_NRulsimTest':
+						HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
+						if ldpc.exitStatus==1:
+							RAN.prematureExit = True
+					elif action == 'Pull_Cluster_Image':
+						if not CLUSTER.PullClusterImage(HTML,RAN):
+							RAN.prematureExit = True
+					elif action == 'Build_Cluster_Image':
+						if not CLUSTER.BuildClusterImage(HTML):
+							RAN.prematureExit = True
+					elif action == 'Build_Image':
+						success = CONTAINERS.BuildImage(HTML)
+						if not success:
+							RAN.prematureExit = True
+					elif action == 'Build_Run_Tests':
+						success = CONTAINERS.BuildRunTests(HTML)
+						if not success:
+							RAN.prematureExit = True
+					elif action == 'Build_Proxy':
+						success = CONTAINERS.BuildProxy(HTML)
+						if not success:
+							RAN.prematureExit = True
+					elif action == 'Push_Local_Registry':
+						success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
+						if not success:
+							RAN.prematureExit = True
+					elif action == 'Pull_Local_Registry':
+						success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
+						if not success:
+							RAN.prematureExit = True
+					elif action == 'Clean_Test_Server_Images':
+						success = CONTAINERS.Clean_Test_Server_Images(HTML)
+						if not success:
+							RAN.prematureExit = True
+					elif action == 'Deploy_Object':
+						CONTAINERS.DeployObject(HTML, EPC)
+						if CONTAINERS.exitStatus==1:
+							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+							RAN.prematureExit = True
+					elif action == 'Undeploy_Object':
+						CONTAINERS.UndeployObject(HTML, RAN)
+						if CONTAINERS.exitStatus == 1:
+							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+							RAN.prematureExit = True
+					elif action == 'Cppcheck_Analysis':
+						SCA.CppCheckAnalysis(HTML)
+					elif action == 'LicenceAndFormattingCheck':
+						ret = SCA.LicenceAndFormattingCheck(HTML)
+						if ret != 0:
+							RAN.prematureExit = True
+					elif action == 'Deploy_Run_PhySim':
+						PHYSIM.Deploy_PhySim(HTML, RAN)
+					elif action == 'DeployGenObject':
+						CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
+						if CONTAINERS.exitStatus==1:
+							RAN.prematureExit = True
+					elif action == 'UndeployGenObject':
+						CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
+						if CONTAINERS.exitStatus==1:
+							RAN.prematureExit = True
+					elif action == 'IperfFromContainer':
+						CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
+						if CONTAINERS.exitStatus==1:
+							RAN.prematureExit = True
+					elif action == 'StatsFromGenObject':
+						CONTAINERS.StatsFromGenObject(HTML)
+					elif action == 'Push_Images_To_Test_Servers':
+						logging.debug('To be implemented')
+					else:
+						sys.exit('Invalid class (action) from xml')
+				except Exception as e:
+					s = traceback.format_exc()
+					logging.error(f'while running CI, an exception occurred:\n{s}')
+					HTML.CreateHtmlTestRowQueue("N/A", 'KO', [f"CI test code encountered an exception:\n{s}"])
+					RAN.prematureExit = True
+
 				if RAN.prematureExit:
 					if CiTestObj.testCase_id == CiTestObj.testMinStableId:
 						logging.warning('Scenario has reached minimal stability point')

ci-scripts/ran.py

@@ -992,7 +992,7 @@ class RANManagement():
 				NSA_RAPROC_PUSCH_check = 1
 
 			# Collect information on UE DLSCH and ULSCH statistics
-			keys = {'dlsch_rounds','dlsch_total_bytes','ulsch_rounds','ulsch_total_bytes_scheduled'}
+			keys = {'dlsch_rounds','ulsch_rounds'}
 			for k in keys:
 				result = re.search(k, line)
 				if result is None:
@@ -1161,7 +1161,7 @@ class RANManagement():
 				dlcheckers = [] if 'd_retx_th' not in checkers else checkers['d_retx_th']
 				retx_status[ue]['dl'] = self._analyzeUeRetx(dlulstat['dlsch_rounds'], dlcheckers, r'^.*dlsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+dlsch_errors\s+(\d+)')
 				ulcheckers = [] if 'u_retx_th' not in checkers else checkers['u_retx_th']
-				retx_status[ue]['ul'] = self._analyzeUeRetx(dlulstat['ulsch_rounds'], ulcheckers, r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+.*,\s+ulsch_errors\s+(\d+)')
+				retx_status[ue]['ul'] = self._analyzeUeRetx(dlulstat['ulsch_rounds'], ulcheckers, r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+ulsch_errors\s+(\d+)')
 
 
 			#real time statistics

ci-scripts/xml_class_list.yml

@@ -34,6 +34,7 @@
   - IdleSleep
   - Perform_X2_Handover
   - Build_Image
+  - Build_Run_Tests
   - Deploy_Object
   - Undeploy_Object
   - Cppcheck_Analysis

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -27,14 +27,10 @@
         <TestCaseRequestedList>
  111111
  100021
- 000020
  000021
  000022
  000023
- 000024
  020021
- 020022
- 030021
  100021
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
@@ -46,80 +42,38 @@
                 <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
-        <testCase id="000020">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
         <testCase id="000021">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf</services>
+                <nb_healthy>4</nb_healthy>
         </testCase>
 
         <testCase id="000022">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G CU-CP RF sim SA</desc>
+                <desc>Deploy OAI 5G RAN RF sim SA (1 CU-CP, 3 CU-UPs, 3 DUs)</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-cucp</services>
-                <nb_healthy>7</nb_healthy>
+                <services>oai-cucp oai-cuup oai-cuup2 oai-cuup3 oai-du oai-du2 oai-du3</services>
+                <nb_healthy>11</nb_healthy>
         </testCase>
 
         <testCase id="000023">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G CU-UP and DU RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-cuup oai-du</services>
-                <nb_healthy>9</nb_healthy>
-        </testCase>
-
-        <testCase id="000024">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>10</nb_healthy>
+                <services>oai-nr-ue oai-nr-ue2 oai-nr-ue3</services>
+                <nb_healthy>14</nb_healthy>
         </testCase>
 
         <testCase id="020021">
                 <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <ping_args> -c 20 192.168.73.135</ping_args>
+                <desc>Ping ext-dn from all NR-UEs</desc>
+                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+                <ping_args> -c 20 12.1.1.1 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
-        <testCase id="020022">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <ping_args>-c 20 12.1.1.2</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="030021">
-                <class>IperfFromContainer</class>
-                <desc>Iperf UDP Downlink</desc>
-                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
-                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
-                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
-                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
-        </testCase>
-
-        <testCase id="030022">
-                <class>IperfFromContainer</class>
-                <desc>Iperf UDP Uplink</desc>
-                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
-                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
-                <server_options>-u -i 1 -s</server_options>
-                <client_options>-B 12.1.1.2 -c 192.168.73.135 -u -i 1 -t 30 -b 1M</client_options>
-        </testCase>
-
         <testCase id="100021">
                 <class>UndeployGenObject</class>
                 <desc>Undeploy all OAI 5G stack</desc>

ci-scripts/xml_files/container_5g_e1_rfsim_down.xml

@@ -22,7 +22,7 @@
 -->
 <testCaseList>
         <htmlTabRef>rfsim-5gnr-down-e1</htmlTabRef>
-        <htmlTabName>CleanUp CUCP-CUUP-DU E1+F1 split</htmlTabName>
+        <htmlTabName>CleanUp E1+F1 split</htmlTabName>
         <htmlTabIcon>trash</htmlTabIcon>
         <TestCaseRequestedList>
  100022

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -27,13 +27,11 @@
         <TestCaseRequestedList>
  111111
  100021
- 000020
  000021
  000022
- 000023
- 000024
- 000025
  020021
+ 030021
+ 030022
  100021
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
@@ -42,61 +40,29 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
-        </testCase>
-
-        <testCase id="000020">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
+                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000021">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000022">
                 <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G CU RF sim SA</desc>
+                <desc>Deploy OAI 5G CU+DU+UE RF sim SA</desc>
                 <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-cu</services>
-                <nb_healthy>7</nb_healthy>
-        </testCase>
-
-        <testCase id="000023">
-                <class>DeployGenObject</class>
-                <desc>Deploy 3 OAI 5G DUs RF sim SA</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-du oai-du2 oai-du3</services>
-                <nb_healthy>10</nb_healthy>
-        </testCase>
-
-        <testCase id="000024">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-nr-ue oai-nr-ue2</services>
-                <nb_healthy>12</nb_healthy>
-        </testCase>
-
-        <testCase id="000025">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-nr-ue3</services>
-                <nb_healthy>13</nb_healthy>
+                <services>oai-cu oai-du oai-nr-ue</services>
+                <nb_healthy>8</nb_healthy>
         </testCase>
 
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+                <id>rfsim5g_ue</id>
                 <ping_args> -c 20 192.168.72.135 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -107,7 +73,7 @@
                 <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
                 <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
                 <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
-                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 10 -b 20M</client_options>
         </testCase>
 
         <testCase id="030022">
@@ -116,7 +82,7 @@
                 <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
                 <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
                 <server_options>-u -i 1 -s</server_options>
-                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 10 -b 5M</client_options>
         </testCase>
 
         <testCase id="100021">

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -59,8 +59,8 @@
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000012">
@@ -68,7 +68,7 @@
                 <desc>Deploy OAI 5G gNB RF sim SA</desc>
                 <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000013">
@@ -76,7 +76,7 @@
                 <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>8</nb_healthy>
+                <nb_healthy>7</nb_healthy>
         </testCase>
 
         <testCase id="020011">

ci-scripts/xml_files/container_5g_l2sim_tdd.xml

@@ -60,8 +60,8 @@
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
@@ -69,7 +69,7 @@
                 <desc>Deploy OAI 5G gNB L2 sim SA</desc>
                 <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000003">
@@ -77,7 +77,7 @@
                 <desc>Deploy OAI 5G NR-UE L2 sim SA and Proxy</desc>
                 <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
                 <services>proxy oai-nr-ue0</services>
-                <nb_healthy>9</nb_healthy>
+                <nb_healthy>8</nb_healthy>
         </testCase>
 
         <testCase id="000004">

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -28,7 +28,6 @@
         <TestCaseRequestedList>
  111111
  100001
- 000000
  000001
  000002
  000003
@@ -36,6 +35,7 @@
  000005
  000006
  000007
+ 000008
  020001
  020002
  020003
@@ -58,23 +58,15 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <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</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
+                <images_to_pull>oai-gnb-asan oai-nr-ue</images_to_pull>
         </testCase>
 
         <testCase id="000001">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
@@ -82,7 +74,7 @@
                 <desc>Deploy OAI 5G gNB RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000003">
@@ -90,7 +82,7 @@
                 <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue</services>
-                <nb_healthy>8</nb_healthy>
+                <nb_healthy>7</nb_healthy>
         </testCase>
 
         <testCase id="000004">
@@ -98,7 +90,7 @@
                 <desc>Deploy Second OAI 5G NR-UE RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue2</services>
-                <nb_healthy>9</nb_healthy>
+                <nb_healthy>8</nb_healthy>
         </testCase>
 
         <testCase id="000005">
@@ -106,7 +98,7 @@
                 <desc>Deploy OAI 5G NR-UEs (#3, #4, #5) RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue3 oai-nr-ue4 oai-nr-ue5</services>
-                <nb_healthy>12</nb_healthy>
+                <nb_healthy>11</nb_healthy>
         </testCase>
 
         <testCase id="000006">
@@ -114,7 +106,7 @@
                 <desc>Deploy OAI 5G NR-UEs (#6, #7, #8) RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue6 oai-nr-ue7 oai-nr-ue8</services>
-                <nb_healthy>15</nb_healthy>
+                <nb_healthy>14</nb_healthy>
         </testCase>
 
         <testCase id="000007">
@@ -122,7 +114,13 @@
                 <desc>Deploy OAI 5G NR-UEs (#9, #10) RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                 <services>oai-nr-ue9 oai-nr-ue10</services>
-                <nb_healthy>17</nb_healthy>
+                <nb_healthy>16</nb_healthy>
+        </testCase>
+
+        <testCase id="000008">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
         </testCase>
 
         <testCase id="020001">

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -59,8 +59,8 @@
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
@@ -68,7 +68,7 @@
                 <desc>Deploy OAI 5G gNB RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000003">
@@ -76,7 +76,7 @@
                 <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>8</nb_healthy>
+                <nb_healthy>7</nb_healthy>
         </testCase>
 
         <testCase id="020001">

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -59,8 +59,8 @@
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
@@ -68,7 +68,7 @@
                 <desc>Deploy OAI 5G gNB RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000003">
@@ -76,7 +76,7 @@
                 <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>8</nb_healthy>
+                <nb_healthy>7</nb_healthy>
         </testCase>
 
         <testCase id="020001">

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -59,8 +59,8 @@
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G CoreNetwork</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
         </testCase>
 
         <testCase id="000002">
@@ -68,7 +68,7 @@
                 <desc>Deploy OAI 5G gNB RF sim SA</desc>
                 <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                 <services>oai-gnb</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>6</nb_healthy>
         </testCase>
 
         <testCase id="000003">
@@ -76,7 +76,7 @@
                 <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>8</nb_healthy>
+                <nb_healthy>7</nb_healthy>
         </testCase>
 
         <testCase id="020001">

ci-scripts/xml_files/container_build_run_tests.xml

@@ -0,0 +1,40 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>build-run-test-tab</htmlTabRef>
+	<htmlTabName>Build and Run Unit Tests</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="030201">
+		<class>Build_Run_Tests</class>
+		<desc>Build and Run UnitTests</desc>
+		<kind>all</kind>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -185,8 +185,8 @@
 
 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/90Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 90M -t 60 -i 1 -fm</iperf_args>
+		<desc>iperf (DL/70Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 70M -t 60 -i 1 -fm</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_aw2s_asue.xml

@@ -145,8 +145,8 @@
 
   <testCase id="000020">
     <class>Iperf</class>
-    <desc>iperf (UL/2Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 20M -t 30 -i 1 </iperf_args>
+    <desc>iperf (UL/3.6Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-u -b 36M -t 30 -i 1 </iperf_args>
     <direction>IPERF3</direction>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_sc_b200_quectel.xml

@@ -129,8 +129,8 @@
 
   <testCase id="270000">
     <class>Iperf</class>
-    <desc>iperf (DL/100Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 100M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (DL/80Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 80M -t 30 -i 1 -fm</iperf_args>
     <direction>DL</direction>
     <id>idefix</id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>

ci-scripts/yaml_files/5g_f1_rfsimulator/amf-healthcheck.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-AMF_PORT_FOR_NGAP=38412
-AMF_PORT_FOR_N11_HTTP=80
-AMF_IP_NGAP_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_NGAP | grep inet | awk {'print $2'})
-AMF_IP_N11_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_N11 | grep inet | awk {'print $2'})
-N2_PORT_STATUS=$(netstat -Snpl | grep -o "$AMF_IP_NGAP_INTERFACE:$AMF_PORT_FOR_NGAP")
-N11_PORT_STATUS=$(netstat -tnpl | grep -o "$AMF_IP_N11_INTERFACE:$AMF_PORT_FOR_N11_HTTP")
-#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
-NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: configuration file is not configured properly"
-fi
-
-if [[ -z $N2_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: N2 SCTP port $AMF_PORT_FOR_NGAP is not listening"
-fi
-
-if [[ -z $N11_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: N11/SBI TCP/HTTP port $AMF_PORT_FOR_N11_HTTP is not listening"
-fi
-
-#host="${MYSQL_SERVER}"
-#user="${MYSQL_USER:-root}"
-#export MYSQL_PWD="${MYSQL_PASS}"
-
-#args=(
-#	-h"$host"
-#	-u"$user"
-#	--silent
-#)
-
-#if ! command -v mysql &> /dev/null; then
-#	echo "Installing mysql command"
-#	apt update
-#	apt-get -y install mysql-client
-#else
-#	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
-#		database_check=$(mysql -h$host -u$user -D oai_db --silent -e "SELECT * FROM users;")
-#		if [[ -z $database_check ]]; then
-#			echo "Healthcheck error: oai_db not populated"
-#			STATUS=1
-#		fi
-#		STATUS=0
-#	else
-#		echo "Healthcheck error: Mysql port inactive"
-#		STATUS=1
-#	fi
-#fi
-
-exit $STATUS

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

@@ -1,20 +1,11 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
         volumes:
-            - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+            - ../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
@@ -31,108 +22,36 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
         environment:
             - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml:/openair-amf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - mysql
         networks:
             public_net:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml:/openair-smf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-amf
         networks:
             public_net:
                 ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml:/openair-upf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-smf
         cap_add:
             - NET_ADMIN
@@ -145,6 +64,7 @@ services:
                 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
@@ -153,7 +73,7 @@ services:
               "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-spgwu
+            - oai-upf
         networks:
             traffic_net:
                 ipv4_address: 192.168.72.135
@@ -162,18 +82,19 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+
     oai-cu:
         image: oaisoftwarealliance/oai-gnb:develop
         privileged: true
         container_name: rfsim5g-oai-cu
         environment: 
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
             public_net:
-                ipv4_address: 192.168.71.140
+                ipv4_address: 192.168.71.150
         volumes:
           - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
@@ -181,56 +102,19 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+
     oai-du:
         image: oaisoftwarealliance/oai-gnb:develop
         privileged: true
         container_name: rfsim5g-oai-du
-        environment: 
+        environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-cu
         networks:
             public_net:
-                ipv4_address: 192.168.71.142
-        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-du2:
-        image: oaisoftwarealliance/oai-gnb:develop
-        privileged: true
-        container_name: rfsim5g-oai-du2
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 --MACRLCs.[0].local_n_address 192.168.71.143 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cu
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.143
-        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-du3:
-        image: oaisoftwarealliance/oai-gnb:develop
-        privileged: true
-        container_name: rfsim5g-oai-du3
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 --MACRLCs.[0].local_n_address 192.168.71.144 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cu
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.144
+                ipv4_address: 192.168.71.171
         volumes:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
@@ -238,56 +122,21 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
         privileged: true
         container_name: rfsim5g-oai-nr-ue
-        environment: 
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.142 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+                                    -r 106 --numerology 1 -C 3619200000
+                                    --uicc0.imsi 208990100001100
+                                    --rfsimulator.serveraddr 192.168.71.171
         depends_on:
             - oai-du
         networks:
             public_net:
-                ipv4_address: 192.168.71.150
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue2:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue2
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.143 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-du2
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.151
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue3:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue3
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.144 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-du3
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.152
+                ipv4_address: 192.168.71.181
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -307,7 +156,7 @@ networks:
             com.docker.network.bridge.name: "rfsim5g-public"
     traffic_net:
         driver: bridge
-        name: rfsim5g-oai-traffic_net-net
+        name: rfsim5g-oai-traffic-net
         ipam:
             config:
                 - subnet: 192.168.72.128/26

ci-scripts/yaml_files/5g_f1_rfsimulator/mysql-healthcheck.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-if [ "$MYSQL_ROOT_PASSWORD" ] && [ -z "$MYSQL_USER" ] && [ -z "$MYSQL_PASSWORD" ]; then
-	echo >&2 'Healthcheck error: cannot determine root password (and MYSQL_USER and MYSQL_PASSWORD were not set)'
-	exit 0
-fi
-
-host="$(hostname --ip-address || echo '127.0.0.1')"
-user="${MYSQL_USER:-root}"
-export MYSQL_PWD="${MYSQL_PASSWORD:-$MYSQL_ROOT_PASSWORD}"
-
-args=(
-	# force mysql to not use the local "mysqld.sock" (test "external" connectivity)
-	-h"$host"
-	-u"$user"
-	--silent
-)
-
-STATUS=0
-if command -v mysqladmin &> /dev/null; then
-	if mysqladmin "${args[@]}" ping > /dev/null; then
-		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
-		if [[ -z $database_check ]]; then
-			echo "Healthcheck error: oai_db not populated"
-			STATUS=1
-		fi
-		STATUS=0
-	else
-		echo "Healthcheck error: Mysql port inactive"
-		STATUS=1
-	fi
-else
-	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
-		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
-		if [[ -z $database_check ]]; then
-			echo "Healthcheck error: oai_db not populated"
-			STATUS=1
-		fi
-		STATUS=0
-	else
-		echo "Healthcheck error: Mysql port inactive"
-		STATUS=1
-	fi
-fi
-exit $STATUS

ci-scripts/yaml_files/5g_f1_rfsimulator/nrf-healthcheck.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-NRF_IP_SBI_INTERFACE=$(ifconfig $NRF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
-NRF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$NRF_IP_SBI_INTERFACE:$NRF_INTERFACE_PORT_FOR_SBI")
-#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
-NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-fi
-
-if [[ -z $NRF_SBI_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $NRF_INTERFACE_PORT_FOR_SBI is not listening."
-fi
-
-exit $STATUS

ci-scripts/yaml_files/5g_f1_rfsimulator/smf-healthcheck.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
-SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI")
-
-#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
-#NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-#if [ $NB_UNREPLACED_AT -ne 0 ]; then
-#	STATUS=-1
-#	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-#fi
-#
-if [[ -z $SMF_SBI_PORT_STATUS ]]; then
-	STATUS=-1
-	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening."
-fi
-
-exit $STATUS

ci-scripts/yaml_files/5g_f1_rfsimulator/spgwu-healthcheck.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-SGW_PORT_FOR_S1U_S12_S4_UP=2152
-SGW_PORT_FOR_SX=8805
-SGW_IP_S1U_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP | grep inet | awk {'print $2'})
-SGW_IP_SX_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_SX | grep inet | awk {'print $2'})
-S1U_S12_S4_UP_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_S1U_INTERFACE:$SGW_PORT_FOR_S1U_S12_S4_UP")
-SX_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_SX_INTERFACE:$SGW_PORT_FOR_SX")
-#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
-NB_UNREPLACED_AT=`cat /openair-spgwu/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-fi
-
-if [[ -z $S1U_S12_S4_UP_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY S1U port $SGW_PORT_FOR_S1U_S12_S4_UP is not listening."
-fi
-
-if [[ -z $SX_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY SX port $SGW_PORT_FOR_SX is not listening."
-fi
-
-exit $STATUS

ci-scripts/yaml_files/5g_fdd_rfsimulator/amf-healthcheck.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-AMF_PORT_FOR_NGAP=38412
-AMF_PORT_FOR_N11_HTTP=80
-AMF_IP_NGAP_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_NGAP | grep inet | awk {'print $2'})
-AMF_IP_N11_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_N11 | grep inet | awk {'print $2'})
-N2_PORT_STATUS=$(netstat -Snpl | grep -o "$AMF_IP_NGAP_INTERFACE:$AMF_PORT_FOR_NGAP")
-N11_PORT_STATUS=$(netstat -tnpl | grep -o "$AMF_IP_N11_INTERFACE:$AMF_PORT_FOR_N11_HTTP")
-#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
-NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: configuration file is not configured properly"
-fi
-
-if [[ -z $N2_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: N2 SCTP port $AMF_PORT_FOR_NGAP is not listening"
-fi
-
-if [[ -z $N11_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: N11/SBI TCP/HTTP port $AMF_PORT_FOR_N11_HTTP is not listening"
-fi
-
-#host="${MYSQL_SERVER}"
-#user="${MYSQL_USER:-root}"
-#export MYSQL_PWD="${MYSQL_PASS}"
-
-#args=(
-#	-h"$host"
-#	-u"$user"
-#	--silent
-#)
-
-#if ! command -v mysql &> /dev/null; then
-#	echo "Installing mysql command"
-#	apt update
-#	apt-get -y install mysql-client
-#else
-#	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
-#		database_check=$(mysql -h$host -u$user -D oai_db --silent -e "SELECT * FROM users;")
-#		if [[ -z $database_check ]]; then
-#			echo "Healthcheck error: oai_db not populated"
-#			STATUS=1
-#		fi
-#		STATUS=0
-#	else
-#		echo "Healthcheck error: Mysql port inactive"
-#		STATUS=1
-#	fi
-#fi
-
-exit $STATUS

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

@@ -1,20 +1,11 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
         volumes:
-            - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+            - ../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
@@ -31,108 +22,36 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
         environment:
             - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - mysql
         networks:
             public_net:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-amf
         networks:
             public_net:
                 ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-smf
         cap_add:
             - NET_ADMIN
@@ -153,7 +72,7 @@ services:
               "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-spgwu
+            - oai-upf
         networks:
             traffic_net:
                 ipv4_address: 192.168.72.135
@@ -166,7 +85,7 @@ services:
         image: oaisoftwarealliance/oai-gnb:develop
         privileged: true
         container_name: rfsim5g-oai-gnb
-        environment: 
+        environment:
             USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
@@ -187,7 +106,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment: 
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_fdd_rfsimulator/mysql-healthcheck.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-if [ "$MYSQL_ROOT_PASSWORD" ] && [ -z "$MYSQL_USER" ] && [ -z "$MYSQL_PASSWORD" ]; then
-	echo >&2 'Healthcheck error: cannot determine root password (and MYSQL_USER and MYSQL_PASSWORD were not set)'
-	exit 0
-fi
-
-host="$(hostname --ip-address || echo '127.0.0.1')"
-user="${MYSQL_USER:-root}"
-export MYSQL_PWD="${MYSQL_PASSWORD:-$MYSQL_ROOT_PASSWORD}"
-
-args=(
-	# force mysql to not use the local "mysqld.sock" (test "external" connectivity)
-	-h"$host"
-	-u"$user"
-	--silent
-)
-
-STATUS=0
-if command -v mysqladmin &> /dev/null; then
-	if mysqladmin "${args[@]}" ping > /dev/null; then
-		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
-		if [[ -z $database_check ]]; then
-			echo "Healthcheck error: oai_db not populated"
-			STATUS=1
-		fi
-		STATUS=0
-	else
-		echo "Healthcheck error: Mysql port inactive"
-		STATUS=1
-	fi
-else
-	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
-		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
-		if [[ -z $database_check ]]; then
-			echo "Healthcheck error: oai_db not populated"
-			STATUS=1
-		fi
-		STATUS=0
-	else
-		echo "Healthcheck error: Mysql port inactive"
-		STATUS=1
-	fi
-fi
-exit $STATUS

ci-scripts/yaml_files/5g_fdd_rfsimulator/nrf-healthcheck.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-NRF_IP_SBI_INTERFACE=$(ifconfig $NRF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
-NRF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$NRF_IP_SBI_INTERFACE:$NRF_INTERFACE_PORT_FOR_SBI")
-#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
-NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-fi
-
-if [[ -z $NRF_SBI_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $NRF_INTERFACE_PORT_FOR_SBI is not listening."
-fi
-
-exit $STATUS

ci-scripts/yaml_files/5g_fdd_rfsimulator/smf-healthcheck.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
-SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI")
-
-#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
-#NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-#if [ $NB_UNREPLACED_AT -ne 0 ]; then
-#	STATUS=-1
-#	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-#fi
-#
-if [[ -z $SMF_SBI_PORT_STATUS ]]; then
-	STATUS=-1
-	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening."
-fi
-
-exit $STATUS

ci-scripts/yaml_files/5g_fdd_rfsimulator/spgwu-healthcheck.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-SGW_PORT_FOR_S1U_S12_S4_UP=2152
-SGW_PORT_FOR_SX=8805
-SGW_IP_S1U_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP | grep inet | awk {'print $2'})
-SGW_IP_SX_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_SX | grep inet | awk {'print $2'})
-S1U_S12_S4_UP_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_S1U_INTERFACE:$SGW_PORT_FOR_S1U_S12_S4_UP")
-SX_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_SX_INTERFACE:$SGW_PORT_FOR_SX")
-#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
-NB_UNREPLACED_AT=`cat /openair-spgwu/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-fi
-
-if [[ -z $S1U_S12_S4_UP_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY S1U port $SGW_PORT_FOR_S1U_S12_S4_UP is not listening."
-fi
-
-if [[ -z $SX_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY SX port $SGW_PORT_FOR_SX is not listening."
-fi
-
-exit $STATUS

ci-scripts/yaml_files/5g_l2sim_tdd/README.md

@@ -96,10 +96,9 @@ Now pull images.
 
 ```bash
 docker pull mysql:8.0
-docker pull oaisoftwarealliance/oai-amf:v1.5.0
-docker pull oaisoftwarealliance/oai-nrf:v1.5.0
-docker pull oaisoftwarealliance/oai-smf:v1.5.0
-docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+docker pull oaisoftwarealliance/oai-amf:v2.0.0
+docker pull oaisoftwarealliance/oai-smf:v2.0.0
+docker pull oaisoftwarealliance/oai-upf:v2.0.0
 docker pull oaisoftwarealliance/trf-gen-cn5g:focal
 
 docker pull oaisoftwarealliance/oai-gnb:develop
@@ -139,14 +138,13 @@ sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up
 
 ```bash
 cd ci-scripts/yaml_files/5g_l2sim_tdd
-docker-compose up -d mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn
+docker-compose up -d mysql oai-amf oai-smf oai-upf oai-ext-dn
 ```
 ```bash
 Creating network "l2sim-oai-public-net" with driver "bridge"
 Creating network "l2sim-oai-traffic_net-net" with driver "bridge"
-Creating l2sim-oai-nrf ... done
 Creating l2sim-mysql      ... done
-Creating l2sim-oai-spgwu ... done
+Creating l2sim-oai-upf   ... done
 Creating l2sim-oai-amf   ... done
 Creating l2sim-oai-smf   ... done
 Creating l2sim-oai-ext-dn ... done
@@ -160,12 +158,11 @@ docker-compose ps -a
 ```bash
        Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 l2sim-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+l2sim-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
 ```
 
 At this point, you can prepare a capture on the newly-created public docker bridges:
@@ -206,8 +203,7 @@ sudo nohup tshark -f "(host 192.168.72.135 and icmp) or (not host 192.168.72.135
 docker-compose up -d oai-gnb
 ```
 ```bash
-l2sim-oai-nrf is up-to-date
-l2sim-oai-spgwu is up-to-date
+l2sim-oai-upf is up-to-date
 l2sim-oai-ext-dn is up-to-date
 Creating l2sim-oai-gnb ... done
 ```
@@ -220,13 +216,12 @@ $ docker-compose ps -a
 ```bash
        Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 l2sim-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
-l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
+l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+l2sim-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
 ```
 
 You can verify that the `gNB` is connected with the `AMF`:
@@ -250,10 +245,9 @@ docker-compose up -d proxy oai-nr-ue
 ```
 ```bash
 l2sim-mysql is up-to-date
-l2sim-oai-nrf is up-to-date
 l2sim-oai-amf is up-to-date
 l2sim-oai-smf is up-to-date
-l2sim-oai-spgwu is up-to-date
+l2sim-oai-upf is up-to-date
 l2sim-oai-ext-dn is up-to-date
 l2sim-oai-gnb is up-to-date
 Creating l2sim-oai-nr-ue ... done
@@ -268,18 +262,17 @@ docker-compose ps -a
 ```bash
        Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 l2sim-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
-l2sim-oai-nr-ue0   /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)                               
-l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
-l2sim-proxy        /oai-lte-multi-ue-proxy/bi ...   Up (healthy)                               
+l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
+l2sim-oai-nr-ue0   /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
+l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+l2sim-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
+l2sim-proxy        /oai-lte-multi-ue-proxy/bi ...   Up (healthy)
 ```
 ```bash
-docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}	{{.MemUsage}}\t{{.MemPerc}}" l2sim-mysql l2sim-oai-amf l2sim-oai-ext-dn l2sim-oai-gnb l2sim-oai-nr-ue0 l2sim-oai-nrf l2sim-oai-smf l2sim-oai-spgwu l2sim-proxy
+docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}	{{.MemUsage}}\t{{.MemPerc}}" l2sim-mysql l2sim-oai-amf l2sim-oai-ext-dn l2sim-oai-gnb l2sim-oai-nr-ue0 l2sim-oai-smf l2sim-oai-upf l2sim-proxy
 ```
 ```bash
 CONTAINER          CPU %     MEM USAGE / LIMIT     MEM %
@@ -288,9 +281,8 @@ l2sim-oai-amf      4.05%     29.49MiB / 62.54GiB   0.05%
 l2sim-oai-ext-dn   0.00%     31.27MiB / 62.54GiB   0.05%
 l2sim-oai-gnb      1.29%     1.853GiB / 62.54GiB   2.96%
 l2sim-oai-nr-ue0   1.43%     350.8MiB / 62.54GiB   0.55%
-l2sim-oai-nrf      0.21%     9.105MiB / 62.54GiB   0.01%
 l2sim-oai-smf      3.24%     30.23MiB / 62.54GiB   0.05%
-l2sim-oai-spgwu    0.00%     11.78MiB / 62.54GiB   0.02%
+l2sim-oai-upf      0.00%     11.78MiB / 62.54GiB   0.02%
 l2sim-proxy        6.97%     290.4MiB / 62.54GiB   0.45%
 ```
 
@@ -389,19 +381,17 @@ Stopping l2sim-oai-nr-ue2 ... done
 Stopping l2sim-oai-nr-ue  ... done
 Stopping l2sim-oai-gnb    ... done
 Stopping l2sim-oai-ext-dn ... done
-Stopping l2sim-oai-spgwu  ... done
+Stopping l2sim-oai-upf    ... done
 Stopping l2sim-oai-smf    ... done
 Stopping l2sim-oai-amf    ... done
-Stopping l2sim-oai-nrf    ... done
 Stopping l2sim-mysql      ... done
 Removing l2sim-oai-nr-ue2 ... done
 Removing l2sim-oai-nr-ue  ... done
 Removing l2sim-oai-gnb    ... done
 Removing l2sim-oai-ext-dn ... done
-Removing l2sim-oai-spgwu  ... done
+Removing l2sim-oai-upf    ... done
 Removing l2sim-oai-smf    ... done
 Removing l2sim-oai-amf    ... done
-Removing l2sim-oai-nrf    ... done
 Removing l2sim-mysql      ... done
 Removing network l2sim-oai-public-net
 Removing network l2sim-oai-traffic-net

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

@@ -1,14 +1,5 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "l2sim-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
     mysql:
         container_name: "l2sim-mysql"
         image: mysql:8.0
@@ -31,108 +22,36 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "l2sim-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
         environment:
             - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - mysql
         networks:
             public_net:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "l2sim-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-amf
         networks:
             public_net:
                 ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "l2sim-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "l2sim-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-smf
         cap_add:
             - NET_ADMIN
@@ -153,7 +72,7 @@ services:
               "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-spgwu
+            - oai-upf
         networks:
             traffic_net:
                 ipv4_address: 192.168.72.135
@@ -172,7 +91,7 @@ services:
             USE_ADDITIONAL_OPTIONS: --sa --nfapi VNF --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
-            - oai-spgwu
+            - oai-upf
             - oai-amf
         volumes:
             - ../../conf_files/gnb.sa.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/gnb.conf

ci-scripts/yaml_files/5g_rfsimulator/README.md

@@ -37,10 +37,9 @@ Now pull images.
 
 ```bash
 $ docker pull mysql:8.0
-$ docker pull oaisoftwarealliance/oai-amf:v1.5.0
-$ docker pull oaisoftwarealliance/oai-nrf:v1.5.0
-$ docker pull oaisoftwarealliance/oai-smf:v1.5.0
-$ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+$ docker pull oaisoftwarealliance/oai-amf:v2.0.0
+$ docker pull oaisoftwarealliance/oai-smf:v2.0.0
+$ docker pull oaisoftwarealliance/oai-upf:v2.0.0
 $ docker pull oaisoftwarealliance/trf-gen-cn5g:focal
 
 $ docker pull oaisoftwarealliance/oai-gnb:develop
@@ -53,7 +52,7 @@ $ docker logout
 
 **CAUTION: 2023/01/27 with the release `v1.5.0` of the `CN5G`, the previous version was not compatible any-more.**
 
-**This new version is working only with the `v1.5.0` of the `CN5G`.**
+**This new version is working only with the `v2.0.0` of the `CN5G`.**
 
 # 2. Deploy containers #
 
@@ -65,18 +64,18 @@ $ docker logout
 
 All the following commands **SHALL** be run from the `ci-scripts/yaml_files/5g_rfsimulator` folder for a deployment with monolithic gNB.
 
-For a deployment with the gNB split in CU and DU components, the following commands **SHALL** be run from the `ci-scripts/yaml_files/5g_f1_rfsimulator` folder. 
+For a deployment with the gNB split in CU and DU components, please refer to the `../5g_f1_rfsimulator` folder.
+For a deployment with the gNB split in CU-CP, CU-UP, and DU components, please refer to the ../5g_rfsimulator_e1` folder.
 
 ## 2.1. Deploy OAI 5G Core Network ##
 
 ```bash
 $ cd ci-scripts/yaml_files/5g_rfsimulator
-$ docker-compose up -d mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn
+$ docker-compose up -d mysql oai-amf oai-smf oai-upf oai-ext-dn
 Creating network "rfsim5g-oai-public-net" with driver "bridge"
 Creating network "rfsim5g-oai-traffic_net-net" with driver "bridge"
-Creating rfsim5g-oai-nrf ... done
 Creating rfsim5g-mysql      ... done
-Creating rfsim5g-oai-spgwu ... done
+Creating rfsim5g-oai-upf   ... done
 Creating rfsim5g-oai-amf   ... done
 Creating rfsim5g-oai-smf   ... done
 Creating rfsim5g-oai-ext-dn ... done
@@ -86,20 +85,19 @@ Wait for a bit.
 
 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports            
+       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+rfsim5g-oai-upf      /bin/bash -c /openair-upf/ ...   Up (healthy)   2152/udp, 8805/udp
 ```
 
 At this point, you can prepare a capture on the newly-created public docker bridges:
 
 ```bash
-$ ifconfig 
+$ ifconfig
 ...
 rfsim5g-public: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
         inet 192.168.71.129  netmask 255.255.255.192  broadcast 192.168.71.191
@@ -130,8 +128,7 @@ The gNB can be deployed either in monolithic mode, or in CU/DU split mode.
 
 ```bash
 $ docker-compose up -d oai-gnb
-rfsim5g-oai-nrf is up-to-date
-rfsim5g-oai-spgwu is up-to-date
+rfsim5g-oai-upf is up-to-date
 rfsim5g-oai-ext-dn is up-to-date
 Creating rfsim5g-oai-gnb ... done
 ```
@@ -149,15 +146,14 @@ Wait for a bit.
 
 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports            
+       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
-rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
+rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+rfsim5g-oai-upf      /bin/bash -c /openair-upf/ ...   Up (healthy)   2152/udp, 8805/udp
 ```
 
 You can verify that the `gNB` is connected with the `AMF`:
@@ -177,10 +173,9 @@ $ docker logs rfsim5g-oai-amf
 ```bash
 $ docker-compose up -d oai-nr-ue
 rfsim5g-mysql is up-to-date
-rfsim5g-oai-nrf is up-to-date
 rfsim5g-oai-amf is up-to-date
 rfsim5g-oai-smf is up-to-date
-rfsim5g-oai-spgwu is up-to-date
+rfsim5g-oai-upf is up-to-date
 rfsim5g-oai-ext-dn is up-to-date
 rfsim5g-oai-gnb is up-to-date
 Creating rfsim5g-oai-nr-ue ... done
@@ -190,23 +185,22 @@ Wait for a bit.
 
 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports            
+       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
-rfsim5g-oai-nr-ue    /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)                               
-rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
+rfsim5g-oai-nr-ue    /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
+rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+rfsim5g-oai-upf      /bin/bash -c /openair-upf/ ...   Up (healthy)   2152/udp, 8805/udp
 ```
 
 Making sure the OAI UE is connected:
 
 ```bash
 $ docker exec -it rfsim5g-oai-nr-ue /bin/bash
-root@bb4d400a832d:/opt/oai-nr-ue# ifconfig 
+root@bb4d400a832d:/opt/oai-nr-ue# ifconfig
 eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
         inet 192.168.71.150  netmask 255.255.255.192  broadcast 192.168.71.191
         ether 02:42:c0:a8:47:89  txqueuelen 0  (Ethernet)
@@ -265,10 +259,9 @@ Create the entry for the second UE in `docker-compose.yaml` file as follows:
 ```bash
 $ docker-compose up -d oai-nr-ue2
 rfsim5g-mysql is up-to-date
-rfsim5g-oai-nrf is up-to-date
 rfsim5g-oai-amf is up-to-date
 rfsim5g-oai-smf is up-to-date
-rfsim5g-oai-spgwu is up-to-date
+rfsim5g-oai-upf is up-to-date
 rfsim5g-oai-ext-dn is up-to-date
 rfsim5g-oai-gnb is up-to-date
 Creating rfsim5g-oai-nr-ue2 ... done
@@ -278,7 +271,7 @@ Wait for a bit.
 
 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports            
+       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
 rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
@@ -286,16 +279,15 @@ rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
 rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
 rfsim5g-oai-nr-ue    /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
 rfsim5g-oai-nr-ue2   /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
-rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp
 rfsim5g-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
-rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp
+rfsim5g-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
 ```
 
 Making sure the Second OAI UE is connected:
 
 ```bash
 $ docker exec -it rfsim5g-oai-nr-ue2 /bin/bash
-root@bb4d400a832d:/opt/oai-nr-ue# ifconfig 
+root@bb4d400a832d:/opt/oai-nr-ue# ifconfig
 eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
         inet 192.168.71.151  netmask 255.255.255.192  broadcast 192.168.71.191
         ether 02:42:c0:a8:47:8a  txqueuelen 0  (Ethernet)
@@ -457,19 +449,17 @@ Stopping rfsim5g-oai-nr-ue2 ... done
 Stopping rfsim5g-oai-nr-ue  ... done
 Stopping rfsim5g-oai-gnb    ... done
 Stopping rfsim5g-oai-ext-dn ... done
-Stopping rfsim5g-oai-spgwu  ... done
+Stopping rfsim5g-oai-upf    ... done
 Stopping rfsim5g-oai-smf    ... done
 Stopping rfsim5g-oai-amf    ... done
-Stopping rfsim5g-oai-nrf    ... done
 Stopping rfsim5g-mysql      ... done
 Removing rfsim5g-oai-nr-ue2 ... done
 Removing rfsim5g-oai-nr-ue  ... done
 Removing rfsim5g-oai-gnb    ... done
 Removing rfsim5g-oai-ext-dn ... done
-Removing rfsim5g-oai-spgwu  ... done
+Removing rfsim5g-oai-upf    ... done
 Removing rfsim5g-oai-smf    ... done
 Removing rfsim5g-oai-amf    ... done
-Removing rfsim5g-oai-nrf    ... done
 Removing rfsim5g-mysql      ... done
 Removing network rfsim5g-oai-public-net
 Removing network rfsim5g-oai-traffic-net
@@ -521,24 +511,21 @@ docker-compose entry mount another config, or add `--uicc0.imsi
 feature of the configuration module to overwrite any configuration option in
 the config file on the command line.
 
-We are also using a dedicated `oai-smf.conf` for the `SMF` container: the `oai` DNN shall match the one in  the NR-UE section of `docker-compose.yaml` (`DNN: oai`).
-
 ## 5.2. Making the gNB connect to the core network ##
 
-Mainly you need to match the PLMN in `gNB`, `AMF` and `SPGWU` parameters:
+Mainly you need to match the PLMN in `gNB`, `AMF` and `UPF` parameters in the `mini_nonrf_config.yaml`:
 
-* `AMF`
-  - `MCC=208`
-  - `MNC=99`
-  - `PLMN_SUPPORT_TAC=0x0001`
-  - ...
-* `SPGWU`
-  - `MCC=208`
-  - `MNC=99`
-  - `TAC=1`
-* `gNB`
-  - `MCC: '208'`
-  - `MNC: '99'`
-  - `TAC: 1`
+```yaml
+  plmn_support_list:
+    - mcc: 208
+      mnc: 99
+      tac: 0x0001
+      nssai:
+        - *embb_slice1
+...
+snssais:
+  - &embb_slice1
+    sst: 1
+```
 
 The `ST` and `SD` values shall also match.

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

@@ -1,14 +1,5 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
@@ -31,108 +22,36 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
         environment:
             - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ./mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - mysql
         networks:
             public_net:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ./mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-amf
         networks:
             public_net:
                 ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ./mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-smf
         cap_add:
             - NET_ADMIN
@@ -153,7 +72,7 @@ services:
               "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-spgwu
+            - oai-upf
         networks:
             traffic_net:
                 ipv4_address: 192.168.72.135
@@ -187,7 +106,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -206,7 +124,6 @@ services:
         container_name: rfsim5g-oai-nr-ue2
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -225,7 +142,6 @@ services:
         container_name: rfsim5g-oai-nr-ue3
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -244,7 +160,6 @@ services:
         container_name: rfsim5g-oai-nr-ue4
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -263,7 +178,6 @@ services:
         container_name: rfsim5g-oai-nr-ue5
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -282,7 +196,6 @@ services:
         container_name: rfsim5g-oai-nr-ue6
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -301,7 +214,6 @@ services:
         container_name: rfsim5g-oai-nr-ue7
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -320,7 +232,6 @@ services:
         container_name: rfsim5g-oai-nr-ue8
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -339,7 +250,6 @@ services:
         container_name: rfsim5g-oai-nr-ue9
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -358,7 +268,6 @@ services:
         container_name: rfsim5g-oai-nr-ue10
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

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

@@ -0,0 +1,189 @@
+################################################################################
+# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The OpenAirInterface Software Alliance licenses this file to You under
+# the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.openairinterface.org/?page_id=698
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#-------------------------------------------------------------------------------
+# For more information about the OpenAirInterface (OAI) Software Alliance:
+#      contact@openairinterface.org
+################################################################################
+
+# OAI CN Configuration File
+### This file can be used by all OAI NFs
+### Some fields are specific to an NF and will be ignored by other NFs
+
+## NOTE ON YAML ANCHORS ##
+# We use YAML anchors to ease the configuration and to avoid duplicating parts of the configuration.
+# This is especially true for the SNSSAIs, as we have to define them for multiple NFs.
+# Please note that the use of anchors is not mandatory, and you can define the SNSSAI in each NF yourself.
+# You can read more about anchors here: https://yaml.org/spec/1.2.2/#anchors-and-aliases
+
+############# Common configuration
+
+# Log level for all the NFs
+log_level:
+  general: debug
+
+# If you enable registration, the other NFs will use the NRF discovery mechanism
+register_nf:
+  general: no
+
+http_version: 1
+
+############## SBI Interfaces
+### Each NF takes its local SBI interfaces and remote interfaces from here, unless it gets them using NRF discovery mechanisms
+nfs:
+  amf:
+    host: oai-amf
+    sbi:
+      port: 80
+      api_version: v1
+      interface_name: eth0
+    n2:
+      interface_name: eth0
+      port: 38412
+  smf:
+    host: oai-smf
+    sbi:
+      port: 80
+      api_version: v1
+      interface_name: eth0
+    n4:
+      interface_name: eth0
+      port: 8805
+
+  upf:
+    host: oai-upf
+    sbi:
+      port: 80
+      api_version: v1
+      interface_name: eth0
+    n3:
+      interface_name: eth0
+      port: 2152
+    n4:
+      interface_name: eth0
+      port: 8805
+    n6:
+      interface_name: eth1
+    n9:
+      interface_name: eth0
+      port: 2152
+
+#### Common for UDR and AMF
+database:
+  host: mysql
+  user: test
+  type: mysql
+  password: test
+  database_name: oai_db
+  generate_random: true
+  connection_timeout: 300 # seconds
+
+## general single_nssai configuration
+## Defines YAML anchors, which are reused in the config file
+snssais:
+  - &embb_slice1
+    sst: 1
+
+############## NF-specific configuration
+amf:
+  amf_name: "OAI-AMF"
+  # This really depends on if we want to keep the "mini" version or not
+  support_features_options:
+    enable_simple_scenario: yes # "no" by default with the normal deployment scenarios with AMF/SMF/UPF/AUSF/UDM/UDR/NRF.
+                               # set it to "yes" to use with the minimalist deployment scenario (including only AMF/SMF/UPF) by using the internal AUSF/UDM implemented inside AMF.
+                               # There's no NRF in this scenario, SMF info is taken from "nfs" section.
+    enable_nssf: no
+    enable_smf_selection: no
+  relative_capacity: 30
+  statistics_timer_interval: 20  # in seconds
+  emergency_support: false
+  served_guami_list:
+    - mcc: 208
+      mnc: 99
+      amf_region_id: 01
+      amf_set_id: 001
+      amf_pointer: 01
+  plmn_support_list:
+    - mcc: 208
+      mnc: 99
+      tac: 0x0001
+      nssai:
+        - *embb_slice1
+  supported_integrity_algorithms:
+    - "NIA0"
+    - "NIA1"
+    - "NIA2"
+  supported_encryption_algorithms:
+    - "NEA0"
+    - "NEA1"
+    - "NEA2"
+
+smf:
+  ue_mtu: 1500
+  support_features:
+    use_local_subscription_info: yes # Use infos from local_subscription_info or from UDM
+    use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
+  upfs:
+    - host: oai-upf
+      port: 8805
+      config:
+        enable_usage_reporting: no
+        # follows UPFInfo from 3GPP TS 29.510, currently only these values from interfaceUpfInfoList are supported
+      upf_info:
+        interfaceUpfInfoList:
+          - interfaceType: "N3"
+            networkInstance: "access.oai.org"
+          - interfaceType: "N6"
+            networkInstance: "core.oai.org"
+  ue_dns:
+    primary_ipv4: "172.21.3.100"
+    primary_ipv6: "2001:4860:4860::8888"
+    secondary_ipv4: "8.8.8.8"
+    secondary_ipv6: "2001:4860:4860::8888"
+  ims:
+    pcscf_ipv4: "127.0.0.1"
+    pcscf_ipv6: "fe80::7915:f408:1787:db8b"
+  # the DNN you configure here should be configured in "dnns"
+  # follows the SmfInfo datatype from 3GPP TS 29.510
+  smf_info:
+    sNssaiSmfInfoList:
+      - sNssai: *embb_slice1
+        dnnSmfInfoList:
+          - dnn: "oai"
+  local_subscription_infos:
+    - single_nssai: *embb_slice1
+      dnn: "oai"
+      qos_profile:
+        5qi: 9
+        session_ambr_ul: "200Mbps"
+        session_ambr_dl: "400Mbps"
+
+upf:
+  support_features:
+    enable_bpf_datapath: no    # If "on": BPF is used as datapath else simpleswitch is used, DEFAULT= off
+    enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
+  remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
+  upf_info:
+    sNssaiUpfInfoList:
+      - sNssai: *embb_slice1
+        dnnUpfInfoList:
+          - dnn: "oai"
+
+## DNN configuration
+dnns:
+  - dnn: "oai"
+    pdu_session_type: "IPV4"
+    ipv4_subnet: "12.1.1.0/24"

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

@@ -1,14 +1,5 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
@@ -31,108 +22,36 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
         environment:
             - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - mysql
         networks:
             public_net:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-amf
         networks:
             public_net:
                 ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-smf
         cap_add:
             - NET_ADMIN
@@ -153,7 +72,7 @@ services:
               "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-spgwu
+            - oai-upf
         networks:
             traffic_net:
                 ipv4_address: 192.168.72.135
@@ -187,7 +106,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

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

@@ -1,14 +1,5 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
@@ -31,108 +22,36 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
         environment:
             - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - mysql
         networks:
             public_net:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-amf
         networks:
             public_net:
                 ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-smf
         cap_add:
             - NET_ADMIN
@@ -153,7 +72,7 @@ services:
               "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-spgwu
+            - oai-upf
         networks:
             traffic_net:
                 ipv4_address: 192.168.72.135
@@ -188,7 +107,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_e1/README.md

@@ -0,0 +1,229 @@
+# CI test for 5G F1+E1 splits with RFsimulator
+
+## General
+
+This docker-compose file deploys a core, RAN, and 3 UEs. Specifically:
+
+- 5GC mini deployment,
+- 1 CU-CP,
+- 3 CU-UPs, one for slices SST=1,2,3,
+- 3 DUs, 
+- 3 UEs connecting to each DU, each requesting slice SST=1,2,3.
+
+The CU-CP associates each UE X connecting through DU X to CU-UP X, X=1,2,3.  To this end, the docker-compose file deliberately employs the three `f1u_netX` networks to route the user-plane traffic of each DU X/CU-UP X pair, through the `f1u_netX` network in order to effectively test that the correct CU-UP is associated. Basically, the traffic test will only succeed if the correct pair of DU/CU-UP has been established; if not, the DU/CU-UP cannot communicate, as the traffic cannot be routed.
+
+Core network components are on `core_net` network, CU-CP <--> CU-UP X communicate via `e1_net` network, CU-CP <--> DU X communicate via `f1c_net` network and DU X <--> NR_UE X communicate via `ue_net` network.
+
+
+## Connectivity
+
+```
+AMF  --> 192.168.71.132 (N2,Namf)
+SMF  --> 192.168.71.133 (N4,Nsmf)
+UPF    --> 192.168.71.134 (N3)
+CU-CP  --> 192.168.71.X (N2), 192.168.72.2 (F1C), 192.168.77.2 (E1)
+CU-UP1 --> 192.168.71.X (N3), 192.168.73.2 (F1U), 192.168.77.3 (E1)
+CU-UP2 --> 192.168.71.X (N3), 192.168.74.2 (F1U), 192.168.77.4 (E1)
+CU-UP3 --> 192.168.71.X (N3), 192.168.76.2 (F1U), 192.168.77.5 (E1)
+DU1    --> 192.168.72.2 (F1C), 192.168.73.3 (F1U), 192.168.78.2 (RFSIM)
+DU2    --> 192.168.72.3 (F1C), 192.168.74.3 (F1U), 192.168.78.3 (RFSIM)
+DU3    --> 192.168.72.4 (F1C), 192.168.76.3 (F1U), 192.168.78.4 (RFSIM)
+UE1    --> 192.168.78.5 (RFSIM)
+UE2    --> 192.168.78.6 (RFSIM)
+UE3    --> 192.168.78.7 (RFSIM)
+```
+
+## How to run
+
+You should be able to deploy the [basic 5G RFsim deployment](../5g_rfsimulator/README.md).
+
+First, start the MySQL server and 5GC:
+
+```bash
+docker-compose up -d mysql oai-amf oai-smf oai-upf
+docker-compose ps -a
+```
+
+Wait till everything is healthy.
+
+Next, start the RAN:
+
+```bash
+docker-compose up -d oai-cucp oai-cuup{,2,3} oai-du{,2,3}
+```
+
+You can verify that the DUs and CU-UPs connected successfully:
+```bash
+docker logs rfsim5g-oai-cucp
+```
+
+<details>
+<summary>The output is similar to:</summary>
+
+```console
+[...]
+18535.139811 [RRC] I Accepting new CU-UP ID 3585 name gNB-OAI (assoc_id 257)
+18535.425744 [RRC] I Accepting new CU-UP ID 3584 name gNB-OAI (assoc_id 260)
+18535.425757 [RRC] I Accepting new CU-UP ID 3586 name gNB-OAI (assoc_id 261)
+18535.669733 [NR_RRC] I Received F1 Setup Request from gNB_DU 3585 (du-rfsim) on assoc_id 263
+18535.669814 [RRC] I Accepting DU 3585 (du-rfsim), sending F1 Setup Response
+18536.066417 [NR_RRC] I Received F1 Setup Request from gNB_DU 3586 (du-rfsim) on assoc_id 265
+18536.066476 [RRC] I Accepting DU 3586 (du-rfsim), sending F1 Setup Response
+18536.135581 [NR_RRC] I Received F1 Setup Request from gNB_DU 3584 (du-rfsim) on assoc_id 267
+18536.135650 [RRC] I Accepting DU 3584 (du-rfsim), sending F1 Setup Response
+```
+</details>
+
+You should see that the CU-UP initialized two GTP instances (one for NG-U, the other for F1-U):
+
+```bash
+docker logs -f rfsim5g-oai-cuup
+```
+
+<details>
+<summary>The output is similar to:</summary>
+
+```console
+[...]
+122690.500374 [GTPU] I Initializing UDP for local address 192.168.73.2 with port 2153
+122690.500406 [GTPU] I Created gtpu instance id: 96
+122690.500413 [GTPU] I Configuring GTPu address : 192.168.71.161, port : 2152
+122690.500414 [GTPU] I Initializing UDP for local address 192.168.71.161 with port 2152
+122690.500420 [GTPU] I Created gtpu instance id: 97
+```
+</details>
+
+
+
+You should see the typical periodical output at the DUs:
+
+```bash
+docker logs rfsim5g-oai-du
+```
+<details>
+<summary>The output is similar to:</summary>
+
+```console
+[...]
+18626.446953 [NR_MAC] I Frame.Slot 128.0
+
+18629.151076 [NR_MAC] I Frame.Slot 256.0
+```
+</details>
+
+```
+
+Next, connect the UEs. They are configured to connect to each DU by setting the
+RFsimulator server address to the `public_net` IP address of each DU. For each,
+you should see that they get an IP address
+
+```bash
+docker compose up -d oai-nr-ue{,2,3}
+```
+
+```bash
+docker logs rfsim5g-oai-nr-ue
+```
+
+<details>
+<summary>The output is similar to:</summary>
+
+```console
+[...]
+18758.176149 [NR_RRC] I rrcReconfigurationComplete Encoded 10 bits (2 bytes)
+18758.176153 [NR_RRC] I  Logical Channel UL-DCCH (SRB1), Generating RRCReconfigurationComplete (bytes 2)
+18758.176154 [NAS] I [UE 0] Received NAS_CONN_ESTABLI_CNF: errCode 1, length 87
+18758.176455 [OIP] I Interface oaitun_ue1 successfully configured, ip address 12.1.1.3, mask 255.255.255.0 broadcast address 12.1.1.255
+```
+</details>
+
+
+Alternatively, check that they all received an IP address (the associated IP addresses might be different):
+
+```bash
+docker exec -it rfsim5g-oai-nr-ue3 ip a show oaitun_ue1
+```
+<details>
+<summary>The output is similar to:</summary>
+
+```console
+[...]
+    inet 12.1.1.2/24 brd 12.1.1.255 scope global oaitun_ue1
+[...]
+```
+</details>
+
+```bash
+docker exec -it rfsim5g-oai-nr-ue2 ip a show oaitun_ue1
+```
+<details>
+<summary>The output is similar to:</summary>
+
+```console
+[...]
+    inet 12.1.1.4/24 brd 12.1.1.255 scope global oaitun_ue1
+[...]
+```
+</details>
+
+```bash
+docker exec -it rfsim5g-oai-nr-ue ip a show oaitun_ue1
+```
+<details>
+<summary>The output is similar to:</summary>
+
+```console
+[...]
+    inet 12.1.1.3/24 brd 12.1.1.255 scope global oaitun_ue1
+[...]
+```
+</details>
+
+
+
+Also, note that each DU sees only one UE! At the CU-CP, you should see that
+each DU has been associated to a different CU-UP, based on the NSSAI (`exact
+NSSAI match`):
+```bash
+docker logs rfsim5g-oai-cucp | grep CU-U
+```
+
+<details>
+<summary>The output is similar to:</summary>
+
+```console
+[...]
+18757.531423 [RRC] I selecting CU-UP ID 3586 based on exact NSSAI match (3:0xffffff)
+18757.531434 [RRC] I UE 1 associating to CU-UP assoc_id 261 out of 3 CU-UPs
+18758.171502 [RRC] I selecting CU-UP ID 3584 based on exact NSSAI match (1:0xffffff)
+18758.171510 [RRC] I UE 2 associating to CU-UP assoc_id 260 out of 3 CU-UPs
+18758.772320 [RRC] I selecting CU-UP ID 3585 based on exact NSSAI match (2:0xffffff)
+18758.772327 [RRC] I UE 3 associating to CU-UP assoc_id 257 out of 3 CU-UPs
+```
+</details>
+
+
+Also, each UE should be able to ping the core network. For instance, with UE 1:
+```bash
+docker exec -it rfsim5g-oai-nr-ue ping -c1 12.1.1.1
+```
+<details>
+<summary>The output is similar to:</summary>
+
+```console
+PING 12.1.1.1 (12.1.1.1) 56(84) bytes of data.
+64 bytes from 12.1.1.1: icmp_seq=1 ttl=64 time=15.2 ms
+
+--- 12.1.1.1 ping statistics ---
+1 packets transmitted, 1 received, 0% packet loss, time 0ms
+rtt min/avg/max/mdev = 15.155/15.155/15.155/0.000 ms
+```
+</details>
+
+
+Finally, undeploy the UEs (to give them time to do deregistration), and then
+the rest of the network:
+```bash
+docker compose stop oai-nr-ue{,2,3}
+docker compose down
+```

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

@@ -1,14 +1,5 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            core_net:
-                ipv4_address: 192.168.71.130
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
@@ -31,108 +22,36 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
         environment:
             - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ./mini_nonrf_config_3slices.yaml:/openair-amf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - mysql
         networks:
             core_net:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ./mini_nonrf_config_3slices.yaml:/openair-smf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-amf
         networks:
             core_net:
                 ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ./mini_nonrf_config_3slices.yaml:/openair-upf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-smf
         cap_add:
             - NET_ADMIN
@@ -144,40 +63,26 @@ services:
             core_net:
                 ipv4_address: 192.168.71.134
             traffic_net:
-                ipv4_address: 192.168.73.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.73.134 dev eth0; sleep infinity"
-        depends_on:
-            - oai-spgwu
-        networks:
-            traffic_net:
-                ipv4_address: 192.168.73.135
-        healthcheck:
-            test: /bin/bash -c "ping -c 2 192.168.73.134"
-            interval: 10s
-            timeout: 5s
-            retries: 5
+                ipv4_address: 192.168.72.134
 
     oai-cucp:
         image: oaisoftwarealliance/oai-gnb:develop
         privileged: true
         container_name: rfsim5g-oai-cucp
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
+                                    --gNBs.[0].local_s_address 192.168.72.2
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
-            - oai-ext-dn
+            - oai-upf
         networks:
             core_net:
-                ipv4_address: 192.168.71.140
-            ran_net:
-                ipv4_address: 192.168.72.140
+                ipv4_address: 192.168.71.150
+            f1c_net:
+                ipv4_address: 192.168.72.2
+            e1_net:
+                ipv4_address: 192.168.77.2
         volumes:
             - ../../conf_files/gnb-cucp.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
@@ -191,15 +96,83 @@ services:
         privileged: true
         container_name: rfsim5g-oai-cuup
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cuup 192.168.77.3
+                                    --gNBs.[0].local_s_address 192.168.73.2
+                                    --gNBs.[0].remote_s_address 127.0.0.1
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-cucp
         networks:
             core_net:
-                ipv4_address: 192.168.71.141
-            ran_net:
-                ipv4_address: 192.168.72.141
+                ipv4_address: 192.168.71.161
+            f1u_1_net:
+                ipv4_address: 192.168.73.2
+            e1_net:
+                ipv4_address: 192.168.77.3
+        volumes:
+            - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-cuup"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-cuup2:
+        image: oaisoftwarealliance/oai-nr-cuup:develop
+        privileged: true
+        container_name: rfsim5g-oai-cuup2
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].gNB_CU_UP_ID 0xe01
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cuup 192.168.77.4
+                                    --gNBs.[0].local_s_address 192.168.74.2
+                                    --gNBs.[0].remote_s_address 127.0.0.1
+                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NGU 192.168.71.162
+                                    --gNBs.[0].plmn_list.[0].snssaiList.[0].sst 2
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-cucp
+        networks:
+            core_net:
+                ipv4_address: 192.168.71.162
+            f1u_2_net:
+                ipv4_address: 192.168.74.2
+            e1_net:
+                ipv4_address: 192.168.77.4
+        volumes:
+            - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-cuup"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-cuup3:
+        image: oaisoftwarealliance/oai-nr-cuup:develop
+        privileged: true
+        container_name: rfsim5g-oai-cuup3
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].gNB_CU_UP_ID 0xe02
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
+                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cuup 192.168.77.5
+                                    --gNBs.[0].local_s_address 192.168.76.2
+                                    --gNBs.[0].remote_s_address 127.0.0.1
+                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NGU 192.168.71.163
+                                    --gNBs.[0].plmn_list.[0].snssaiList.[0].sst 3
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-cucp
+        networks:
+            core_net:
+                ipv4_address: 192.168.71.163
+            f1u_3_net:
+                ipv4_address: 192.168.76.2
+            e1_net:
+                ipv4_address: 192.168.77.5
         volumes:
             - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
@@ -214,12 +187,81 @@ services:
         container_name: rfsim5g-oai-du
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+                                    --MACRLCs.[0].local_n_address 192.168.73.3
+                                    --MACRLCs.[0].remote_n_address 192.168.72.2
             ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-cucp
+            - oai-cuup
         networks:
-            ran_net:
-                ipv4_address: 192.168.72.142
+            f1c_net:
+                ipv4_address: 192.168.72.3
+            f1u_1_net:
+                ipv4_address: 192.168.73.3
+            ue_net:
+                ipv4_address: 192.168.78.2
         volumes:
-            - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-du2:
+        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-du2
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].gNB_DU_ID 0xe01
+                                    --gNBs.[0].nr_cellid 87654321
+                                    --gNBs.[0].servingCellConfigCommon.[0].physCellId 1
+                                    --MACRLCs.[0].local_n_address 192.168.74.3
+                                    --MACRLCs.[0].remote_n_address 192.168.72.2
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-cucp
+            - oai-cuup2
+        networks:
+            f1c_net:
+                ipv4_address: 192.168.72.4
+            f1u_2_net:
+                ipv4_address: 192.168.74.3
+            ue_net:
+                ipv4_address: 192.168.78.3
+        volumes:
+            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-du3:
+        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-du3
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].gNB_DU_ID 0xe02
+                                    --gNBs.[0].nr_cellid 11111111
+                                    --gNBs.[0].servingCellConfigCommon.[0].physCellId 2
+                                    --MACRLCs.[0].local_n_address 192.168.76.3
+                                    --MACRLCs.[0].remote_n_address 192.168.72.2
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-cucp
+            - oai-cuup3
+        networks:
+            f1c_net:
+                ipv4_address: 192.168.72.5
+            f1u_3_net:
+                ipv4_address: 192.168.76.3
+            ue_net:
+                ipv4_address: 192.168.78.4
+        volumes:
+            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -231,13 +273,60 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.72.142 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+                                    -r 106 --numerology 1 -C 3619200000
+                                    --uicc0.imsi 208990100001100
+                                    --rfsimulator.serveraddr 192.168.78.2
         depends_on:
             - oai-du
         networks:
-            ran_net:
-                ipv4_address: 192.168.72.150
+            ue_net:
+                ipv4_address: 192.168.78.5
+        volumes:
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-nr-ue2:
+        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue2
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+                                    -r 106 --numerology 1 -C 3619200000
+                                    --uicc0.imsi 208990100001101 --uicc0.nssai_sst 2
+                                    --rfsimulator.serveraddr 192.168.78.3
+        depends_on:
+            - oai-du2
+        networks:
+            ue_net:
+                ipv4_address: 192.168.78.6
+        volumes:
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-nr-ue3:
+        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue3
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+                                    -r 106 --numerology 1 -C 3619200000
+                                    --uicc0.imsi 208990100001102 --uicc0.nssai_sst 3
+                                    --rfsimulator.serveraddr 192.168.78.4
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-du3
+        networks:
+            ue_net:
+                ipv4_address: 192.168.78.7
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -255,19 +344,59 @@ networks:
                 - subnet: 192.168.71.128/26
         driver_opts:
             com.docker.network.bridge.name: "rfsim5g-core"
-    ran_net:
+    traffic_net:
         driver: bridge
-        name: rfsim5g-oai-ran-net
+        name: rfsim5g-oai-traffic-net
         ipam:
             config:
                 - subnet: 192.168.72.128/26
         driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-ran"
-    traffic_net:
+            com.docker.network.bridge.name: "rfsim5g-traffic"
+    f1c_net:
         driver: bridge
-        name: rfsim5g-oai-traffic_net-net
+        name: rfsim5g-oai-f1c-net
         ipam:
             config:
-                - subnet: 192.168.73.128/26
+                - subnet: 192.168.72.0/28
         driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-traffic"
+            com.docker.network.bridge.name: "rfsim5g-f1c"
+    f1u_1_net:
+        driver: bridge
+        name: rfsim5g-oai-f1u-1-net
+        ipam:
+            config:
+                - subnet: 192.168.73.0/28
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-f1u_1"
+    f1u_2_net:
+        driver: bridge
+        name: rfsim5g-oai-f1u-2-net
+        ipam:
+            config:
+                - subnet: 192.168.74.0/28
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-f1u_2"
+    f1u_3_net:
+        driver: bridge
+        name: rfsim5g-oai-f1u-3-net
+        ipam:
+            config:
+                - subnet: 192.168.76.0/28
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-f1u_3"
+    e1_net:
+        driver: bridge
+        name: rfsim5g-oai-e1-net
+        ipam:
+            config:
+                - subnet: 192.168.77.1/28
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-e1"
+    ue_net:
+        driver: bridge
+        name: rfsim5g-oai-ue-net
+        ipam:
+            config:
+                - subnet: 192.168.78.1/28
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-ue"

ci-scripts/yaml_files/5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml

@@ -0,0 +1,213 @@
+################################################################################
+# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The OpenAirInterface Software Alliance licenses this file to You under
+# the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.openairinterface.org/?page_id=698
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#-------------------------------------------------------------------------------
+# For more information about the OpenAirInterface (OAI) Software Alliance:
+#      contact@openairinterface.org
+################################################################################
+
+# OAI CN Configuration File
+### This file can be used by all OAI NFs
+### Some fields are specific to an NF and will be ignored by other NFs
+
+## NOTE ON YAML ANCHORS ##
+# We use YAML anchors to ease the configuration and to avoid duplicating parts of the configuration.
+# This is especially true for the SNSSAIs, as we have to define them for multiple NFs.
+# Please note that the use of anchors is not mandatory, and you can define the SNSSAI in each NF yourself.
+# You can read more about anchors here: https://yaml.org/spec/1.2.2/#anchors-and-aliases
+
+############# Common configuration
+
+# Log level for all the NFs
+log_level:
+  general: debug
+
+# If you enable registration, the other NFs will use the NRF discovery mechanism
+register_nf:
+  general: no
+
+http_version: 1
+
+############## SBI Interfaces
+### Each NF takes its local SBI interfaces and remote interfaces from here, unless it gets them using NRF discovery mechanisms
+nfs:
+  amf:
+    host: oai-amf
+    sbi:
+      port: 80
+      api_version: v1
+      interface_name: eth0
+    n2:
+      interface_name: eth0
+      port: 38412
+  smf:
+    host: oai-smf
+    sbi:
+      port: 80
+      api_version: v1
+      interface_name: eth0
+    n4:
+      interface_name: eth0
+      port: 8805
+
+  upf:
+    host: oai-upf
+    sbi:
+      port: 80
+      api_version: v1
+      interface_name: eth0
+    n3:
+      interface_name: eth0
+      port: 2152
+    n4:
+      interface_name: eth0
+      port: 8805
+    n6:
+      interface_name: eth1
+    n9:
+      interface_name: eth0
+      port: 2152
+
+#### Common for UDR and AMF
+database:
+  host: mysql
+  user: test
+  type: mysql
+  password: test
+  database_name: oai_db
+  generate_random: true
+  connection_timeout: 300 # seconds
+
+## general single_nssai configuration
+## Defines YAML anchors, which are reused in the config file
+snssais:
+  - &embb_slice1
+    sst: 1
+  - &embb_slice2
+    sst: 2
+  - &embb_slice3
+    sst: 3
+
+############## NF-specific configuration
+amf:
+  amf_name: "OAI-AMF"
+  # This really depends on if we want to keep the "mini" version or not
+  support_features_options:
+    enable_simple_scenario: yes # "no" by default with the normal deployment scenarios with AMF/SMF/UPF/AUSF/UDM/UDR/NRF.
+                               # set it to "yes" to use with the minimalist deployment scenario (including only AMF/SMF/UPF) by using the internal AUSF/UDM implemented inside AMF.
+                               # There's no NRF in this scenario, SMF info is taken from "nfs" section.
+    enable_nssf: no
+    enable_smf_selection: no
+  relative_capacity: 30
+  statistics_timer_interval: 20  # in seconds
+  emergency_support: false
+  served_guami_list:
+    - mcc: 208
+      mnc: 99
+      amf_region_id: 01
+      amf_set_id: 001
+      amf_pointer: 01
+  plmn_support_list:
+    - mcc: 208
+      mnc: 99
+      tac: 0x0001
+      nssai:
+        - *embb_slice1
+        - *embb_slice2
+        - *embb_slice3
+  supported_integrity_algorithms:
+    - "NIA0"
+    - "NIA1"
+    - "NIA2"
+  supported_encryption_algorithms:
+    - "NEA0"
+    - "NEA1"
+    - "NEA2"
+
+smf:
+  ue_mtu: 1500
+  support_features:
+    use_local_subscription_info: yes # Use infos from local_subscription_info or from UDM
+    use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
+  upfs:
+    - host: oai-upf
+      port: 8805
+      config:
+        enable_usage_reporting: no
+        # follows UPFInfo from 3GPP TS 29.510, currently only these values from interfaceUpfInfoList are supported
+      upf_info:
+        interfaceUpfInfoList:
+          - interfaceType: "N3"
+            networkInstance: "access.oai.org"
+          - interfaceType: "N6"
+            networkInstance: "core.oai.org"
+  ue_dns:
+    primary_ipv4: "172.21.3.100"
+    primary_ipv6: "2001:4860:4860::8888"
+    secondary_ipv4: "8.8.8.8"
+    secondary_ipv6: "2001:4860:4860::8888"
+  ims:
+    pcscf_ipv4: "127.0.0.1"
+    pcscf_ipv6: "fe80::7915:f408:1787:db8b"
+  # the DNN you configure here should be configured in "dnns"
+  # follows the SmfInfo datatype from 3GPP TS 29.510
+  smf_info:
+    sNssaiSmfInfoList:
+      - sNssai: *embb_slice1
+        dnnSmfInfoList:
+          - dnn: "oai"
+  local_subscription_infos:
+    - single_nssai: *embb_slice1
+      dnn: "oai"
+      qos_profile:
+        5qi: 9
+        session_ambr_ul: "200Mbps"
+        session_ambr_dl: "400Mbps"
+    - single_nssai: *embb_slice2
+      dnn: "oai"
+      qos_profile:
+        5qi: 9
+        session_ambr_ul: "200Mbps"
+        session_ambr_dl: "400Mbps"
+    - single_nssai: *embb_slice3
+      dnn: "oai"
+      qos_profile:
+        5qi: 9
+        session_ambr_ul: "200Mbps"
+        session_ambr_dl: "400Mbps"
+
+upf:
+  support_features:
+    enable_bpf_datapath: no    # If "on": BPF is used as datapath else simpleswitch is used, DEFAULT= off
+    enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
+  remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
+  upf_info:
+    sNssaiUpfInfoList:
+      - sNssai: *embb_slice1
+        dnnUpfInfoList:
+          - dnn: "oai"
+      - sNssai: *embb_slice2
+        dnnUpfInfoList:
+          - dnn: "oai"
+      - sNssai: *embb_slice3
+        dnnUpfInfoList:
+          - dnn: "oai"
+
+## DNN configuration
+dnns:
+  - dnn: "oai"
+    pdu_session_type: "IPV4"
+    ipv4_subnet: "12.1.1.0/24"

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

@@ -1,14 +1,5 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
@@ -31,108 +22,36 @@ services:
                 ipv4_address: 192.168.71.131
     oai-amf:
         container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
         environment:
             - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - mysql
         networks:
             public_net:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-amf
         networks:
             public_net:
                 ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
         environment:
             - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
         depends_on:
-            - oai-nrf
             - oai-smf
         cap_add:
             - NET_ADMIN
@@ -153,7 +72,7 @@ services:
               "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-spgwu
+            - oai-upf
         networks:
             traffic_net:
                 ipv4_address: 192.168.72.135
@@ -188,7 +107,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152260000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

cmake_targets/at_commands/CMakeLists.txt

@@ -139,7 +139,7 @@ target_include_directories(secu_cn PRIVATE
 ################################################################################
 set(util_SRC
     ${OPENAIR_NAS_DIR}/COMMON/UTIL/device.c
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/memory.c
+    ${OPENAIR_DIR}/common/utils/mem/memory.c
     ${OPENAIR_NAS_DIR}/COMMON/UTIL/nas_log.c
     ${OPENAIR_NAS_DIR}/COMMON/UTIL/nas_timer.c
     ${OPENAIR_NAS_DIR}/COMMON/UTIL/OctetString.c
@@ -149,19 +149,8 @@ set(util_SRC
     ${OPENAIR_NAS_DIR}/COMMON/UTIL/socket.c
     ${OPENAIR_NAS_DIR}/COMMON/UTIL/stty.c
 )
-set(util_HDR
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/device.h
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/memory.h
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/nas_log.h
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/nas_timer.h
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/OctetString.h
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/parser.h
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/TLVDecoder.h
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/TLVEncoder.h
-    ${OPENAIR_NAS_DIR}/COMMON/UTIL/socket.h
-)
 
-add_library(util ${util_SRC} ${util_HDR})
+add_library(util ${util_SRC})
 target_include_directories(util PRIVATE ${OPENAIR_NAS_DIR}/COMMON/UTIL
                                         ${OPENAIR_NAS_DIR}/COMMON
                                         )
@@ -178,15 +167,7 @@ set(api_user_SRC
     ${OPENAIR_NAS_DIR}/UE/API/USER/user_indication.c
 )
 
-set(api_user_HDR
-    ${OPENAIR_NAS_DIR}/UE/API/USER/at_command.h
-    ${OPENAIR_NAS_DIR}/UE/API/USER/at_error.h
-    ${OPENAIR_NAS_DIR}/UE/API/USER/at_response.h
-    ${OPENAIR_NAS_DIR}/UE/API/USER/user_api.h
-    ${OPENAIR_NAS_DIR}/UE/API/USER/user_indication.h
-)
-
-add_library(api_user ${api_user_SRC} ${api_user_HDR})
+add_library(api_user ${api_user_SRC})
 target_include_directories(api_user PRIVATE ${OPENAIR_NAS_DIR}/UE/API/USER
                                             ${OPENAIR_NAS_DIR}/COMMON
                                             ${OPENAIR_NAS_DIR}/UE
@@ -200,13 +181,7 @@ set(api_usim_SRC
     ${OPENAIR_NAS_DIR}/UE/API/USIM/usim_api.c
 )
 
-set(api_usim_HDR
-    ${OPENAIR_NAS_DIR}/UE/API/USIM/aka_functions.h
-    ${OPENAIR_NAS_DIR}/UE/API/USIM/usim_api.h
-
-)
-
-add_library(api_usim ${api_usim_SRC} ${api_usim_HDR})
+add_library(api_usim ${api_usim_SRC})
 target_include_directories(api_usim PRIVATE ${OPENAIR_NAS_DIR}/UE/API/USIM)
 
 ################################################################################
@@ -217,13 +192,8 @@ set(api_network_SRC
     ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/nas_message.c
     ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/network_api.c
 )
-set(api_network_HDR
-    ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/as_message.h
-    ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/nas_message.h
-    ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/network_api.h
-)
 
-add_library(api_network ${api_network_SRC} ${api_network_HDR})
+add_library(api_network ${api_network_SRC})
 target_include_directories(api_network PRIVATE ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK
                                                ${OPENAIR_NAS_DIR}/COMMON
                                                )
@@ -311,60 +281,7 @@ set(emm_SRC
     
 )
 
-set(emm_HDR
-    ${OPENAIR_NAS_DIR}/UE/EMM/emmData.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/emm_main.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/emm_proc.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/IdleMode.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/LowerLayer.h
-    
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AttachAccept.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AttachComplete.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AttachReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AttachRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AuthenticationFailure.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AuthenticationReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AuthenticationRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AuthenticationResponse.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/CsServiceNotification.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/DetachAccept.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/DetachRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/DownlinkNasTransport.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/emm_cause.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/EmmInformation.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/emm_msgDef.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/emm_msg.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/EmmStatus.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/ExtendedServiceRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/GutiReallocationCommand.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/GutiReallocationComplete.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/IdentityRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/IdentityResponse.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/NASSecurityModeCommand.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/NASSecurityModeComplete.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/SecurityModeReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/ServiceReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/ServiceRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/TrackingAreaUpdateReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/UplinkNasTransport.h
-    
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_asDef.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_as.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_esmDef.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_esm.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_fsm.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_recv.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_regDef.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_reg.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_sap.h
-    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_send.h
-
-)
-
-add_library(emm ${emm_SRC} ${emm_HDR})
+add_library(emm ${emm_SRC})
 
 target_include_directories(emm PRIVATE 
                      ${OPENAIR_DIR}/common/utils
@@ -423,41 +340,7 @@ set(esm_SRC
     ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_send.c
 )
 
-set(esm_HDR
-    ${OPENAIR_TARGETS}/COMMON/openairinterface5g_limits.h
-    ${OPENAIR_NAS_DIR}/UE/ESM/esm_main.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/BearerResourceAllocationReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/BearerResourceAllocationRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/BearerResourceModificationReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/BearerResourceModificationRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/esm_cause.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/EsmInformationRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/EsmInformationResponse.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/esm_msgDef.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/esm_msg.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/EsmStatus.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ModifyEpsBearerContextReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/PdnConnectivityReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/PdnConnectivityRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/PdnDisconnectReject.h
-    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/PdnDisconnectRequest.h
-    ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_recv.h
-    ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_sap.h
-    ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_send.h
-    ${OPENAIR_DIR}/common/utils/utils.h
-)
-
-add_library(esm ${esm_SRC} ${esm_HDR})
+add_library(esm ${esm_SRC})
 
 target_include_directories(esm PRIVATE 
                      ${OPENAIR_DIR}/common/utils
@@ -553,89 +436,8 @@ set(ies_SRC
     ${OPENAIR_NAS_DIR}/COMMON/IES/UeSecurityCapability.c
     ${OPENAIR_NAS_DIR}/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c
 )
-set(ies_HDR
-    ${OPENAIR_NAS_DIR}/COMMON/IES/AccessPointName.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/AdditionalUpdateResult.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/AdditionalUpdateType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/ApnAggregateMaximumBitRate.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/AuthenticationFailureParameter.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/AuthenticationParameterAutn.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/AuthenticationParameterRand.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/AuthenticationResponseParameter.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/CipheringKeySequenceNumber.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/Cli.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/CsfbResponse.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/DaylightSavingTime.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/DetachType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/DrxParameter.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EmergencyNumberList.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EmmCause.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsAttachResult.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsAttachType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsBearerContextStatus.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsBearerIdentity.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsMobileIdentity.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsNetworkFeatureSupport.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsQualityOfService.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsUpdateResult.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsUpdateType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EsmCause.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EsmInformationTransferFlag.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/EsmMessageContainer.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/GprsTimer.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/GutiType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/IdentityType2.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/ImeisvRequest.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/KsiAndSequenceNumber.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/LcsClientIdentity.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/LcsIndicator.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/LinkedEpsBearerIdentity.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/LlcServiceAccessPointIdentifier.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/LocationAreaIdentification.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/MessageType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/MobileIdentity.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/MobileStationClassmark2.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/MobileStationClassmark3.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/MsNetworkCapability.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/MsNetworkFeatureSupport.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/NasKeySetIdentifier.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/NasMessageContainer.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/NasRequestType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/NasSecurityAlgorithms.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/NetworkName.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/Nonce.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/PacketFlowIdentifier.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/PagingIdentity.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/PdnAddress.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/PdnType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/PlmnList.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/ProcedureTransactionIdentity.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/ProtocolConfigurationOptions.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/ProtocolDiscriminator.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/PTmsiSignature.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/QualityOfService.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/RadioPriority.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/SecurityHeaderType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/ServiceType.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/ShortMac.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/SsCode.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/SupportedCodecList.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/TimeZoneAndTime.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/TimeZone.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/TmsiStatus.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/TrackingAreaIdentity.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/TrackingAreaIdentityList.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/TrafficFlowAggregateDescription.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/TrafficFlowTemplate.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/TransactionIdentifier.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/UeNetworkCapability.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/UeSecurityCapability.h
-    ${OPENAIR_NAS_DIR}/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h
 
-)
-
-add_library(ies ${ies_SRC} ${ies_HDR})
+add_library(ies ${ies_SRC})
 
 target_include_directories(ies PRIVATE 
                      ${OPENAIR_NAS_DIR}/COMMON/IES 

cmake_targets/build_oai

@@ -96,7 +96,7 @@ Options:
    USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
 -t | --transport
-   Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g
+   Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g, oran_fhlib_5g
 -P | --phy_simulators
    Makes the unitary tests Layer 1 simulators
 -S | --core_simulators
@@ -248,7 +248,7 @@ function main() {
             RU=1
             TARGET_LIST="$TARGET_LIST oairu"
             echo_info "Will compile RRU"
-	    shift;;
+            shift;;
        --UE)
             UE=1
             TARGET_LIST="$TARGET_LIST lte-uesoftmodem"
@@ -302,10 +302,14 @@ function main() {
                 TARGET_LIST="$TARGET_LIST oai_eth_transpro"
                 CMAKE_CMD="$CMAKE_CMD -DOAI_${2^^}=ON" # ^^ makes uppercase
                 ;;
-              "benetel4g" | "benetel5g")
+              "benetel4g" | "benetel5g" | "oran_fhlib_4g")
                 TARGET_LIST="$TARGET_LIST $2"
                 CMAKE_CMD="$CMAKE_CMD -DOAI_${2^^}=ON" # ^^ makes uppercase
                 ;;
+              "oran_fhlib_5g")
+                TARGET_LIST="$TARGET_LIST $2"
+                CMAKE_CMD="$CMAKE_CMD -DOAI_FHI72=ON"
+                ;;
               "None")
                 ;;
               *)
@@ -387,7 +391,7 @@ function main() {
                 echo_info "Enabling build of optional shared library $lib"
               done
             fi
-            shift 2;;		
+            shift 2;;
         --noavx512)
             CMAKE_CMD="$CMAKE_CMD -DAVX512=OFF"
             echo_info "Disabling AVX512 instructions"
@@ -424,8 +428,8 @@ function main() {
         -h | --help)
             print_help
             exit 1;;
-	*)
-	    print_help
+        *)
+            print_help
             echo_fatal "Unknown option $1"
             break;;
    esac
@@ -454,7 +458,7 @@ function main() {
       if [ ! -v BUILD_UHD_FROM_SOURCE ] && [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
         install_usrp_uhd_driver $UHD_IMAGES_DIR
       fi
-    fi 
+    fi
     if [ "$HW" == "OAI_BLADERF" ] ; then
       echo_info "installing packages for BLADERF support"
       check_install_bladerf_driver
@@ -503,6 +507,12 @@ function main() {
 	echo_info "Built Doxygen based documentation. The documentation file is located here: $OPENAIR_DIR/$BUILD_DIR/build/html/index.html"
     fi
 
+    # TODO: once we got the CMakeLists.txt file done for the ORAN files, remove the following lines
+    if [[ $TARGET_LIST =~ "oran_fhlib_5g" ]]; then
+      rm -f liboai_transpro.so
+      ln -s liboran_fhlib_5g.so liboai_transpro.so
+    fi
+
     if [ "$UE" = 1 ] ; then
 
       echo_info "Compiling UE specific part"

cmake_targets/nas_sim_tools/CMakeLists.txt

@@ -28,24 +28,12 @@ set(CONF2UEDATA_LIB_SRC
     ${OPENAIR_DIR}/openair3/NAS/TOOLS/display.c
     ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.c
     ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.c
-    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.c
+    ${OPENAIR_DIR}/common/utils/mem/memory.c
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.c
     ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.c
     ${OPENAIR_DIR}/common/utils/utils.c
 )
 
-set(conf2uedata_HDR
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf2uedata.h
-    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_emm.h
-    ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.h
-    ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.h
-    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.h
-    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.h
-    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.h
-    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.h
-    ${OPENAIR_DIR}/common/utils/utils.h
-)
-
 include_directories(
     ${OPENAIR_DIR}/common/utils
     ${OPENAIR_DIR}/openair3/NAS/UE
@@ -65,7 +53,7 @@ set(conf2uedata_SRC
 	${CONF2UEDATA_LIB_SRC}
 )
 
-add_executable(conf2uedata  ${conf2uedata_SRC} ${conf2uedata_HDR} )
+add_executable(conf2uedata  ${conf2uedata_SRC} )
 target_link_libraries(conf2uedata ${CONFIG_LIBRARIES})
 
 # usim binary
@@ -76,7 +64,7 @@ set(usim_SRC
 )
 
 
-add_executable(usim  ${usim_SRC} ${conf2uedata_HDR} )
+add_executable(usim  ${usim_SRC} )
 target_link_libraries(usim ${CONFIG_LIBRARIES})
 
 # nvram binary
@@ -87,5 +75,5 @@ set(nvram_SRC
 )
 
 
-add_executable(nvram  ${nvram_SRC} ${conf2uedata_HDR} )
+add_executable(nvram  ${nvram_SRC})
 target_link_libraries(nvram ${CONFIG_LIBRARIES})

cmake_targets/tools/MODULES/Findxran.cmake

@@ -0,0 +1,140 @@
+#
+# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The OpenAirInterface Software Alliance licenses this file to You under
+# the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.openairinterface.org/?page_id=698
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ------------------------------------------------------------------------------
+# For more information about the OpenAirInterface (OAI) Software Alliance:
+#      contact@openairinterface.org
+# 
+
+# FindXran
+# -------
+# 
+# Finds the xran library. Note that the library number is as follows:
+# - oran_bronze_release_v1.1 -> 2.1.1 (B = second letter)
+# - oran_e_maintenance_release_v1.0 -> 5.1.0
+# the version is currently hardcoded to 5.1.0
+#
+# Required options
+# ^^^^^^^^^^^^^^^^
+#
+# ``xran_LOCATION``
+#   The location of the library.
+# 
+# Imported Targets
+# ^^^^^^^^^^^^^^^^
+# 
+# This module provides the following imported targets, if found:
+# 
+# ``xran::xran``
+#   The xran library
+# 
+# Result Variables
+# ^^^^^^^^^^^^^^^^
+# 
+# This will define the following variables:
+# 
+# ``xran_FOUND``
+#   True if the system has the xran library.
+# ``xran_VERSION``
+#   The version of the xran library which was found.
+# ``xran_INCLUDE_DIRS``
+#   Include directories needed to use xran.
+# ``xran_LIBRARIES``
+#   Libraries needed to link to xran.
+# 
+# Cache Variables
+# ^^^^^^^^^^^^^^^
+# 
+# The following cache variables may also be set:
+# 
+# ``xran_INCLUDE_DIR``
+#   The directory containing ``foo.h``.
+# ``xran_LIBRARY``
+#   The path to the xran library.
+
+option(xran_LOCATION "directory of XRAN library" "")
+if (NOT xran_LOCATION)
+  message(FATAL_ERROR "xran_LOCATION required")
+endif()
+if (NOT EXISTS ${xran_LOCATION})
+  message(FATAL_ERROR "no such directory: ${xran_LOCATION}")
+endif()
+
+find_path(xran_INCLUDE_DIR
+  NAMES
+    xran_common.h
+    xran_compression.h
+    xran_cp_api.h
+    xran_ecpri_owd_measurements.h
+    xran_fh_o_du.h
+    xran_pkt.h
+    xran_pkt_up.h
+    xran_sync_api.h
+  PATHS ${xran_LOCATION}
+  PATH_SUFFIXES api
+)
+find_library(xran_LIBRARY
+  NAMES xran
+  PATHS ${xran_LOCATION}/build
+)
+if (NOT xran_LIBRARY)
+  message(FATAL_ERROR "could not detect xran build artifacts at ${xran_LOCATION}/build")
+endif()
+
+set(xran_VERSION_FILE "${xran_LOCATION}/../app/src/common.h")
+if(NOT EXISTS ${xran_VERSION_FILE})
+  message(FATAL_ERROR "could not find xran version file at ${xran_VERSION_FILE}")
+endif()
+
+file(STRINGS ${xran_VERSION_FILE} xran_VERSION_LINE REGEX "^#define[ \t]+VERSIONX[ \t]+\"[a-z_.0-9]+\"$")
+string(REGEX REPLACE "^#define[ \t]+VERSIONX[ \t]+\"([a-z_.0-9]+)\"$" "\\1" xran_VERSION_STRING "${xran_VERSION_LINE}")
+message(STATUS "Found xran release ${xran_VERSION_STRING}")
+set(xran_VERSION "NOTFOUND")
+if (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.0")
+  set(xran_VERSION 5.1.0)
+elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.1")
+  set(xran_VERSION 5.1.1)
+endif()
+unset(xran_VERSION_LINE)
+unset(xran_VERSION_STRING)
+unset(xran_VERSION_FILE)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(xran
+  FOUND_VAR xran_FOUND
+  REQUIRED_VARS
+    xran_LIBRARY
+    xran_INCLUDE_DIR
+  VERSION_VAR xran_VERSION
+)
+
+if(xran_FOUND)
+  set(xran_LIBRARIES ${xran_LIBRARY})
+  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR})
+endif()
+
+if(xran_FOUND AND NOT TARGET xran::xran)
+  add_library(xran::xran UNKNOWN IMPORTED)
+  set_target_properties(xran::xran PROPERTIES
+    IMPORTED_LOCATION "${xran_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${xran_INCLUDE_DIR}"
+  )
+endif()
+
+mark_as_advanced(
+  xran_INCLUDE_DIR
+  xran_LIBRARY
+)

cmake_targets/tools/build_helper

@@ -666,7 +666,10 @@ 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
-    git checkout vlm_master
+    # 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
     # Showing which version is used
     git log -n1
     autoreconf -iv

cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch

@@ -0,0 +1,443 @@
+diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h
+index 7508117..a93c085 100644
+--- a/fhi_lib/app/src/common.h
++++ b/fhi_lib/app/src/common.h
+@@ -28,7 +28,7 @@
+ #include <rte_common.h>
+ #include <rte_mbuf.h>
+ 
+-#define VERSIONX                "oran_e_maintenance_release_v1.0"
++#define VERSIONX                "oran_e_maintenance_release_v1.1"
+ 
+ #define APP_O_DU  0
+ #define APP_O_RU  1
+diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile
+index de141bf..5bcde3d 100644
+--- a/fhi_lib/lib/Makefile
++++ b/fhi_lib/lib/Makefile
+@@ -23,11 +23,11 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
+ ##############################################################
+ #  Tools configuration
+ ##############################################################
+-CC  := icc
+-CPP := icpc
++CC  := gcc
++CPP := g++
+ AS := as
+ AR := ar
+-LD := icc
++LD := gcc
+ OBJDUMP := objdump
+ 
+ ifeq ($(SHELL),cmd.exe)
+@@ -95,8 +95,7 @@ CPP_SRC = $(SRC_DIR)/xran_compression.cpp \
+ 	$(SRC_DIR)/xran_bfp_cplane32.cpp \
+ 	$(SRC_DIR)/xran_bfp_cplane64.cpp \
+ 	$(SRC_DIR)/xran_bfp_uplane_9b16rb.cpp \
+-	$(SRC_DIR)/xran_bfp_uplane.cpp \
+-	$(SRC_DIR)/xran_mod_compression.cpp
++	$(SRC_DIR)/xran_bfp_uplane.cpp
+ 
+ CPP_SRC_SNC = $(SRC_DIR)/xran_compression_snc.cpp \
+ 	$(SRC_DIR)/xran_bfp_cplane8_snc.cpp \
+@@ -112,12 +111,12 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
+         -fPIC \
+ 	-Wall \
+ 	-Wimplicit-function-declaration \
+-	-g -O3 -wd1786 -mcmodel=large
++	-g -O -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512#--wd1786 -mcmodel=large
+ 
+-CPP_FLAGS := -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_GNU_SOURCE -D_REENTRANT -pipe -no-prec-div \
+-                -no-prec-div -fp-model fast=2 -fPIC \
+-                -no-prec-sqrt  -falign-functions=16 -fast-transcendentals \
+-        -Werror -Wno-unused-variable -std=c++14 -mcmodel=large
++CPP_FLAGS := -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_GNU_SOURCE -D_REENTRANT -pipe \
++                -fPIC \
++                -falign-functions=16  \
++        -Werror -Wno-unused-variable -std=c++14 -mcmodel=large -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512
+ 
+ INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)
+ DEF :=
+@@ -150,8 +149,8 @@ CPP_SNC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS_SNC))
+ 
+ AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS))
+ #-qopt-report=5 -qopt-matmul -qopt-report-phase=all
+-CPP_COMP       := -O3 -DNDEBUG  -xcore-avx512 -fPIE -restrict -fasm-blocks
+-CPP_COMP_SNC   := -O3 -DNDEBUG -march=icelake-server -fPIE -restrict -fasm-blocks
++CPP_COMP       := -O3 -DNDEBUG  -fPIE
++CPP_COMP_SNC   := -O3 -DNDEBUG -march=icelake-server -fPIE
+ CC_FLAGS_FULL  := $(CC_FLAGS)  $(INC) $(DEF)
+ CPP_FLAGS_FULL := $(CPP_FLAGS) $(CPP_COMP) $(INC) $(DEF)
+ CPP_FLAGS_FULL_SNC := $(CPP_FLAGS) $(CPP_COMP_SNC) $(INC) $(DEF)
+diff --git a/fhi_lib/lib/api/xran_fh_o_du.h b/fhi_lib/lib/api/xran_fh_o_du.h
+index 7419ae1..a85f973 100644
+--- a/fhi_lib/lib/api/xran_fh_o_du.h
++++ b/fhi_lib/lib/api/xran_fh_o_du.h
+@@ -1104,6 +1104,30 @@ int32_t xran_reg_physide_cb(void *pHandle, xran_fh_tti_callback_fn Cb, void *cbP
+  */
+ int32_t xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,  uint32_t *nSlotIdx, uint64_t *nSecond);
+ 
++/**
++ * @ingroup xran
++ *
++ *   Function returns Frame, Subframe, Slot Number based on rx_tti
++ *
++ * @param tti
++ *    tti for which to compute Frame, Subframe, Slot
++ *
++ * @param nFrameIdx
++ *    Pointer to Frame number [0-99]
++ *
++ * @param nSubframeIdx
++ *    Pointer to Subframe number [0-10]
++ *
++ * @param nSlotIdx
++ *    Pointer to Slot number [0-7]
++ *
++ * @param nSecond
++ *    Pointer to current UTC second
++ *
++ * @return
++ *   current TTI number [0-7999]
++ */
++int32_t xran_get_slot_idx_from_tti (uint32_t tti, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,  uint32_t *              nSlotIdx, uint64_t *nSecond);
+ /**
+  * @ingroup xran
+  *
+diff --git a/fhi_lib/lib/api/xran_up_api.h b/fhi_lib/lib/api/xran_up_api.h
+index 7d3afc5..3e00c5a 100644
+--- a/fhi_lib/lib/api/xran_up_api.h
++++ b/fhi_lib/lib/api/xran_up_api.h
+@@ -80,6 +80,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+     uint8_t *subframe_id,
+     uint8_t *slot_id,
+     uint8_t *symb_id,
++    uint8_t *filter_id,
+     union ecpri_seq_id *seq_id,
+     uint16_t *num_prbu,
+     uint16_t *start_prbu,
+diff --git a/fhi_lib/lib/ethernet/ethdi.c b/fhi_lib/lib/ethernet/ethdi.c
+index b6ba257..74b3c26 100644
+--- a/fhi_lib/lib/ethernet/ethdi.c
++++ b/fhi_lib/lib/ethernet/ethdi.c
+@@ -479,11 +479,13 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+                     ctx->tx_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING_TRX,
+                     rte_lcore_to_socket_id(*lcore_id), RING_F_SC_DEQ);
+                     PANIC_ON(ctx->tx_ring[i] == NULL, "failed to allocate rx ring");
++                    printf("Created ring %s on core %d\n",ring_name,*lcore_id);
+                     for(qi = 0; qi < io_cfg->num_rxq; qi++) {
+                         snprintf(ring_name, RTE_DIM(ring_name), "%s_%d_%d", "rx_ring_cp", i, qi);
+                         ctx->rx_ring[i][qi] = rte_ring_create(ring_name, NUM_MBUFS_RING_TRX,
+                             rte_lcore_to_socket_id(*lcore_id), RING_F_SP_ENQ);
+                         PANIC_ON(ctx->rx_ring[i][qi] == NULL, "failed to allocate rx ring");
++                        printf("Created ring %s on core %d\n",ring_name,*lcore_id);
+                     }
+                 }
+             } else {
+@@ -553,7 +555,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+         ctx->up_dl_pkt_gen_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING,
+         rte_lcore_to_socket_id(*lcore_id), /*RING_F_SC_DEQ*/0);
+         PANIC_ON(ctx->up_dl_pkt_gen_ring[i] == NULL, "failed to allocate dl gen ring");
+-        printf("created %s\n", ring_name);
++        printf("created %s on core %d\n", ring_name, *lcore_id);
+     }
+ 
+     return 1;
+diff --git a/fhi_lib/lib/src/xran_bfp_ref.cpp b/fhi_lib/lib/src/xran_bfp_ref.cpp
+index e6d3067..8e0abee 100644
+--- a/fhi_lib/lib/src/xran_bfp_ref.cpp
++++ b/fhi_lib/lib/src/xran_bfp_ref.cpp
+@@ -29,6 +29,7 @@
+ #include <complex>
+ #include <algorithm>
+ #include <limits.h>
++#include <limits>
+ 
+ static int16_t saturateAbs(int16_t inVal)
+ {
+diff --git a/fhi_lib/lib/src/xran_bfp_uplane.cpp b/fhi_lib/lib/src/xran_bfp_uplane.cpp
+index a345df4..7831fa0 100644
+--- a/fhi_lib/lib/src/xran_bfp_uplane.cpp
++++ b/fhi_lib/lib/src/xran_bfp_uplane.cpp
+@@ -116,7 +116,7 @@ namespace BFP_UPlane
+     /// Get AVX512 pointer aligned to desired RB
+     const __m512i* rawDataIn = reinterpret_cast<const __m512i*>(dataIn.dataExpanded + numREOffset);
+     /// Apply the exponent shift
+-    const auto compData = _mm512_srai_epi16(*rawDataIn, thisExp);
++    const auto compData = _mm512_srai_epi16(_mm512_loadu_epi16(rawDataIn), thisExp);
+     /// Pack compressed data network byte order
+     const auto compDataBytePacked = networkBytePack(compData);
+     /// Store exponent first
+@@ -201,7 +201,7 @@ namespace BFP_UPlane
+     /// Get AVX512 pointer aligned to desired RB
+     const __m512i* rawDataIn = reinterpret_cast<const __m512i*>(dataIn.dataExpanded + numREOffset);
+     /// Apply the exponent shift
+-    const auto compData = _mm512_srai_epi16(*rawDataIn, thisExp);
++    const auto compData = _mm512_srai_epi16(_mm512_loadu_epi16(rawDataIn), thisExp);
+     /// Store exponent first
+     dataOut->dataCompressed[thisRBExpAddr] = thisExp;
+     /// Now have 1 RB worth of bytes separated into 3 chunks (1 per lane)
+diff --git a/fhi_lib/lib/src/xran_common.c b/fhi_lib/lib/src/xran_common.c
+index baa673f..edd4ecb 100644
+--- a/fhi_lib/lib/src/xran_common.c
++++ b/fhi_lib/lib/src/xran_common.c
+@@ -656,6 +656,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+     int32_t valid_res = 0;
+     int expect_comp  = (p_dev_ctx->fh_cfg.ru_conf.compMeth != XRAN_COMPMETHOD_NONE);
+     enum xran_comp_hdr_type staticComp = p_dev_ctx->fh_cfg.ru_conf.xranCompHdrType;
++    uint8_t filter_id;
+ 
+     if (staticComp == XRAN_COMP_HDR_TYPE_STATIC)
+     {
+@@ -674,6 +675,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+                                         &subframe_id,
+                                         &slot_id,
+                                         &symb_id,
++                                        &filter_id,
+                                         &seq,
+                                         &num_prbu,
+                                         &start_prbu,
+@@ -688,23 +690,9 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+         print_err("num_bytes is wrong [%d]\n", num_bytes);
+         return MBUF_FREE;
+     }
+-
+-    valid_res = xran_pkt_validate(p_dev_ctx,
+-                                pkt,
+-                                iq_samp_buf,
+-                                num_bytes,
+-                                CC_ID,
+-                                Ant_ID,
+-                                frame_id,
+-                                subframe_id,
+-                                slot_id,
+-                                symb_id,
+-                                &seq,
+-                                num_prbu,
+-                                start_prbu,
+-                                sym_inc,
+-                                rb,
+-                                sect_id);
++    pCnt->rx_counter++;
++    pCnt->Rx_on_time++;
++    pCnt->Total_msgs_rcvd++;
+ #ifndef FCN_ADAPT
+     if(valid_res != 0) {
+         print_dbg("valid_res is wrong [%d] ant %u (%u : %u : %u : %u) seq %u num_bytes %d\n", valid_res, Ant_ID, frame_id, subframe_id, slot_id, symb_id, seq.seq_id, num_bytes);
+@@ -1189,7 +1177,7 @@ int generate_cpmsg_prach(void *pHandle, struct xran_cp_gen_params *params, struc
+         timeOffset += startSymId * (2048 + 144);
+     }
+     timeOffset = timeOffset >> nNumerology; //original number is Tc, convert to Ts based on mu
+-    if ((slot_id == 0) || (slot_id == (SLOTNUM_PER_SUBFRAME(pxran_lib_ctx->interval_us_local) >> 1)))
++    if (startSymId > 0 && ((slot_id == 0) || (slot_id == (SLOTNUM_PER_SUBFRAME(pxran_lib_ctx->interval_us_local) >> 1))))
+         timeOffset += 16;
+ 
+     params->dir                  = XRAN_DIR_UL;
+@@ -1295,8 +1283,7 @@ int32_t ring_processing_func(void* args)
+ 
+     for (i = 0; i < ctx->io_cfg.num_vfs && i < XRAN_VF_MAX; i++){
+         for(qi = 0; qi < ctx->rxq_per_port[i]; qi++) {
+-            if (process_ring(ctx->rx_ring[i][qi], i, qi))
+-            return 0;
++            process_ring(ctx->rx_ring[i][qi],i,qi);
+         }
+     }
+ 
+diff --git a/fhi_lib/lib/src/xran_common.h b/fhi_lib/lib/src/xran_common.h
+index 3ed75cd..d61fe7f 100644
+--- a/fhi_lib/lib/src/xran_common.h
++++ b/fhi_lib/lib/src/xran_common.h
+@@ -221,7 +221,7 @@ int generate_cpmsg_prach(void *pHandle, struct xran_cp_gen_params *params, struc
+ struct xran_eaxcid_config *xran_get_conf_eAxC(void *pHandle);
+ int xran_register_cb_mbuf2ring(xran_ethdi_mbuf_send_fn mbuf_send_cp, xran_ethdi_mbuf_send_fn mbuf_send_up);
+ 
+-uint16_t xran_alloc_sectionid(void *pHandle, uint8_t dir, uint8_t cc_id, uint8_t ant_id, uint8_t slot_id);
++//uint16_t xran_alloc_sectionid(void *pHandle, uint8_t dir, uint8_t cc_id, uint8_t ant_id, uint8_t slot_id);
+ uint8_t xran_get_seqid(void *pHandle, uint8_t dir, uint8_t cc_id, uint8_t ant_id, uint8_t slot_id);
+ int32_t ring_processing_func(void* arg);
+ int xran_init_prach(struct xran_fh_config* pConf, struct xran_device_ctx * p_xran_dev_ctx);
+diff --git a/fhi_lib/lib/src/xran_compression.cpp b/fhi_lib/lib/src/xran_compression.cpp
+index 112caae..7c74342 100644
+--- a/fhi_lib/lib/src/xran_compression.cpp
++++ b/fhi_lib/lib/src/xran_compression.cpp
+@@ -62,7 +62,7 @@ xranlib_compress(const struct xranlib_compress_request *request,
+         return xranlib_5gnr_mod_compression(&mod_request, &mod_response);
+   }
+     else{
+-        if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
++        if(false) {
+             return xranlib_compress_avxsnc(request,response);
+         } else {
+             return xranlib_compress_avx512(request,response);
+@@ -89,7 +89,7 @@ xranlib_decompress(const struct xranlib_decompress_request *request,
+         return xranlib_5gnr_mod_decompression(&mod_request, &mod_response);
+       }
+     else{
+-        if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
++        if(false) {
+             return xranlib_decompress_avxsnc(request,response);
+         } else {
+             return xranlib_decompress_avx512(request,response);
+@@ -101,7 +101,7 @@ int32_t
+ xranlib_compress_bfw(const struct xranlib_compress_request *request,
+                         struct xranlib_compress_response *response)
+     {
+-    if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
++    if(false) {
+         return xranlib_compress_avxsnc_bfw(request,response);
+     } else {
+         return xranlib_compress_avx512_bfw(request,response);
+@@ -112,7 +112,7 @@ int32_t
+ xranlib_decompress_bfw(const struct xranlib_decompress_request *request,
+     struct xranlib_decompress_response *response)
+   {
+-    if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
++    if(false) {
+         return xranlib_decompress_avxsnc_bfw(request,response);
+     } else {
+         return xranlib_decompress_avx512_bfw(request,response);
+diff --git a/fhi_lib/lib/src/xran_main.c b/fhi_lib/lib/src/xran_main.c
+index 89dcc1f..640f6b6 100644
+--- a/fhi_lib/lib/src/xran_main.c
++++ b/fhi_lib/lib/src/xran_main.c
+@@ -272,7 +272,7 @@ xran_init_prach(struct xran_fh_config* pConf, struct xran_device_ctx * p_xran_de
+         printf("PRACH start symbol %u lastsymbol %u\n", p_xran_dev_ctx->prach_start_symbol[0], p_xran_dev_ctx->prach_last_symbol[0]);
+     }
+ 
+-    pPrachCPConfig->eAxC_offset = xran_get_num_eAxc(p_xran_dev_ctx);
++    pPrachCPConfig->eAxC_offset = pPRACHConfig->eAxC_offset;
+     print_dbg("PRACH eAxC_offset %d\n",  pPrachCPConfig->eAxC_offset);
+ 
+     /* Save some configs for app */
+@@ -844,7 +844,7 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
+                         struct xran_cp_gen_params params;
+                         struct xran_section_gen_info sect_geninfo[8];
+                         struct rte_mbuf *mbuf = xran_ethdi_mbuf_alloc();
+-                        prach_port_id = ant_id + num_eAxc;
++                        prach_port_id = ant_id + pPrachCPConfig->eAxC_offset;
+                         /* start new section information list */
+                         xran_cp_reset_section_info(pHandle, XRAN_DIR_UL, cc_id, prach_port_id, ctx_id);
+ 
+@@ -1059,6 +1059,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
+         {
+         case ECPRI_IQ_DATA:
+                 pkt_data[num_data++] = pkt;
++            uint8_t *pkt_bytes=rte_pktmbuf_mtod(pkt,uint8_t*);
+             break;
+         // For RU emulation
+         case ECPRI_RT_CONTROL_DATA:
+@@ -1076,7 +1077,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
+                 break;
+             default:
+                 if (p_dev_ctx->fh_init.io_cfg.id == O_DU) {
+-                    print_err("Invalid eCPRI message type - %d", ecpri_hdr->cmnhdr.bits.ecpri_mesg_type);
++                    rte_pktmbuf_free(pkt);
+         }
+                 break;
+     }
+@@ -1771,8 +1772,7 @@ ring_processing_func_per_port(void* args)
+     for (i = 0; i < ctx->io_cfg.num_vfs && i < XRAN_VF_MAX; i = i+1) {
+         if (ctx->vf2xran_port[i] == port_id) {
+             for(qi = 0; qi < ctx->rxq_per_port[port_id]; qi++){
+-                if (process_ring(ctx->rx_ring[i][qi], i, qi))
+-                    return 0;
++                process_ring(ctx->rx_ring[i][qi],i,qi);
+             }
+         }
+     }
+@@ -1837,8 +1837,6 @@ xran_spawn_workers(void)
+         nWorkerCore = nWorkerCore << 1;
+     }
+ 
+-    extern int _may_i_use_cpu_feature(unsigned __int64);
+-    icx_cpu = _may_i_use_cpu_feature(_FEATURE_AVX512IFMA52);
+ 
+     printf("O-XU      %d\n", eth_ctx->io_cfg.id);
+     printf("HW        %d\n", icx_cpu);
+@@ -3074,6 +3072,24 @@ xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,
+     return tti;
+ }
+ 
++int32_t
++xran_get_slot_idx_from_tti (uint32_t tti, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,  uint32_t *nSlotIdx, uint64_t *nSecond)
++{
++    struct xran_device_ctx * p_xran_dev_ctx = xran_dev_get_ctx_by_id(0);
++    if (!p_xran_dev_ctx)
++    {
++      print_err("Null xRAN context on port id %u!!\n", 0);
++      return 0;
++    }
++
++    *nSlotIdx     = (uint32_t)XranGetSlotNum(tti, SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local));
++    *nSubframeIdx = (uint32_t)XranGetSubFrameNum(tti,SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local),  SUBFRAMES_PER_SYSTEMFRAME);
++    *nFrameIdx    = (uint32_t)XranGetFrameNum(tti,0/*xran_getSfnSecStart()*/,SUBFRAMES_PER_SYSTEMFRAME, SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local));
++    *nSecond      = timing_get_current_second();
++
++    return tti;
++}
++
+ int32_t
+ xran_set_debug_stop(int32_t value, int32_t count)
+ {
+diff --git a/fhi_lib/lib/src/xran_mod_compression.cpp b/fhi_lib/lib/src/xran_mod_compression.cpp
+index 7d4a5d0..87bdbd5 100644
+--- a/fhi_lib/lib/src/xran_mod_compression.cpp
++++ b/fhi_lib/lib/src/xran_mod_compression.cpp
+@@ -747,10 +747,11 @@ int xranlib_5gnr_mod_compression(const struct xranlib_5gnr_mod_compression_reque
+ #ifdef C_Module_Used
+     return (xranlib_5gnr_mod_compression_c(request, response));
+ #else
+-    if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52))
++    if (false) {
+         return (xranlib_5gnr_mod_compression_snc(request, response));
+-    else
++    } else {
+         return (xranlib_5gnr_mod_compression_avx512(request, response));
++    }
+ #endif
+ }
+ 
+diff --git a/fhi_lib/lib/src/xran_rx_proc.c b/fhi_lib/lib/src/xran_rx_proc.c
+index 36bd72c..f7f5678 100644
+--- a/fhi_lib/lib/src/xran_rx_proc.c
++++ b/fhi_lib/lib/src/xran_rx_proc.c
+@@ -107,6 +107,10 @@ int xran_process_prach_sym(void *arg,
+             if(mb)
+                 rte_pktmbuf_free(mb);
+ 
++            mb = p_xran_dev_ctx->sFHPrachRxBbuIoBufCtrlDecomp[tti % XRAN_N_FE_BUF_LEN][CC_ID][Ant_ID].sBufferList.pBuffers[symb_id_offset].pCtrl;
++            if(mb)
++                rte_pktmbuf_free(mb);
++
+             if(p_xran_dev_ctx->fh_cfg.ru_conf.byteOrder == XRAN_CPU_LE_BYTE_ORDER) {
+                 int idx = 0;
+                 uint16_t *psrc = (uint16_t *)iq_data_start;
+diff --git a/fhi_lib/lib/src/xran_up_api.c b/fhi_lib/lib/src/xran_up_api.c
+index 397853a..4a714b5 100644
+--- a/fhi_lib/lib/src/xran_up_api.c
++++ b/fhi_lib/lib/src/xran_up_api.c
+@@ -329,6 +329,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+     uint8_t *subframe_id,
+     uint8_t *slot_id,
+     uint8_t *symb_id,
++    uint8_t *filter_id,
+     union ecpri_seq_id *seq_id,
+     uint16_t *num_prbu,
+     uint16_t *start_prbu,
+@@ -387,6 +388,8 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+     if (symb_id)
+         *symb_id = radio_hdr->sf_slot_sym.symb_id;
+ 
++    if (filter_id)
++	*filter_id = radio_hdr->data_feature.filter_id;
+     /* Process data section hdr */
+     struct data_section_hdr *data_hdr =
+         (void *)rte_pktmbuf_adj(mbuf, sizeof(*radio_hdr));
+@@ -401,6 +404,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+     *sym_inc    = data_hdr->fields.sym_inc;
+     *rb         = data_hdr->fields.rb;
+     *sect_id    = data_hdr->fields.sect_id;
++    if (*num_prbu == 0) *num_prbu=273;
+ 
+     if(expect_comp) {
+             const struct data_section_compression_hdr *data_compr_hdr;

common/config/config_cmdline.c

@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-#include <platform_types.h>
+#include "common/platform_types.h"
 #include "config_userapi.h"
 #include "config_common.h"
 #include "../utils/LOG/log.h"

common/config/config_common.c

@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <dlfcn.h>
 #include <arpa/inet.h>
-#include <platform_types.h>
+#include "common/platform_types.h"
 #include "config_common.h"
 #include "../utils/LOG/log.h"
 static int managed_ptr_sz(configmodule_interface_t *cfg, void *ptr)

common/config/config_load_configmodule.c

@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <dlfcn.h>
-#include <platform_types.h>
+#include "common/platform_types.h"
 
 #define CONFIG_LOADCONFIG_MAIN
 #include "config_load_configmodule.h"

common/config/config_userapi.c

@@ -39,7 +39,7 @@
 #include <errno.h>
 #include <dlfcn.h>
 #include <arpa/inet.h>
-#include <platform_types.h>
+#include "common/platform_types.h"
 #include "config_userapi.h"
 #include "config_common.h"
 #include "../utils/LOG/log.h"

common/platform_constants.h

@@ -89,7 +89,9 @@
 #define NUM_MAX_CBA_GROUP 4
 
 #define printk printf
-
+#define RETURNok (0)
+#define RETURNerror (-1)
+#define DEFAULT_NAS_PATH "PWD"
 #define UNUSED_VARIABLE(vARIABLE) (void)(vARIABLE)
 
 #endif /* __PLATFORM_CONSTANTS_H__ */

common/platform_types.h

@@ -36,152 +36,153 @@
 //-----------------------------------------------------------------------------
 // GENERIC ACCESS STRATUM TYPES
 //-----------------------------------------------------------------------------
-typedef int32_t               sdu_size_t;
-typedef uint32_t              frame_t;
-typedef int32_t               sframe_t;
-typedef uint32_t              sub_frame_t;
-typedef uint32_t              slot_t;
-typedef uint16_t              module_id_t;
-typedef uint8_t               slice_id_t;
-typedef uint8_t               eNB_index_t;
-typedef uint64_t              ue_id_t;
-typedef int16_t               smodule_id_t;
-typedef long              rb_id_t;
-typedef long              srb_id_t;
+typedef int32_t sdu_size_t;
+typedef uint32_t frame_t;
+typedef int32_t sframe_t;
+typedef uint32_t sub_frame_t;
+typedef uint32_t slot_t;
+typedef uint16_t module_id_t;
+typedef uint8_t slice_id_t;
+typedef uint8_t eNB_index_t;
+typedef uint64_t ue_id_t;
+typedef int16_t smodule_id_t;
+typedef long rb_id_t;
+typedef long srb_id_t;
 
 typedef bool MBMS_flag_t;
-#define MBMS_FLAG_NO  false
+#define MBMS_FLAG_NO false
 #define MBMS_FLAG_YES true
 
 typedef bool eNB_flag_t;
-#define ENB_FLAG_NO  false
+#define ENB_FLAG_NO false
 #define ENB_FLAG_YES true
 
 typedef bool gNB_flag_t;
-#define GNB_FLAG_NO  false
+#define GNB_FLAG_NO false
 #define GNB_FLAG_YES true
 
 typedef bool srb_flag_t;
-#define SRB_FLAG_NO  false
+#define SRB_FLAG_NO false
 #define SRB_FLAG_YES true
 
 typedef bool sl_discovery_flag_t;
-#define SL_DISCOVERY_FLAG_NO  false
+#define SL_DISCOVERY_FLAG_NO false
 #define SL_DISCOVERY_FLAG_YES true
 
-typedef enum link_direction_e {
-  UNKNOWN_DIR          = 0,
-  DIR_UPLINK           = 1,
-  DIR_DOWNLINK         = 2
-} link_direction_t;
+typedef enum link_direction_e { UNKNOWN_DIR = 0, DIR_UPLINK = 1, DIR_DOWNLINK = 2 } link_direction_t;
 
-typedef enum rb_type_e {
-  UNKNOWN_RADIO_BEARER        = 0,
-  SIGNALLING_RADIO_BEARER     = 1,
-  RADIO_ACCESS_BEARER         = 2
-} rb_type_t;
+typedef enum rb_type_e { UNKNOWN_RADIO_BEARER = 0, SIGNALLING_RADIO_BEARER = 1, RADIO_ACCESS_BEARER = 2 } rb_type_t;
 
-typedef enum {
-  CR_ROUND = 0,
-  CR_SRB12 = 1,
-  CR_HOL   = 2,
-  CR_LC    = 3,
-  CR_CQI   = 4,
-  CR_LCP   = 5,
-  CR_NUM   = 6
-} sorting_criterion_t;
+typedef enum { CR_ROUND = 0, CR_SRB12 = 1, CR_HOL = 2, CR_LC = 3, CR_CQI = 4, CR_LCP = 5, CR_NUM = 6 } sorting_criterion_t;
 
-typedef enum {
-  POL_FAIR   = 0,
-  POL_GREEDY = 1,
-  POL_NUM    = 2
-} accounting_policy_t;
+typedef enum { POL_FAIR = 0, POL_GREEDY = 1, POL_NUM = 2 } accounting_policy_t;
 //-----------------------------------------------------------------------------
 // PHY TYPES
 //-----------------------------------------------------------------------------
-typedef uint8_t            crc8_t;
-typedef uint16_t           crc16_t;
-typedef uint32_t           crc32_t;
-typedef unsigned int       crc_t;
+typedef uint8_t crc8_t;
+typedef uint16_t crc16_t;
+typedef uint32_t crc32_t;
+typedef unsigned int crc_t;
 
 //-----------------------------------------------------------------------------
 // MAC TYPES
 //-----------------------------------------------------------------------------
-typedef sdu_size_t         tbs_size_t;
-typedef sdu_size_t         tb_size_t;
-typedef unsigned int       logical_chan_id_t;
-typedef unsigned int       num_tb_t;
-typedef uint8_t            mac_enb_index_t;
+typedef sdu_size_t tbs_size_t;
+typedef sdu_size_t tb_size_t;
+typedef unsigned int logical_chan_id_t;
+typedef unsigned int num_tb_t;
+typedef uint8_t mac_enb_index_t;
 
 //-----------------------------------------------------------------------------
 // RLC TYPES
 //-----------------------------------------------------------------------------
-typedef unsigned int       mui_t;
-typedef unsigned int       confirm_t;
-typedef unsigned int       rlc_tx_status_t;
-typedef int16_t            rlc_sn_t;
-typedef uint16_t           rlc_usn_t;
-typedef int32_t            rlc_buffer_occupancy_t;
-typedef signed int         rlc_op_status_t;
+typedef unsigned int mui_t;
+typedef unsigned int confirm_t;
+typedef unsigned int rlc_tx_status_t;
+typedef int16_t rlc_sn_t;
+typedef uint16_t rlc_usn_t;
+typedef int32_t rlc_buffer_occupancy_t;
+typedef signed int rlc_op_status_t;
 
-#define  SDU_CONFIRM_NO          false
-#define  SDU_CONFIRM_YES         true
+typedef enum rlc_mode_e { RLC_MODE_NONE = 0, RLC_MODE_AM = 1, RLC_MODE_UM = 2, RLC_MODE_TM = 4 } rlc_mode_t;
+
+/*! \struct  mac_rlc_status_resp_t
+ * \brief Primitive exchanged between RLC and MAC informing about the buffer occupancy of the RLC protocol instance.
+ */
+typedef struct {
+  rlc_buffer_occupancy_t bytes_in_buffer; /*!< \brief Bytes buffered in RLC protocol instance. */
+  rlc_buffer_occupancy_t pdus_in_buffer; /*!< \brief Number of PDUs buffered in RLC protocol instance (OBSOLETE). */
+  frame_t head_sdu_creation_time; /*!< \brief Head SDU creation time. */
+  sdu_size_t head_sdu_remaining_size_to_send; /*!< \brief remaining size of sdu: could be the total size or the remaining size of
+                                                 already segmented sdu */
+  bool head_sdu_is_segmented; /*!< \brief 0 if head SDU has not been segmented, 1 if already segmented */
+} mac_rlc_status_resp_t;
+
+#define SDU_CONFIRM_NO false
+#define SDU_CONFIRM_YES true
 //-----------------------------------------------------------------------------
 // PDCP TYPES
 //-----------------------------------------------------------------------------
-typedef uint16_t           pdcp_sn_t;
-typedef uint32_t           pdcp_hfn_t;
-typedef int16_t            pdcp_hfn_offset_t;
+typedef uint16_t pdcp_sn_t;
+typedef uint32_t pdcp_hfn_t;
+typedef int16_t pdcp_hfn_offset_t;
 
 typedef enum pdcp_transmission_mode_e {
-  PDCP_TRANSMISSION_MODE_UNKNOWN     = 0,
-  PDCP_TRANSMISSION_MODE_CONTROL     = 1,
-  PDCP_TRANSMISSION_MODE_DATA        = 2,
+  PDCP_TRANSMISSION_MODE_UNKNOWN = 0,
+  PDCP_TRANSMISSION_MODE_CONTROL = 1,
+  PDCP_TRANSMISSION_MODE_DATA = 2,
   PDCP_TRANSMISSION_MODE_TRANSPARENT = 3
 } pdcp_transmission_mode_t;
 //-----------------------------------------------------------------------------
 // IP DRIVER / PDCP TYPES
 //-----------------------------------------------------------------------------
-typedef uint16_t           tcp_udp_port_t;
-typedef enum  ip_traffic_type_e {
-  TRAFFIC_IPVX_TYPE_UNKNOWN    =  0,
-  TRAFFIC_IPV6_TYPE_UNICAST    =  1,
-  TRAFFIC_IPV6_TYPE_MULTICAST  =  2,
-  TRAFFIC_IPV6_TYPE_UNKNOWN    =  3,
-  TRAFFIC_IPV4_TYPE_UNICAST    =  5,
-  TRAFFIC_IPV4_TYPE_MULTICAST  =  6,
-  TRAFFIC_IPV4_TYPE_BROADCAST  =  7,
-  TRAFFIC_IPV4_TYPE_UNKNOWN    =  8,
-  TRAFFIC_PC5S_SIGNALLING      =  9,
-  TRAFFIC_PC5S_SESSION_INIT    =  10
+typedef uint16_t tcp_udp_port_t;
+typedef enum ip_traffic_type_e {
+  TRAFFIC_IPVX_TYPE_UNKNOWN = 0,
+  TRAFFIC_IPV6_TYPE_UNICAST = 1,
+  TRAFFIC_IPV6_TYPE_MULTICAST = 2,
+  TRAFFIC_IPV6_TYPE_UNKNOWN = 3,
+  TRAFFIC_IPV4_TYPE_UNICAST = 5,
+  TRAFFIC_IPV4_TYPE_MULTICAST = 6,
+  TRAFFIC_IPV4_TYPE_BROADCAST = 7,
+  TRAFFIC_IPV4_TYPE_UNKNOWN = 8,
+  TRAFFIC_PC5S_SIGNALLING = 9,
+  TRAFFIC_PC5S_SESSION_INIT = 10
 } ip_traffic_type_t;
 
+typedef struct net_ip_address_s {
+  unsigned ipv4: 1;
+  unsigned ipv6: 1;
+  char ipv4_address[16];
+  char ipv6_address[46];
+} net_ip_address_t;
+
 //-----------------------------------------------------------------------------
 // RRC TYPES
 //-----------------------------------------------------------------------------
-typedef uint32_t           mbms_session_id_t;
-typedef uint16_t           mbms_service_id_t;
-typedef uint16_t           rnti_t;
-typedef uint8_t            rrc_enb_index_t;
-typedef uint8_t            mme_code_t;
-typedef uint32_t           m_tmsi_t;
+typedef uint32_t mbms_session_id_t;
+typedef uint16_t mbms_service_id_t;
+typedef uint16_t rnti_t;
+typedef uint8_t rrc_enb_index_t;
+typedef uint8_t mme_code_t;
+typedef uint32_t m_tmsi_t;
 
-//Random UE identity length = 40 bits
-  #define NOT_A_RANDOM_UE_IDENTITY (uint64_t)0xFFFFFFFF
-  #define NOT_A_RNTI (rnti_t)0
-  #define M_RNTI     (rnti_t)0xFFFD
-  #define P_RNTI     (rnti_t)0xFFFE
-  #define SI_RNTI    (rnti_t)0xFFFF
-#define CBA_RNTI   (rnti_t)0xfff4
+// Random UE identity length = 40 bits
+#define NOT_A_RANDOM_UE_IDENTITY (uint64_t)0xFFFFFFFF
+#define NOT_A_RNTI (rnti_t)0
+#define M_RNTI (rnti_t)0xFFFD
+#define P_RNTI (rnti_t)0xFFFE
+#define SI_RNTI (rnti_t)0xFFFF
+#define CBA_RNTI (rnti_t)0xfff4
 #define OAI_C_RNTI (rnti_t)0x1234
 typedef enum config_action_e {
-  CONFIG_ACTION_NULL              = 0,
-  CONFIG_ACTION_ADD               = 1,
-  CONFIG_ACTION_REMOVE            = 2,
-  CONFIG_ACTION_MODIFY            = 3,
+  CONFIG_ACTION_NULL = 0,
+  CONFIG_ACTION_ADD = 1,
+  CONFIG_ACTION_REMOVE = 2,
+  CONFIG_ACTION_MODIFY = 3,
   CONFIG_ACTION_SET_SECURITY_MODE = 4,
-  CONFIG_ACTION_MBMS_ADD          = 10,
-  CONFIG_ACTION_MBMS_MODIFY       = 11
+  CONFIG_ACTION_MBMS_ADD = 10,
+  CONFIG_ACTION_MBMS_MODIFY = 11
 } config_action_t;
 
 /* Maximum size of any message we might send or receive (e.g., via a socket) */
@@ -195,10 +196,9 @@ typedef struct nsa_msg_t {
 //-----------------------------------------------------------------------------
 // GTPV1U TYPES
 //-----------------------------------------------------------------------------
-typedef uint32_t           teid_t; // tunnel endpoint identifier
-typedef uint8_t            ebi_t;  // eps bearer id
-typedef uint8_t            pdusessionid_t;
-
+typedef uint32_t teid_t; // tunnel endpoint identifier
+typedef uint8_t ebi_t; // eps bearer id
+typedef uint8_t pdusessionid_t;
 
 //-----------------------------------------------------------------------------
 //
@@ -207,42 +207,39 @@ typedef uint8_t            pdusessionid_t;
 typedef intptr_t instance_t;
 
 typedef struct protocol_ctxt_s {
-  module_id_t module_id;     /*!< \brief  Virtualized module identifier      */
-  eNB_flag_t  enb_flag;      /*!< \brief  Flag to indicate eNB (1) or UE (0) */
-  instance_t  instance;      /*!< \brief  ITTI or OTG module identifier      */
+  module_id_t module_id; /*!< \brief  Virtualized module identifier      */
+  eNB_flag_t enb_flag; /*!< \brief  Flag to indicate eNB (1) or UE (0) */
+  instance_t instance; /*!< \brief  ITTI or OTG module identifier      */
   ue_id_t rntiMaybeUEid;
-  frame_t     frame;         /*!< \brief  LTE frame number.*/
-  sub_frame_t subframe;      /*!< \brief  LTE sub frame number.*/
-  eNB_index_t eNB_index;     /*!< \brief  valid for UE indicating the index of connected eNB(s)      */
-  bool        brOption;
+  frame_t frame; /*!< \brief  LTE frame number.*/
+  sub_frame_t subframe; /*!< \brief  LTE sub frame number.*/
+  eNB_index_t eNB_index; /*!< \brief  valid for UE indicating the index of connected eNB(s)      */
+  bool brOption;
 } protocol_ctxt_t;
 // warning time hardcoded
-#define PROTOCOL_CTXT_TIME_MILLI_SECONDS(CtXt_h) ((CtXt_h)->frame*10+(CtXt_h)->subframe)
+#define PROTOCOL_CTXT_TIME_MILLI_SECONDS(CtXt_h) ((CtXt_h)->frame * 10 + (CtXt_h)->subframe)
 
 #define UE_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD + RC.nb_inst
-#define ENB_MODULE_ID_TO_INSTANCE( mODULE_iD ) mODULE_iD
+#define ENB_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD
 #define UE_INSTANCE_TO_MODULE_ID(iNSTANCE) iNSTANCE - RC.nb_inst
-#define ENB_INSTANCE_TO_MODULE_ID( iNSTANCE )iNSTANCE
+#define ENB_INSTANCE_TO_MODULE_ID(iNSTANCE) iNSTANCE
 
-//NR
+// NR
 #define GNB_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD
 
-#define MODULE_ID_TO_INSTANCE(mODULE_iD, iNSTANCE, eNB_fLAG) \
-  do { \
+#define MODULE_ID_TO_INSTANCE(mODULE_iD, iNSTANCE, eNB_fLAG)                                                          \
+  do {                                                                                                                \
     iNSTANCE = eNB_fLAG == ENB_FLAG_YES ? ENB_MODULE_ID_TO_INSTANCE(mODULE_iD) : UE_MODULE_ID_TO_INSTANCE(mODULE_iD); \
   } while (0)
 
-#define INSTANCE_TO_MODULE_ID(iNSTANCE, mODULE_iD, eNB_fLAG) \
-  do { \
+#define INSTANCE_TO_MODULE_ID(iNSTANCE, mODULE_iD, eNB_fLAG)                                                         \
+  do {                                                                                                               \
     mODULE_iD = eNB_fLAG == ENB_FLAG_YES ? ENB_INSTANCE_TO_MODULE_ID(iNSTANCE) : UE_INSTANCE_TO_MODULE_ID(iNSTANCE); \
   } while (0)
 
-#define PROTOCOL_CTXT_COMPUTE_MODULE_ID(CtXt_h) \
-  INSTANCE_TO_MODULE_ID( (CtXt_h)->instance , (CtXt_h)->module_id , (CtXt_h)->enb_flag )
+#define PROTOCOL_CTXT_COMPUTE_MODULE_ID(CtXt_h) INSTANCE_TO_MODULE_ID((CtXt_h)->instance, (CtXt_h)->module_id, (CtXt_h)->enb_flag)
 
-
-#define PROTOCOL_CTXT_COMPUTE_INSTANCE(CtXt_h) \
-  MODULE_ID_TO_INSTANCE( (CtXt_h)->module_id , (CtXt_h)->instance , (CtXt_h)->enb_flag )
+#define PROTOCOL_CTXT_COMPUTE_INSTANCE(CtXt_h) MODULE_ID_TO_INSTANCE((CtXt_h)->module_id, (CtXt_h)->instance, (CtXt_h)->enb_flag)
 
 #define PROTOCOL_CTXT_SET_BY_MODULE_ID(Ctxt_Pp, mODULE_iD, eNB_fLAG, rNTI, fRAME, sUBfRAME, eNB_iNDEX) \
   do {                                                                                                 \
@@ -252,7 +249,7 @@ typedef struct protocol_ctxt_s {
     (Ctxt_Pp)->frame = fRAME;                                                                          \
     (Ctxt_Pp)->subframe = sUBfRAME;                                                                    \
     (Ctxt_Pp)->eNB_index = eNB_iNDEX;                                                                  \
-    (Ctxt_Pp)->brOption = false;                 /* set a default value */                             \
+    (Ctxt_Pp)->brOption = false; /* set a default value */                                             \
     PROTOCOL_CTXT_COMPUTE_INSTANCE(Ctxt_Pp);                                                           \
   } while (0)
 
@@ -263,22 +260,23 @@ typedef struct protocol_ctxt_s {
     (Ctxt_Pp)->rntiMaybeUEid = rNTI;                                                      \
     (Ctxt_Pp)->frame = fRAME;                                                             \
     (Ctxt_Pp)->subframe = sUBfRAME;                                                       \
-    (Ctxt_Pp)->eNB_index = 0;                    /* set a default value */                \
-    (Ctxt_Pp)->brOption = false;                 /* set a default value */                \
+    (Ctxt_Pp)->eNB_index = 0; /* set a default value */                                   \
+    (Ctxt_Pp)->brOption = false; /* set a default value */                                \
     PROTOCOL_CTXT_COMPUTE_MODULE_ID(Ctxt_Pp);                                             \
   } while (0)
 
 #define PROTOCOL_CTXT_FMT "[FRAME %05u][%s][MOD %02d][RNTI %" PRIx64 "]"
-#define PROTOCOL_CTXT_ARGS(CTXT_Pp) (CTXT_Pp)->frame, ((CTXT_Pp)->enb_flag == ENB_FLAG_YES) ? "eNB" : " UE", (CTXT_Pp)->module_id, (CTXT_Pp)->rntiMaybeUEid
+#define PROTOCOL_CTXT_ARGS(CTXT_Pp) \
+  (CTXT_Pp)->frame, ((CTXT_Pp)->enb_flag == ENB_FLAG_YES) ? "eNB" : " UE", (CTXT_Pp)->module_id, (CTXT_Pp)->rntiMaybeUEid
 
-#define PROTOCOL_NR_CTXT_ARGS(CTXT_Pp) (CTXT_Pp)->frame, ((CTXT_Pp)->enb_flag == GNB_FLAG_YES) ? "gNB" : " UE", (CTXT_Pp)->module_id, (CTXT_Pp)->rntiMaybeUEid
+#define PROTOCOL_NR_CTXT_ARGS(CTXT_Pp) \
+  (CTXT_Pp)->frame, ((CTXT_Pp)->enb_flag == GNB_FLAG_YES) ? "gNB" : " UE", (CTXT_Pp)->module_id, (CTXT_Pp)->rntiMaybeUEid
 
 #define CHECK_CTXT_ARGS(CTXT_Pp)
 
 #define exit_fun(msg) exit_function(__FILE__, __FUNCTION__, __LINE__, "exit_fun", OAI_EXIT_NORMAL)
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 void exit_function(const char *file, const char *function, const int line, const char *s, const int assert);
 #ifdef __cplusplus

common/utils/assertions.h

@@ -27,7 +27,7 @@
 #include <inttypes.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <platform_types.h>
+#include "common/platform_types.h"
 
 #define OAI_EXIT_NORMAL 0
 #define OAI_EXIT_ASSERT 1

common/utils/config.h

@@ -37,9 +37,9 @@
  *
  * In code:
  * ```
- * set_log(ASN1, OAI_INFO); // enable logging
+ * set_log(ASN1, OAILOG_INFO); // enable logging
  * // do your encoding here
- * set_log(ASN1, OAI_ERR);  // disable logging
+ * set_log(ASN1, OAILOG_ERR);  // disable logging
  * ```
  *
  * in gdb:

common/utils/ds/byte_array.c

@@ -21,7 +21,6 @@
 
 #include "byte_array.h"
 
-#include "common/utils/assertions.h"
 #include <assert.h>
 #include <string.h>
 
@@ -29,7 +28,7 @@ byte_array_t copy_byte_array(byte_array_t src)
 {
   byte_array_t dst = {0};
   dst.buf = malloc(src.len);
-  AssertFatal(dst.buf != NULL, "Memory exhausted");
+  assert(dst.buf != NULL && "Memory exhausted");
   memcpy(dst.buf, src.buf, src.len);
   dst.len = src.len;
   return dst;

common/utils/mem/memory.c

@@ -19,42 +19,11 @@
  *      contact@openairinterface.org
  */
 
-/*****************************************************************************
-Source    memory.c
-
-Version   0.1
-
-Date    2012/10/09
-
-Product   NAS stack
-
-Subsystem Utilities
-
-Author    Frederic Maurel
-
-Description Memory access utilities
-
-*****************************************************************************/
-
-#include "memory.h"
-#include "commonDef.h"
-#include "nas_log.h"
-
-#include <stdio.h>  // fopen, fread, fclose
-#include <stdlib.h> // getenv, malloc, free
-#include <string.h> // strlen
-
-/****************************************************************************/
-/****************  E X T E R N A L    D E F I N I T I O N S  ****************/
-/****************************************************************************/
-
-/****************************************************************************/
-/*******************  L O C A L    D E F I N I T I O N S  *******************/
-/****************************************************************************/
-
-/****************************************************************************/
-/******************  E X P O R T E D    F U N C T I O N S  ******************/
-/****************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "common/utils/mem/oai_memory.h"
+#include "common/utils/LOG/log.h"
 
 /****************************************************************************
  **                                                                        **
@@ -85,13 +54,12 @@ char* memory_get_path(const char* dirname, const char* filename)
   }
 
   if (path == NULL) {
-    LOG_TRACE(WARNING, "MEMORY  - %s and %s environment variables are not defined trying local directory", dirname, DEFAULT_NAS_PATH);
     path = ".";
   }
 
   /* Append non-volatile data file name */
   size_t size = strlen(path) + strlen(filename) + 1;
-  char* data_filename = (char*)malloc(size+1);
+  char* data_filename = (char*)malloc(size + 1);
 
   if (data_filename != NULL) {
     if (size != sprintf(data_filename, "%s/%s", path, filename)) {
@@ -114,19 +82,17 @@ char* memory_get_path_from_ueid(const char* dirname, const char* filename, int u
   }
 
   if (path == NULL) {
-    LOG_TRACE(WARNING, "MEMORY  - %s and %s environment variables are not defined trying local directory", dirname, DEFAULT_NAS_PATH);
     path = ".";
   }
 
   /* Append non-volatile data file name */
-  if ( snprintf(buffer, sizeof(buffer), "%s/%s%d", path, filename, ueid) < 0 ) {
+  if (snprintf(buffer, sizeof(buffer), "%s/%s%d", path, filename, ueid) < 0) {
     return NULL;
   }
 
   return strdup(buffer);
 }
 
-
 /****************************************************************************
  **                                                                        **
  ** Name:  memory_read()                                             **
@@ -201,8 +167,3 @@ int memory_write(const char* datafile, const void* data, size_t size)
 
   return (rc);
 }
-
-/****************************************************************************/
-/*********************  L O C A L    F U N C T I O N S  *********************/
-/****************************************************************************/
-

common/utils/mem/oai_memory.h

@@ -19,42 +19,21 @@
  *      contact@openairinterface.org
  */
 
-/*****************************************************************************
-Source    memory.h
-
-Version   0.1
-
-Date    2012/10/09
-
-Product   NAS stack
-
-Subsystem Utilities
-
-Author    Frederic Maurel
-
-Description Memory access utilities
-
-*****************************************************************************/
 #ifndef __MEMORY_H__
 #define __MEMORY_H__
 
-#include <stddef.h> // size_t
+#include <stddef.h>
+#include <stdint.h>
+#include <stddef.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "common/platform_constants.h"
+//-----------------------------------------------------------------------------
 
-/****************************************************************************/
-/*********************  G L O B A L    C O N S T A N T S  *******************/
-/****************************************************************************/
+typedef unsigned char uint8_t;
 
-/****************************************************************************/
-/************************  G L O B A L    T Y P E S  ************************/
-/****************************************************************************/
-
-/****************************************************************************/
-/********************  G L O B A L    V A R I A B L E S  ********************/
-/****************************************************************************/
-
-/****************************************************************************/
-/******************  E X P O R T E D    F U N C T I O N S  ******************/
-/****************************************************************************/
+//-----------------------------------------------------------------------------
 
 char* memory_get_path(const char* dirname, const char* filename);
 
@@ -64,4 +43,7 @@ int memory_read(const char* datafile, void* data, size_t size);
 
 int memory_write(const char* datafile, const void* data, size_t size);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __MEMORY_H__*/

common/utils/minimal_stub.c

@@ -4,6 +4,9 @@
 int T_stdout;
 #endif
 
+struct configmodule_interface_s;
+struct configmodule_interface_s *uniqCfg = NULL;
+
 void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
 {
   if (assert) {

common/utils/nr/nr_common.c

@@ -755,11 +755,25 @@ void SLIV2SL(int SLIV,int *S,int *L) {
   }
 }
 
-int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA)
+int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA, int scs)
 {
-  uint32_t absolute_diff = (absoluteFrequencySSB - absoluteFrequencyPointA);
-  const int scaling_5khz = absoluteFrequencyPointA < 600000 ? 3 : 1;
-  return ((absolute_diff / scaling_5khz) % 24);
+  // for FR1 k_SSB expressed in terms of 15kHz SCS
+  // for FR2 k_SSB expressed in terms of the subcarrier spacing provided by the higher-layer parameter subCarrierSpacingCommon
+  // absoluteFrequencySSB and absoluteFrequencyPointA are ARFCN
+  // NR-ARFCN delta frequency is 5kHz if f < 3 GHz, 15kHz for other FR1 freq and 60kHz for FR2
+  const uint32_t absolute_diff = absoluteFrequencySSB - absoluteFrequencyPointA;
+  int scaling = 1;
+  if (absoluteFrequencyPointA < 600000) // correspond to 3GHz
+    scaling = 3;
+  if (scs > 2) // FR2
+    scaling <<= (scs - 2);
+  int sco_limit = scs == 1 ? 24 : 12;
+  int subcarrier_offset = (absolute_diff / scaling) % sco_limit;
+  // 30kHz is the only case where k_SSB is expressed in terms of a different SCS (15kHz)
+  // the assertion is to avoid having an offset of half a subcarrier
+  if (scs == 1)
+    AssertFatal(subcarrier_offset % 2 == 0, "ssb offset %d invalid for scs %d\n", subcarrier_offset, scs);
+  return subcarrier_offset;
 }
 
 uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
@@ -767,16 +781,16 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
                                   int ssbSubcarrierSpacing,
                                   int frequency_range)
 {
+  // offset to pointA is expressed in terms of 15kHz SCS for FR1 and 60kHz for FR2
+  // only difference wrt NR-ARFCN is delta frequency 5kHz if f < 3 GHz for ARFCN
   uint32_t absolute_diff = (absoluteFrequencySSB - absoluteFrequencyPointA);
   const int scaling_5khz = absoluteFrequencyPointA < 600000 ? 3 : 1;
-  int sco = get_ssb_subcarrier_offset(absoluteFrequencySSB, absoluteFrequencyPointA);
-  const int scs_scaling = frequency_range == FR2 ? 1 << (ssbSubcarrierSpacing - 2) : 1 << ssbSubcarrierSpacing;
-  const int scaled_abs_diff = absolute_diff / scaling_5khz;
-  const int ssb_offset_point_a =
-      (scaled_abs_diff - sco) / 12
-      - 10 * scs_scaling; // absoluteFrequencySSB is the central frequency of SSB which is made by 20RBs in total
-  AssertFatal(ssb_offset_point_a % scs_scaling == 0, "PRB offset %d can create frequency offset\n", ssb_offset_point_a);
-  AssertFatal(sco % scs_scaling == 0, "ssb offset %d can create frequency offset\n", sco);
+  const int scaling = frequency_range == FR2 ? 1 << (ssbSubcarrierSpacing - 2) : 1 << ssbSubcarrierSpacing;
+  const int scaled_abs_diff = absolute_diff / (scaling_5khz * scaling);
+  // absoluteFrequencySSB is the central frequency of SSB which is made by 20RBs in total
+  const int ssb_offset_point_a = ((scaled_abs_diff / 12) - 10) * scaling;
+  // Offset to point A needs to be divisible by scaling
+  AssertFatal(ssb_offset_point_a % scaling == 0, "PRB offset %d not valid for scs %d\n", ssb_offset_point_a, ssbSubcarrierSpacing);
   return ssb_offset_point_a;
 }
 
@@ -865,3 +879,44 @@ void nr_est_delay(int ofdm_symbol_size, const c16_t *ls_est, c16_t *ch_estimates
   delay->delay_max_val = max_val;
   delay->est_delay = max_pos - sync_pos;
 }
+
+void nr_timer_start(NR_timer_t *timer)
+{
+  timer->active = true;
+  timer->counter = 0;
+}
+
+void nr_timer_stop(NR_timer_t *timer)
+{
+  timer->active = false;
+  timer->counter = 0;
+}
+
+bool is_nr_timer_active(NR_timer_t timer)
+{
+  return timer.active;
+}
+
+bool nr_timer_tick(NR_timer_t *timer)
+{
+  bool expired = false;
+  if (timer->active) {
+    timer->counter += timer->step;
+    expired = nr_timer_expired(*timer);
+    if (expired)
+      timer->active = false;
+  }
+  return expired;
+}
+
+bool nr_timer_expired(NR_timer_t timer)
+{
+  return (timer.counter >= timer.target);
+}
+
+void nr_timer_setup(NR_timer_t *timer, const uint32_t target, const uint32_t step)
+{
+  timer->target = target;
+  timer->step = step;
+  nr_timer_stop(timer);
+}

common/utils/nr/nr_common.h

@@ -44,7 +44,39 @@
 #define NR_NB_SC_PER_RB 12
 #define NR_MAX_NUM_LCID 32
 #define NR_MAX_NUM_QFI 64
-#define NR_MAX_NUM_SLICES 10
+#define RNTI_NAMES /* see 38.321  Table 7.1-2  RNTI usage */      \
+  R(TYPE_C_RNTI_) /* Cell RNTI */                                  \
+  R(TYPE_CS_RNTI_) /* Configured Scheduling RNTI */                \
+  R(TYPE_TC_RNTI_) /* Temporary C-RNTI */                          \
+  R(TYPE_P_RNTI_) /* Paging RNTI */                                \
+  R(TYPE_SI_RNTI_) /* System information RNTI */                   \
+  R(TYPE_RA_RNTI_) /* Random Access RNTI */                        \
+  R(TYPE_SP_CSI_RNTI_) /* Semipersistent CSI reporting on PUSCH */ \
+  R(TYPE_SFI_RNTI_) /* Slot Format Indication on the given cell */ \
+  R(TYPE_INT_RNTI_) /* Indication pre-emption in DL */            \
+  R(TYPE_TPC_PUSCH_RNTI_) /* PUSCH power control */               \
+  R(TYPE_TPC_PUCCH_RNTI_) /* PUCCH power control */               \
+  R(TYPE_TPC_SRS_RNTI_)                                           \
+  R(TYPE_MCS_C_RNTI_)
+
+#define R(k) k ,
+typedef enum { RNTI_NAMES } nr_rnti_type_t;
+#undef R
+
+#define R(k) \
+  case k:       \
+    return #k;
+static inline const char *rnti_types(nr_rnti_type_t rr)
+{
+  switch (rr) {
+    RNTI_NAMES
+    default:
+      return "Not existing RNTI type";
+  }
+}
+#undef R
+
+#define NR_MAX_NB_LAYERS 4 // 8
 
 typedef enum {
   nr_FR1 = 0,
@@ -84,6 +116,49 @@ typedef struct {
   int delay_max_val;
 } delay_t;
 
+typedef struct {
+  bool active;
+  uint32_t counter;
+  uint32_t target;
+  uint32_t step;
+} NR_timer_t;
+
+/**
+ * @brief To start a timer
+ * @param timer Timer to be started
+ */
+void nr_timer_start(NR_timer_t *timer);
+/**
+ * @brief To stop a timer
+ * @param timer Timer to stopped
+ */
+void nr_timer_stop(NR_timer_t *timer);
+/**
+ * @brief If active, it increases timer counter by an amout of units equal to step. It stops timer if expired
+ * @param timer Timer to be handled
+ * @return Indication if the timer is expired or not
+ */
+bool nr_timer_tick(NR_timer_t *timer);
+/**
+ * @brief To setup a timer
+ * @param timer Timer to setup
+ * @param target Target value for timer (when reached, timer is considered expired)
+ * @param step Amount of units to add to timer counter every tick
+ */
+void nr_timer_setup(NR_timer_t *timer, const uint32_t target, const uint32_t step);
+/**
+ * @brief To check if a timer is expired
+ * @param timer Timer to be checked
+ * @return Indication if the timer is expired or not
+ */
+bool nr_timer_expired(NR_timer_t timer);
+/**
+ * @brief To check if a timer is active
+ * @param timer Timer to be checked
+ * @return Indication if the timer is active or not
+ */
+bool is_nr_timer_active(NR_timer_t timer);
+
 extern const nr_bandentry_t nr_bandtable[];
 
 static inline int get_num_dmrs(uint16_t dmrs_mask ) {
@@ -127,7 +202,7 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
                                   uint32_t absoluteFrequencyPointA,
                                   int ssbSubcarrierSpacing,
                                   int frequency_range);
-int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA);
+int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA, int scs);
 int get_delay_idx(int delay, int max_delay_comp);
 
 void freq2time(uint16_t ofdm_symbol_size,

common/utils/oai_asn1.h

@@ -32,7 +32,7 @@
  *\param[in] pointer to the BIT_STRING_t object.
  *\return the extracted value.
  */
-static inline uint8_t BIT_STRING_to_uint8(BIT_STRING_t *asn) {
+static inline uint8_t BIT_STRING_to_uint8(const BIT_STRING_t *asn) {
   DevCheck ((asn->size == 1), asn->size, 0, 0);
 
   return asn->buf[0] >> asn->bits_unused;
@@ -43,7 +43,7 @@ static inline uint8_t BIT_STRING_to_uint8(BIT_STRING_t *asn) {
  *\param[in] pointer to the BIT_STRING_t object.
  *\return the extracted value.
  */
-static inline uint16_t BIT_STRING_to_uint16(BIT_STRING_t *asn) {
+static inline uint16_t BIT_STRING_to_uint16(const BIT_STRING_t *asn) {
   uint16_t result = 0;
   int index = 0;
 
@@ -69,7 +69,7 @@ static inline uint16_t BIT_STRING_to_uint16(BIT_STRING_t *asn) {
  *\param[in] pointer to the BIT_STRING_t object.
  *\return the extracted value.
  */
-static inline uint32_t BIT_STRING_to_uint32(BIT_STRING_t *asn) {
+static inline uint32_t BIT_STRING_to_uint32(const BIT_STRING_t *asn) {
   uint32_t result = 0;
   size_t index;
 
@@ -91,7 +91,7 @@ static inline uint32_t BIT_STRING_to_uint32(BIT_STRING_t *asn) {
  *\param[in] pointer to the BIT_STRING_t object.
  *\return the extracted value.
  */
-static inline uint64_t BIT_STRING_to_uint64(BIT_STRING_t *asn) {
+static inline uint64_t BIT_STRING_to_uint64(const BIT_STRING_t *asn) {
   uint64_t result = 0;
   size_t index;
   int shift;
@@ -117,5 +117,11 @@ static inline uint64_t BIT_STRING_to_uint64(BIT_STRING_t *asn) {
 #define asn1cSequenceAdd(VaR, TyPe, lOcPtr) \
   TyPe *lOcPtr= calloc(1,sizeof(TyPe)); \
   asn1cSeqAdd(&VaR,lOcPtr)
+#define asn1cFreeStruc(ASN_DEF, STRUCT) \
+  do {                                  \
+    ASN_STRUCT_RESET(ASN_DEF, STRUCT);  \
+    free(STRUCT);                       \
+    STRUCT = NULL;                      \
+  } while (0)
 
 #endif

common/utils/ocp_itti/intertask_interface.cpp

@@ -59,29 +59,6 @@ typedef struct timer_elm_s {
   static int nb_queues=0;
   static pthread_mutex_t lock_nb_queues;
 
-  void *pool_buffer_init (void) {
-    return 0;
-  }
-
-  void *pool_buffer_clean (void *arg) {
-    //-----------------------------------------------------------------------------
-    return 0;
-  }
-
-  void free_mem_block (mem_block_t *leP, const char *caller) {
-    AssertFatal(leP!=NULL,"");
-    free(leP);
-  }
-
-  mem_block_t *get_free_mem_block (uint32_t sizeP, const char *caller) {
-    mem_block_t *ptr=(mem_block_t *)malloc(sizeP+sizeof(mem_block_t));
-    ptr->next = NULL;
-    ptr->previous = NULL;
-    ptr->data=((unsigned char *)ptr)+sizeof(mem_block_t);
-    ptr->size=sizeP;
-    return ptr;
-  }
-
   void *itti_malloc(task_id_t origin_task_id, task_id_t destination_task_id, ssize_t size) {
     void *ptr = NULL;
     AssertFatal ((ptr=calloc (size, 1)) != NULL, "Memory allocation of %zu bytes failed (%d -> %d)!\n",

common/utils/ocp_itti/intertask_interface.h

@@ -26,9 +26,8 @@
 #include <stdint.h>
 #include <sys/epoll.h>
 
-#include <mem_block.h>
 #include <assertions.h>
-
+#include "common/utils/mem/oai_memory.h"
 
 typedef enum timer_type_s {
   TIMER_PERIODIC,
@@ -62,7 +61,6 @@ typedef struct itti_lte_time_s {
   uint8_t slot;
 } itti_lte_time_t;
 
-
 typedef struct IttiMsgEmpty_s {
   // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
   // To be removed if the structure is filled
@@ -552,7 +550,6 @@ void itti_set_task_real_time(task_id_t task_id);
 void itti_send_terminate_message(task_id_t task_id);
 
 void *itti_malloc(task_id_t origin_task_id, task_id_t destination_task_id, ssize_t size);
-int memory_read(const char *datafile, void *data, size_t size);
 int itti_free(task_id_t task_id, void *ptr);
 
 int itti_init(task_id_t task_max, const task_info_t *tasks_info);

common/utils/system.c

@@ -230,7 +230,7 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
   int ret;
   int settingPriority = 1;
   ret=pthread_attr_init(&attr);
-  AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
+  AssertFatal(ret == 0, "Error in pthread_attr_init(): ret: %d, errno: %d\n", ret, errno);
 
   LOG_I(UTIL,"Creating thread %s with affinity %d and priority %d\n",name,affinity,priority);
 
@@ -241,9 +241,9 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
   
   if (settingPriority) {
     ret=pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
-    AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
+    AssertFatal(ret == 0, "Error in pthread_attr_setinheritsched(): ret: %d, errno: %d\n", ret, errno);
     ret=pthread_attr_setschedpolicy(&attr, SCHED_OAI);
-    AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
+    AssertFatal(ret == 0, "Error in pthread_attr_setschedpolicy(): ret: %d, errno: %d\n", ret, errno);
     if(priority<sched_get_priority_min(SCHED_OAI) || priority>sched_get_priority_max(SCHED_OAI)) {
       LOG_E(UTIL,"Prio not possible: %d, min is %d, max: %d, forced in the range\n",
 	    priority,
@@ -258,18 +258,20 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
     struct sched_param sparam={0};
     sparam.sched_priority = priority;
     ret=pthread_attr_setschedparam(&attr, &sparam);
-    AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
+    AssertFatal(ret == 0, "Error in pthread_attr_setschedparam(): ret: %d errno: %d\n", ret, errno);
   }
-  
+ 
+  LOG_I(UTIL,"threadCreate for %s, affinity %x, priority %d\n",name,affinity,priority); 
   ret=pthread_create(t, &attr, func, param);
-  AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
+  AssertFatal(ret == 0, "Error in pthread_create(): ret: %d, errno: %d\n", ret, errno);
   
   pthread_setname_np(*t, name);
   if (affinity != -1 ) {
     cpu_set_t cpuset;
     CPU_ZERO(&cpuset);
     CPU_SET(affinity, &cpuset);
-    AssertFatal( pthread_setaffinity_np(*t, sizeof(cpu_set_t), &cpuset) == 0, "Error setting processor affinity");
+    ret = pthread_setaffinity_np(*t, sizeof(cpu_set_t), &cpuset);
+    AssertFatal(ret == 0, "Error in pthread_getaffinity_np(): ret: %d, errno: %d", ret, errno);
   }
   pthread_attr_destroy(&attr);
 }

common/utils/telnetsrv/telnetsrv_bearer.c

@@ -56,7 +56,7 @@ int get_single_rnti(char *buf, int debug, telnet_printfunc_t prnt)
   return 0;
 }
 
-void rrc_gNB_trigger_new_bearer(int rnti);
+//void rrc_gNB_trigger_new_bearer(int rnti);
 int add_bearer(char *buf, int debug, telnet_printfunc_t prnt)
 {
   int rnti = -1;
@@ -75,12 +75,13 @@ int add_bearer(char *buf, int debug, telnet_printfunc_t prnt)
   if (!rrcue)
     ERROR_MSG_RET("could not find UE with RNTI %04x\n", rnti);
 
-  rrc_gNB_trigger_new_bearer(rnti);
+  AssertFatal(false, "not implemented\n");
+  //rrc_gNB_trigger_new_bearer(rnti);
   prnt("called rrc_gNB_trigger_new_bearer(%04x)\n", rnti);
   return 0;
 }
 
-void rrc_gNB_trigger_release_bearer(int rnti);
+//void rrc_gNB_trigger_release_bearer(int rnti);
 int release_bearer(char *buf, int debug, telnet_printfunc_t prnt)
 {
   int rnti = -1;
@@ -99,7 +100,8 @@ int release_bearer(char *buf, int debug, telnet_printfunc_t prnt)
   if (!rrcue)
     ERROR_MSG_RET("could not find UE with RNTI %04x\n", rnti);
 
-  rrc_gNB_trigger_release_bearer(rnti);
+  AssertFatal(false, "not implemented\n");
+  //rrc_gNB_trigger_release_bearer(rnti);
   prnt("called rrc_gNB_trigger_release_bearer(%04x)\n", rnti);
   return 0;
 }

common/utils/telnetsrv/telnetsrv_ci.c

@@ -92,10 +92,10 @@ int get_reestab_count(char *buf, int debug, telnet_printfunc_t prnt)
       ERROR_MSG_RET("could not find UE with RNTI %04x in RRC\n");
   }
 
-  prnt("UE RNTI %04x reestab %d reconf_after_reestab %d\n",
+  prnt("UE RNTI %04x reestab %d reconfig %d\n",
        ue->ue_context.rnti,
        ue->ue_context.ue_reestablishment_counter,
-       ue->ue_context.ue_reconfiguration_after_reestablishment_counter);
+       ue->ue_context.ue_reconfiguration_counter);
   return 0;
 }
 

common/utils/threadPool/thread-pool.c

@@ -150,8 +150,11 @@ void initNamedTpool(char *params,tpool_t *pool, bool performanceMeas, char *name
         //Configure the thread scheduler policy for Linux
         // set the thread name for debugging
         sprintf(pool->allthreads->name,"%s%d_%d",tname,pool->nbThreads,pool->allthreads->coreID);
+        // we set the maximum priority for thread pool threads (which is close
+        // but not equal to Linux maximum). See also the corresponding commit
+        // message; initially introduced for O-RAN 7.2 fronthaul split
         threadCreate(&pool->allthreads->threadID, one_thread, (void *)pool->allthreads,
-                     pool->allthreads->name, pool->allthreads->coreID, OAI_PRIORITY_RT);
+                     pool->allthreads->name, pool->allthreads->coreID, OAI_PRIORITY_RT_MAX);
         pool->nbThreads++;
     }
 

common/utils/time_meas.h

@@ -218,4 +218,10 @@ time_stats_t *register_meas(char *name);
 void send_meas(time_stats_t *ts, int msgid);
 void end_meas(void);
 
+#define timeIt(a)                                           \
+  {                                                         \
+    uint64_t deb = rdtsc_oai();                             \
+    a;                                                      \
+    LOG_W(UTIL, #a ": %llu\n", (rdtsc_oai() - deb) / 3000); \
+  }
 #endif

common/utils/utils.c

@@ -132,3 +132,21 @@ void set_priority(int priority)
     abort();
   }
 }
+
+/**
+ * @brief Convert a version string x.y.z into numbers.
+ *
+ * The function takes a version string of format "x.y.z" where x is the major
+ * version number, y minor, z patch. It tries to match version, and outputs the
+ * numbers in the correspondingly named variables.
+ *
+ * @return The number of version parts matched (should be three on x.y.z).
+ */
+int read_version(const char *version, uint8_t *major, uint8_t *minor, uint8_t *patch)
+{
+  int ret = sscanf(version, "%hhu.%hhu.%hhu", major, minor, patch);
+  // EOF means "end of input reached or matching failure"
+  if (ret == EOF)
+    return 3;
+  return ret; // ret has number of items matched
+}

common/utils/utils.h

@@ -107,6 +107,10 @@ void set_priority(int priority);
 
 char *itoa(int i);
 
+#define STRINGIFY(S) #S
+#define TO_STRING(S) STRINGIFY(S)
+int read_version(const char *version, uint8_t *major, uint8_t *minor, uint8_t *patch);
+
 #define findInList(keY, result, list, element_type) {\
     int i;\
     for (i=0; i<sizeof(list)/sizeof(element_type) ; i++)\

doc/BUILD.md

@@ -63,6 +63,8 @@ Calling the `build_oai` script with the `-h` option gives the list of all availa
 - `--ninja` is to use the `ninja` build tool, which speeds up compilation.
 - `-c` is to clean the workspace and force a complete rebuild.
 
+`build_oai` also provides various options to enable runtime error checkers, i.e. sanitizers in order to find various types of bugs in the codebase and eventually enhance the stability of the OAI softmodems. Refer to [sanitizers.md](./dev_tools/sanitizers.md) for more details.
+
 ## Installing dependencies
 
 Install all dependencies by issuing the `-I` option. To install furthermore libraries for optional libraries, use the `--install-optional-packages` option. The `-I` option will also install dependencies for an SDR when paired with `-w`. For instance, in order to install all dependencies and the ones for USRP, run:
@@ -184,6 +186,7 @@ Some libraries have further dependencies and might not build on every system:
 - `nrqtscope`: Qt5
 - `ldpc_cuda`: CUDA
 - `websrv`: npm and others
+- `ldpc_t2`: DPDK with patch
 
 # Running `cmake` directly
 

doc/Doxyfile

@@ -1337,9 +1337,9 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_timer.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVDecoder.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_timer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/memory.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/mem/memory.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/OctetString.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/memory.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/mem/oai_memory.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVDecoder.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_log.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVEncoder.h \
@@ -1771,7 +1771,6 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_models.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_externs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MEM/mem_block.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MATH/oml.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MATH/oml.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_ue_context_management.c \
@@ -1836,7 +1835,7 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_def.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_types.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/platform_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/platform_types.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_types.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_types.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_types.h \

doc/E1-design.md

@@ -17,17 +17,22 @@ connection setup only in split-mode, the rest is the same for CU):
 sequenceDiagram
   participant c as CUCP
   participant u as CUUP
-  u->c: SCTP connection setup (in split mode)
-  u->>c: E1AP Setup Request
-  Note over c: Execute rrc_gNB_process_e1_setup_req()
-  c->>u: E1AP Setup Response
 
+  Note over c,u: E1 Setup Procedure
+  u->c: SCTP connection setup (in split mode)
+  u->>c: E1 Setup Request
+  Note over c: Execute rrc_gNB_process_e1_setup_req()
+  c->>u: E1 Setup Response
+  c-->>u: E1 Setup Failure
+
+  Note over c,u: E1 Bearer Context Setup Procedure
   Note over c: Receives PDU session setup request from AMF
   c->>u: Bearer Context Setup Request
   Note over u: Execute e1_bearer_context_setup()<br/>Configure DRBs and create GTP Tunnels for F1-U and N3
   u->>c: Bearer Context Setup Response
   Note over c: Execute rrc_gNB_process_e1_setup_req()<br/>Sends F1-U UL TNL info to DU and receives DL TNL info
 
+  Note over c,u: E1 Bearer Context Modification (CU-CP Initiated) Procedure
   c->>u: Bearer Context Modification Request
   Note over u: Execute e1_bearer_context_modif()<br/>Updates GTP Tunnels with received info
   u->>c: Bearer Context Modification Response
@@ -40,19 +45,63 @@ sequenceDiagram
   Note over c: Execute rrc_gNB_process_e1_bearer_context_release_cplt()
 ```
 
-The files that implement the callback towards these handlers are in
-- `cucp_cuup_direct.c`: integrated CU (for CP=>UP messages)
-- `cucp_cuup_e1ap.c`: E1 split mode (for CP=>UP messages)
-- `cuup_cucp_direct.c`: integrated CU (for UP=>CP messages)
-- `cuup_cucp_e1ap.c`: E1 split mode (for UP=>CP messages)
+The implementation of callbacks towards these handlers is distributed across the following file, depending on the operating mode:
+
+| Mode          | CP=>UP messages     |UP=>CP messages     |
+| --------------| --------------------|--------------------|
+| Integrated CU | `cucp_cuup_direct.c`|`cuup_cucp_direct.c`|
+| E1 Split      | `cucp_cuup_e1ap.c`  |`cuup_cucp_e1ap.c`  |
+
+As long as concerns E1 Interface Management Procedures, the code flow of request messages towards northbound looks like this:
+
+```mermaid
+sequenceDiagram
+  participant r as RRC
+  participant c as CUCP
+  participant u as CUUP
+
+  Note over u: E1AP_CUUP_task (SCTP Handler)
+  Note over u: ASN1 encoder
+  u->>c: e.g. E1 Setup Request (SCTP)
+  Note over c: E1AP_CUCP_task (SCTP Handler)
+  Note over c: ASN1 decoder
+  c->>r: E1AP_SETUP_REQ (ITTI)
+  Note over r: TASK_RRC_GNB (RRC Handler)
+  r->>c: E1AP_SETUP_RESP (ITTI)
+  Note over c: E1AP_CUCP_task (E1AP Callback)
+  Note over c: ASN1 encoder
+
+  c->>u: e.g. E1 Setup Response/Failure
+  Note over u: E1AP_CUUP_task (SCTP Handler)
+  Note over u: ASN1 decoder
+```
+
 
 # 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.
+
 ## 2.1 Configuration File
 
-The gNB is started based on the node type that is specified in the configuration file. To start a gNB instance in CUCP or CUUP, the `tr_s_preference` should be set to "f1" and the config member `E1_INTERFACE` should be present in the config file. The `type` parameter within the `E1_INTERFACE` should be set to `cp`, and executable `nr-softmodem` should be used to run a CU-CP. The type should be `up` and executable `nr-cuup` should be used to run the CU-UP. Further, there are the parameters `ipv4_cucp` and `ipv4_cuup` to specify the IP addresses of the respective network functions.
+The gNB is started based on the node type that is specified in the configuration file. The following parameters must be configured accordingly.
 
-For CUCP, a typical `E1_INTERFACE` config looks like
+On either CUCP and CUUP:
+* The southbound transport preference `gNBs.[0].tr_s_preference` set to `f1`
+* config section `E1_INTERFACE` should be present
+
+On the CU-CP:
+* `type` parameter within the `E1_INTERFACE` should be set to `cp`
+
+On the CU-UP:
+* `type` parameter within the `E1_INTERFACE` should be set to `up`
+
+Executables:
+* executable `nr-softmodem` to run a CU-CP
+* executable `nr-cuup` to run the CU-UP
+
+In the `E1_INTERFACE` configuration section, the parameters `ipv4_cucp` and `ipv4_cuup` must be configured to specify the IP addresses of the respective network functions.
+
+For CUCP, a typical `E1_INTERFACE` config looks like:
 ```
 E1_INTERFACE =
 (
@@ -64,7 +113,7 @@ E1_INTERFACE =
 )
 ```
 
-For CUUP, it is
+For CUUP, it is:
 ```
 E1_INTERFACE =
 (
@@ -77,7 +126,7 @@ E1_INTERFACE =
 ```
 One could take an existing CU configuration file and add the above parameters to run the gNB as CUCP or CUUP.
 
-The CUUP uses the IP address specified in `local_s_address` for F1-U and `GNB_IPV4_ADDRESS_FOR_NGU` for N3 links. Note that `local_s_address` is under `gNBs` and `GNB_IPV4_ADDRESS_FOR_NGU` is part of the `NETWORK_INTERFACES` config member.  
+The CUUP uses the IP address specified in `gNBs.[0].local_s_address` for F1-U and `GNB_IPV4_ADDRESS_FOR_NGU` for N3 links. Note that `local_s_address` is under `gNBs` and `GNB_IPV4_ADDRESS_FOR_NGU` is part of the `NETWORK_INTERFACES` config member.
 
 Alternatively, you can use the config files `ci-scripts/conf_files/gnb-cucp.sa.f1.conf` and `ci-scripts/conf_files/gnb-cuup.sa.f1.conf`.
 

doc/F1-design.md

@@ -20,15 +20,15 @@ The F1 interface is the functional split of 3GPP between the CU (centralized
 unit: PDCP, RRC, SDAP) and the DU (distributed unit: RLC, MAC, PHY). It is
 standardized in TS 38.470 - 38.473 for 5G NR. No equivalent for 4G exists.
 
-We assume that each DU handles only one cell.  Multiple DUs connected to one CU
+We assume that each DU handles only one cell. Multiple DUs connected to one CU
 are supported. Mobility over F1 is not yet supported.
 
 # Control plane status (F1-C)
 
 ## Implementation Status
 
-Note that OAI uses F1 "internally". That means, that even if you run a
-monolithic gNB, the internal information exchange uses F1. You can therefore
+Note that OAI uses F1 "internally". That means, that even **if you run a
+monolithic gNB, the internal information exchange uses F1**. You can therefore
 expect that everything working in a monolithic deployment should also work in
 F1.  The current implementation is based on R16.3.
 
@@ -118,13 +118,13 @@ see [this `docker-compose` file](../ci-scripts/yaml_files/5g_f1_rfsimulator/dock
 
 The rules to decide if a config triggers a start of a DU, CU, or monolithic
 gNB, are, in order:
-1. If the `MACRLCs` section lists `f1` as northbound transport preference
+1. If the `MACRLCs` section lists `f1` as **northbound transport preference**
    (`tr_n_preference`), it is a DU.
-2. If the `gNBs` section lists `f1` as a southound transport preference
+2. If the `gNBs` section lists `f1` as a **southound transport preference**
    (`tr_s_preference`), it is a CU.
 3. It is a (monolithic) gNB.
 
-## Configuration of F1 IP/port information
+## Local network deployment of F1
 
 For a local deployment, you should update the following fields.
 We assume that the CU will bind on `192.168.70.129` towards the core,
@@ -152,9 +152,11 @@ In the CU file:
 In the DU file:
 - Set `MACRLCs.[0].tr_n_preference` to `f1`
 - Update `MACRLCs.[0].local_n_address` (local north-bound address of the DU) to
-  `127.0.0.4`
+  `127.0.0.4`. This IP address is used to bind the GTP socket (F1-U user plane
+  traffic).
 - Update `MACRLCs.[].remote_n_address` (remote north-bound address of the CU)
-  to `127.0.0.3`
+  to `127.0.0.3`. This IP address is used as the CU destination IP address for
+  F1AP communication.
 
 Note: all `local_*_if_name` parameters are ignored.
 

doc/FEATURE_SET.md

@@ -191,22 +191,30 @@ Furthermore, the gNB and UE support
 ## gNB F1AP
 
 - Integration of F1AP messages and procedures for the control plane exchanges between the CU and DU entities according to 38.473 Rel. 16
-  - F1 Setup request/response
+  - F1 Setup request/response/failure
   - F1 DL/UL RRC message transfer
   - F1 Initial UL RRC message transfer
   - F1 UE Context setup request/response
   - F1 UE Context modification request/response
-  - F1 UE Context release
+  - F1 UE Context modification required
+  - F1 UE Context release req/cmd/complete
   - F1 gNB CU configuration update
 - Interface with RRC
 - Interface with gtp-u (tunnel creation/handling for F1-U interface)
 
 ## gNB E1AP
 
-- Integration of E1AP messages and procedures for exchange between CU-CP and CU-UP according to 38.463 Rel. 16
-  - gNB-CU-UP E1 Setup Setup request/response
-  - E1 Bearer Context Setup
+- Integration of E1AP messages and procedures for exchange between CU-CP and CU-UP according to TS 38.463 Rel. 16
+  - E1 Setup (gNB-CU-UP initiated)
+      - E1 Setup Request
+      - E1 Setup Response
+      - E1 Setup Failure
+  - E1 Bearer Context Setup (gNB-CU-CP initiated)
+      - E1 Bearer Context Setup Request
+      - E1 Bearer Context Setup Response
   - Bearer Context Modification (gNB-CU-CP initiated)
+      - E1 Bearer Context Modification Request
+      - E1 Bearer Context Modification Response
 - Interface with RRC and PDCP
 
 ## gNB GTP-U

doc/L1SIM.md

@@ -12,23 +12,29 @@
   </tr>
 </table>
 
-This page is valid for the develop branch
+**Note: unless you know what you are doing, you likely do not need this!
+Rather, you are probably looking for the
+[RFsimulator](../radio/rfsimulator/README.md)!**
 
-**Table of Contents**
+oaisim has been scraped and replaced by the same programs that are used for the
+real-time operation, `lte-softmodem` and `lte-uesoftmodem`. This uses the IF4p5
+fronthaul protocol to achieve the communication.
+
+Context: oaisim used to be a simulation mode inside OAI to emulate an eNB and
+multiple UEs.
 
 [[_TOC_]]
 
-The old oaisim is dead! Long live oaisim! :)
+# Build
 
-If you are looking for a description of the old oaisim (which is still available in some branches/tags), please see [here](OpenAirLTEEmulation) and [here](how-to-run-oaisim-with-multiple-ue).
+Build eNB/UE as normal, as also described in [How to build the eNB and the UE](./BUILD.md):
+```bash
+./build_oai -c --ninja --eNB --UE
+```
 
-oaisim has been scraped and replaced by the same programs that are used for the real-time operation, `lte-softmodem` and `lte-uesoftmodem`. The latter also now includes an optional channel model, just like oaisim did. 
+# How to run an eNB with the noS1 option
 
-# <a name="build">[How to build the eNB and the UE](BUILD.md)</a>
-
-The following paragraph explains how to run the L1 simulator in noS1 mode and using the oai kernel modules. 
-
-# <a name="run-noS1-eNB">How to run an eNB with the noS1 option</a>
+The following paragraph(s) explains how to run the L1 simulator in noS1 mode and using the oai kernel modules.
 
 Modify the configuration file for IF4p5 fronthaul, `/openairinterface5g/ci-scripts/conf_files/rcc.band7.nos1.simulator.conf`, and replace the loopback interface with a physical ethernet interface and the IP addresses to work on your network. Copy your modifications to a new file, let's call YYY.conf the resulting configuration file.
 
@@ -42,7 +48,7 @@ $ cd ../ran_build/build
 $ sudo -E ./lte-softmodem -O YYY.conf --noS1 --nokrnmod 0
 ```
 
-# <a name="run-noS1-UE">How to run a UE with the noS1 option</a>
+# How to run a UE with the noS1 option
 
 Similarly modify the example configuration file in `/openairinterface5g/ci-scripts/conf_files/rru.band7.nos1.simulator.conf` and replace loopback interface and IP addresses. Copy your modifications to a new file, let's call XXX.conf the resulting configuration file.
 
@@ -58,38 +64,17 @@ $ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1 --nokrnmod 0
 
 That should give you equivalent functionality to what you had with oaisim including noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs. 
 
-# <a name="CInote">Continuous Integration notes</a>
-The CI currently tests the noS1 build option with one eNB and one UE in the following scenarios:
-* pinging one UE from one eNB
-* pinging one eNB from one UE
-* iperf download between one eNB and one UE
-* iperf upload between one eNB and one UE
-* all the above tests are done in FDD 5Mhz mode.
-
-# <a name="noS1-pinging">How to ping an eNB from a UE and vice versa (with the noS1 option)</a>
+# How to ping an eNB from a UE and vice versa (with the noS1 option)
 
 Once your eNB and UE (built with the noS1 option) are running and synchronised, you can ping the eNB from the UE with the following command:
 
 ```bash
 ping -I oai0 -c 20 $eNB_ip_addr
 ```
-where $eNB_ip_addr is the IP address of your eNB.
+where `$eNB_ip_addr` is the IP address of your eNB.
 
 Similarly, you can ping the UE from the eNB.
 
-The IP adresses of the eNB and the UE are set up by the init_nas_nos1 program and should have the following values:
-* eNB_ip_addr set to 20 10.0.1.1
-* ue_ip_addr set to 20 10.0.1.2
-
-
-
-
-
-
-
-[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
-
-[oai softmodem features](FEATURE_SET.md)
-
-[oai softmodem build procedure](BUILD.md)
-
+The IP adresses of the eNB and the UE are set up by the `init_nas_nos1` program and should have the following values:
+* `$eNB_ip_addr` set to 10.0.1.1
+* `ue_ip_addr` set to 10.0.1.2

doc/LDPC_T2_OFFLOAD_SETUP.md

@@ -21,19 +21,21 @@ This documentation aims to provide a tutorial for AMD Xilinx T2 Telco card integ
 # Requirements
 
  - bitstream image and PMD driver for the T2 card provided by AccelerComm
- - DPDK 20.11.7 with patch from Accelercomm (also tested with DPDK 20.11.3)
- - tested on RHEL7.9, RHEL9.2, Ubuntu 20.04, Ubuntu 22.04
+ - DPDK 20.11.9 with patch from Accelercomm: version ACCL_BBDEV_DPDK20.11.3_ldpc_3.1.918.patch
+ - tested on RHEL7.9, RHEL9.2, Ubuntu 22.04
 
 # DPDK setup
 ## DPDK installation
+*Note: Following instructions are valid for ACCL_BBDEV_DPDK20.11.3_ldpc_3.1.918.patch version, which is compatible with DPDK 20.11.9. Installation steps, which should be followed for older versions of the patch file (for example ACL_BBDEV_DPDK20.11.3_BL_1006_build_1105_dev_branch_MCT_optimisations_1106_physical_std.patch) are present in older version of this documentation, under the tag 2023.w48.*
+
 ```
 # Get DPDK source code
 git clone https://github.com/DPDK/dpdk-stable.git ~/dpdk-stable
 cd ~/dpdk-stable
-git checkout v20.11.7
-git apply ~/ACL_BBDEV_DPDK20.11.3_xxx.patch
+git checkout v20.11.9
+git apply ~/ACL_BBDEV_DPDK20.11.3_ldpc_3.1.918.patch
 ```
-Replace `~/ACL_BBDEV_DPDK20.11.3_xxx.patch` by patch file provided by
+Replace `~/ACL_BBDEV_DPDK20.11.3_ldpc_3.1.918.patch` by patch file provided by
 Accelercomm.
 ```
 cd ~/dpdk-stable
@@ -47,33 +49,32 @@ sudo ldconfig
 ## DPDK configuration
  - load required kernel module
 ```
-sudo modprobe igb_uio
-sudo insmod ~/dpdk-stable/kernel/linux/igb_uio/igb_uio.ko
+sudo modprobe vfio-pci
 ```
  - check presence of the card and its PCI addres on the host machine
 ```
 lspci | grep "Xilinx"
 ```
- - bind the card with igb_uio driver
+ - bind the card with vfio-pci driver
 ```
-sudo python3 ~/dpdk-stable/usertools/dpdk-devbind.py -b igb_uio 41:00.0
+sudo python3 ~/dpdk-stable/usertools/dpdk-devbind.py --bind=vfio-pci 41:00.0
 ```
 Replace PCI address of the card *41:00.0* by address detected by *lspci | grep "Xilinx"* command
  - hugepages setup (10 x 1GB hugepages)
 ```
-sudo python3 ~/dpdk-stable/usertools/dpdk-hugepages.py -p 1G --setup 10G`
+sudo python3 ~/dpdk-stable/usertools/dpdk-hugepages.py -p 1G --setup 10G
 ```
 
 *Note: device binding and hugepages setup has to be done after every reboot of
 the host machine*
 
 # Modifications in the OAI code
-## PMD path specification
-Path to the PMD for operating the card is specified in `CMakeLists.txt` file in
+## DPDK lib and PMD path specification
+Path to the DPDK lib and Accelercomm PMD for operating the card is specified in the `CMakeLists.txt` file, in
 *LDPC OFFLOAD library* section. Modify following line based on the location of
-the PMD on your system. By deafult, path to the PMD is set to `/opt/dpdk-t2/lib/x86_64-linux-gnu/`.
+`libdpdk.pc` file associated with the target DPDK library on your system. By default, the path is set to `/usr/local/lib/x86_64-linux-gnu/pkgconfig`.
 ```
-find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS "/opt/dpdk-t2/lib/x86_64-linux-gnu/")
+set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/x86_64-linux-gnu/pkgconfig")
 ```
 
 ## T2 card DPDK initialization
@@ -106,7 +107,7 @@ cd ~/openairinterface5g/cmake_targets
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets
-./build_oai -w USRP --ninja --gNB -P -C --build-lib "ldpc_t2"
+./build_oai -w USRP --ninja --gNB -P --build-lib "ldpc_t2" -C
 ```
 Shared object file *libldpc_t2.so* is created during the compilation. This object is conditionally compiled. Selection of the library to compile is done using *--build-lib ldpc_t2*.
 
@@ -131,19 +132,18 @@ sudo ./nr_dlsim -n300 -s30 -R 106 -e 27 -c
 ```
 
 # OTA test
-Offload of the channel encoding and decoding to the AMD Xilinx T2 card is enabled by *--ldpc-offload-enable 1* option.
+Offload of the channel encoding and decoding to the AMD Xilinx T2 card is enabled by *--ldpc-offload-enable* option.
 
 ## Run OAI gNB with USRP B210
 ```
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
-sudo ./nr-softmodem --sa -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --ldpc-offload-enable 1
+sudo ./nr-softmodem --sa -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --ldpc-offload-enable
 ```
 
 # Limitations
 ## AMD Xilinx T2 card
- - offload of the LDPC encoding implemented for MCS > 2, OAI CPU encoder is used for MCS =< 2
  - functionality of the LDPC encoding and decoding offload verified in OTA SISO setup with USRP N310 and Quectel RM500Q, blocking of the card reported for MIMO setup (2 layers)
 
 *Note: AMD Xilinx T1 Telco card is not supported anymore.*

doc/ORAN_FHI7.2_Tutorial.md

@@ -0,0 +1,636 @@
+<table style="border-collapse: collapse; border: none;">
+  <tr style="border-collapse: collapse; border: none;">
+    <td style="border-collapse: collapse; border: none;">
+      <a href="http://www.openairinterface.org/">
+         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
+         </img>
+      </a>
+    </td>
+    <td style="border-collapse: collapse; border: none; vertical-align: center;">
+      <b><font size = "5">OAI 7.2 Fronthaul Interface 5G SA Tutorial</font></b>
+    </td>
+  </tr>
+</table>
+
+**Table of Contents**
+
+[[_TOC_]]
+
+# Prerequisites
+
+The hardware on which we have tried this tutorial:
+
+|Hardware (CPU,RAM)                          |Operating System (kernel)                  |NIC (Vendor,Driver,Firmware)                     |
+|--------------------------------------------|----------------------------------|-------------------------------------------------|
+|Intel(R) Xeon(R) Gold 6354 36-Core, 128GB   |RHEL 9.2 (5.14.0-284.18.1.rt14.303.el9_2.x86_64)|Intel X710, i40e, 9.20 0x8000d95e 22.0.9|
+|Intel(R) Xeon(R) Gold 6354 36-Core, 128GB   |Ubuntu 22.04.3 LTS (5.15.0-1033-realtime)|Intel X710, i40e, 9.00 0x8000cfeb 21.5.9|
+|AMD EPYC 9374F 32-Core Processor, 128GB      |Ubuntu 22.04.2 LTS (5.15.0-1038-realtime)       |Intel E810 ,ice, 4.00 0x8001184e 1.3236.0   |
+
+**NOTE**: These are not minimum hardware requirements. This is the configuration of our servers. The NIC card should support hardware PTP time stamping.
+
+NICs we have tested so far:
+
+|Vendor      |Firmware Version        |
+|------------|------------------------|
+|Intel X710  |9.20 0x8000d95e 22.0.9  |
+|Intel E810  |4.00 0x8001184e 1.3236.0|
+|Intel XXV710|6.02 0x80003888         |
+
+PTP enabled switches and grandmaster clock we have in are lab:
+
+|Vendor                  |Software Version|
+|------------------------|----------------|
+|CISCO C93180YC-FX3      |10.2(4)         |
+|Fibrolan Falcon-RX/812/G|8.0.25.4        |
+|Qulsar Qg2 (Grandmaster)|12.1.27         |
+
+
+Radio units we are testing/integrating:
+
+|Vendor     |Software Version |
+|-----------|-----------------|
+|VVDN LPRU  |03-v3.0.4        |
+|LiteON RU  |01.00.08/02.00.03|
+|Benetel 650|v0.8.1           |
+
+Tested libxran releases:
+
+| Vendor                                  |
+|-----------------------------------------|
+| `oran_e_maintenance_release_v1.0`       |
+
+**Note**: the libxran driver of OAI identifies the above version as "5.1.0" (E is fifth letter, then 1.0).
+
+## Configure your server
+
+1. Disable Hyperthreading (HT) in your BIOS. In all our servers HT is always disabled.
+2. We recommend you to start with a fresh installation of OS (either RHEL or Ubuntu). You have to install realtime kernel on your OS (Operating System). Based on your OS you can search how to install realtime kernel.
+3. Install realtime kernel for your OS
+4. Change the boot commands based on the below section. They can be performed either via `tuned` or via manually building the kernel
+
+### CPU allocation
+
+**This section is important to read, regardless of the operating system you are using.**
+
+Your server could be:
+
+* One NUMA Node (See [one NUMA node example](#111-one-numa-node)): all the processors are sharing a single memory system.
+* Two NUMA Node (see [two NUMA node example](#112-two-numa-node)): processors are grouped in 2 memory systems.
+  - Usually the even (ie `0,2,4,...`) CPUs are on the 1st socket
+  - And the odd (ie (`1,3,5,...`) CPUs are on the 2nd socket
+
+DPDK, OAI and kernel threads require to be properly allocated to extract maximum real-time performance for your use case.
+
+1. **NOTE**: Currently the default OAI 7.2 configuration file requires isolated **CPUs 0,2,4** for DPDK/libXRAN, **CPU 6** for `ru_thread` and **CPU 8** for `L1_rx_thread`. It is preferrable to have all these threads on the same socket.
+2. Allocating CPUs to the OAI nr-softmodem is done using the `--thread-pool` option. Allocating 4 CPUs is the minimal configuration but we recommend to allocate at least **8** CPUs. And they can be on a different socket as the DPDK threads.
+3. And to avoid kernel preempting these allocated CPUs, it is better to force the kernel to use un-allocated CPUs.
+
+Let summarize for example on a `32-CPU` single NUMA node system, regardless of the number of sockets:
+
+|Applicative Threads|Allocated CPUs    |
+|-------------------|------------------|
+|XRAN DPDK usage    |0,2,4             |
+|OAI `ru_thread`    |6                 |
+|OAI `L1_rx_thread` |8                 |
+|OAI `nr-softmodem` |1,3,5,7,9,11,13,15|
+|kernel             |16-31             |
+
+In below example we have shown the output of `/proc/cmdline` for two different servers, each of them have different number of numa nodes. Be careful in isolating the CPUs in your environment. Apart from CPU allocation there are additional parameters which are important to be present in your boot command.
+
+Modifying the `linux` command line usually requires to edit the `/etc/default/grub`, run a `grub` command and reboot the server.
+
+### One NUMA NODE
+
+Below is the output of `/proc/cmdline` of a single numa node server,
+
+```bash
+NUMA:
+  NUMA node(s):          1
+  NUMA node0 CPU(s):     0-31
+```
+
+```bash
+isolcpus=0-15 nohz_full=0-15 rcu_nocbs=0-15 kthread_cpus=16-31 rcu_nocb_poll nosoftlockup default_hugepagesz=1GB hugepagesz=1G hugepages=20 amd_iommu=on iommu=pt mitigations=off skew_tick=1 selinux=0 enforcing=0 tsc=nowatchdog nmi_watchdog=0 softlockup_panic=0 audit=0 vt.handoff=7
+```
+
+Example taken for AMD EPYC 9374F 32-Core Processor
+
+### Two numa nodes
+
+Below is the output of `/proc/cmdline` of a two numa node server,
+
+```
+NUMA:
+  NUMA node(s):          2
+  NUMA node0 CPU(s):     0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34
+  NUMA node1 CPU(s):     1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35
+```
+
+```bash
+mitigations=off usbcore.autosuspend=-1 intel_iommu=on intel_iommu=pt selinux=0 enforcing=0 nmi_watchdog=0 softlockup_panic=0 audit=0 skew_tick=1 isolcpus=managed_irq,domain,0,2,4,6,8,10,12,14,16 nohz_full=0,2,4,6,8,10,12,14,16 rcu_nocbs=0,2,4,6,8,10,12,14,16 rcu_nocb_poll intel_pstate=disable nosoftlockup tsc=nowatchdog cgroup_disable=memory mce=off hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 default_hugepagesz=1G isolcpus=managed_irq,domain,0,2,4,6,8,10,12,14 kthread_cpus=18-35 intel_pstate=disable nosoftlockup tsc=reliable
+```
+
+Example taken for Intel(R) Xeon(R) Gold 6354 CPU @ 3.00GHz
+
+### Common
+
+Configure your servers to maximum performance mode either via OS or in BIOS. If you want to disable CPU sleep state via OS then use the below command:
+
+```bash
+# to disable
+sudo cpupower idle-set -D 0
+#to enable
+sudo cpupower idle-set -E
+```
+
+Set the `tuned` profile to `realtime`. If the `tuned-adm` command is not installed then you have to install it.
+
+```bash
+tuned-adm profile realtime
+```
+
+The above information we have gathered either from O-RAN documents or via our own experiments. In case you would like to read the O-RAN documents then here are the links:
+
+1. [O-RAN-SC O-DU Setup Configuration](https://docs.o-ran-sc.org/projects/o-ran-sc-o-du-phy/en/latest/Setup-Configuration_fh.html)
+2. [O-RAN Cloud Platform Reference Designs 2.0,O-RAN.WG6.CLOUD-REF-v02.00,February 2021](https://orandownloadsweb.azurewebsites.net/specifications)
+
+
+## PTP configuration
+
+1. You can install `linuxptp` rpm or debian package. It will install ptp4l and phc2sys.
+
+```bash
+#RHEL
+sudo dnf install linuxptp -y
+#Ubuntu
+sudo apt install linuxptp -y
+```
+
+Once installed you can use this configuration file for ptp4l (`/etc/ptp4l.conf`). Here the clock domain is 24 so you can adjust it according to your PTP GM clock domain
+
+```
+[global]
+domainNumber            24
+slaveOnly               1
+time_stamping           hardware
+tx_timestamp_timeout    1
+logging_level           6
+summary_interval        0
+#priority1               127
+
+[your_PTP_ENABLED_NIC]
+network_transport       L2
+hybrid_e2e              0
+```
+Probably you need to increase `tx_timestamp_timeout` to 50 or 100 for Intel E-810. You will see that in the logs of ptp.
+
+Create the configuration file for phc2sys (`/etc/sysconfig/phc2sys`)
+
+```
+OPTIONS="-a -r -r -n 24"
+```
+
+The service of ptp4l (`/usr/lib/systemd/system/ptp4l.service`) should be configured as below:
+
+```
+[Unit]
+Description=Precision Time Protocol (PTP) service
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+EnvironmentFile=-/etc/sysconfig/ptp4l
+ExecStart=/usr/sbin/ptp4l $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
+```
+
+and service of phc2sys (`/usr/lib/systemd/system/phc2sys.service`) should be configured as below:
+
+```
+[Unit]
+Description=Synchronize system clock or PTP hardware clock (PHC)
+After=ntpdate.service ptp4l.service
+
+[Service]
+Type=simple
+EnvironmentFile=-/etc/sysconfig/phc2sys
+ExecStart=/usr/sbin/phc2sys $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
+```
+
+### Debugging PTP issues
+
+You can see these steps in case your ptp logs have erorrs or `rms` reported in `ptp4l` logs is more than 100ms.
+
+1. Make sure that you have `skew_tick=1` in `/proc/cmdline`
+2. For Intel E-810 cards set `tx_timestamp_timeout` to 50 or 100 if there are errors in ptp4l logs
+3. Other time sources than PTP, such as NTP or chrony timesources, should be disabled. Make sure they are enabled as further below.
+4. If `rms` or `delay` remain high, you can try pinning the PTP process to an isolated CPU.
+
+```bash
+#to check there is NTP enabled or not
+timedatectl | grep NTP
+#to disable
+timedatectl set-ntp false
+```
+
+## DPDK (Data Plane Development Kit)
+
+Download DPDK version 20.11.7.
+
+```bash
+# on debian
+sudo apt install wget xz-utils
+# on Fedora/RHEL
+sudo dnf install wget xz
+cd
+wget http://fast.dpdk.org/rel/dpdk-20.11.7.tar.xz
+```
+
+### DPDK Compilation and Installation
+
+```bash
+# Installing meson : it should pull ninja-build and compiler packages
+# on debian
+sudo apt install meson
+# on Fedora/RHEL
+sudo dnf install meson
+tar xvf dpdk-20.11.7.tar.xz && cd dpdk-stable-20.11.7
+
+meson build
+ninja -C build
+sudo ninja install -C build
+```
+
+### Verify the installation is complete
+
+Check if the LD cache contains the DPDK Shared Objects after update:
+
+```bash
+sudo ldconfig -v | grep rte_
+	librte_fib.so.0.200.2 -> librte_fib.so.0.200.2
+	librte_telemetry.so.0.200.2 -> librte_telemetry.so.0.200.2
+	librte_compressdev.so.0.200.2 -> librte_compressdev.so.0.200.2
+	librte_gro.so.20.0 -> librte_gro.so.20.0.2
+	librte_mempool_dpaa.so.20.0 -> librte_mempool_dpaa.so.20.0.2
+	librte_distributor.so.20.0 -> librte_distributor.so.20.0.2
+	librte_rawdev_dpaa2_cmdif.so.20.0 -> librte_rawdev_dpaa2_cmdif.so.20.0.2
+	librte_mempool.so.20.0 -> librte_mempool.so.20.0.2
+	librte_pmd_octeontx2_crypto.so.20.0 -> librte_pmd_octeontx2_crypto.so.20.0.2
+	librte_common_cpt.so.20.0 -> librte_common_cpt.so.20.0.2
+....
+```
+
+You may not have the `/usr/local/lib`, `/usr/local/lib64`, or custom DPDK
+installation paths in the `LD_LIBRARY_PATH`. In this case, add it as below; if
+you installed into a
+custom
+
+```bash
+sudo echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf
+sudo echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+sudo ldconfig
+sudo ldconfig -v | grep rte_
+```
+
+Check if the PKG-CONFIG tool discovers the libraries:
+
+```bash
+pkg-config --libs libdpdk --static
+```
+
+<details>
+<summary>Possible output</summary>
+
+```console
+-lrte_node -lrte_graph -lrte_bpf -lrte_flow_classify -lrte_pipeline -lrte_table -lrte_port -lrte_fib -lrte_ipsec -lrte_vhost -lrte_stack -lrte_security -lrte_sched -lrte_reorder -lrte_rib -lrte_rawdev -lrte_pdump -lrte_power -lrte_member -lrte_lpm -lrte_latencystats -lrte_kni -lrte_jobstats -lrte_ip_frag -lrte_gso -lrte_gro -lrte_eventdev -lrte_efd -lrte_distributor -lrte_cryptodev -lrte_compressdev -lrte_cfgfile -lrte_bitratestats -lrte_bbdev -lrte_acl -lrte_timer -lrte_hash -lrte_metrics -lrte_cmdline -lrte_pci -lrte_ethdev -lrte_meter -lrte_net -lrte_mbuf -lrte_mempool -lrte_rcu -lrte_ring -lrte_eal -lrte_telemetry -lrte_kvargs -Wl,--whole-archive -lrte_common_cpt -lrte_common_dpaax -lrte_common_iavf -lrte_common_octeontx -lrte_common_octeontx2 -lrte_bus_dpaa -lrte_bus_fslmc -lrte_bus_ifpga -lrte_bus_pci -lrte_bus_vdev -lrte_bus_vmbus -lrte_mempool_bucket -lrte_mempool_dpaa -lrte_mempool_dpaa2 -lrte_mempool_octeontx -lrte_mempool_octeontx2 -lrte_mempool_ring -lrte_mempool_stack -lrte_pmd_af_packet -lrte_pmd_ark -lrte_pmd_atlantic -lrte_pmd_avp -lrte_pmd_axgbe -lrte_pmd_bond -lrte_pmd_bnxt -lrte_pmd_cxgbe -lrte_pmd_dpaa -lrte_pmd_dpaa2 -lrte_pmd_e1000 -lrte_pmd_ena -lrte_pmd_enetc -lrte_pmd_enic -lrte_pmd_failsafe -lrte_pmd_fm10k -lrte_pmd_i40e -lrte_pmd_hinic -lrte_pmd_hns3 -lrte_pmd_iavf -lrte_pmd_ice -lrte_pmd_igc -lrte_pmd_ixgbe -lrte_pmd_kni -lrte_pmd_liquidio -lrte_pmd_memif -lrte_pmd_netvsc -lrte_pmd_nfp -lrte_pmd_null -lrte_pmd_octeontx -lrte_pmd_octeontx2 -lrte_pmd_pfe -lrte_pmd_qede -lrte_pmd_ring -lrte_pmd_sfc -lrte_pmd_softnic -lrte_pmd_tap -lrte_pmd_thunderx -lrte_pmd_vdev_netvsc -lrte_pmd_vhost -lrte_pmd_virtio -lrte_pmd_vmxnet3 -lrte_rawdev_dpaa2_cmdif -lrte_rawdev_dpaa2_qdma -lrte_rawdev_ioat -lrte_rawdev_ntb -lrte_rawdev_octeontx2_dma -lrte_rawdev_octeontx2_ep -lrte_rawdev_skeleton -lrte_pmd_caam_jr -lrte_pmd_dpaa_sec -lrte_pmd_dpaa2_sec -lrte_pmd_nitrox -lrte_pmd_null_crypto -lrte_pmd_octeontx_crypto -lrte_pmd_octeontx2_crypto -lrte_pmd_crypto_scheduler -lrte_pmd_virtio_crypto -lrte_pmd_octeontx_compress -lrte_pmd_qat -lrte_pmd_ifc -lrte_pmd_dpaa_event -lrte_pmd_dpaa2_event -lrte_pmd_octeontx2_event -lrte_pmd_opdl_event -lrte_pmd_skeleton_event -lrte_pmd_sw_event -lrte_pmd_dsw_event -lrte_pmd_octeontx_event -lrte_pmd_bbdev_null -lrte_pmd_bbdev_turbo_sw -lrte_pmd_bbdev_fpga_lte_fec -lrte_pmd_bbdev_fpga_5gnr_fec -Wl,--no-whole-archive -lrte_node -lrte_graph -lrte_bpf -lrte_flow_classify -lrte_pipeline -lrte_table -lrte_port -lrte_fib -lrte_ipsec -lrte_vhost -lrte_stack -lrte_security -lrte_sched -lrte_reorder -lrte_rib -lrte_rawdev -lrte_pdump -lrte_power -lrte_member -lrte_lpm -lrte_latencystats -lrte_kni -lrte_jobstats -lrte_ip_frag -lrte_gso -lrte_gro -lrte_eventdev -lrte_efd -lrte_distributor -lrte_cryptodev -lrte_compressdev -lrte_cfgfile -lrte_bitratestats -lrte_bbdev -lrte_acl -lrte_timer -lrte_hash -lrte_metrics -lrte_cmdline -lrte_pci -lrte_ethdev -lrte_meter -lrte_net -lrte_mbuf -lrte_mempool -lrte_rcu -lrte_ring -lrte_eal -lrte_telemetry -lrte_kvargs -Wl,-Bdynamic -pthread -lm -ldl
+```
+</details>
+
+If DPDK was installed into `/usr/local/lib`, `/usr/local/lib64`, or another
+custom path, you have to point to the right directory with `PKG_CONFIG_PATH`,
+for instance:
+
+```bash
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib64/pkgconfig/
+pkg-config --libs libdpdk --static
+```
+
+### If you want to de-install this version of DPDK
+
+Go back to the version folder you used to build and install
+
+```
+cd ~/dpdk-stable-20.11.7
+sudo ninja deinstall -C build
+```
+
+# Build OAI-FHI gNB
+
+Clone OAI code base in a suitable repository, here we are cloning in `~/openairinterface5g` directory,
+
+```bash
+git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git ~/openairinterface5g
+cd ~/openairinterface5g/
+```
+
+## Build ORAN Fronthaul Interface Library
+
+Download ORAN FHI DU library and checkout the correct version.
+
+```bash
+git clone https://gerrit.o-ran-sc.org/r/o-du/phy.git ~/phy
+cd ~/phy
+git checkout oran_e_maintenance_release_v1.0
+```
+
+Apply the patch (available in `oai_folder/cmake_targets/tools/oran_fhi_integration_patches/E`):
+
+```bash
+git apply ~/openairinterface5g/cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch
+```
+
+Compile the fronthaul interface library by calling `make` and the option
+`XRAN_LIB_SO=1` to have it build a shared object. Note that we provide two
+environment variables `RTE_SDK` for the path to the source tree of DPDK, and
+`XRAN_DIR` to set the path to the fronthaul library.
+
+```bash
+cd ~/phy/fhi_lib/lib
+make clean
+RTE_SDK=~/dpdk-stable-20.11.7/ XRAN_DIR=~/phy/fhi_lib make XRAN_LIB_SO=1
+...
+[AR] build/libxran.so
+./build/libxran.so
+```
+
+The shared library object `~/phy/fhi_lib/lib/build/libxran.so` must be present
+before proceeding.
+
+## Build OAI gNB
+
+You can now proceed building OAI. You build it the same way as for other
+radios, providing option `-t oran_fhlib_5g`. Additionally, you need to provide
+it the location of the FH library: `--cmake-opt -Dxran_LOCATION=PATH`. Note
+that since we cannot use `~` here, we resort to `$HOME`, which is equivalent.
+Finally, if you needed to define `PKG_CONFIG_PATH` previously, you need to do
+so now, too.
+
+```bash
+# You should have already cloned above
+cd ~/openairinterface5g/cmake_targets
+# on debian
+sudo apt install -y libnuma-dev
+# on RHEL
+sudo dnf install -y numactl-devel
+export PKG_CONFIG_PATH=/opt/dpdk/lib64/pkgconfig/
+./build_oai -I  # if you never installed OAI, use this command once before the next line
+./build_oai --gNB --ninja -t oran_fhlib_5g --cmake-opt -Dxran_LOCATION=$HOME/phy/fhi_lib/lib
+```
+
+You can optionally check that everything has been linked properly with
+```bash
+ldd ran_build/build/liboran_fhlib_5g.so
+```
+
+<details>
+<summary>Possible output</summary>
+
+```console
+#check if all the libraries are properly linked to liboai_transpro.so
+ldd ran_build/build/liboran_fhlib_5g.so
+    linux-vdso.so.1 (0x00007fffb459e000)
+    librte_node.so.21 => /usr/local/lib64/librte_node.so.21 (0x00007fd358690000)
+    librte_graph.so.21 => /usr/local/lib64/librte_graph.so.21 (0x00007fd358685000)
+    librte_bpf.so.21 => /usr/local/lib64/librte_bpf.so.21 (0x00007fd358672000)
+    librte_flow_classify.so.21 => /usr/local/lib64/librte_flow_classify.so.21 (0x00007fd35866c000)
+    librte_pipeline.so.21 => /usr/local/lib64/librte_pipeline.so.21 (0x00007fd35862f000)
+    librte_table.so.21 => /usr/local/lib64/librte_table.so.21 (0x00007fd358612000)
+    librte_port.so.21 => /usr/local/lib64/librte_port.so.21 (0x00007fd3585f8000)
+    librte_fib.so.21 => /usr/local/lib64/librte_fib.so.21 (0x00007fd3585e9000)
+...
+    libm.so.6 => /lib64/libm.so.6 (0x00007fd357eb1000)
+    libnuma.so.1 => /lib64/libnuma.so.1 (0x00007fd357ea1000)
+    libc.so.6 => /lib64/libc.so.6 (0x00007fd357c98000)
+    /lib64/ld-linux-x86-64.so.2 (0x00007fd3587c7000)
+    libelf.so.1 => /lib64/libelf.so.1 (0x00007fd357c7d000)
+    libz.so.1 => /lib64/libz.so.1 (0x00007fd357c61000)
+```
+</details>
+
+Note that you might also call cmake directly instead of using `build_oai`:
+```
+cd ~/openairinterface5g
+mkdir build && cd build
+cmake .. -GNinja -DOAI_FHI72=ON -Dxran_LOCATION=$HOME/phy/fhi_lib/lib
+ninja nr-softmodem oran_fhlib_5g params_libconfig
+```
+
+# Configure the RU
+
+Contact the RU vendor to get the configuration manual, and configure the RU
+appropriately. You can orient on the OAI configuration files mentioned further
+below.
+
+We are evaluating if we can share RU configuration steps.
+
+# Configure OAI gNB
+
+Sample configuration files for OAI gNB, specific to the manufacturer of the radio unit, are available at:
+1. LITE-ON RU: [`gnb.sa.band78.273prb.fhi72.4x4-liteon.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf) (band n78, 273 PRBs, 3.5GHz center freq, 4x4 antenna configuration with 9 bit I/Q samples (compressed) for PUSCH/PDSCH/PRACH, 2-layer DL MIMO, UL SISO)
+2. Benetel 650 RU: [`gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel650.conf) (band n78, 273 PRBs, 3.5GHz center freq, 4x2 antenna configuration with 9 bit I/Q samples (compressed) for PUSCH/PDSCH/PRACH, 2-layer DL MIMO, UL SISO)
+3. VVDN RU: [`gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf) (band n77, 273 PRBs, 4.0GHz center freq, 4x4 antenna configuration with 9 bit I/Q samples (compressed) for PUSCH/PDSCH/PRACH, 2-layer DL MIMO, UL SISO)
+
+## Adapt the OAI-gNB configuration file to your system/workspace
+
+Edit the sample OAI gNB configuration file and check following parameters:
+
+* `gNBs` section
+  * The PLMN section shall match the one defined in the AMF
+  * `amf_ip_address` shall be the correct AMF IP address in your system
+  * `GNB_INTERFACE_NAME_FOR_NG_AMF` and `GNB_IPV4_ADDRESS_FOR_NG_AMF` shall match your DU N2 interface name and IP address
+  * `GNB_INTERFACE_NAME_FOR_NGU` and `GNB_IPV4_ADDRESS_FOR_NGU` shall match your DU N3 interface name and IP address
+  * `prach_ConfigurationIndex`
+  * `prach_msg1_FrequencyStart`
+  * Adjust the frequency, bandwidth and SSB position
+
+* `L1s` section
+  * Set an isolated core for L1 thread `L1_rx_thread_core`, in our environment we are using CPU 8
+  * `phase_compensation` should be set to 0 to disable when it is performed in the RU and set to 1 when it should be performed on the DU side
+
+* `RUs` section
+  * Set an isolated core for RU thread `ru_thread_core`, in our environment we are using CPU 6
+
+* `fhi_72` (FrontHaul Interface) section: this config follows the structure
+  that is employed by the xRAN library (`xran_fh_init` and `xran_fh_config`
+  structs in the code):
+  * `dpdk_devices`: PCI addresses of NIC VFs binded to the DPDK
+  * `io_core`: absolute CPU core ID for XRAN library
+  * `worker_cores`: array of absolute CPU core IDs for XRAN library
+  * `du_addr`: DU C- and U-plane MAC-addresses (format `UU:VV:WW:XX:YY:ZZ`,
+    hexadecimal numbers)
+  * `ru_addr`: RU C- and U-plane MAC-addresses (format `UU:VV:WW:XX:YY:ZZ`,
+    hexadecimal numbers)
+  * `mtu`: Maximum Transmission Unit for the RU, specified by RU vendor
+  * `fh_config`: parameters that need to match RU parameters
+    * timing parameters (starting with `T`) depend on the RU: `Tadv_cp_dl` is a
+      single number, the rest pairs of numbers `(x, y)` specifying minimum and
+      maximum delays
+    * `ru_config`: RU-specific configuration:
+      * `iq_width`: Width of DL/UL IQ samples: if 16, no compression, if <16, applies
+        compression
+      * `iq_width_prach`: Width of PRACH IQ samples: if 16, no compression, if <16, applies
+        compression
+      * `fft_size`: size of FFT performed by RU, set to 12 by default
+    * `prach_config`: PRACH-specific configuration
+      * `eAxC_offset`:  PRACH antenna offset
+      * `kbar`: the PRACH guard interval, provided in RU
+
+xRAN SRS reception is not supported. The eAxC offsets for DL/UL are determined
+from the antenna configuration.
+
+## Configure Network Interfaces and DPDK VFs
+
+The 7.2 fronthaul uses the xran library, which requires DPDK. In this step, we
+need to configure network interfaces to send data to the RU, and configure DPDK
+to bind to the corresponding PCI interfaces. More specifically, in the
+following we use [SR-IOV](https://en.wikipedia.org/wiki/Single-root_input/output_virtualization)
+to create multiple virtual functions (VFs) through which Control plane (C
+plane) and User plane (U plane) traffic will flow. The following commands are
+not persistant, and have to be repeated after reboot.
+
+In the following, we will use these short hands:
+
+- `physical-interface`: Physical network interface through which you can access the RU
+- `vlan`: VLAN tags as defined in the RU configuration
+- `mtu`: the MTU as specified by the RU vendor, and supported by the NIC
+- `du-c-plane-mac-addr`: DU C plane MAC address
+- `lspci-address-c-plane-vf`: PCI bus address of the VF for C plane
+- `du-u-plane-mac-addr`: DU U plane MAC address
+- `lspci-address-u-plane-vf`: PCI bus address of the VF for U plane
+
+For both the MAC addresses, you might use the MAC addresses which are
+pre-configured in the RUs (typically `00:11:22:33:44:66`, but that is not
+always the case). Note that if your system has Intel E-810 NIC cards/ICE
+driver, you have to choose different MAC addresses (valid for above-mentioned
+kernels). If the RU vendor requires untagged traffic, remove the VLAN tagging
+in the below command and configure VLAN on the switch as "access VLAN". In case
+the MTU is different than 1500, you have to update the MTU on the switch
+interface as well.
+
+First, set maximum ring buffers:
+```bash
+sudo ethtool -g <physical-interface>
+sudo ethtool -G <physical-interface> rx 4096     # assumes 4096 is max
+sudo ethtool -G <physical-interface> tx 4096     # assumes 4096 is max
+```
+
+Set the maximum MTU in the physical interface:
+```bash
+sudo ifconfig <physical-interface> mtu <mtu>
+```
+
+(Re-)create two VFs, load the Linux "Base Driver for Intel Ethernet Adaptive
+Virtual Function" (in case you use Intel ethernet card), and set up the VFs.
+
+```bash
+sudo modprobe iavf
+sudo sh -c echo "0" > /sys/class/net/<physical-interface>/device/sriov_numvfs
+sudo sh -c echo "2" > /sys/class/net/<physical-interface>/device/sriov_numvfs
+sudo ip link set <physical-interface> vf 0 mac <du-c-plane-mac-addr> vlan <vlan> mtu <mtu> spoofchk off
+sudo ip link set <physical-interface> vf 1 mac <du-u-plane-mac-addr> vlan <vlan> mtu <mtu> spoofchk off
+```
+
+After running the above commands, the kernel created virtual functions that
+have been assigned a PCI address under the same device and vendor ID. For
+instance, use `sudo lshw -c network -businfo` to get a list of PCI addresses
+and interface names, locate the PCI address of `<physical-interface>`, then use
+`lspci | grep Virtual` to get all virtual interfaces and use the ones with the
+same Device/Vendor ID parts (first two numbers).
+
+<details>
+<summary>Example</summary>
+
+The machine in this example has an Intel X710 card. The interface
+<physical-interface> in question is `eno12409`. Running `lshw` gives:
+
+```bash
+$ sudo lshw -c network -businfo
+Bus info          Device     Class          Description
+=======================================================
+[...]
+pci@0000:31:00.1  eno12409   network        Ethernet Controller X710 for 10GbE SFP+
+[...]
+```
+
+We see the PCI address `31:00.1`. Listing the virtual interfaces through
+`lspci`, we get
+
+```bash
+$ lspci | grep Virtual
+31:06.0 Ethernet controller: Intel Corporation Ethernet Virtual Function 700 Series (rev 02)
+31:06.1 Ethernet controller: Intel Corporation Ethernet Virtual Function 700 Series (rev 02)
+98:11.0 Ethernet controller: Intel Corporation Ethernet Adaptive Virtual Function (rev 02)
+98:11.1 Ethernet controller: Intel Corporation Ethernet Adaptive Virtual Function (rev 02)
+98:11.2 Ethernet controller: Intel Corporation Ethernet Adaptive Virtual Function (rev 02)
+98:11.3 Ethernet controller: Intel Corporation Ethernet Adaptive Virtual Function (rev 02)
+98:11.4 Ethernet controller: Intel Corporation Ethernet Adaptive Virtual Function (rev 02)
+98:11.5 Ethernet controller: Intel Corporation Ethernet Adaptive Virtual Function (rev 02)
+```
+
+The hardware card `31:00.1` has two associated virtual functions `31:06.0` and
+`31:06.1`.
+</details>
+
+Now, unbind any pre-existing DPDK devices, load the "Virtual Function I/O"
+driver `vfio_pci`, and bind DPDK to these devices:
+
+```
+sudo /usr/local/bin/dpdk-devbind.py --unbind <lspci-address-c-plane-vf>
+sudo /usr/local/bin/dpdk-devbind.py --unbind <lspci-address-u-plane-vf>
+sudo modprobe vfio_pci
+sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci <lspci-address-c-plane-vf>
+sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci <lspci-address-u-plane-vf>
+```
+
+We recommand to put the above commands into a script file to quickly repeat them.
+
+<details>
+<summary>Example script for Benetel 650 with Intel X710 on host</summary>
+
+```console
+set -x
+
+sudo ethtool -G eno12409 rx 4096
+sudo ethtool -G eno12409 tx 4096
+sudo ifconfig eno12409 mtu 9216
+
+sudo modprobe iavf
+sudo sh -c 'echo 0 > /sys/class/net/eno12409/device/sriov_numvfs'
+sudo sh -c 'echo 2 > /sys/class/net/eno12409/device/sriov_numvfs'
+sudo ip link set eno12409 vf 0 mac 00:11:22:33:44:67 vlan 3 qos 0 spoofchk off mtu 9216
+sudo ip link set eno12409 vf 1 mac 00:11:22:33:44:66 vlan 3 qos 0 spoofchk off mtu 9216
+
+sudo /usr/local/bin/dpdk-devbind.py --unbind 31:06.0
+sudo /usr/local/bin/dpdk-devbind.py --unbind 31:06.1
+sudo modprobe vfio-pci
+sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci 31:06.0
+sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci 31:06.1
+```
+</details>
+
+# Start OAI gNB
+
+```bash
+cd ran_build/build
+
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/oran.fh.band78.fr1.273PRB.conf --sa --reorder-thread-disable 1 --thread-pool <list of non isolated cpus>
+```
+
+For example if you have two numa nodes (for example 18 CPU per socket) in your system and odd cores are non isolated then you can put the thread-pool on `1,3,5,7,9,11,13,15`. Else if you have 1 numa node either you can use isolated cores or non isolated. Just make sure that isolated cores are not the ones defined earlier.
+

doc/README.md

@@ -21,6 +21,7 @@
 - [BUILD.md](./BUILD.md): how to build the sources
 - [cross-compile.md](./cross-compile.md): how to cross-compile OAI for ARM
 - [clang-format.md](./clang-format.md): how to format the code
+- [sanitizers.md](./dev_tools/sanitizers.md): how to run with ASan/UBSan/MemSAN/TSan
 - [environment-variables.md](./environment-variables.md): the environment variables used by OAI
 
 There is some general information in the [OpenAirInterface Gitlab Wiki](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/home)
@@ -38,6 +39,7 @@ There is some general information in the [OpenAirInterface Gitlab Wiki](https://
   * (5G) Using SDAP and custom DRBs
   * IF setups and arbitrary frequencies
   * MIMO
+- [How to run OAI with O-RAN 7.2 FHI](./ORAN_FHI7.2_Tutorial.md)
 - [How to run a 5G-NSA setup](./TESTING_GNB_W_COTS_UE.md)
 - [How to run a 4G setup using L1 simulator](./L1SIM.md) _Note: we recommend the RFsimulator_
 - [How to use the L2 simulator](./L2NFAPI.md)

doc/RUNMODEM.md

@@ -7,12 +7,18 @@
       </a>
     </td>
     <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">Running OAI Softmodems</font></b>
+      <b><font size = "5">Running OAI 5G Softmodems</font></b>
     </td>
   </tr>
 </table>
 
-After you have [built the softmodem executables](BUILD.md) you can set your default directory  to the build directory `cmake_targets/ran_build/build/` and start testing some use cases. Below, the description of the different oai functionalities should help you choose the oai configuration that suits your need. 
+This document explains some options for running 5G executables.
+
+After you have [built the softmodem executables](BUILD.md) you can set your
+default directory  to the build directory `cmake_targets/ran_build/build/` and
+start testing some use cases. Below, the description of the different OAI
+functionalities should help you choose the OAI configuration that suits your
+need.
 
 [[_TOC_]]
 
@@ -20,28 +26,27 @@ After you have [built the softmodem executables](BUILD.md) you can set your defa
 
 ## RFsimulator
 
-The RF simulator is an OAI device replacing the radio heads (for example the USRP device). It allows connecting the oai UE (LTE or 5G) and respectively the oai eNodeB or gNodeB through a network interface carrying the time-domain samples, getting rid of over the air unpredictable perturbations. This is the ideal tool to check signal processing algorithms and protocols implementation.  The rf simulator has some preliminary support for channel modeling.
+The RFsimulator is an OAI device replacing the radio heads (for example the
+USRP device). It allows connecting the oai UE (LTE or 5G) and respectively the
+oai eNodeB or gNodeB through a network interface carrying the time-domain
+samples, getting rid of over the air unpredictable perturbations. This is the
+ideal tool to check signal processing algorithms and protocols implementation.
+The RFsimulator has some preliminary support for channel modeling.
 
 It is planned to enhance this simulator with the following functionalities:
 
 - Support for multiple eNodeB's or gNodeB's for hand-over tests
 
-This is an easy use-case to setup and test, as no specific hardware is required. The [rfsimulator page](../radio/rfsimulator/README.md ) contains the detailed documentation.
+This is an easy use-case to setup and test, as no specific hardware is required. The [rfsimulator page](../radio/rfsimulator/README.md) contains the detailed documentation.
 
 ## L2 nFAPI Simulator
 
-This simulator connects a eNodeB  and UEs through a nfapi interface, short-cutting the L1 layer. The objective of this simulator is to allow multi UEs simulation, with a large number of UEs (ideally up to 255 ) .Here to ease the platform setup, UEs are simulated via a single `lte-uesoftmodem` instance. Today the CI tests just with one UE and architecture has to be reviewed to allow a number of UE above about 16. This work is on-going.
+This simulator connects an eNodeB and UEs through an nFAPI interface,
+short-cutting the L1 layer. The objective of this simulator is to allow multi
+UEs simulation, with a large number of UEs (ideally up to 255).
 
-As for the rf simulator, no specific hardware is required. The [L2 nfapi simulator page](L2NFAPI.md) contains the detailed documentation.
-
-## L1 Simulator
-
-**This information might be outdated. We recommend to use the RFsimulator as
-shown above.**
-
-The L1 simulator is using the ethernet fronthaul protocol, as used to connect a RRU and a RAU to connect UEs and a eNodeB. UEs are simulated in a single `lte-uesoftmodem` process, as for the nfapi simulator. 
-
-The [L1 simulator page](L1SIM.md) contains the detailed documentation.
+As for the RFsimulator, no specific hardware is required. The [L2 nfapi
+simulator page](./L2NFAPI.md) contains the detailed documentation.
 
 # Running with a true radio head
 
@@ -89,7 +94,7 @@ At the UE the --sa flag will:
   4) 5G-NR RRC Reconfiguration
   5) Start Downlink and Uplink Data Transfer
 
-Command line parameters for UE in --sa mode:
+Command line parameters for UE in `--sa` mode:
 - `-C` : downlink carrier frequency in Hz (default value 0)
 - `--CO` : uplink frequency offset for FDD in Hz (default value 0)
 - `--numerology` : numerology index (default value 1)
@@ -104,7 +109,7 @@ sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band
 sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --sa
 ```
 
-With the RF simulator (on the same machine):
+With the RFsimulator (on the same machine):
 
 ```bash
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --rfsim --sa
@@ -117,11 +122,15 @@ Additionally, at UE side `--uecap_file` option can be used to pass the UE Capabi
 
 Some other useful paramters of the UE are
 
- - --ue-fo-compensation: enables the frequency offset compenstation at the UE. This is useful when running over the air and/or without an external clock/time source
- - --usrp-args: this is the equivalend paramter of sdr_addrs field in the gNB config file and can be used to identify the USRP and set some basic paramters (like the clock source)
- - --clock-source: sets the clock-source (internal or external). 
- - --time-source: sets the time-source (internal or external). 
+- `--ue-fo-compensation`: enables the frequency offset compenstation at the UE. This is useful when running over the air and/or without an external clock/time source
+- `--usrp-args`: this is the equivalend paramter of `sdr_addrs` field in the gNB config file and can be used to identify the USRP and set some basic paramters (like the clock source)
+- `--clock-source`: sets the clock-source (internal or external).
+- `--time-source`: sets the time-source (internal or external).
 
+You can see all options by typing
+```
+./nr-uesoftmodem --help
+```
 
 # Specific OAI modes
 
@@ -154,9 +163,31 @@ In phy-test mode it is possible to mimic the reception of UE Capabilities at gNB
 
 ## noS1 setup with OAI UE
 
-Instead of randomly generated payload, in the phy-test mode we can also inject/receive user-plane traffic over a TUN interface. This is the so-called noS1 mode. 
+Instead of randomly generated payload, in the phy-test mode we can also
+inject/receive user-plane traffic over a TUN interface. This is the so-called
+noS1 mode.
 
-This setup is described in the [rfsimulator page](../radio/rfsimulator/README.md#5g-case). In theory this should also work with the real hardware target although this has yet to be tested.
+The noS1 mode is applicable to both gNB/UE, and enabled by passing `--noS1` as
+an option. The gNB/UE will open a TUN interface which the interface names and
+IP addresses `oaitun_enb1`/10.0.1.1, and `oaitun_ue1`/10.0.1.2, respectively.
+You can then use these interfaces to send traffic, e.g.,
+```bash
+iperf -sui1 -B 10.0.1.2
+```
+to open an iperf server on the UE side, and
+```bash
+iperf -uc 10.0.1.2 -B 10.0.1.1 -i1 -t10 -b1M
+```
+to send data from the gNB down to the UE.
+
+Note that this does not work if both interfaces are on the same host. We
+recommend to use two different hosts, or at least network namespaces, to route
+traffic through the gNB/UE tunnel.
+
+This option is only really helpful for phy-test/do-ra (see below) modes, in
+which the UE does not connect to a core network. If the UE connects to a core
+network, it receives an IP address for which it automatically opens a network
+interface.
 
 ## do-ra setup with OAI
 
@@ -244,7 +275,3 @@ The DL logical antenna port configuration can be selected through configuration
 Finally the number of TX physical antenna in the RU part of the configuration file, `nb_tx`, should be equal or larger than the total number of PDSCH logical antenna ports.
 
 [Example of configuration file with parameters for 2-layer MIMO](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf)
-
-# Additional links
-
-[Selecting an alternative ldpc implementation at run time](../openair1/PHY/CODING/DOC/LDPCImplementation.md)

doc/SW_archi.md

@@ -274,7 +274,7 @@ nr_preprocessor_phytest()], multiple users in FR1
   2)  Checks the quantity of waiting data in RLC
   3)  Either set up resource allocation directly (e.g., for a single UE,
       phytest), or call into a function to perform actual resource allocation.
-      Currently, this is done using nr_pf_dl() which implements a basic
+      Currently, this is done using pf_dl() which implements a basic
       proportional fair scheduler:
       * for every UE, check for retransmission and allocate as necessary
       * Calculate the PF coefficient and put eligible UEs into a list

doc/TESTBenches.md

@@ -109,6 +109,7 @@ information on how the images are built.
   - build image from `Dockerfile.clang.rhel9` (compilation only, artifacts not used currently)
 - [RAN-Ubuntu18-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/)
   ~BUILD-ONLY ~4G-LTE ~5G-NR
+  - run formatting check from `ci-scripts/docker/Dockerfile.formatting.bionic`
   - obelix: Ubuntu 20 image build using docker (Note: builds U20 images while pipeline is named U18!)
   - base image from `Dockerfile.base.ubuntu20`
   - build image from `Dockerfile.build.ubuntu20`, followed by
@@ -118,6 +119,7 @@ information on how the images are built.
     - target image from `Dockerfile.nrUE.ubuntu20`
     - target image from `Dockerfile.lteUE.ubuntu20`
     - target image from `Dockerfile.lteRU.ubuntu20`
+  - build unit tests from `ci-scripts/docker/Dockerfile.unittest.ubuntu20`, and run them
 
 #### Image Test pipelines
 

doc/dev_tools/sanitizers.md

@@ -0,0 +1,63 @@
+<table style="border-collapse: collapse; border: none;">
+  <tr style="border-collapse: collapse; border: none;">
+    <td style="border-collapse: collapse; border: none;">
+      <a href="http://www.openairinterface.org/">
+         <img src="./../images/oai_final_logo.png" alt="" border=3 height=50 width=150>
+         </img>
+      </a>
+    </td>
+    <td style="border-collapse: collapse; border: none; vertical-align: center;">
+      <b><font size = "5">OAI Build Procedures</font></b>
+    </td>
+  </tr>
+</table>
+
+[[_TOC_]]
+
+# Sanitize options in `build_oai`
+
+The `build_oai` script provides various [Instrumentation Options](https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html) to add run-time instrumentation to the code and enable runtime error checkers, i.e. sanitizers, in order to help find various types of bugs in the codebase and eventually enhance the stability of the OAI softmodems.  The following sanitizers can be enabled using different build options:
+
+## Address Sanitizer (ASAN)
+[Address Sanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer) is enabled using the `--sanitize-address` option or its shorthand `-fsanitize=address`. It serves as a fast memory error detector and helps detect issues like out-of-bounds accesses, use-after-free bugs, and memory leaks.
+
+### Run OAI Softmodem with ASAN on
+
+It is necessary to add the envinronment variable `LD_LIBRARY_PATH` to the run command, e.g.:
+```
+cd cmake_targets/ran_build/build
+sudo LD_LIBRARY_PATH=. ./nr-softmodem ...
+```
+
+## Undefined Behavior Sanitizer (UBSAN)
+[Undefined Behavior Sanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html) (UBSAN) is a runtime undefined behavior checker. It uses compile-time instrumentation to catch undefined behavior by inserting code that performs specific checks before operations that may cause it. UBSAN can be activated with the `--sanitize-undefined` option or `-fsanitize=undefined`.
+
+UBSAN offers a range of suboptions that enable precise checks for various types of undefined behavior at runtime. These suboptions can be set by tweaking the [CMakeLists.txt](../../CMakeLists.txt) file. Here is an overview of some key suboptions:
+
+* `-fsanitize=shift`: Enables checks for the result of shift operations, with suboptions for base and exponent.
+* `-fsanitize=integer-divide-by-zero`: Detects integer division by zero.
+* `-fsanitize=null`: Enables pointer checking, issuing an error message when dereferencing a NULL pointer or binding a reference to a NULL pointer.
+* `-fsanitize=signed-integer-overflow`: Detects signed integer overflow.
+* `-fsanitize=bounds`: Instruments array bounds, detecting various out-of-bounds accesses.
+* `-fsanitize=alignment`: Checks the alignment of pointers when dereferenced or when a reference is bound to an insufficiently aligned target.
+* `-fsanitize=object-size`: Checks out-of-bounds pointer accesses.
+* `-fsanitize=float-divide-by-zero`: Detects floating-point division by zero.
+
+## Memory Sanitizer
+To enable [Memory Sanitizer](https://clang.llvm.org/docs/MemorySanitizer.html), use the `--sanitize-memory` option or `-fsanitize=memory`. It requires clang and is incompatible with ASAN and UBSAN. Building with this option helps catch issues related to uninitialized memory reads.
+
+To build with Memory Sanitizer, use the following command:
+```
+CC=/usr/bin/clang CXX=/usr/bin/clang++ ./build_oai ... --sanitize-memory
+```
+
+## Thread Sanitizer
+[Thread Sanitizer](https://clang.llvm.org/docs/ThreadSanitizer.html) can be activated using the `--sanitize-thread` option or `-fsanitize=thread`. This sanitizer helps identify data races and other threading-related issues in the code.
+
+# Summary of Sanitizer Options
+
+- `--sanitize`: Shortcut for using both ASAN and UBSAN.
+- `--sanitize-address` or `-fsanitize=address`: Enable ASAN on all targets.
+- `--sanitize-undefined` or `-fsanitize=undefined`: Enable UBSAN on all targets.
+- `--sanitize-memory` or `-fsanitize=memory`: Enable Memory Sanitizer on all targets (requires clang).
+- `--sanitize-thread` or `-fsanitize=thread`: Enable Thread Sanitizer on all targets.

docker/Dockerfile.base.rocky

@@ -21,11 +21,11 @@
 #---------------------------------------------------------------------
 #
 # Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Rocky 8.7
+#   Valid for Rocky 9
 #
 #---------------------------------------------------------------------
 
-ARG BASE_IMAGE=docker.io/rockylinux:8.7
+ARG BASE_IMAGE=docker.io/rockylinux:9
 FROM $BASE_IMAGE AS ran-base
 
 ENV TZ=Europe/Paris
@@ -33,7 +33,6 @@ ENV BUILD_UHD_FROM_SOURCE=True
 ENV UHD_VERSION=4.4.0.0
 
 RUN dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled powertools && \
     dnf install epel-release -y && crb enable && \
     dnf update -y && \
     dnf install -y \

docker/Dockerfile.build.rocky

@@ -21,7 +21,7 @@
 #---------------------------------------------------------------------
 #
 # Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Rocky 8.7
+#   Valid for Rocky 9
 #
 #---------------------------------------------------------------------
 

docker/Dockerfile.eNB.rocky

@@ -21,17 +21,15 @@
 #---------------------------------------------------------------------
 #
 # Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Rocky 8.7
+#   Valid for Rocky 9
 #
 #---------------------------------------------------------------------
 
-ARG BASE_IMAGE=docker.io/rockylinux:8.7
+ARG BASE_IMAGE=docker.io/rockylinux:9
 FROM ran-base:latest AS enb-base
 
 FROM ran-build:latest AS enb-build
 
-RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \
-    cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
 
 #start from scratch for target executable
 FROM $BASE_IMAGE as oai-enb
@@ -56,9 +54,9 @@ RUN dnf update -y && \
 
 WORKDIR /opt/oai-enb/bin
 COPY --from=enb-build \
-    /oai-ran/cmake_targets/ran_build/build/lte-softmodem \
-    /oai-ran/docker/scripts/entrypoint.sh \
-    ./
+    /oai-ran/cmake_targets/ran_build/build/lte-softmodem ./
+
+COPY ./docker/scripts/enb_entrypoint.sh ./entrypoint.sh
 
 COPY --from=enb-build \
     /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
@@ -73,24 +71,25 @@ COPY --from=enb-build \
     /usr/local/lib/
 
 COPY --from=enb-base \
-    /lib64/libconfig.so.9 \
+    /lib64/libconfig.so.11 \
     /lib64/libblas.so.3 \
+    /lib64/libcblas.so.3 \
     /lib64/liblapack.so.3 \
     /lib64/liblapacke.so.3 \
-    /lib64/libboost_chrono.so.1.66.0 \
-    /lib64/libboost_date_time.so.1.66.0 \
-    /lib64/libboost_filesystem.so.1.66.0 \
-    /lib64/libboost_program_options.so.1.66.0 \
-    /lib64/libboost_serialization.so.1.66.0 \
-    /lib64/libboost_thread.so.1.66.0 \
-    /lib64/libboost_system.so.1.66.0 \
-    /lib64/libboost_unit_test_framework.so.1.66.0 \
-    /lib64/libboost_atomic.so.1.66.0 \
-    /lib64/libboost_timer.so.1.66.0 \
-    /lib64/libboost_regex.so.1.66.0 \
-    /lib64/libicudata.so.60 \
-    /lib64/libicui18n.so.60 \
-    /lib64/libicuuc.so.60 \
+    /lib64/libboost_chrono.so.1.75.0 \
+    /lib64/libboost_date_time.so.1.75.0 \
+    /lib64/libboost_filesystem.so.1.75.0 \
+    /lib64/libboost_program_options.so.1.75.0 \
+    /lib64/libboost_serialization.so.1.75.0 \
+    /lib64/libboost_thread.so.1.75.0 \
+    /lib64/libboost_system.so.1.75.0 \
+    /lib64/libboost_unit_test_framework.so.1.75.0 \
+    /lib64/libboost_atomic.so.1.75.0 \
+    /lib64/libboost_timer.so.1.75.0 \
+    /lib64/libboost_regex.so.1.75.0 \
+    /lib64/libicudata.so.67 \
+    /lib64/libicui18n.so.67 \
+    /lib64/libicuuc.so.67 \
     /lib64/
 
 
@@ -116,10 +115,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 && \
     echo "ldd on libtelnetsrv_enb.so" && ldd /usr/local/lib/libtelnetsrv_enb.so
 
-# Copy the relevant configuration files for eNB
-WORKDIR /opt/oai-enb/etc
-COPY --from=enb-build /oai-ran/docker/etc .
-
 WORKDIR /opt/oai-enb
 
 # 2152 --> S1U, GTP/UDP

docker/Dockerfile.gNB.aw2s.rocky

@@ -21,11 +21,11 @@
 #---------------------------------------------------------------------
 #
 # Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Rocky 8.7
+#   Valid for Rocky 9
 #
 #---------------------------------------------------------------------
 
-ARG BASE_IMAGE=docker.io/rockylinux:8.7
+ARG BASE_IMAGE=docker.io/rockylinux:9
 FROM ran-base:latest AS gnb-base
 
 FROM ran-build:latest AS gnb-build
@@ -55,11 +55,11 @@ RUN dnf update -y && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
     echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
 
+COPY ./libori.so /usr/local/lib
+
 WORKDIR /opt/oai-gnb-aw2s/bin
-COPY --from=gnb-build \
-    /oai-ran/cmake_targets/ran_build/build/nr-softmodem \
-    ./
-COPY ./docker/scripts/gnb-aw2s_entrypoint.sh ./entrypoint.sh
+COPY --from=gnb-build /oai-ran/cmake_targets/ran_build/build/nr-softmodem ./
+COPY ./docker/scripts/gnb-aw2s_entrypoint.sh /opt/oai-gnb-aw2s/bin/entrypoint.sh
 
 COPY --from=gnb-build \
     /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
@@ -70,21 +70,30 @@ COPY --from=gnb-build \
     /oai-ran/cmake_targets/ran_build/build/libdfts.so \
     /oai-ran/cmake_targets/ran_build/build/libldpc*.so \
     /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
-    /usr/local/lib/libori.so \
     /usr/local/lib/
 
 COPY --from=gnb-base \
-    /lib64/libconfig.so.9 \
+    /lib64/libconfig.so.11 \
     /lib64/libforms.so.2 \
     /lib64/libblas.so.3 \
+    /lib64/libcblas.so.3 \
     /lib64/liblapack.so.3 \
     /lib64/liblapacke.so.3 \
     /lib64/
 
 RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \
     ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so && \
-    ldconfig
+    ldconfig && \
+    echo "ldd on nr-softmodem" && ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \
+    echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on libthirdparty_transpro.so" && ldd /usr/local/lib/libthirdparty_transpro.so && \
+    echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so
 
 WORKDIR /opt/oai-gnb-aw2s
+
 ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem", "-O", "/opt/oai-gnb-aw2s/etc/gnb.conf"]