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

[S] Change in pysim[master]: ts_51_011: replace encoding of EF.MSISDN with construct model

by dexter

Attention is currently required from: dexter, laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/38117?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ts_51_011: replace encoding of EF.MSISDN with construct model ...................................................................... ts_51_011: replace encoding of EF.MSISDN with construct model The encoding of EF.MSISDN is currently done with enc_msisdn and dec_msisdn from utils.py. Let's replace this with a construct based model, similar to the one we already use with EF.ADN Related: OS#5714 Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a --- M pySim/ts_51_011.py 1 file changed, 17 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/17/38117/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38117?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a Gerrit-Change-Number: 38117 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/s1ap: add E-RAB RELEASE templates

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38144?usp=email ) Change subject: library/s1ap: add E-RAB RELEASE templates ...................................................................... library/s1ap: add E-RAB RELEASE templates Change-Id: I2e9305da80934ea68e3eca8215a9c16de48b37fd --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 236 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index 60dd063..4f0b5ee 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -1200,4 +1200,240 @@ } } +/* 9.1.3.5 E-RAB RELEASE COMMAND */ +template (value) S1AP_PDU +ts_S1AP_RABReleaseCmd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABList rab_items) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABRelease, + criticality := reject, + value_ := { + e_RABReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABToBeReleasedList, + criticality := ignore, + value_ := { e_RABList := rab_items } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABReleaseCmd(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABList rab_items := ?) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABRelease, + criticality := reject, + value_ := { + e_RABReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABToBeReleasedList, + criticality := ignore, + value_ := { e_RABList := rab_items } + } + } + } + } + } +} + +/* 9.1.3.6 E-RAB RELEASE RESPONSE */ +template (value) S1AP_PDU +ts_S1AP_RABReleaseRsp(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABReleaseListBearerRelComp rab_items) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABRelease, + criticality := reject, + value_ := { + e_RABReleaseResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + criticality := ignore, + value_ := { e_RABReleaseListBearerRelComp := rab_items } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABReleaseRsp(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABReleaseListBearerRelComp rab_items := ?) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABRelease, + criticality := reject, + value_ := { + e_RABReleaseResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + criticality := ignore, + value_ := { e_RABReleaseListBearerRelComp := rab_items } + } + } + } + } + } +} + +/* 9.1.3.7 E-RAB RELEASE INDICATION */ +template (value) S1AP_PDU +ts_S1AP_RABReleaseInd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABList rab_items) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABReleaseIndication, + criticality := reject, + value_ := { + e_RABReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABReleasedList, + criticality := ignore, + value_ := { E_RABList := rab_items } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABReleaseInd(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABList rab_items := ?) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABReleaseIndication, + criticality := reject, + value_ := { + e_RABReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABReleasedList, + criticality := ignore, + value_ := { E_RABList := rab_items } + } + } + } + } + } +} + +/* 9.2.1.36 E-RAB List */ +template (value) E_RABList +ts_E_RABList(template (value) E_RABItem it) := { + { + id := S1AP_Constants.id_E_RABItem, + criticality := ignore, + value_ := { E_RABItem := it } + } +} +template (present) E_RABList +tr_E_RABList(template (present) E_RABItem it := ?) := { + { + id := S1AP_Constants.id_E_RABItem, + criticality := ignore, + value_ := { E_RABItem := it } + } +} + +template (value) E_RABItem +ts_E_RABItem(template (value) E_RAB_ID rab_id, + template (value) Cause cause := {nas := normal_release}) := { + e_RAB_ID := rab_id, + cause := cause, + iE_Extensions := omit +} +template (present) E_RABItem +tr_E_RABItem(template (present) E_RAB_ID rab_id := ?, + template (present) Cause cause := ?) := { + e_RAB_ID := rab_id, + cause := cause, + iE_Extensions := * +} + +/* E-RAB Release List */ +template (value) E_RABReleaseListBearerRelComp +ts_E_RABReleaseListBearerRelComp(template (value) E_RABReleaseItemBearerRelComp it) := { + { + id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + criticality := ignore, + value_ := { E_RABReleaseItemBearerRelComp := it } + } +} +template (present) E_RABReleaseListBearerRelComp +tr_E_RABReleaseListBearerRelComp(template (present) E_RABReleaseItemBearerRelComp it := ?) := { + { + id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + criticality := ignore, + value_ := { E_RABReleaseItemBearerRelComp := it } + } +} + +template (value) E_RABReleaseItemBearerRelComp +ts_E_RABReleaseItemBearerRelComp(template (value) E_RAB_ID rab_id) := { + e_RAB_ID := rab_id, + iE_Extensions := omit +} +template (present) E_RABReleaseItemBearerRelComp +tr_E_RABReleaseItemBearerRelComp(template (present) E_RAB_ID rab_id := ?) := { + e_RAB_ID := rab_id, + iE_Extensions := * +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38144?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2e9305da80934ea68e3eca8215a9c16de48b37fd Gerrit-Change-Number: 38144 Gerrit-PatchSet: 2 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>

9 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: derive functions from f_TC_e_rab_setup()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38062?usp=email ) Change subject: s1gw: derive functions from f_TC_e_rab_setup() ...................................................................... s1gw: derive functions from f_TC_e_rab_setup() ... to avoid code duplication when adding more E-RAB related TCs. While at it, allow establishing multiple E-RABs. Change-Id: I1bff371da6337ecd7710219d1c86f0fff82ad17f --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 124 insertions(+), 50 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index d90609d..7737676 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -281,4 +281,117 @@ f_pfcp_handle_assoc_setup_req(); } } + +/* 256 is maxnoofE-RABs (see S1AP_Constants.asn) */ +type record length(1..256) of ERab ERabList; +type record ERab { + E_RAB_ID erab_id, /* ::= INTEGER (0..15, ...) */ + ERabParams u2c, /* UPF -> Core params */ + ERabParams c2u, /* Core -> UPF params */ + ERabParams a2u, /* Access -> UPF params */ + ERabParams u2a /* UPF -> Access params */ +}; + +type record ERabParams { + GTP_TEID teid, /* ::= OCTET STRING (SIZE (4)) */ + charstring tla /* Transport Layer Address */ +}; + +private const MME_UE_S1AP_ID c_MME_UE_ID := 4242; + +function f_ConnHdlr_tx_erab_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var template (value) E_RABToBeSetupListBearerSUReq 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_RABToBeSetupItemBearerSUReq item; + var template (value) TransportLayerAddress tla; + var ERabParams epars := erabs[i].u2c; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := ts_S1AP_RABToBeSetupItemBearerSUReq(rab_id := erabs[i].erab_id, + qos_params := qos_params, + tla := tla, + gtp_teid := epars.teid, + nas_pdu := ''O); + items[i] := ts_S1AP_RABToBeSetupListBearerSUReq(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupReq(mme_ue_id, enb_ue_id, items)); +} + +function f_ConnHdlr_rx_erab_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_RABToBeSetupListBearerSUReq 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_RABToBeSetupItemBearerSUReq item; + var template (present) TransportLayerAddress tla; + var ERabParams epars := erabs[i].a2u; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := tr_S1AP_RABToBeSetupItemBearerSUReq(rab_id := erabs[i].erab_id, + qos_params := ?, + tla := tla, + gtp_teid := epars.teid, + nas_pdu := ''O); + items[i] := tr_S1AP_RABToBeSetupListBearerSUReq(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupReq(mme_ue_id, enb_ue_id, items)); + return pdu; +} + +function f_ConnHdlr_tx_erab_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var template (value) E_RABSetupListBearerSURes 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_RABSetupItemBearerSURes item; + var template (value) TransportLayerAddress tla; + var ERabParams epars := erabs[i].u2a; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := ts_S1AP_RABSetupItemBearerSURes(rab_id := erabs[i].erab_id, + tla := tla, + gtp_teid := epars.teid); + items[i] := ts_S1AP_RABSetupListBearerSURes(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupRsp(mme_ue_id, enb_ue_id, items)); +} + +function f_ConnHdlr_rx_erab_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_RABSetupListBearerSURes 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_RABSetupItemBearerSURes item; + var template (present) TransportLayerAddress tla; + var ERabParams epars := erabs[i].c2u; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := tr_S1AP_RABSetupItemBearerSURes(rab_id := erabs[i].erab_id, + tla := tla, + gtp_teid := epars.teid); + items[i] := tr_S1AP_RABSetupListBearerSURes(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(mme_ue_id, enb_ue_id, items)); + return pdu; +} + } diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index eb65ce5..1896e30 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -250,10 +250,13 @@ } function f_TC_e_rab_setup(charstring id) runs on ConnHdlr { - const integer mme_id := 7; - const integer enb_id := 9; - const integer erab_id := 6; - var S1AP_PDU pdu; + const ERab erab := { + erab_id := 0, + u2c := {'42424242'O, "1.2.3.4"}, + c2u := {'42424242'O, mp_s1gw_mme_ip}, + a2u := {'24242424'O, "4.3.2.1"}, + u2a := {'24242424'O, mp_s1gw_enb_ip} + }; f_ConnHdlr_register_pfcp(); f_ConnHdlr_s1ap_register(g_pars.genb_id); @@ -261,55 +264,13 @@ f_ConnHdlr_s1ap_setup(g_pars.genb_id); log("eNB <- [S1GW] <- MME: E-RAB SETUP REQUEST"); - var template (value) E_RABToBeSetupListBearerSUReq items_req; - var E_RABToBeSetupItemBearerSUReq item_req := { - e_RAB_ID := erab_id, - e_RABlevelQoSParameters := { - qCI := 5, - allocationRetentionPriority := { - priorityLevel := 1, - pre_emptionCapability := shall_not_trigger_pre_emption, - pre_emptionVulnerability := not_pre_emptable, - iE_Extensions := omit - }, - gbrQosInformation := omit, - iE_Extensions := omit - }, - transportLayerAddress := -, - gTP_TEID := f_rnd_octstring(4), - nAS_PDU := ''O, - iE_Extensions := omit - }; - - /* MME -> S1GW */ - item_req.transportLayerAddress := oct2bit(f_inet_addr("1.2.3.4")); - items_req := ts_S1AP_RABToBeSetupListBearerSUReq(item_req); - f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupReq(mme_id, enb_id, items_req)); - - /* S1GW -> eNB */ - item_req.transportLayerAddress := oct2bit(f_inet_addr(mp_s1gw_mme_ip)); - items_req := ts_S1AP_RABToBeSetupListBearerSUReq(item_req); - f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupReq(mme_id, enb_id, items_req)); + f_ConnHdlr_tx_erab_setup_req({erab}); + f_ConnHdlr_rx_erab_setup_req({erab}); log("eNB -> [S1GW] -> MME: E-RAB SETUP RESPONSE"); - var template (value) E_RABSetupListBearerSURes items_res; - var E_RABSetupItemBearerSURes item_res := { - e_RAB_ID := erab_id, - transportLayerAddress := -, - gTP_TEID := f_rnd_octstring(4), - iE_Extensions := omit - }; - - /* eNB -> S1GW */ - item_res.transportLayerAddress := oct2bit(f_inet_addr("4.3.2.1")); - items_res := ts_S1AP_RABSetupListBearerSURes(item_res); - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupRsp(mme_id, enb_id, items_res)); - - /* S1GW -> MME */ - item_res.transportLayerAddress := oct2bit(f_inet_addr(mp_s1gw_enb_ip)); - items_res := ts_S1AP_RABSetupListBearerSURes(item_res); - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(mme_id, enb_id, items_res)); + f_ConnHdlr_tx_erab_setup_rsp({erab}); + f_ConnHdlr_rx_erab_setup_rsp({erab}); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38062?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1bff371da6337ecd7710219d1c86f0fff82ad17f Gerrit-Change-Number: 38062 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: fix TC_e_rab_setup: handle PFCP Session related PDUs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38102?usp=email ) Change subject: s1gw: fix TC_e_rab_setup: handle PFCP Session related PDUs ...................................................................... s1gw: fix TC_e_rab_setup: handle PFCP Session related PDUs S1GW_Tests.TC_e_rab_setup is failing since we introduced the PFCP support to osmo-s1gw. The IUT now requires co-located UPF, which we need to emulate in the testsuite. This patch patch adds the following API: * S1GW_ConnHdlr.f_ConnHdlr_rx_session_establish_req(), * S1GW_ConnHdlr.f_ConnHdlr_tx_session_establish_resp(), * S1GW_ConnHdlr.f_ConnHdlr_rx_session_modify_req(), * S1GW_ConnHdlr.f_ConnHdlr_tx_session_modify_resp(), and makes use of it in S1GW_Tests.TC_e_rab_setup. Change-Id: Ibbb326badaa1e3df968c137f3e4b576ca5c6f94d --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 174 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 7737676..cd61123 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -51,7 +51,10 @@ type record ConnHdlrPars { integer idx, Global_ENB_ID genb_id, - charstring statsd_prefix + charstring statsd_prefix, + charstring pfcp_loc_addr, + charstring pfcp_rem_addr, + ERabList erabs }; template Global_ENB_ID @@ -289,7 +292,9 @@ ERabParams u2c, /* UPF -> Core params */ ERabParams c2u, /* Core -> UPF params */ ERabParams a2u, /* Access -> UPF params */ - ERabParams u2a /* UPF -> Access params */ + ERabParams u2a, /* UPF -> Access params */ + OCT8 pfcp_loc_seid, + OCT8 pfcp_rem_seid optional }; type record ERabParams { @@ -394,4 +399,139 @@ 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); + + /* Packet Detection Rules */ + var template (present) Outer_Header_Removal ohr; + var template (present) Create_PDR pdr1; + var template (present) Create_PDR pdr2; + + ohr := tr_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4); + pdr1 := tr_PFCP_Create_PDR(pdr_id := 1, /* -- for Core -> Access */ + pdi := tr_PFCP_PDI(CORE), + ohr := ohr, + far_id := 1); + pdr2 := tr_PFCP_Create_PDR(pdr_id := 2, /* -- for Access -> Core */ + pdi := tr_PFCP_PDI(ACCESS), + ohr := ohr, + far_id := 2); + + /* Forwarding Action Rules */ + var template (present) Outer_Header_Creation ohc2; + var template (present) Forwarding_Parameters fpars2; + var template (present) Create_FAR far1; + var template (present) Create_FAR far2; + + ohc2 := tr_PFCP_Outer_Header_Creation_GTP_ipv4(erab.u2c.teid, + f_inet_addr(erab.u2c.tla)); + fpars2 := tr_PFCP_Forwarding_Parameters(CORE, ohc2); + + far1 := tr_PFCP_Create_FAR(far_id := 1, /* -- for Core -> Access */ + aa := tr_PFCP_Apply_Action_DROP, + fp := omit); + far2 := tr_PFCP_Create_FAR(far_id := 2, /* -- for Access -> Core */ + aa := tr_PFCP_Apply_Action_FORW, + fp := fpars2); + + /* The final Session Establishment Request PDU */ + var template (present) PDU_PFCP tr_pdu; + tr_pdu := tr_PFCP_Session_Est_Req(node_id := tr_PFCP_Node_ID_ipv4(addr), + cp_f_seid := tr_PFCP_F_SEID_ipv4(addr), + create_pdr := {pdr1, pdr2}, + create_far := {far1, far2}); + return f_ConnHdlr_pfcp_expect(tr_pdu); +} + +function f_ConnHdlr_tx_session_establish_resp(in ERab erab, + in PDU_PFCP req) +runs on ConnHdlr { + var OCT4 addr := f_inet_addr(g_pars.pfcp_loc_addr); + var PFCP_Session_Establishment_Request serq; + + serq := req.message_body.pfcp_session_establishment_request; + + /* Created Packet Detection Rules */ + var template (value) Created_PDR pdr1; + var template (value) Created_PDR pdr2; + pdr1 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[0].grouped_ie.pdr_id, + local_F_TEID := ts_PFCP_F_TEID_ipv4(erab.c2u.teid, + f_inet_addr(erab.c2u.tla))); + pdr2 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[1].grouped_ie.pdr_id, + local_F_TEID := ts_PFCP_F_TEID_ipv4(erab.a2u.teid, + f_inet_addr(erab.a2u.tla))); + + /* The final Session Establishment Response PDU */ + var template (value) PDU_PFCP resp; + resp := ts_PFCP_Session_Est_Resp(seq_nr := req.sequence_number, + node_id := ts_PFCP_Node_ID_ipv4(addr), + seid := erab.pfcp_rem_seid, + f_seid := ts_PFCP_F_SEID_ipv4(addr, erab.pfcp_loc_seid), + created_pdr := {pdr1, pdr2}); + PFCP.send(resp); +} + +function f_ConnHdlr_rx_session_modify_req(in ERab erab) +runs on ConnHdlr return PDU_PFCP { + /* Forwarding Action Rules */ + var template (present) Outer_Header_Creation ohc1; + var template (present) Update_Forwarding_Parameters fpars1; + var template (present) Update_FAR far1; + + ohc1 := tr_PFCP_Outer_Header_Creation_GTP_ipv4(erab.u2a.teid, + f_inet_addr(erab.u2a.tla)); + fpars1 := tr_PFCP_Update_Forwarding_Parameters(ohc := ohc1); + + far1 := tr_PFCP_Update_FAR(far_id := 1, /* -- for Core -> Access */ + aa := tr_PFCP_Apply_Action_FORW, + fp := fpars1); + + /* The final Session Modification Request PDU */ + var template (present) PDU_PFCP tr_pdu; + tr_pdu := tr_PFCP_Session_Mod_Req(seid := erab.pfcp_loc_seid, + update_far := far1); + return f_ConnHdlr_pfcp_expect(tr_pdu); +} + +function f_ConnHdlr_tx_session_modify_resp(in ERab erab, + in PDU_PFCP req) +runs on ConnHdlr { + /* The final Session Modification Response PDU */ + var template (value) PDU_PFCP resp; + resp := ts_PFCP_Session_Mod_Resp(seq_nr := req.sequence_number, + seid := erab.pfcp_rem_seid); + PFCP.send(resp); +} + +function f_ConnHdlr_erab_setup_req(inout ERabList erabs) +runs on ConnHdlr { + 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; + log("UPF -> S1GW: PFCP Session Establishment Response for E-RAB ID ", erabs[i].erab_id); + f_ConnHdlr_tx_session_establish_resp(erabs[i], pdu); + } + log("[eNB <- S1GW] <- MME: E-RAB SETUP REQUEST"); + f_ConnHdlr_rx_erab_setup_req(erabs); +} + +function f_ConnHdlr_erab_setup_rsp(in ERabList erabs) +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); + } + log("eNB -> [S1GW -> MME]: E-RAB SETUP RESPONSE"); + f_ConnHdlr_rx_erab_setup_rsp(erabs); +} + } diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 1896e30..fb4ee9b 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -111,10 +111,38 @@ template (value) ConnHdlrPars t_ConnHdlrPars(integer idx := 0, - charstring statsd_prefix := mp_statsd_prefix) := { + integer num_erabs := 1, + charstring statsd_prefix := mp_statsd_prefix, + charstring pfcp_loc_addr := mp_upf_bind_ip, + charstring pfcp_rem_addr := mp_s1gw_upf_ip) := { idx := idx, genb_id := ts_Global_ENB_ID(idx), - statsd_prefix := statsd_prefix + statsd_prefix := statsd_prefix, + pfcp_loc_addr := pfcp_loc_addr, + pfcp_rem_addr := pfcp_rem_addr, + erabs := f_gen_erab_list(idx, num_erabs) +} + +private function f_gen_erab_list(integer idx, integer num_erabs) +return ERabList { + var OCT6 seid_prefix := char2oct("TTCN-3"); + var ERabList erabs; + + for (var integer id := 0; id < num_erabs; id := id + 1) { + var OCT2 uid := int2oct(idx, 1) & int2oct(id, 1); + + erabs[id] := { + erab_id := id, /* sequentially assign E-RAB IDs */ + u2c := {'0001'O & uid, "127.0.0.1"}, + c2u := {'0101'O & uid, "127.0.1.1"}, + a2u := {'0202'O & uid, "127.0.2.2"}, + u2a := {'0002'O & uid, "127.0.0.2"}, + pfcp_loc_seid := seid_prefix & uid, + pfcp_rem_seid := omit /* assigned by S1GW */ + }; + } + + return erabs; } function f_ConnHdlr_spawn(void_fn fn, ConnHdlrPars pars) @@ -250,27 +278,13 @@ } function f_TC_e_rab_setup(charstring id) runs on ConnHdlr { - const ERab erab := { - erab_id := 0, - u2c := {'42424242'O, "1.2.3.4"}, - c2u := {'42424242'O, mp_s1gw_mme_ip}, - a2u := {'24242424'O, "4.3.2.1"}, - u2a := {'24242424'O, mp_s1gw_enb_ip} - }; - f_ConnHdlr_register_pfcp(); 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); - log("eNB <- [S1GW] <- MME: E-RAB SETUP REQUEST"); - f_ConnHdlr_tx_erab_setup_req({erab}); - f_ConnHdlr_rx_erab_setup_req({erab}); - - - log("eNB -> [S1GW] -> MME: E-RAB SETUP RESPONSE"); - f_ConnHdlr_tx_erab_setup_rsp({erab}); - f_ConnHdlr_rx_erab_setup_rsp({erab}); + f_ConnHdlr_erab_setup_req(g_pars.erabs); + f_ConnHdlr_erab_setup_rsp(g_pars.erabs); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38102?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibbb326badaa1e3df968c137f3e4b576ca5c6f94d Gerrit-Change-Number: 38102 Gerrit-PatchSet: 3 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>

