October 2026 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: 5gc: Improve meaningful encoding of Source NG-RAN Node to Target NG-R...
by pespin 06 Oct '26

06 Oct '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43791?usp=email ) Change subject: 5gc: Improve meaningful encoding of Source NG-RAN Node to Target NG-RAN Node Transparent Container ...................................................................... 5gc: Improve meaningful encoding of Source NG-RAN Node to Target NG-RAN Node Transparent Container The RRC container is still left with wrong encoding (because it's not NGAP, but RRC from 3GPP TS 38.331 and it's too much effort adding it). It's fine leaving it as is since anyway the container is transparent to the 5GC. Change-Id: I275b1b551e0f9bea479effebef457deb3f750fc4 --- M 5gc/ConnHdlr.ttcn M library/ngap/NGAP_EncDec.cc M library/ngap/NGAP_Types.ttcn 3 files changed, 42 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/43791/1 diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 74a47a8..c7b93ea 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -1129,12 +1129,30 @@ var octetstring transfer_enc; var template (value) PDUSessionResourceItemHORqd it; var template (value) NGAP_PDU tx_pdu; + var template (value) SourceNGRANNode_ToTargetNGRANNode_TransparentContainer container; + var octetstring container_enc; transfer := m_handoverRequiredTransfer(direct_forwarding_avail); transfer_enc := enc_NGAP_HandoverRequiredTransfer(valueof(transfer)); it := m_pDUSessionResourceItemHORqd(g_pars.ue_pars.sess_pars.id, transfer_enc); + container := m_sourceNGRANNode_ToTargetNGRANNode_TransparentContainer( + p_targetCell_ID := m_ngENB_ID_nR_CGI(g_pars.ngran_pars[g_pars.c5g_idx].cell_identity.nR_CGI), + p_rRCContainer := ''O /* TODO: TS 38.331 HandoverPreparationInformation */, + p_uEHistoryInformation := { + m_lastVisitedCellItem( + m_interSystemHandoverReportType_nGRANCell( + m_lastVisitedNGRANCellInformation( + p_globalCellID := m_ngENB_ID_nR_CGI(g_pars.ngran_pars[g_pars.c5g_idx].cell_identity.nR_CGI), + p_cellType := m_cellType(m_cellSize(medium)), + p_timeUEStayedInCell := 10 + ) + ) + ) + }); + container_enc := enc_NGAP_SourceNGRANNode_ToTargetNGRANNode_TransparentContainer(valueof(container)); + tx_pdu := m_ngap_initMsg( f_m_n2_HandoverRequired( g_pars.ue_pars.amf_id, @@ -1144,7 +1162,7 @@ target_id, direct_forwarding_avail, { it }, - '1234'O /* random string, transparent to the AMF */)); + container_enc)); NGAP.send(tx_pdu); } diff --git a/library/ngap/NGAP_EncDec.cc b/library/ngap/NGAP_EncDec.cc index d6d7ead..ae2f34f 100644 --- a/library/ngap/NGAP_EncDec.cc +++ b/library/ngap/NGAP_EncDec.cc @@ -229,4 +229,24 @@ return ret; } +OCTETSTRING enc__NGAP__SourceNGRANNode__ToTargetNGRANNode__TransparentContainer(const NGAP__IEs::SourceNGRANNode__ToTargetNGRANNode__TransparentContainer &p) +{ + TTCN_Buffer TTCN_buf; + TTCN_buf.clear(); + p.encode(NGAP__IEs::SourceNGRANNode__ToTargetNGRANNode__TransparentContainer_descr_, TTCN_buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return OCTETSTRING(TTCN_buf.get_len(), TTCN_buf.get_data()); +} + +NGAP__IEs::SourceNGRANNode__ToTargetNGRANNode__TransparentContainer dec__NGAP__SourceNGRANNode__ToTargetNGRANNode__TransparentContainer(const OCTETSTRING &stream) +{ + NGAP__IEs::SourceNGRANNode__ToTargetNGRANNode__TransparentContainer ret; + TTCN_Buffer TTCN_buf; + TTCN_buf.clear(); + TTCN_buf.put_os(stream); + ret.decode(NGAP__IEs::SourceNGRANNode__ToTargetNGRANNode__TransparentContainer_descr_, TTCN_buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return ret; +} + } diff --git a/library/ngap/NGAP_Types.ttcn b/library/ngap/NGAP_Types.ttcn index 73378d1..78054bc 100644 --- a/library/ngap/NGAP_Types.ttcn +++ b/library/ngap/NGAP_Types.ttcn @@ -35,4 +35,7 @@ external function enc_NGAP_SecondaryRATDataUsageReportTransfer(NGAP_IEs.SecondaryRATDataUsageReportTransfer p) return octetstring; external function dec_NGAP_SecondaryRATDataUsageReportTransfer(in octetstring pdu) return NGAP_IEs.SecondaryRATDataUsageReportTransfer; + + external function enc_NGAP_SourceNGRANNode_ToTargetNGRANNode_TransparentContainer(NGAP_IEs.SourceNGRANNode_ToTargetNGRANNode_TransparentContainer p) return octetstring; + external function dec_NGAP_SourceNGRANNode_ToTargetNGRANNode_TransparentContainer(in octetstring pdu) return NGAP_IEs.SourceNGRANNode_ToTargetNGRANNode_TransparentContainer; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43791?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I275b1b551e0f9bea479effebef457deb3f750fc4 Gerrit-Change-Number: 43791 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: NGAP_Templates.ttcn: HandoverRequired: Allow passing optional Direct ...
by pespin 06 Oct '26

06 Oct '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43790?usp=email ) Change subject: NGAP_Templates.ttcn: HandoverRequired: Allow passing optional Direct Forwarding Path Availability IE ...................................................................... NGAP_Templates.ttcn: HandoverRequired: Allow passing optional Direct Forwarding Path Availability IE Change-Id: Ie2da6fffb57bf0e1eeb39c89e808725e1ac7baa2 --- M 5gc/ConnHdlr.ttcn M library/ngap/NGAP_Templates.ttcn 2 files changed, 84 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/43790/1 diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 6125489..74a47a8 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -1122,25 +1122,27 @@ /* 3GPP TS 38.413 8.4.1 Handover Preparation * 3GPP TS 38.413 9.2.3.1 HANDOVER REQUIRED * 3GPP TS 38.413 9.3.4.14 Handover Required Transfer */ -function f_n2_handover_required(template (value) TargetID target_id) runs on ConnHdlr -{ +function f_n2_handover_required(template (value) TargetID target_id, + template (omit) DirectForwardingPathAvailability direct_forwarding_avail := omit) +runs on ConnHdlr { var template (value) HandoverRequiredTransfer transfer; var octetstring transfer_enc; var template (value) PDUSessionResourceItemHORqd it; var template (value) NGAP_PDU tx_pdu; - transfer := m_handoverRequiredTransfer(omit); + transfer := m_handoverRequiredTransfer(direct_forwarding_avail); transfer_enc := enc_NGAP_HandoverRequiredTransfer(valueof(transfer)); it := m_pDUSessionResourceItemHORqd(g_pars.ue_pars.sess_pars.id, transfer_enc); tx_pdu := m_ngap_initMsg( - m_n2_HandoverRequired( + f_m_n2_HandoverRequired( g_pars.ue_pars.amf_id, g_pars.ue_pars.ran_id, intra5gs, m_cause_radioNetwork(resource_optimisation_handover), target_id, + direct_forwarding_avail, { it }, '1234'O /* random string, transparent to the AMF */)); NGAP.send(tx_pdu); diff --git a/library/ngap/NGAP_Templates.ttcn b/library/ngap/NGAP_Templates.ttcn index 8a3e543..df6be17 100644 --- a/library/ngap/NGAP_Templates.ttcn +++ b/library/ngap/NGAP_Templates.ttcn @@ -3863,6 +3863,84 @@ } } // End of template m_n2_HandoverRequired + function f_m_n2_HandoverRequired(template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, + template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID, + template (value) HandoverType p_handoverType := PX_HANDOVER_TYPE, + template (value) Cause p_cause := m_cause_radioNetwork(PX_CAUSE_HANDOVER_REQUIRED), + template (value) TargetID p_targetID, + template (omit) DirectForwardingPathAvailability p_directForwardingPathAvailability, + template (value) PDUSessionResourceListHORqd p_pDUSessionResourceListHORqd, + template (value) SourceToTarget_TransparentContainer p_SourceToTarget_TransparentContainer) + return template (value) InitiatingMessage { + var template (value) InitiatingMessage pdu := { + procedureCode := id_HandoverPreparation, + criticality := reject, + value_ := { + HandoverRequired := { + protocolIEs := { + { + id := id_AMF_UE_NGAP_ID, + criticality := reject, + value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } + }, + { + id := id_RAN_UE_NGAP_ID, + criticality := reject, + value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } + }, + { + id := id_HandoverType, + criticality := reject, + value_ := { HandoverType := p_handoverType } + }, + { + id := id_Cause, + criticality := ignore, + value_ := { Cause := p_cause } + }, + { + id := id_TargetID, + criticality := reject, + value_ := { TargetID := p_targetID } + } + } + } + } + }; + var integer idx := lengthof(pdu.value_.HandoverRequired.protocolIEs); + + /* Direct Forwarding Path Availability */ + if (isvalue(p_directForwardingPathAvailability)) { + pdu.value_.HandoverRequired.protocolIEs[idx] := + { + id := id_DirectForwardingPathAvailability, + criticality := ignore, + value_ := { DirectForwardingPathAvailability := p_directForwardingPathAvailability } + }; + idx := idx + 1; + } + + /* PDU Session Resource List */ + pdu.value_.HandoverRequired.protocolIEs[idx] := + { + id := id_PDUSessionResourceListHORqd, + criticality := reject, + value_ := { PDUSessionResourceListHORqd := p_pDUSessionResourceListHORqd } + }; + idx := idx + 1; + + /* Source to Target Transparent Container */ + pdu.value_.HandoverRequired.protocolIEs[idx] := + { + id := id_SourceToTarget_TransparentContainer, + criticality := reject, + value_ := { SourceToTarget_TransparentContainer := p_SourceToTarget_TransparentContainer } + }; + idx := idx + 1; + + return pdu; + } // End of f_m_n2_HandoverRequired + } // End of group Send group Receive { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie2da6fffb57bf0e1eeb39c89e808725e1ac7baa2 Gerrit-Change-Number: 43790 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_handover_inter_ngran_n2_dataforwardingpossible...
by pespin 06 Oct '26

06 Oct '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43792?usp=email ) Change subject: 5gc: Introduce test TC_handover_inter_ngran_n2_dataforwardingpossible_change ...................................................................... 5gc: Introduce test TC_handover_inter_ngran_n2_dataforwardingpossible_change Validate that DataForwardingNotPossible in Handover Request is applied based on info obtained during Handover Required. Related: SYS#8269 Change-Id: I51731e9fb771666d39d7ee53055b44bdec636cf6 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml 3 files changed, 129 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/43792/1 diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 0edd792..85e0bae 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -956,13 +956,8 @@ vc_conn[1].done; } -/* 3GPP TS 23.502 4.9.1.3 Inter NG-RAN node N2 based handover */ -private function f_TC_handover_inter_ngran_n2_source() runs on ConnHdlr { - f_register(); - f_pdu_sess_establish(); - f_sleep(1.0); - f_ping(g_pars.ue_pars.sess_pars.run_prog_pars.ping_hostname); - +private function f_handover_inter_ngran_n2_source(integer tgt_idx := 1, + template (omit) DirectForwardingPathAvailability direct_forwarding_avail := omit) runs on ConnHdlr { var NG_NAS_UE_State nus := f_ngap_obtain_nus(g_pars.ue_pars.ran_id); COORD.send(Handover_n2_Pars:{ @@ -970,26 +965,23 @@ pti := g_pars.ue_pars.pti, sess_pars := g_pars.ue_pars.sess_pars, kset_id := g_pars.kset_id, - nus := nus + nus := nus, + exp_ho_request_data_forwarding_not_possible := not isvalue(direct_forwarding_avail) }); /* 3GPP TS 23.502 4.9.1.3.2 step 1: */ - f_n2_handover_required(m_targetID_targetRANNodeID(m_targetRANNodeID(g_pars.ngran_pars[1].global_ngran_id, - ts_ngran_NGAP_TAI(g_pars.ngran_pars[1])) - )); + f_n2_handover_required(m_targetID_targetRANNodeID(m_targetRANNodeID(g_pars.ngran_pars[tgt_idx].global_ngran_id, + ts_ngran_NGAP_TAI(g_pars.ngran_pars[tgt_idx])) + ), + direct_forwarding_avail := direct_forwarding_avail); /* 3GPP TS 23.502 4.9.1.3.3 step 1: */ f_n2_handover_command(); /* 3GPP TS 23.502 4.9.1.3.3 step 2: */ COORD.send("HANDOVER_COMMAND_CONFIRM"); - - /* 3GPP TS 23.502 4.9.1.3.3 step 14a + 14b: */ - as_ngap_handle_UeContextReleaseCmd(exp_cause := mw_cause_radioNetwork(successful_handover)); } -private function f_TC_handover_inter_ngran_n2_target() runs on ConnHdlr { - var Handover_n2_Pars ho_n2_pars; - /* Redirect Handover Request from AMF containing new AMF ID to our target ConnHdlr: */ - f_create_ngap_expect_proc(id_HandoverResourceAllocation, self); +private function f_handover_inter_ngran_n2_target() runs on ConnHdlr { + var Handover_n2_Pars ho_n2_pars; COORD.receive(Handover_n2_Pars:?) -> value ho_n2_pars; g_pars.ue_pars.guti := ho_n2_pars.guti; @@ -1002,7 +994,7 @@ /* 3GPP TS 23.502 4.9.1.3.2 step 9+10: */ - f_n2_handover_request(); + f_n2_handover_request(ho_n2_pars.exp_ho_request_data_forwarding_not_possible); /* 3GPP TS 23.502 4.9.1.3.3 step 4 */ COORD.receive("HANDOVER_COMMAND_CONFIRM"); @@ -1010,6 +1002,25 @@ /* 3GPP TS 23.502 4.9.1.3.3 step 5: */ f_n2_handover_notify(); +} + +/* 3GPP TS 23.502 4.9.1.3 Inter NG-RAN node N2 based handover */ +private function f_TC_handover_inter_ngran_n2_source() runs on ConnHdlr { + f_register(); + f_pdu_sess_establish(); + f_sleep(1.0); + f_ping(g_pars.ue_pars.sess_pars.run_prog_pars.ping_hostname); + + f_handover_inter_ngran_n2_source(tgt_idx := 1); + + /* 3GPP TS 23.502 4.9.1.3.3 step 14a + 14b: */ + as_ngap_handle_UeContextReleaseCmd(exp_cause := mw_cause_radioNetwork(successful_handover)); +} +private function f_TC_handover_inter_ngran_n2_target() runs on ConnHdlr { + /* Redirect Handover Request from AMF containing new AMF ID to our target ConnHdlr: */ + f_create_ngap_expect_proc(id_HandoverResourceAllocation, self); + + f_handover_inter_ngran_n2_target(); f_sleep(1.0); @@ -1069,7 +1080,7 @@ f_create_ngap_expect_proc(id_HandoverResourceAllocation, self); /* 3GPP TS 23.502 4.9.1.3.2 step 9+10: */ - f_n2_handover_request(); + f_n2_handover_request(true); /* Expect to get a release on the target gNB due to cancelled Handover: */ as_ngap_handle_UeContextReleaseCmd(exp_cause := mw_cause_radioNetwork(handover_cancelled)); @@ -1096,6 +1107,82 @@ vc_conn[1].done; } + +/* 3GPP TS 23.502 4.9.1.3 Inter NG-RAN node N2 based handover. + * 0->1 handover with directForwardingPathAvailability=false, + * 0<-1 handover with directForwardingPathAvailability=true */ +private function f_TC_handover_inter_ngran_n2_dataforwardingpossible_change_source() runs on ConnHdlr { + f_register(); + f_pdu_sess_establish(); + f_sleep(1.0); + f_ping(g_pars.ue_pars.sess_pars.run_prog_pars.ping_hostname); + + f_handover_inter_ngran_n2_source(tgt_idx := 1, direct_forwarding_avail := omit); + + /* 3GPP TS 23.502 4.9.1.3.3 step 14a + 14b: */ + as_ngap_handle_UeContextReleaseCmd(exp_cause := mw_cause_radioNetwork(successful_handover)); + f_pdu_sess_delete_tun(); + + log("0: Handover 0->1 successful!"); + + /* Now wait for handover 1->0: */ + f_create_ngap_expect_proc(id_HandoverResourceAllocation, self); + f_handover_inter_ngran_n2_target(); + + f_sleep(1.0); + + f_pdu_sess_create_tun(); + f_ping(g_pars.ue_pars.sess_pars.run_prog_pars.ping_hostname); + + log("0: Handover 1->0 successful!"); + f_pdu_sess_release(); + f_deregister(); + +} +private function f_TC_handover_inter_ngran_n2_dataforwardingpossible_change_target() runs on ConnHdlr { + var Handover_n2_Pars ho_n2_pars; + + /* Redirect Handover Request from AMF containing new AMF ID to our target ConnHdlr: */ + f_create_ngap_expect_proc(id_HandoverResourceAllocation, self); + + f_handover_inter_ngran_n2_target(); + + f_sleep(1.0); + + f_pdu_sess_create_tun(); + f_ping(g_pars.ue_pars.sess_pars.run_prog_pars.ping_hostname); + + log("1: Handover 0->1 successful!"); + + /* Now initiate handover 1->0: */ + f_handover_inter_ngran_n2_source(tgt_idx := 0, direct_forwarding_avail := direct_path_available); + + /* 3GPP TS 23.502 4.9.1.3.3 step 14a + 14b: */ + as_ngap_handle_UeContextReleaseCmd(exp_cause := mw_cause_radioNetwork(successful_handover)); + log("1: Handover 1->0 successful!"); +} +testcase TC_handover_inter_ngran_n2_dataforwardingpossible_change() runs on MTC_CT { + var ConnHdlr vc_conn[2]; + var integer i; + + f_init(t_guard := 60.0); + f_ngap_setup(0); + f_ngap_setup(1); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0, c5g_idx := 0); + vc_conn[0] := f_start_handler_create(ngap_idx := 0); + vc_conn[1] := f_start_handler_create(ngap_idx := 1); + connect(vc_conn[0]:COORD, vc_conn[1]:COORD); + + f_start_handler_run(vc_conn[0], refers(f_TC_handover_inter_ngran_n2_dataforwardingpossible_change_source), pars); + pars.c5g_idx := 1; + pars.ue_pars.sess_pars.ran_gtpu_teid := int2oct(oct2int(pars.ue_pars.sess_pars.ran_gtpu_teid) + 1, 4); + f_start_handler_run(vc_conn[1], refers(f_TC_handover_inter_ngran_n2_dataforwardingpossible_change_target), pars); + + vc_conn[0].done; + vc_conn[1].done; +} + /* 3GPP TS 23.502 4.21 Secondary RAT Usage Data Reporting Procedure * 3GPP TS 38.413 8.15.1 Secondary RAT Data Usage Report * 3GPP TS 29.502 5.2.2.3.7 RAN Initiated QoS Flow Mobility @@ -1185,6 +1272,7 @@ execute( TC_handover_inter_ngran_n2() ); execute( TC_handover_inter_ngran_n2_cancel() ); + execute( TC_handover_inter_ngran_n2_dataforwardingpossible_change() ); execute( TC_ran_initiated_qos_flow_mobility() ); execute( TC_secondary_rat_data_usage_report() ); diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index c7b93ea..3332f9d 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -131,7 +131,9 @@ ProcedureTransactionIdentifier pti, PDUSessionParams sess_pars, NAS_KeySetIdentifier kset_id, - NG_NAS_UE_State nus /* 3GPP TS 38.423 9.2.1.13 UE Context Information */ + NG_NAS_UE_State nus /* 3GPP TS 38.423 9.2.1.13 UE Context Information */, + /* Whether to expect received HO Request should contain a DataForwardingNotPossible IE: */ + boolean exp_ho_request_data_forwarding_not_possible }; type port ConnHdlr_Coord_PT message @@ -365,12 +367,14 @@ } /* Handle a PDUSessionResourceSetupRequestTransfer and return a Result */ -private function f_pdu_handle_PDUSessionResourceSetupRequestTransfer(NGAP_IEs.PDUSessionResourceSetupRequestTransfer setup_req_transf) +private function f_pdu_handle_PDUSessionResourceSetupRequestTransfer(NGAP_IEs.PDUSessionResourceSetupRequestTransfer setup_req_transf, + boolean exp_data_forwarding_not_possible) runs on ConnHdlr return NGAP_IEs.PDUSessionResourceSetupResponseTransfer { var template (value) UPTransportLayerInformation utla; var template (value) QosFlowPerTNLInformation qos; var NGAP_IEs.PDUSessionResourceSetupResponseTransfer setup_resp_transf; var integer qos_id := 0; + var boolean found_data_forwarding_not_possible := false; for (var integer i := 0; i < lengthof(setup_req_transf.protocolIEs); i := i + 1) { select (setup_req_transf.protocolIEs[i].id) { @@ -383,7 +387,17 @@ var QosFlowSetupRequestList qos_req_li := setup_req_transf.protocolIEs[i].value_.QosFlowSetupRequestList; qos_id := qos_req_li[0].qosFlowIdentifier; } + case (id_DataForwardingNotPossible) { + found_data_forwarding_not_possible := true; } + } + } + + if (exp_data_forwarding_not_possible != found_data_forwarding_not_possible) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("PDUSessionResourceSetupRequestTransfer: DataForwardingNotPossible IE: received presence ", + found_data_forwarding_not_possible, " vs exp ", + exp_data_forwarding_not_possible)); } /* Prepare Response for it: */ @@ -406,7 +420,7 @@ /* Parse PDUSessionResourceSetupRequestTransfer contained inside InitialContextSetupRequest's PDUSessionResourceSetup Item: */ setup_req_transf := dec_NGAP_PDUSessionResourceSetupRequestTransfer(req.pDUSessionResourceSetupRequestTransfer); - setup_resp_transf := f_pdu_handle_PDUSessionResourceSetupRequestTransfer(setup_req_transf); + setup_resp_transf := f_pdu_handle_PDUSessionResourceSetupRequestTransfer(setup_req_transf, false); setup_trans_enc := enc_NGAP_PDUSessionResourceSetupResponseTransfer(setup_resp_transf) resp := valueof(m_pDUSessionResourceSetupItemCxtRes(req.pDUSessionID, setup_trans_enc)); @@ -479,7 +493,7 @@ /* Parse PDUSessionResourceSetupRequestTransfer contained inside InitialContextSetupRequest's PDUSessionResourceSetup Item: */ setup_req_transf := dec_NGAP_PDUSessionResourceSetupRequestTransfer(req.pDUSessionResourceSetupRequestTransfer); - setup_resp_transf := f_pdu_handle_PDUSessionResourceSetupRequestTransfer(setup_req_transf); + setup_resp_transf := f_pdu_handle_PDUSessionResourceSetupRequestTransfer(setup_req_transf, false); setup_trans_enc := enc_NGAP_PDUSessionResourceSetupResponseTransfer(setup_resp_transf) resp := valueof(m_pDUSessionResourceSetupItemSURes(req.pDUSessionID, setup_trans_enc)); @@ -1168,7 +1182,7 @@ /* 3GPP TS 38.413 9.2.3.4 HANDOVER REQUEST * 3GPP TS 23.502 4.9.1.3.2 step 9+10 */ -function f_n2_handover_request() runs on ConnHdlr +function f_n2_handover_request(boolean exp_ho_request_data_forwarding_not_possible := true) runs on ConnHdlr { var template (value) QosFlowItemWithDataForwarding qos; var template (value) HandoverRequestAcknowledgeTransfer transfer; @@ -1196,7 +1210,7 @@ var NGAP_IEs.PDUSessionResourceSetupRequestTransfer setup_req_transf; var NGAP_IEs.PDUSessionResourceSetupResponseTransfer setup_resp_transf; setup_req_transf := dec_NGAP_PDUSessionResourceSetupRequestTransfer(res_it.handoverRequestTransfer); - setup_resp_transf := f_pdu_handle_PDUSessionResourceSetupRequestTransfer(setup_req_transf); + setup_resp_transf := f_pdu_handle_PDUSessionResourceSetupRequestTransfer(setup_req_transf, exp_ho_request_data_forwarding_not_possible); qos_id := setup_resp_transf.dLQosFlowPerTNLInformation.associatedQosFlowList[0].qosFlowIdentifier; } } diff --git a/5gc/expected-results.xml b/5gc/expected-results.xml index bbdc0b2..6f4af71 100644 --- a/5gc/expected-results.xml +++ b/5gc/expected-results.xml @@ -45,6 +45,7 @@ <testcase classname='C5G_Tests' name='TC_handover_inter_ngran_xn' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_handover_inter_ngran_n2' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_handover_inter_ngran_n2_cancel' time='MASKED'/> + <testcase classname='C5G_Tests' name='TC_handover_inter_ngran_n2_dataforwardingpossible_change' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ran_initiated_qos_flow_mobility' time='MASKED'> <failure type='fail-verdict'>"C5G_Tests.ttcn:MASKED : Tguard timeout" C5G_Tests.ttcn:MASKED TC_ran_initiated_qos_flow_mobility testcase -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43792?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I51731e9fb771666d39d7ee53055b44bdec636cf6 Gerrit-Change-Number: 43792 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: publish-manuals-for-tags: build full osmo-trx
by osmith 06 Oct '26

