September 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: library/s1ap: comment out optional IE in tr_S1AP_InitialCtxSetupResp

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38277?usp=email ) Change subject: library/s1ap: comment out optional IE in tr_S1AP_InitialCtxSetupResp ...................................................................... library/s1ap: comment out optional IE in tr_S1AP_InitialCtxSetupResp Change-Id: I4765036be69ff10adb8c510d4092834c4e923229 --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/38277/1 diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index 0079649..5425fb1 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -710,7 +710,7 @@ ts_S1AP_InitialCtxSetupResp(template (value) MME_UE_S1AP_ID mme_id, template (value) ENB_UE_S1AP_ID enb_id, template (value) E_RABSetupListCtxtSURes rab_setup_items - /*OPTIONAL: template (value) E_RABList rab_items */ + /* OPTIONAL: template (omit) E_RABList rab_failed_items */ ) := { successfulOutcome := { procedureCode := id_InitialContextSetup, @@ -734,7 +734,7 @@ /*, { id := S1AP_Constants.id_E_RABFailedToSetupListCtxtSURes, criticality := ignore, - value_ := {E_RABList := rab_items} + value_ := {E_RABList := rab_failed_items} }*/ } } @@ -744,8 +744,9 @@ template (present) S1AP_PDU tr_S1AP_InitialCtxSetupResp(template (present) MME_UE_S1AP_ID mme_id := ?, template (present) ENB_UE_S1AP_ID enb_id := ?, - template (present) E_RABSetupListCtxtSURes rab_setup_items := ?, - template (present) E_RABList rab_items := ?) := { + template (present) E_RABSetupListCtxtSURes rab_setup_items := ? + /* OPTIONAL: template E_RABList rab_failed_items := * */ + ) := { successfulOutcome := { procedureCode := id_InitialContextSetup, criticality := reject, @@ -764,11 +765,13 @@ id := S1AP_Constants.id_E_RABSetupListCtxtSURes, criticality := ignore, value_ := {E_RABSetupListCtxtSURes := rab_setup_items} - }, { + }, + /*, { id := S1AP_Constants.id_E_RABFailedToSetupListCtxtSURes, criticality := ignore, value_ := {E_RABList := rab_items} - }, * + }, */ + * } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38277?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: I4765036be69ff10adb8c510d4092834c4e923229 Gerrit-Change-Number: 38277 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: TC_e_rab_setup: complete E-RAB release

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38238?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: s1gw: TC_e_rab_setup: complete E-RAB release ...................................................................... s1gw: TC_e_rab_setup: complete E-RAB release The MME originated E-RAB RELEASE procedure includes both: * [ENB <- MME] E-RAB RELEASE COMMAND, and * [ENB -> MME] E-RAB RELEASE RESPONSE. The later was overlooked in a99224c9, so add it. Change-Id: I856248d825b6ecf0635590b7bf02593cfae893d3 Fixes: a99224c9 "s1gw: TC_e_rab_setup: also test E-RAB release" --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/38238/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38238?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I856248d825b6ecf0635590b7bf02593cfae893d3 Gerrit-Change-Number: 38238 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: separate f_ConnHdlr_session_{establish,modify}()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38278?usp=email ) Change subject: s1gw: separate f_ConnHdlr_session_{establish,modify}() ...................................................................... s1gw: separate f_ConnHdlr_session_{establish,modify}() Change-Id: I95dc3be975a8f51f7535b96d1580ef70b85fa2e0 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 38 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/38278/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 4c88252..97df4c0 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -624,6 +624,42 @@ PFCP.send(resp); } +function f_ConnHdlr_session_establish(inout ERabList erabs) +runs on ConnHdlr { + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + log("UPF <- S1GW: PFCP Session Establishment Request for E-RAB ID ", erabs[i].erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_establish_req(erabs[i]); + /* store peer's SEID, so that it can be used in outgoing PDUs later */ + erabs[i].pfcp_rem_seid := pdu.message_body.pfcp_session_establishment_request.CP_F_SEID.seid; + /* ask PFCPEM to route PDUs with the local SEID to us */ + f_PFCPEM_subscribe_seid(erabs[i].pfcp_loc_seid); + log("UPF -> S1GW: PFCP Session Establishment Response for E-RAB ID ", erabs[i].erab_id); + f_ConnHdlr_tx_session_establish_resp(erabs[i], pdu); + } +} + +function f_ConnHdlr_session_modify(in ERabList erabs) +runs on ConnHdlr { + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erabs[i].erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(erabs[i]); + log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erabs[i].erab_id); + f_ConnHdlr_tx_session_modify_resp(erabs[i], pdu); + } +} + +function f_ConnHdlr_session_delete(in ERabList erabs) +runs on ConnHdlr { + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + log("UPF <- S1GW: PFCP Session Deletion Request for E-RAB ID ", erabs[i].erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_delete_req(erabs[i]); + log("UPF -> S1GW: PFCP Session Deletion Response for E-RAB ID ", erabs[i].erab_id); + f_ConnHdlr_tx_session_delete_resp(erabs[i], pdu); + /* ask PFCPEM to *not* route PDUs with this SEID to us */ + f_PFCPEM_unsubscribe_seid(erabs[i].pfcp_loc_seid); + } +} + function f_ConnHdlr_erab_setup_req(inout ERabList erabs) runs on ConnHdlr { const OCT8 c_SEID0 := '0000000000000000'O; @@ -640,16 +676,7 @@ log("eNB <- [S1GW <- MME]: E-RAB SETUP REQUEST"); f_ConnHdlr_tx_erab_setup_req(erabs); - for (var integer i := 0; i < lengthof(erabs); i := i + 1) { - log("UPF <- S1GW: PFCP Session Establishment Request for E-RAB ID ", erabs[i].erab_id); - var PDU_PFCP pdu := f_ConnHdlr_rx_session_establish_req(erabs[i]); - /* store peer's SEID, so that it can be used in outgoing PDUs later */ - erabs[i].pfcp_rem_seid := pdu.message_body.pfcp_session_establishment_request.CP_F_SEID.seid; - /* ask PFCPEM to route PDUs with the local SEID to us */ - f_PFCPEM_subscribe_seid(erabs[i].pfcp_loc_seid); - log("UPF -> S1GW: PFCP Session Establishment Response for E-RAB ID ", erabs[i].erab_id); - f_ConnHdlr_tx_session_establish_resp(erabs[i], pdu); - } + f_ConnHdlr_session_establish(erabs); /* We're done establishing PFCP sessions, so at this point we no longer expect to * receive Session Establishment Request PDUs with SEID=0. Unregister and unlock @@ -665,28 +692,11 @@ runs on ConnHdlr { log("[eNB -> S1GW] -> MME: E-RAB SETUP RESPONSE"); f_ConnHdlr_tx_erab_setup_rsp(erabs); - for (var integer i := 0; i < lengthof(erabs); i := i + 1) { - log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erabs[i].erab_id); - var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(erabs[i]); - log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erabs[i].erab_id); - f_ConnHdlr_tx_session_modify_resp(erabs[i], pdu); - } + f_ConnHdlr_session_modify(erabs); log("eNB -> [S1GW -> MME]: E-RAB SETUP RESPONSE"); f_ConnHdlr_rx_erab_setup_rsp(erabs); } -private function f_ConnHdlr_session_delete(inout ERabList erabs) -runs on ConnHdlr { - for (var integer i := 0; i < lengthof(erabs); i := i + 1) { - log("UPF <- S1GW: PFCP Session Deletion Request for E-RAB ID ", erabs[i].erab_id); - var PDU_PFCP pdu := f_ConnHdlr_rx_session_delete_req(erabs[i]); - log("UPF -> S1GW: PFCP Session Deletion Response for E-RAB ID ", erabs[i].erab_id); - f_ConnHdlr_tx_session_delete_resp(erabs[i], pdu); - /* ask PFCPEM to *not* route PDUs with this SEID to us */ - f_PFCPEM_unsubscribe_seid(erabs[i].pfcp_loc_seid); - } -} - function f_ConnHdlr_erab_release_cmd(inout ERabList erabs, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38278?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: I95dc3be975a8f51f7535b96d1580ef70b85fa2e0 Gerrit-Change-Number: 38278 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_initial_ctx_setup_failure

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280?usp=email ) Change subject: s1gw: add TC_initial_ctx_setup_failure ...................................................................... s1gw: add TC_initial_ctx_setup_failure Change-Id: I969ea6813c9b805d116a974c70ab5f6e6e721e48 --- M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 2 files changed, 46 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/38280/1 diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 2e8ebcb..fbe9d44 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -366,7 +366,7 @@ vc_conn.done; } -/* Test INITIAL CONTEXT SETUP procedure */ +/* Test INITIAL CONTEXT SETUP procedure (successful case) */ function f_TC_initial_ctx_setup(charstring id) runs on ConnHdlr { f_ConnHdlr_s1ap_register(g_pars.genb_id); f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); @@ -408,6 +408,48 @@ f_TC_initial_ctx_setup_exec(num_enbs := mp_multi_enb_num, num_erabs := 3); } +/* Test INITIAL CONTEXT SETUP procedure (failure) */ +function f_TC_initial_ctx_setup_failure(charstring id) runs on ConnHdlr { + var template (present) PDU_PFCP pfcp_pdu; + var template (value) S1AP_PDU s1ap_pdu; + var S1AP_PDU unused; + + f_ConnHdlr_s1ap_register(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); + + /* Initiate E-RAB establishment by sending INITIAL CONTEXT SETUP */ + f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs); + /* At this point, the associated PFCP session is created, but not modified yet. + * The E-RAB FSM in the IUT is waiting for INITIAL CONTEXT SETUP RESPONSE. */ + + /* INITIAL CONTEXT SETUP FAILURE does not immediately trigger deletion of PFCP + * sessions. It's forwarded as-is without any action. */ + s1ap_pdu := ts_S1AP_InitialCtxSetupFail(mme_id := 4242, + enb_id := g_pars.idx, + cause := { misc := unspecified }); + f_ConnHdlr_tx_s1ap_from_enb(s1ap_pdu); + f_ConnHdlr_rx_s1ap_from_enb(unused, s1ap_pdu); + + /* TODO: Ideally, the IUT should terminate PFCP session(s) immediately. */ + + /* E-RAB FSM in the IUT terminates due to a timeout and deletes PFCP session. */ + pfcp_pdu := tr_PFCP_Session_Del_Req(g_pars.erabs[0].pfcp_loc_seid); + f_ConnHdlr_pfcp_expect(pfcp_pdu, Tval := 8.0); /* > ERAB_T_WAIT_RELEASE_RSP */ + + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); +} +testcase TC_initial_ctx_setup_failure() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_ConnHdlr_spawn(refers(f_TC_initial_ctx_setup_failure), pars); + vc_conn.done; +} + function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { var integer rts := f_PFCPEM_get_recovery_timestamp(); var PDU_PFCP pfcp_pdu; @@ -445,6 +487,7 @@ execute( TC_initial_ctx_setup3() ); execute( TC_initial_ctx_setup_multi() ); execute( TC_initial_ctx_setup3_multi() ); + execute( TC_initial_ctx_setup_failure() ); execute( TC_pfcp_heartbeat() ); } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index e50f978..3ddbb23 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='14' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='15' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> @@ -13,5 +13,6 @@ <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup3' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup3_multi' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup_failure' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280?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: I969ea6813c9b805d116a974c70ab5f6e6e721e48 Gerrit-Change-Number: 38280 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add testcases for INITIAL CONTEXT SETUP

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38279?usp=email ) Change subject: s1gw: add testcases for INITIAL CONTEXT SETUP ...................................................................... s1gw: add testcases for INITIAL CONTEXT SETUP Change-Id: I72e3ab932fee1de0fce8ddf4041b8f2174416bc1 --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 3 files changed, 192 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/38279/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 97df4c0..775f44c 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -501,6 +501,110 @@ return pdu; } +function f_ConnHdlr_tx_initial_ctx_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var template (value) E_RABToBeSetupListCtxtSUReq items; + var template (value) E_RABLevelQoSParameters qos_params; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + qos_params := valueof(ts_E_RABLevelQoSParameters); + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (value) E_RABToBeSetupItemCtxtSUReq item; + var template (value) TransportLayerAddress tla; + var ERabParams epars := erabs[i].u2c; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := ts_E_RABToBeSetupItemCtxtSUReq(rab_id := erabs[i].erab_id, + qos_params := qos_params, + tla := tla, + gtp_teid := epars.teid, + nas_pdu := omit); + items[i] := ts_E_RABToBeSetupListCtxtSUReq(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_IntialCtxSetupReq(mme_id := mme_ue_id, + enb_id := enb_ue_id, + max_br := ts_UEAggregateMaximumBitrate, + rab_setup_items := items, + ue_sec_par := ts_UESecurityCapabilities, + sec_key := f_rnd_bitstring(256))); +} + +function f_ConnHdlr_rx_initial_ctx_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABToBeSetupListCtxtSUReq items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (present) E_RABToBeSetupItemCtxtSUReq item; + var template (present) TransportLayerAddress tla; + var ERabParams epars := erabs[i].a2u; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := tr_E_RABToBeSetupItemCtxtSUReq(rab_id := erabs[i].erab_id, + qos_params := ?, + tla := tla, + gtp_teid := epars.teid, + nas_pdu := omit); + items[i] := tr_E_RABToBeSetupListCtxtSUReq(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_IntialCtxSetupReq(mme_id := mme_ue_id, + enb_id := enb_ue_id, + max_br := tr_UEAggregateMaximumBitrate, + rab_setup_items := items, + ue_sec_par := tr_UESecurityCapabilities)); + return pdu; +} + +function f_ConnHdlr_tx_initial_ctx_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var template (value) E_RABSetupListCtxtSURes items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (value) E_RABSetupItemCtxtSURes item; + var template (value) TransportLayerAddress tla; + var ERabParams epars := erabs[i].u2a; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := ts_S1AP_RABSetupItemCtxtSURes(rab_id := erabs[i].erab_id, + tla := tla, + gtp_teid := epars.teid); + items[i] := ts_S1AP_RABSetupListCtxtSURes(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_InitialCtxSetupResp(mme_ue_id, enb_ue_id, items)); +} + +function f_ConnHdlr_rx_initial_ctx_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABSetupListCtxtSURes items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (present) E_RABSetupItemCtxtSURes item; + var template (present) TransportLayerAddress tla; + var ERabParams epars := erabs[i].c2u; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := tr_S1AP_RABSetupItemCtxtSURes(rab_id := erabs[i].erab_id, + tla := tla, + gtp_teid := epars.teid); + items[i] := tr_S1AP_RABSetupListCtxtSURes(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_InitialCtxSetupResp(mme_ue_id, enb_ue_id, items)); + return pdu; +} + function f_ConnHdlr_rx_session_establish_req(in ERab erab) runs on ConnHdlr return PDU_PFCP { var OCT4 addr := f_inet_addr(g_pars.pfcp_rem_addr); @@ -725,4 +829,41 @@ f_ConnHdlr_rx_erab_release_ind(erabs, cause); } +function f_ConnHdlr_initial_ctx_setup_req(inout ERabList erabs) +runs on ConnHdlr { + const OCT8 c_SEID0 := '0000000000000000'O; + + /* This code block cannot be executed by more than one component at a time because + * the S1AP E-RAB SETUP REQUEST triggers the IUT to send PFCP Session Establishment + * Request PDU(s), with need to be routed to the respective ConnHdlr component (us). + * As per 3GPP TS 29.244, section 7.2.2.4.2, these PFCP PDUs shall all have SEID=0, + * so that the PFCPEM component cannot route them unambiguously. This is why we + * need to ensure that only one ConnHdlr is triggering PFCP session establishment + * at the given moment of time. */ + f_Mutex_lock(__BFILE__, __LINE__); + f_PFCPEM_subscribe_seid(c_SEID0); + + log("eNB <- [S1GW <- MME]: INITIAL CONTEXT SETUP REQUEST"); + f_ConnHdlr_tx_initial_ctx_setup_req(erabs); + f_ConnHdlr_session_establish(erabs); + + /* We're done establishing PFCP sessions, so at this point we no longer expect to + * receive Session Establishment Request PDUs with SEID=0. Unregister and unlock + * the mutex, enabling other components to establish PFCP sessions after us. */ + f_PFCPEM_unsubscribe_seid(c_SEID0); + f_Mutex_unlock(__BFILE__, __LINE__); + + log("[eNB <- S1GW] <- MME: INITIAL CONTEXT SETUP REQUEST"); + f_ConnHdlr_rx_initial_ctx_setup_req(erabs); +} + +function f_ConnHdlr_initial_ctx_setup_rsp(inout ERabList erabs) +runs on ConnHdlr { + log("[eNB -> S1GW] -> MME: INITIAL CONTEXT SETUP RESPONSE"); + f_ConnHdlr_tx_initial_ctx_setup_rsp(erabs); + f_ConnHdlr_session_modify(erabs); + log("eNB -> [S1GW -> MME]: INITIAL CONTEXT SETUP RESPONSE"); + f_ConnHdlr_rx_initial_ctx_setup_rsp(erabs); +} + } diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 9713c1a..2e8ebcb 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -366,6 +366,48 @@ vc_conn.done; } +/* Test INITIAL CONTEXT SETUP procedure */ +function f_TC_initial_ctx_setup(charstring id) runs on ConnHdlr { + f_ConnHdlr_s1ap_register(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); + + f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs); + f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs); + + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); +} +private function f_TC_initial_ctx_setup_exec(integer num_enbs, integer num_erabs) +runs on test_CT { + var ConnHdlrList vc_conns; + + f_init(); + + for (var integer i := 0; i < num_enbs; i := i + 1) { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(i, num_erabs)); + vc_conns[i] := f_ConnHdlr_spawn(refers(f_TC_initial_ctx_setup), pars); + } + + f_ConnHdlrList_all_done(vc_conns); +} +/* 1 E-RAB at a time, single eNB */ +testcase TC_initial_ctx_setup() runs on test_CT { + f_TC_initial_ctx_setup_exec(num_enbs := 1, num_erabs := 1); +} +/* 1 E-RAB at a time, multiple eNB connections */ +testcase TC_initial_ctx_setup_multi() runs on test_CT { + f_TC_initial_ctx_setup_exec(num_enbs := mp_multi_enb_num, num_erabs := 1); +} +/* 3 E-RABs at a time, single eNB */ +testcase TC_initial_ctx_setup3() runs on test_CT { + f_TC_initial_ctx_setup_exec(num_enbs := 1, num_erabs := 3); +} +/* 3 E-RABs at a time, multiple eNB connections */ +testcase TC_initial_ctx_setup3_multi() runs on test_CT { + f_TC_initial_ctx_setup_exec(num_enbs := mp_multi_enb_num, num_erabs := 3); +} + function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { var integer rts := f_PFCPEM_get_recovery_timestamp(); var PDU_PFCP pfcp_pdu; @@ -399,6 +441,10 @@ execute( TC_e_rab_setup_multi() ); execute( TC_e_rab_setup3_multi() ); execute( TC_e_rab_release_ind() ); + execute( TC_initial_ctx_setup() ); + execute( TC_initial_ctx_setup3() ); + execute( TC_initial_ctx_setup_multi() ); + execute( TC_initial_ctx_setup3_multi() ); execute( TC_pfcp_heartbeat() ); } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index 9075dc3..e50f978 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='10' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='14' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> @@ -9,5 +9,9 @@ <testcase classname='S1GW_Tests' name='TC_e_rab_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_setup3_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_release_ind' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup3' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup_multi' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup3_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38279?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: I72e3ab932fee1de0fce8ddf4041b8f2174416bc1 Gerrit-Change-Number: 38279 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months