9 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_e_rab_setup3 (3 E-RABs at a time)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38146?usp=email ) Change subject: s1gw: add TC_e_rab_setup3 (3 E-RABs at a time) ...................................................................... s1gw: add TC_e_rab_setup3 (3 E-RABs at a time) The idea is to verify setup and release of 3 E-RABs at a time. Change-Id: I6a0a10f826309d8a952c77c23170df3d201e7640 --- M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 2 files changed, 15 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index ebeda6d..b643f37 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -291,8 +291,19 @@ f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } +/* 1 E-RAB at a time */ testcase TC_e_rab_setup() runs on test_CT { - var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := 1)); + var ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_ConnHdlr_spawn(refers(f_TC_e_rab_setup), pars); + vc_conn.done; +} +/* 3 E-RABs at a time */ +testcase TC_e_rab_setup3() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := 3)); var ConnHdlr vc_conn; f_init(); @@ -331,6 +342,7 @@ execute( TC_conn_term_by_mme() ); execute( TC_conn_term_mme_unavail() ); execute( TC_e_rab_setup() ); + execute( TC_e_rab_setup3() ); execute( TC_pfcp_heartbeat() ); } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index 87cd893..f7b0c3b 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,9 +1,10 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='6' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='7' 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'/> <testcase classname='S1GW_Tests' name='TC_conn_term_mme_unavail' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_setup' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_e_rab_setup3' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a0a10f826309d8a952c77c23170df3d201e7640 Gerrit-Change-Number: 38146 Gerrit-PatchSet: 2 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>