06 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email ) Change subject: publish-manuals-for-tags: build full osmo-trx ...................................................................... publish-manuals-for-tags: build full osmo-trx Build osmo-trx with all --with options, so we get the related VTY reference documentation pdfs. Related: OS#7094 Change-Id: I4f0ef6f366eba44c63b158442b6417729ef426d1 --- M scripts/manuals/publish-manuals-for-tags.sh 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index e68fdd5..bc602f8 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -264,6 +264,14 @@ osmo-msc|osmo-sgsn) echo "--enable-iu" ;; + osmo-trx) + echo "--with-bladerf" + echo "--with-ipc" + echo "--with-lms" + echo "--with-mstrx" + echo "--with-uhd" + echo "--with-usrp1" + ;; esac } @@ -379,7 +387,7 @@ build_publish_manuals() { local repo="$1" local tag="$2" - local configure_opts="--enable-manuals $(get_configure_opts_from_repo_name "$repo")" + local configure_opts="--enable-manuals $(get_configure_opts_from_repo_name "$repo" | tr '\n' ' ')" echo "$LOG_PREFIX Building manuals" if ! docker run \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f0ef6f366eba44c63b158442b6417729ef426d1 Gerrit-Change-Number: 43788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: publish-manuals-for-tags: build full osmo-bts
by osmith 06 Oct '26

