Commit f3eb7130 authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'integration_2025_w15' into 'develop' 

Integration: `2025.w15`

Closes #901, #943, #944, #942, and #939

See merge request !3374

* !3358 RedCap InitialBWP
* !3364 NR UE: fix PRACH generation with frequency resource id not 0 when msg1-FDM > 1 in SIB1
* !3365 nr pdcp: 'count' is 32 bits, use explicit type instead of generic 'int'
* !3366 Fix typo in gNB_scheduler_uci.c
* !3370 Doc: add information on how to avoid a common asan bug
* !3275 NAS service reject
* !3312 NR UE: enable concurrent UL slot processing
* !3368 Encapsulate cmake asn1c call, suppress useless output
* !3336 Fix logging in nr_dlsim
* !3281 Add support for 'dl_min_mcs' and 'ul_min_mcs' configuration parameters
* !3355 NR UE: add support for continuous frequency offset compensation (in particular NTN LEO Doppler)
* !3375 CI CoreNetwork fixes
* !3184 NR SIB2
* !3348 CI: Replacing Devkit server with a Grace Hopper in Aerial pipeline
parents b5f7d22c b790fb23

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -823,6 +823,7 @@ set(PHY_SRC_COMMON 
  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c

  ${OPENAIR1_DIR}/PHY/TOOLS/lut.c

  ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c

  ${OPENAIR1_DIR}/PHY/TOOLS/get_sin_cos.c

  )



set(PHY_SRC

ci-scripts/ci_infra.yaml

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ oc-cn5g-20897: 
  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"

  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"



oc-cn5g-20897-aerial2:

  Host: aerial2

oc-cn5g-20897-aerial:

  Host: gracehopper1-oai

  NetworkScript: echo "inet 172.21.6.105"

  RunIperf3Server: False

  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-nvidia-aerial"

ci-scripts/cls_corenetwork.py

+5 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class CoreNetwork: 
		self._host = c.get('Host').strip()

		if self._host == "%%current_host%%":

			if node is None:

				raise Exception(f"core network {self} requires node, but none provided (cannot replace %%current_host%%)")

				raise Exception(f"core network {cn_name} requires node, but none provided (cannot replace %%current_host%%)")

			self._host = node

		if d is not None:

			raise Exception("directory handling not implemented")
@@ -66,7 +66,7 @@ class CoreNetwork: 
		logging.info(f'initialized core {self} from {filename}')



	def __str__(self):

		return f"{self._cn_name}@{self._host} [IP: {self.getIP()}]"

		return f"{self._cn_name}@{self._host}"



	def __repr__(self):

		return self.__str__()
@@ -162,6 +162,9 @@ class CoreNetwork: 
	def getCmdPrefix(self):

		return self._cmd_prefix or ""



	def getName(self):

		return self._cn_name



	def getHost(self):

		return self._host

ci-scripts/cls_oaicitest.py

+2 −2
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ class OaiCiTest(): 
			return (False, f"UE {ue.getName()} has no IP address")

		svrIP = cn.getIP()

		if not svrIP:

			return (False, f"Iperf server {ue.getName()} has no IP address")

			return (False, f"Iperf server {cn.getName()} has no IP address")



		iperf_opt = self.iperf_args

		jsonReport = "--json"
@@ -862,7 +862,7 @@ class OaiCiTest(): 
		success, output = cn.deploy()

		logging.info(f"deployment core network {core_name} success {success}, output:\n{output}")

		if success:

			msg = f"Started {cn}"

			msg = f"Started {cn} [{cn.getIP()}]"

			HTML.CreateHtmlTestRowQueue(core_name, 'OK', [msg])

		else:

			msg = f"deployment of core network {core_name} FAILED"

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

+2 −2
Original line number Diff line number Diff line
@@ -186,8 +186,8 @@ gNBs = 


    NETWORK_INTERFACES :

    {

        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.131";

        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";

        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.202";

        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.202";

        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152

    };