9 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: TC_e_rab_setup: also test E-RAB release

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38145?usp=email ) Change subject: s1gw: TC_e_rab_setup: also test E-RAB release ...................................................................... s1gw: TC_e_rab_setup: also test E-RAB release * s1ap: add E-RAB RELEASE API * pfcp: add PFCP Session Deletion API * s1gw: make use of this API in TC_e_rab_setup Change-Id: Id995c51d8ac76316f41ef49d35380a2521d5ae19 --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 70 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index cd61123..5b2e7bb 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -303,6 +303,7 @@ }; private const MME_UE_S1AP_ID c_MME_UE_ID := 4242; +private const S1AP_IEs.Cause c_REL_CMD_CAUSE := { nas := normal_release }; function f_ConnHdlr_tx_erab_setup_req(in ERabList erabs, MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) @@ -399,6 +400,42 @@ return pdu; } +function f_ConnHdlr_tx_erab_release_cmd(in ERabList erabs, + S1AP_IEs.Cause cause := c_REL_CMD_CAUSE, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var template (value) E_RABList items; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (value) E_RABItem item; + + item := ts_E_RABItem(erabs[i].erab_id, cause); + items[i] := ts_E_RABList(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABReleaseCmd(mme_ue_id, enb_ue_id, items)); +} + +function f_ConnHdlr_rx_erab_release_cmd(in ERabList erabs, + S1AP_IEs.Cause cause := c_REL_CMD_CAUSE, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr return S1AP_PDU { + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var template (present) E_RABList items; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (present) E_RABItem item; + + item := ts_E_RABItem(erabs[i].erab_id, cause); + items[i] := tr_E_RABList(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABReleaseCmd(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); @@ -504,6 +541,24 @@ PFCP.send(resp); } +function f_ConnHdlr_rx_session_delete_req(in ERab erab) +runs on ConnHdlr return PDU_PFCP { + /* The final Session Deletion Request PDU */ + var template (present) PDU_PFCP tr_pdu; + tr_pdu := tr_PFCP_Session_Del_Req(erab.pfcp_loc_seid); + return f_ConnHdlr_pfcp_expect(tr_pdu); +} + +function f_ConnHdlr_tx_session_delete_resp(in ERab erab, + in PDU_PFCP req) +runs on ConnHdlr { + /* The final Session Deletion Response PDU */ + var template (value) PDU_PFCP resp; + resp := ts_PFCP_Session_Del_Resp(seq_nr := req.sequence_number, + seid := erab.pfcp_rem_seid); + PFCP.send(resp); +} + function f_ConnHdlr_erab_setup_req(inout ERabList erabs) runs on ConnHdlr { log("eNB <- [S1GW <- MME]: E-RAB SETUP REQUEST"); @@ -534,4 +589,17 @@ f_ConnHdlr_rx_erab_setup_rsp(erabs); } +function f_ConnHdlr_erab_release_cmd(inout ERabList erabs, + S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) +runs on ConnHdlr { + f_ConnHdlr_tx_erab_release_cmd(erabs, cause); + 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); + } + f_ConnHdlr_rx_erab_release_cmd(erabs, cause); +} + } diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index fb4ee9b..ebeda6d 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -277,6 +277,7 @@ vc_conn.done; } +/* Test E-RAB SETUP [and RELEASE] procedures */ function f_TC_e_rab_setup(charstring id) runs on ConnHdlr { f_ConnHdlr_register_pfcp(); f_ConnHdlr_s1ap_register(g_pars.genb_id); @@ -285,6 +286,7 @@ f_ConnHdlr_erab_setup_req(g_pars.erabs); f_ConnHdlr_erab_setup_rsp(g_pars.erabs); + f_ConnHdlr_erab_release_cmd(g_pars.erabs); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38145?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id995c51d8ac76316f41ef49d35380a2521d5ae19 Gerrit-Change-Number: 38145 Gerrit-PatchSet: 3 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>

9 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: derive functions from f_TC_e_rab_setup()

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38062?usp=email ) Change subject: s1gw: derive functions from f_TC_e_rab_setup() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38062?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1bff371da6337ecd7710219d1c86f0fff82ad17f Gerrit-Change-Number: 38062 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Sep 2024 15:49:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 1 week

