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

Merge branch 'integration_2025_w14_p2' into 'develop' 

Integration: `2025.w14` (part 2)

See merge request oai/openairinterface5g!3362

* !3255 Fixes for E1 and PDU session usage
* !3332 sched_ctrlCommon earlier
* !3356 Avoid accessing current_DL_BWP structure when scheduling DCI for other SIBs
* !3359 Fix inconsistent maxnoofPDUSessions definitions between NGAP and platform constants
* !3357 CI: update VVDN configuration file
* !3333 NR RLC improvements
* !3342 Fix bugs detected gcc
* !3347 feat(oran_fhlib_5g): O-RAN 7.2 FrontHaul Interface on Arm
* !3153 [E2 agent] RAN Control SM - support for REPORT Style 1 ("RRC Message" and "UE ID" RAN Parameter IDs)
* !3234 CI: minor tunings and improvements
* !3276 Optimization for unused symbols in NR UE
* !3317 Extend F1 Handover test
parents 23c909e2 469bf236

CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -453,6 +453,9 @@ target_include_directories(f1ap PUBLIC F1AP_DIR) 
target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)

target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)

target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)

if(E2_AGENT)

  target_compile_definitions(f1ap PRIVATE E2_AGENT)

endif()



# LPP

##############

ci-scripts/cls_containerize.py

+5 −1
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ class Containerize(): 
		result = re.search('native_arm', self.imageKind)

		if result is not None:

			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))

			imageNames.append(('ran-build-fhi72', 'build.fhi72.native_arm', 'ran-build-fhi72', ''))

			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))

			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))

			imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
@@ -889,7 +890,10 @@ class Containerize(): 
				if deployed:

					break

				elif (attempt < num_attempts - 1):

					logging.warning(f'Failed to deploy on attempt {attempt}, restart services {services}')

					warning_msg = f'Restart services {services}'

					logging.warning(warning_msg)

					imagesInfo.append(warning_msg)

					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', ['\n'.join(imagesInfo)])

					for svc in services.split():

						CopyinServiceLog(ssh, lSourcePath, yaml_dir, svc, wd_yaml, f'{svc}-{HTML.testCase_id}-attempt{attempt}.log')

					ssh.run(f'docker compose -f {wd_yaml} down -- {services}')

ci-scripts/cls_oaicitest.py

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos 
		jit_msg = f'Jitter      : {jitter}'

		pal_msg = f'Packet Loss : {packetloss}'

		if float(packetloss) > float(iperf_packetloss_threshold):

			pal_msg += f' (too high! >{self.iperf_packetloss_threshold}%)'

			pal_msg += f' (too high! >{iperf_packetloss_threshold}%)'

		return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')



def Custom_Command(HTML, node, command, command_fail):

ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf

+2 −2
Original line number Diff line number Diff line
@@ -189,11 +189,11 @@ RUs = ( 
         nb_rx          = 1

         # The higher att for TX than RX is because we use a circulator (as for TDD),

         # while we should use a duplexer in the FDD case. However, it uses the same setup.

         att_tx         = 18

         att_tx         = 16

         att_rx         = 0;

         bands          = [1];

         max_pdschReferenceSignalPower = -27;

         max_rxgain                    = 108;

         max_rxgain                    = 110;

         eNB_instances  = [0];

         clock_src = "internal";

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -194,11 +194,11 @@ RUs = ( 
       local_rf       = "yes"

         nb_tx          = 1

         nb_rx          = 1

         att_tx         = 10;

         att_rx         = 10;

         att_tx         = 4;

         att_rx         = 4;

         bands          = [78];

         max_pdschReferenceSignalPower = -27;

         max_rxgain                    = 114;

         max_rxgain                    = 106;

         eNB_instances  = [0];

         clock_src = "internal";

    }