06 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/43789?usp=email ) Change subject: publish-manuals-for-tags: build full osmo-bts ...................................................................... publish-manuals-for-tags: build full osmo-bts Build osmo-bts with all --with options, so we get the related VTY reference documentation pdfs. Related: OS#7094 Change-Id: I092212f3b0dc14ebd1463d45dca66118f92dec53 --- A scripts/manuals/osmo-bts-get-all-headers.sh M scripts/manuals/publish-manuals-for-tags.sh 2 files changed, 57 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/scripts/manuals/osmo-bts-get-all-headers.sh b/scripts/manuals/osmo-bts-get-all-headers.sh new file mode 100644 index 0000000..bdfc068 --- /dev/null +++ b/scripts/manuals/osmo-bts-get-all-headers.sh @@ -0,0 +1,32 @@ +#!/bin/sh -ex +SCRIPTS_DIR="$(realpath "$(dirname "$0")/..")" + +BTS_MODELS=" + sysmo + oct + lc15 + oc2g +" + +for i in $BTS_MODELS; do + DIR=/tmp/osmo-layer1-headers/"$i" + + if [ -f "$DIR/.done" ]; then + continue + fi + + mkdir -p "$DIR" + cd "$DIR" + "$SCRIPTS_DIR"/osmo-layer1-headers.sh "$i" + touch "$DIR"/.done +done + +# Create the directory structure expected for the sysmocom/femtobts headers: +# https://gitea.osmocom.org/cellular-infrastructure/osmo-bts/src/branch/maste… +cd /tmp/osmo-layer1-headers/sysmo/ +if ! [ -e .done-inst ]; then + mkdir -p inst/include/sysmocom/femtobts + ln -s /tmp/osmo-layer1-headers/sysmo/layer1-headers/include/* \ + inst/include/sysmocom/femtobts/ + touch .done-inst +fi diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index bc602f8..d375989 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -2,6 +2,7 @@ . "$(dirname "$0")/../common.sh" OSMO_CI_DIR="$(realpath $(dirname "$0")/../..)" TEMP="$OSMO_CI_DIR/_temp_manuals" +L1_DIR="/tmp/osmo-layer1-headers" WEB_PATH="/downloads/home/docs/web-files" SSH_COMMAND="ssh -o UserKnownHostsFile=$TEMP/src/osmo-gsm-manuals/build/known_hosts -p 48" DOCKER_IMAGE="$USER/debian-trixie-build" @@ -245,6 +246,7 @@ mkdir -p \ "$TEMP" \ + "$TEMP/osmo-layer1-headers" \ "$TEMP/src" check_ssh_auth_sock() { @@ -258,6 +260,21 @@ # $1: repo name get_configure_opts_from_repo_name() { case "$1" in + osmo-bts) + # contrib/jenkins_sysmobts.sh + echo "--enable-sysmocom-bts" + echo "--with-sysmobts=$L1_DIR/sysmo/inst/include" + # contrib/jenkins_oct_and_bts_trx.sh + echo "--enable-octphy" + echo "--enable-trx" + echo "--with-octsdr-2g=$L1_DIR/oct/layer1-headers/" + # contrib/jenkins_lc15.sh + echo "--enable-litecell15" + echo "--with-litecell15=$L1_DIR/lc15/layer1-headers/inc/" + # contrib/jenkins_oc2g.sh + echo "--enable-oc2g" + echo "--with-oc2g=$L1_DIR/oc2g/layer1-headers/inc/" + ;; osmo-hnbgw) echo "--enable-pfcp" ;; @@ -400,6 +417,7 @@ -e "SSH_AUTH_SOCK=/ssh-agent" \ -v "$OSMO_CI_DIR/scripts:/osmo-ci-scripts" \ -v "$TEMP/src/$repo/:/build" \ + -v "$TEMP/osmo-layer1-headers/:$L1_DIR" \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ "$DOCKER_IMAGE" \ sh -ex -c " @@ -424,6 +442,13 @@ cd /opt/osmo-gsm-manuals/ patch -p1 < /osmo-ci-scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch + # Other preparations + case $repo in + osmo-bts) + su build -c \"sh -ex /osmo-ci-scripts/manuals/osmo-bts-get-all-headers.sh\" + ;; + esac + # Build manuals cd /build case $repo in -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I092212f3b0dc14ebd1463d45dca66118f92dec53 Gerrit-Change-Number: 43789 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: publish-manuals-for-tags: mount all scripts
by osmith 06 Oct '26