1
0
0 0

[S] Change in pysim[master]: utils: support alpha identifier in enc/dec_msisdn

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38118?usp=email ) Change subject: utils: support alpha identifier in enc/dec_msisdn ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: let's please stop doing any work on new features for legacy pysim-{prog,read}. The time is invested much better by working on new tools based on the pySim.filesystem / pySim-shell architecture. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38118?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: I19ec8ba14551ec282fc0cc12ae2f6d528bdfc527 Gerrit-Change-Number: 38118 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Sep 2024 15:48:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

9 months, 1 week

1
0
0 0

[M] Change in pysim[master]: pySim-prog: rework documentation

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38166?usp=email ) Change subject: pySim-prog: rework documentation ...................................................................... pySim-prog: rework documentation The documentation for the classic pySim-prog application is a bit sparse. Let's rework it so that it includes the most important information that is required to operate pySim-prog. Let's also add a section about how the batch mode and CSV files are used. Related: SYS#4120 Change-Id: I1d1a65154cea7fa77428b412fcf8c7b4cba629b1 --- M docs/legacy.rst 1 file changed, 171 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/docs/legacy.rst b/docs/legacy.rst index 0961d17..4da9825 100644 --- a/docs/legacy.rst +++ b/docs/legacy.rst @@ -1,20 +1,20 @@ -Legacy tools +Legacy tools ============ *legacy tools* are the classic ``pySim-prog`` and ``pySim-read`` programs that existed long before ``pySim-shell``. -These days, you should primarily use ``pySim-shell`` instead of these +These days, it is highly recommended to use ``pySim-shell`` instead of these legacy tools. pySim-prog ---------- -``pySim-prog`` was the first part of the pySim software suite. It started as -a tool to write ICCID, IMSI, MSISDN and Ki to very simplistic SIM cards, and -was later extended to a variety of other cards. As the number of features supported -became no longer bearable to express with command-line arguments, `pySim-shell` was -created. +``pySim-prog`` was the first part of the pySim software suite. It started as a +tool to write ICCID, IMSI, MSISDN and Ki to very simplistic SIM cards, and was +later extended to a variety of other cards. As the number of features supported +became no longer bearable to express with command-line arguments, `pySim-shell` +was created. Basic use cases can still use `pySim-prog`. @@ -22,36 +22,182 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~ Two modes are possible: - - one where you specify every parameter manually : + - one where the user specifies every parameter manually: -``./pySim-prog.py -n 26C3 -c 49 -x 262 -y 42 -i <IMSI> -s <ICCID>`` + This is the most common way to use ``pySim-prog``. The user will specify all relevant parameters directly via the + commandline. A typical commandline would look like this: + + ``pySim-prog.py -p <pcsc_reader> --ki <ki_value> --opc <opc_value> --mcc <mcc_value> --mnc <mnc_value> + --country <country_code> --imsi <imsi_value> --iccid <iccid_value> --pin-adm <adm_pin>`` + + Please note, that this already lengthy commandline still only contains the most common card parameters. For a full + list of all possible parameters, use the ``--help`` option of ``pySim-prog``. It is also important to mention + that not all parameters are supported by all card types. In particular, very simple programmable SIM cards will only + support a very basic set of parameters, such as MCC, MNC, IMSI and KI values. + + - one where the parameters are generated from a minimal set: + + It is also possible to leave the generation of certain parameters to ``pySim-prog``. This is in particular helpful + when a large number of cards should be initialized with randomly generated key material. + + ``pySim-prog.py -p <pcsc_reader> --mcc <mcc_value> --mnc <mnc_value> --secret <random_secret> --num <card_number> --pin-adm <adm_pin>`` + + The parameter ``--secret`` specifies a random seed that is used to generate the card individual parameters. (IMSI). + The secret should contain enough randomness to avoid conflicts. It is also recommended to store the secret safely, + in case cards have to be re-generated or the current card batch has to be extended later. For security reasons, the + key material, which is also card individual, will not be derived from the random seed. Instead a new random set of + Ki and OPc will be generated during each programming cycle. This means fresh keys are generated, even when the + ``--num`` remains unchanged. + + The parameter ``--num`` specifies a card individual number. This number will be manged into the random seed so that + it serves as an identifier for a particular set of randomly generated parameters. + + In the example above the parameters ``--mcc``, and ``--mnc`` are specified as well, since they identify the GSM + network where the cards should operate in, it is absolutely required to keep them static. ``pySim-prog`` will use + those parameters to generate a valid IMSI that thas the specified MCC/MNC at the beginning and a random tail. + +Specifying the card type: + +``pySim-prog`` usually autodetects the card type. In case auto detection does not work, it is possible to specify +the parameter ``--type``. The following card types are supported: + + * Fairwaves-SIM + * fakemagicsim + * gialersim + * grcardsim + * magicsim + * OpenCells-SIM + * supersim + * sysmoISIM-SJA2 + * sysmoISIM-SJA5 + * sysmosim-gr1 + * sysmoSIM-GR2 + * sysmoUSIM-SJS1 + * Wavemobile-SIM + +Specifying the card reader: + +It is most common to use ``pySim-prog`` together whith a PCSC reader. The PCSC reader number is specified via the +``--pcsc-device`` or ``-p`` option. However, other reader types (such as serial readers and modems) are supported. Use +the ``--help`` option of ``pySim-prog`` for more information. - - one where they are generated from some minimal set : +Card programming using CSV files +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -``./pySim-prog.py -n 26C3 -c 49 -x 262 -y 42 -z <random_string_of_choice> -j <card_num>`` +To simplify the card programming process, ``pySim-prog`` also allows to read +the card parameters from a CSV file. When a CSV file is used as input, the +user does not have to craft an individual commandline for each card. Instead +all card related parameters are automatically drawn from the CSV file. - With <random_string_of_choice> and <card_num>, the soft will generate - 'predictable' IMSI and ICCID, so make sure you choose them so as not to - conflict with anyone. (for eg. your name as <random_string_of_choice> and - 0 1 2 ... for <card num>). +A CSV files may hold rows for multiple (hundreds or even thousands) of +cards. ``pySim-prog`` is able to identify the rows either by ICCID +(recommended as ICCIDs are normally not changed) or IMSI. - You also need to enter some parameters to select the device : - -t TYPE : type of card (supersim, magicsim, fakemagicsim or try 'auto') - -d DEV : Serial port device (default /dev/ttyUSB0) - -b BAUD : Baudrate (default 9600) +The CSV file format is a flexible format with mandatory and optional columns, +here the same rules as for the commandline parameters apply. The column names +match the command line options. The CSV file may also contain columns that are +unknown to pySim-prog, such as inventory numbers, nicknames or parameters that +are unrelated to the card programming process. ``pySim-prog`` will silently +ignore all unknown columns. + +A CSV file may contain the following columns: + +* name +* iccid (typically used as key) +* mcc +* mnc +* imsi (may be used as key, but not recommended) +* smsp +* ki +* opc +* acc +* pin_adm, adm1 or pin_adm_hex (must be present) +* msisdn +* epdgid +* epdgSelection +* pcscf +* ims_hdomain +* impi +* impu +* opmode +* fplmn + +Due to historical reasons, and to maintain the compatibility between multiple different CSV file formats, the ADM pin +may be stored in three different columns. Only one of the three columns must be available. + +* adm1: This column contains the ADM pin in numeric ASCII digit format. This format is the most common. +* pin_adm: Same as adm1, only the column name is different +* pin_adm_hex: If the ADM pin consists of raw HEX digits, rather then of numerical ASCII digits, then the ADM pin + can also be provided as HEX string using this column. + +The following example shows a typical minimal example +:: + + "imsi","iccid","acc","ki","opc","adm1" + "999700000053010","8988211000000530108","0001","51ACE8BD6313C230F0BFE1A458928DF0","E5A00E8DE427E21B206526B5D1B902DF","65942330" + "999700000053011","8988211000000530116","0002","746AAFD7F13CFED3AE626B770E53E860","38F7CE8322D2A7417E0BBD1D7B1190EC","13445792" + "999700123053012","8988211000000530124","0004","D0DA4B7B150026ADC966DC637B26429C","144FD3AEAC208DFFF4E2140859BAE8EC","53540383" + "999700000053013","8988211000000530132","0008","52E59240ABAC6F53FF5778715C5CE70E","D9C988550DC70B95F40342298EB84C5E","26151368" + "999700000053014","8988211000000530140","0010","3B4B83CB9C5F3A0B41EBD17E7D96F324","D61DCC160E3B91F284979552CC5B4D9F","64088605" + "999700000053015","8988211000000530157","0020","D673DAB320D81039B025263610C2BBB3","4BCE1458936B338067989A06E5327139","94108841" + "999700000053016","8988211000000530165","0040","89DE5ACB76E06D14B0F5D5CD3594E2B1","411C4B8273FD7607E1885E59F0831906","55184287" + "999700000053017","8988211000000530173","0080","977852F7CEE83233F02E69E211626DE1","2EC35D48DBF2A99C07D4361F19EF338F","70284674" + +:: + +The following commandline will instruct ``pySim-prog`` to use the provided CSV file as parameter source and the +ICCID (read from the card before programming) as a key to identify the card. To use the IMSI as a key, the parameter +``--read-imsi`` can be used instead of ``--read-iccid``. However, this option is only recommended to be used in very +specific corner cases. + +``pySim-prog.py -p <pcsc_reader> --read-csv <path_to_csv_file> --source csv --read-iccid`` + +It is also possible to pick a row from the CSV file by manually providing an ICCID (option ``--iccid``) or an IMSI +(option ``--imsi``) that is then used as a key to find the matching row in the CSV file. + +``pySim-prog.py -p <pcsc_reader> --read-csv <path_to_csv_file> --source csv --iccid <iccid_value>`` + + +Writing CSV files +~~~~~~~~~~~~~~~~~ +``pySim-prog`` is also able to generate CSV files that contain a subset of the parameters it has generated or received +from some other source (commandline, CSV-File). The generated file will be header-less and contain the following +columns: + +* name +* iccid +* mcc +* mnc +* imsi +* smsp +* ki +* opc + +A commandline that makes use of the CSV write feature would look like this: + +``pySim-prog.py -p <pcsc_reader> --read-csv <path_to_input_csv_file> --read-iccid --source csv --write-csv <path_to_output_csv_file>`` + + +Batch programming +~~~~~~~~~~~~~~~~~ + +In case larger card batches need to be programmed, it is possible to use the ``--batch`` parameter to run ``pySim-prog`` in batch mode. + +The batch mode will prompt the user to insert a card. Once a card is detected in the reader, the programming is carried out. The user may then remove the card again and the process starts over. This allows for a quick and efficient card programming without permanent commandline interaction. pySim-read ---------- -``pySim-read`` allows you to read some data from a SIM card. It will only some files -of the card, and will only read files accessible to a normal user (without any special authentication) +``pySim-read`` allows to read some of the most important data items from a SIM +card. This means it will only read some files of the card, and will only read +files accessible to a normal user (without any special authentication) -These days, you should use the ``export`` command of ``pySim-shell`` -instead. It performs a much more comprehensive export of all of the -[standard] files that can be found on the card. To get a human-readable -decode instead of the raw hex export, you can use ``export --json``. +These days, it is recommended to use the ``export`` command of ``pySim-shell`` +instead. It performs a much more comprehensive export of all of the [standard] +files that can be found on the card. To get a human-readable decode instead of +the raw hex export, you can use ``export --json``. Specifically, pySim-read will dump the following: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38166?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: I1d1a65154cea7fa77428b412fcf8c7b4cba629b1 Gerrit-Change-Number: 38166 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: pySim-prog: treat --imsi and --iccid equally

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38163?usp=email ) Change subject: pySim-prog: treat --imsi and --iccid equally ...................................................................... pySim-prog: treat --imsi and --iccid equally When using a CSV file, we can either read the IMSI or ICCID from the CSV file before programming. However, should also be possible to supply both manually to identify the CSV file entry using the --imsi or --iccid option. This currently only works for the IMSI, but not for the ICCID. Related: SYS#4120 Change-Id: Id3083c7794a7bd59501997f22afdc23bad3069e6 --- M pySim-prog.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-prog.py b/pySim-prog.py index e238b66..cd7ac74 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -732,12 +732,12 @@ if opts.source == 'cmdline': cp = gen_parameters(opts) elif opts.source == 'csv': - imsi = None - iccid = None if opts.read_iccid: (res, _) = scc.read_binary(['3f00', '2fe2'], length=10) iccid = dec_iccid(res) - elif opts.read_imsi: + else: + iccid = opts.iccid + if opts.read_imsi: (res, _) = scc.read_binary(EF['IMSI']) imsi = swap_nibbles(res)[3:] else: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38163?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: Id3083c7794a7bd59501997f22afdc23bad3069e6 Gerrit-Change-Number: 38163 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024