1
0
0 0

[L] Change in osmo-sgsn[master]: Add Routing Areas

by lynxis lazus

Attention is currently required from: daniel, pespin. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email ) Change subject: Add Routing Areas ...................................................................... Patch Set 12: (8 comments) File include/osmocom/sgsn/gprs_routing_area.h: https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/15278811_b87a499b?us… : PS9, Line 19: ras > ra_list Acknowledged https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/530260da_73889357?us… : PS9, Line 19: ras > ra_list Done https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/5629afcf_e19c505c?us… : PS9, Line 32: /* contains cells which are in BVC_UNBLOCKED */ > Not sure what you mean here. […] Acknowledged https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/373acf3c_b6a34518?us… : PS9, Line 32: /* contains cells which are in BVC_UNBLOCKED */ > Not sure what you mean here. […] Done File src/sgsn/gprs_routing_area.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/dc7b4f4c_0a5cdfef?us… : PS5, Line 45: if (!drop_empty_ra) { > I'll remove empty RoutingAreas for now Done https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/614db4c2_54e3679f?us… : PS5, Line 281: } > All this function is also a bit cumbersome, I encourage doing a second thought too. Done File src/sgsn/gprs_routing_area.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/3952621a_a96c5b73?us… : PS9, Line 235: /* FIXME: drop old BVCI? How to handle the same RAI/CellId via different BVCIs? */ > Yeah, I would drop the old one. […] I'm keeping for now the old one and replacing it's parameters, because removing doesn't do anything at the moment. https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/baff9589_cee4a0db?us… : PS9, Line 237: LOGP(DRA, LOGL_INFO, "GERAN Cell changed DLCI. Old: nsei/bvci 0x%04x/0x%04x New: nsei/bvci 0x%04x/0x%04x\n", > gbproxy uses %05u, ns2 uses %d, sometimes %u and other times %05u […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2474b19a7471a1dea3c863ddf8372b16180211aa Gerrit-Change-Number: 37864 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Sep 2024 20:50:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

9 months

1
0
0 0

[XS] Change in ...pyosmocom[master]: tag 0.0.5 for osmocom.construct.Asn1DerInteger

by laforge

Attention is currently required from: dexter, osmith. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38273?usp=email ) Change subject: tag 0.0.5 for osmocom.construct.Asn1DerInteger ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: adding osmith as the build failure seems related to recent jenkis job changes. -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I77914901d7f154d3a6e97c39575292e03453ddf7 Gerrit-Change-Number: 38273 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Sep 2024 18:19:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

9 months

1
0
0 0

[S] Change in ...pyosmocom[master]: osmocom.construct.Asn1DerInteger

by laforge

Attention is currently required from: dexter, osmith. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email ) Change subject: osmocom.construct.Asn1DerInteger ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: adding osmith as the build failure seems related to recent jenkis job changes. -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I0cfe97daf957919de86453d6d44f9c99ab3075ac Gerrit-Change-Number: 38272 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Sep 2024 18:19:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

9 months

1
0
0 0

[XS] Change in pysim[master]: pySim-shell: New '-e' command line argument

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38255?usp=email ) Change subject: pySim-shell: New '-e' command line argument ...................................................................... pySim-shell: New '-e' command line argument Using '-e' it is possible to specify *multiple* pySim-shell commands which shall be executed at startup. This extends the current ability to execute just a single command. Example: ./pySim-shell.py -p0 -e 'select ADF.USIM/EF.IMSI' -e 'read_binary_decoded' Change-Id: I74004f46105553f077c039ca0f86f75afccc7342 --- M pySim-shell.py 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 8c260aa..37d58ae 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -1056,6 +1056,8 @@ adm_group.add_argument('-A', '--pin-adm-hex', metavar='PIN_ADM1_HEX', dest='pin_adm_hex', default=None, help='ADM PIN used for provisioning, as hex string (16 characters long)') +option_parser.add_argument('-e', '--execute-command', action='append', default=[], + help='A pySim-shell command that will be executed at startup') option_parser.add_argument("command", nargs='?', help="A pySim-shell command that would optionally be executed at startup") option_parser.add_argument('command_args', nargs=argparse.REMAINDER, @@ -1122,6 +1124,13 @@ print(e) print("---------------------8<---------------------") + # Run optional commands + for c in opts.execute_command: + if not startup_errors: + app.onecmd_plus_hooks(c) + else: + print("Errors during startup, refusing to execute command (%s)" % c) + # Run optional command if opts.command: if not startup_errors: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38255?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I74004f46105553f077c039ca0f86f75afccc7342 Gerrit-Change-Number: 38255 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de>

9 months

1
0
0 0

[XS] Change in pysim[master]: pySim-shell: New '-e' command line argument

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38255?usp=email ) Change subject: pySim-shell: New '-e' command line argument ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38255?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I74004f46105553f077c039ca0f86f75afccc7342 Gerrit-Change-Number: 38255 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Sep 2024 17:09:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024