06 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email ) Change subject: publish-manuals-for-tags: mount all scripts ...................................................................... publish-manuals-for-tags: mount all scripts Make the whole scripts dir available instead of only scripts/manuals. This is needed so we can access scripts/osmo-layer1-headers.sh for building osmo-bts with more options in order to get the VTY reference manuals. Related: OS#7094 Change-Id: I151ab8698ffb04762329e3a624a94cc9ec9eed82 --- M scripts/manuals/publish-manuals-for-tags.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index 2f0c266..e68fdd5 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -390,7 +390,7 @@ -e "OSMO_REPOSITORY=$(get_docs_dir_from_repo_name "$repo")" \ -e "PUBLISH_REF=$tag" \ -e "SSH_AUTH_SOCK=/ssh-agent" \ - -v "$OSMO_CI_DIR/scripts/manuals:/manuals" \ + -v "$OSMO_CI_DIR/scripts:/osmo-ci-scripts" \ -v "$TEMP/src/$repo/:/build" \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ "$DOCKER_IMAGE" \ @@ -414,7 +414,7 @@ # Remove DRAFT in osmo-gsm-manuals cd /opt/osmo-gsm-manuals/ - patch -p1 < /manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch + patch -p1 < /osmo-ci-scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch # Build manuals cd /build -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I151ab8698ffb04762329e3a624a94cc9ec9eed82 Gerrit-Change-Number: 43787 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: publish-manuals-for-tags: mount all scripts
by fixeria 06 Oct '26

06 Oct '26

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email ) Change subject: publish-manuals-for-tags: mount all scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I151ab8698ffb04762329e3a624a94cc9ec9eed82 Gerrit-Change-Number: 43787 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Oct 2026 11:56:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ci[master]: publish-manuals-for-tags: build full osmo-bts
by fixeria 06 Oct '26

06 Oct '26

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43789?usp=email ) Change subject: publish-manuals-for-tags: build full osmo-bts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I092212f3b0dc14ebd1463d45dca66118f92dec53 Gerrit-Change-Number: 43789 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Oct 2026 11:56:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: publish-manuals-for-tags: build full osmo-trx
by fixeria 06 Oct '26

06 Oct '26

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email ) Change subject: publish-manuals-for-tags: build full osmo-trx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f0ef6f366eba44c63b158442b6417729ef426d1 Gerrit-Change-Number: 43788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Oct 2026 11:53:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: publish-manuals-for-tags: build full osmo-trx
by fixeria 06 Oct '26

06 Oct '26

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email ) Change subject: publish-manuals-for-tags: build full osmo-trx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f0ef6f366eba44c63b158442b6417729ef426d1 Gerrit-Change-Number: 43788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Oct 2026 11:53:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log October 2026