December 2023 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: additional encode/decode test data for various files

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35418?usp=email ) Change subject: additional encode/decode test data for various files ...................................................................... additional encode/decode test data for various files Change-Id: Ib563a2204922d2013b5f7c5abde0773051e17938 --- M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_51_011.py 3 files changed, 38 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/35418/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index ac0dc84..67381f3 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -748,6 +748,8 @@ _test_de_encode = [ ( '3cff02', { "max_current_mA": 60, "t_op_s": 255, "addl_info": { "req_inc_idle_current": False, "support_uicc_suspend": True } } ), + ( '320500', { "max_current_mA": 50, "t_op_s": 5, "addl_info": {"req_inc_idle_current": False, + "support_uicc_suspend": False } } ), ] def __init__(self, fid='2f08', sfid=0x08, name='EF.UMPC', desc='UICC Maximum Power Consumption'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=(5, 5)) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index a203a22..83c15ef 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -296,6 +296,16 @@ # TS 31.102 4.4.11.8 class EF_SUCI_Calc_Info(TransparentEF): + _test_de_encode = [ + ( 'A00401010000A14A80010A81204E858C4D49D1343E6181284C47CA721730C98742CB7C6182D2E8126E08088D3680010B8120D1BC365F4997D17CE4374E72181431CBFEBA9E1B98D7618F79D48561B144672A', + {"prot_scheme_id_list": [{"priority": 0, "identifier": 1, "key_index": 1}, {"priority": 1, + "identifier": 0, + "key_index": 0}], + "hnet_pubkey_list": [{"hnet_pubkey_identifier": 10, "hnet_pubkey": + "4e858c4d49d1343e6181284c47ca721730c98742cb7c6182d2e8126e08088d36"}, + {"hnet_pubkey_identifier": 11, "hnet_pubkey": + "d1bc365f4997d17ce4374e72181431cbfeba9e1b98d7618f79d48561b144672a"}]} ), + ] def __init__(self, fid="4f07", sfid=0x07, name='EF.SUCI_Calc_Info', size=(2, None), desc='SUCI Calc Info', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) @@ -558,6 +568,8 @@ ( '47d1264a62f21037211e00', { "tmsi": "47d1264a", "lai": { "mcc_mnc": "262f01", "lac": "3721" }, "rfu": 30, "lu_status": 0 } ), + ( 'ffffffff62f2200000ff01', + {"tmsi": "ffffffff", "lai": {"mcc_mnc": "262f02", "lac": "0000"}, "rfu": 255, "lu_status": 1} ), ] def __init__(self, fid='6f7e', sfid=0x0b, name='EF.LOCI', desc='Location information', size=(11, 11)): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) @@ -766,6 +778,7 @@ # TS 31.102 Section 4.2.85 class EF_EHPLMNPI(TransparentEF): _test_de_encode = [ + ( '00', {"presentation_ind": "no_preference"} ), ( '02', { "presentation_ind": "display_all" } ), ] def __init__(self, fid='6fdb', sfid=None, name='EF.EHPLMNPI', size=(1, 1), @@ -1488,6 +1501,7 @@ EF_NCP_IP(service=80), EF_EPSLOCI('6fe3', 0x1e, 'EF.EPSLOCI', desc='EPS location information', service=85), EF_EPSNSC(service=85), + # EF.UFC Test data: 801e60c01e900080040000000000000000f0000000004000000000000080 TransparentEF('6fe6', None, 'EF.UFC', desc='USAT Facility Control', size=(1, 16)), TransparentEF('6fe8', None, 'EF.NASCONFIG', desc='Non Access Stratum Configuration', service=96), # UICC IARI (only in cards that have no ISIM) service=95 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index cc8d032..94e7746 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -135,7 +135,12 @@ "unknown", "numbering_plan_id": "isdn_e164" }, "dialing_nr": "6082658001", "cap_conf_id": 255, "ext1_record_id": 255 }), - ] + ( '4B756E64656E626574726575756E67FFFFFF0791947112122721ffffffffffff', + {"alpha_id": "Kundenbetreuung", "len_of_bcd": 7, "ton_npi": {"ext": True, "type_of_number": + "international", + "numbering_plan_id": "isdn_e164"}, + "dialing_nr": "491721217212", "cap_conf_id": 255, "ext1_record_id": 255} ) + ] def __init__(self, fid='6f3a', sfid=None, name='EF.ADN', desc='Abbreviated Dialing Numbers', ext=1, **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(14, 30), **kwargs) @@ -730,6 +735,7 @@ _test_de_encode = [ ( '62F2104000', { "mcc": "262", "mnc": "01", "act": set([ "E-UTRAN WB-S1", "E-UTRAN NB-S1" ]) } ), ( '62F2108000', { "mcc": "262", "mnc": "01", "act": set([ "UTRAN" ]) } ), + ( '62F220488C', { "mcc": "262", "mnc": "02", "act": set([ "E-UTRAN WB-S1", "E-UTRAN NB-S1", "NG-RAN", "GSM", "EC-GSM-IoT"]) } ), ] def __init__(self, fid='1234', sfid=None, name=None, desc=None, size=(40, None), rec_len=5, **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) @@ -859,6 +865,12 @@ # TS 51.011 Section 10.3.45 + TS 31.102 4.2.63 class EF_MWIS(LinFixedEF): + _test_de_encode = [ + ( '0000000000', + {"mwi_status": {"voicemail": False, "fax": False, "email": False, "other": False, "videomail": + False}, "num_waiting_voicemail": 0, "num_waiting_fax": 0, "num_waiting_email": 0, + "num_waiting_other": 0, "num_waiting_videomail": None} ), + ] def __init__(self, fid='6fca', sfid=None, name='EF.MWIS', rec_len=(5, 6), desc='Message Waiting Indication Status', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35418?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib563a2204922d2013b5f7c5abde0773051e17938 Gerrit-Change-Number: 35418 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-msc[master]: VTY: always print MNCC handler type (internal/external)

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/35414?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: VTY: always print MNCC handler type (internal/external) ...................................................................... VTY: always print MNCC handler type (internal/external) ... so that it's clear which MNCC handler is used by looking at the output of `show running-config`. Change-Id: Id1fe7aecc1c8445db48ff5fddcf6df0f05ba5e2e --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/35414/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35414?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id1fe7aecc1c8445db48ff5fddcf6df0f05ba5e2e Gerrit-Change-Number: 35414 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-msc[master]: VTY: always print MNCC handler type (internal/external)

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/35414?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: VTY: always print MNCC handler type (internal/external) ...................................................................... VTY: always print MNCC handler type (internal/external) ... so that it's clear which MNCC handler is used by looking at the output of `show running-config`. Change-Id: Id1fe7aecc1c8445db48ff5fddcf6df0f05ba5e2e --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/35414/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35414?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id1fe7aecc1c8445db48ff5fddcf6df0f05ba5e2e Gerrit-Change-Number: 35414 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-msc[master]: VTY: always print MNCC handler type (internal/external)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/35414?usp=email ) Change subject: VTY: always print MNCC handler type (internal/external) ...................................................................... VTY: always print MNCC handler type (internal/external) ... so that it's clear which MNCC handler is used by looking at the output of `show running-config`. Change-Id: Id1fe7aecc1c8445db48ff5fddcf6df0f05ba5e2e --- M src/libmsc/msc_vty.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/35414/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 70b3b6b..a448fbf 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -763,6 +763,8 @@ vty_out(vty, "msc%s", VTY_NEWLINE); if (gsmnet->mncc_sock_path) vty_out(vty, " mncc external %s%s", gsmnet->mncc_sock_path, VTY_NEWLINE); + else + vty_out(vty, " mncc internal%s", VTY_NEWLINE); vty_out(vty, " mncc guard-timeout %i%s", gsmnet->mncc_guard_timeout, VTY_NEWLINE); vty_out(vty, " ncss guard-timeout %i%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35414?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id1fe7aecc1c8445db48ff5fddcf6df0f05ba5e2e Gerrit-Change-Number: 35414 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: Add missing template tr_NAS_EMMInformation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35408?usp=email ) Change subject: NAS_Templates: Add missing template tr_NAS_EMMInformation ...................................................................... NAS_Templates: Add missing template tr_NAS_EMMInformation Change-Id: Ie71480d44d9674e2dff3ae31cab262bc3e0a261e --- M library/NAS_Templates.ttcn 1 file changed, 29 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/35408/1 diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn index 70561b3..7652720 100644 --- a/library/NAS_Templates.ttcn +++ b/library/NAS_Templates.ttcn @@ -1,4 +1,4 @@ -/* EPC (Evolved Packet Core) NAS (Non-Access Stratum) templates in TTCN-3 +/* 3GPP TS 24.301, EPC (Evolved Packet Core) NAS (Non-Access Stratum) templates in TTCN-3 * (C) 2019 Harald Welte <laforge(a)gnumonks.org> * All rights reserved. * @@ -687,6 +687,25 @@ } } +/* 8.2.13 EMM information */ +template (present) PDU_NAS_EPS +tr_NAS_EMMInformation := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_EMM_Information := { + securityHeaderType := ?, + messageType := '01100001'B, + fullNameForNetwork := *, + shortNameForNetwork := *, + localTimeZone := *, + universalTimeAndLocalTimeZone := *, + networkDaylightSavingTime := * + } + } + } +} + /* 8.2.18 Identity Request */ template (value) PDU_NAS_EPS ts_NAS_IdentityReq(template (value) IdentityType2V id_type) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35408?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie71480d44d9674e2dff3ae31cab262bc3e0a261e Gerrit-Change-Number: 35408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: DIAMETER_ts29_272_Templates: Add missing templates for CLR and CLA me...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35407?usp=email ) Change subject: DIAMETER_ts29_272_Templates: Add missing templates for CLR and CLA messages ...................................................................... DIAMETER_ts29_272_Templates: Add missing templates for CLR and CLA messages Change-Id: I9366b434e856828c5d441cbc7b0d952060cdc71b --- M library/DIAMETER_ts29_272_Templates.ttcn 1 file changed, 69 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/35407/1 diff --git a/library/DIAMETER_ts29_272_Templates.ttcn b/library/DIAMETER_ts29_272_Templates.ttcn index 443e372..d3c7a95 100644 --- a/library/DIAMETER_ts29_272_Templates.ttcn +++ b/library/DIAMETER_ts29_272_Templates.ttcn @@ -301,6 +301,16 @@ } } +/* TS 29.272 7.3.24 Cancellation-Type */ +template (value) GenericAVP ts_AVP_3GPP_CancellationType(template (value) AAA_3GPP_Cancellation_Type t) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Cancellation_Type), + avp_data := { + avp_AAA_3GPP_Cancellation_Type := t + } + } +} + /* TS 29.272 7.3.34 APN-Configuration-Profile */ template (present) GenericAVP tr_AVP_3GPP_ApnConfigProfile(template (present) AVP_list content := ?) := { avp := { @@ -629,4 +639,53 @@ tr_AVP_3GPP_VisitedPlmnId )); -} +/* TS 29.272 7.2.7 Cancel-Location-Request */ +template (value) PDU_DIAMETER +ts_DIA_CLR(/* template (value) */ hexstring imsi, + template (value) AAA_3GPP_Cancellation_Type cancel_type, + template (value) octetstring sess_id := c_def_sess_id, + template (value) charstring orig_host := "ttcn3.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_host := "iut.localdomain", + template (value) charstring dest_realm := "localdomain", + template (value) UINT32 hbh_id := '00000000'O, + template (value) UINT32 ete_id := '00000000'O) := + ts_DIAMETER(flags := '11000000'B, + cmd_code := Cancel_Location, + app_id := int2oct(c_DIAMETER_3GPP_S6_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_AuthSessionState(NO_STATE_MAINTAINED), + ts_AVP_OriginHost(orig_host), + ts_AVP_OriginRealm(orig_realm), + ts_AVP_DestinationHost(dest_host), + ts_AVP_DestinationRealm(dest_realm), + ts_AVP_UserNameImsi(imsi), + /* [Supported-Features ] */ + ts_AVP_3GPP_CancellationType(cancel_type) + }); + +/* TS 29.272 7.2.8 Cancel-Location-Answer */ +template (present) PDU_DIAMETER +tr_DIA_CLA(template (present) AVP_list sub_data := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '0???????'B, + cmd_code := Cancel_Location, + app_id := int2oct(c_DIAMETER_3GPP_S6_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + tr_AVP_ResultCode(DIAMETER_SUCCESS), + tr_AVP_AuthSessionState, + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm) + )); + +} /* module */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35407?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9366b434e856828c5d441cbc7b0d952060cdc71b Gerrit-Change-Number: 35407 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: DIAMETER_Templates: Add missing ts_AVP_DestinationHost

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35406?usp=email ) Change subject: DIAMETER_Templates: Add missing ts_AVP_DestinationHost ...................................................................... DIAMETER_Templates: Add missing ts_AVP_DestinationHost Change-Id: Ifcbd68c48b273fe7b0753c5b31c33d4e51493de9 --- M library/DIAMETER_Templates.ttcn 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/35406/1 diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 05a6ea7..05b63d2 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -601,6 +601,14 @@ } } +template (value) GenericAVP ts_AVP_DestinationHost(template (value) charstring dest_host) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Destination_Host), + avp_data := { + avp_BASE_NONE_Destination_Host := dest_host + } + } +} template (present) GenericAVP tr_AVP_DestinationHost(template (present) charstring host := ?) := { avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Destination_Host), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35406?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifcbd68c48b273fe7b0753c5b31c33d4e51493de9 Gerrit-Change-Number: 35406 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Make tr_GTP2C_DeleteSessionReq() easier to use by de...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35409?usp=email ) Change subject: GTPv2_Templates: Make tr_GTP2C_DeleteSessionReq() easier to use by default ...................................................................... GTPv2_Templates: Make tr_GTP2C_DeleteSessionReq() easier to use by default There's currently no user of this template, but there will be one in a follow-up patch in MME_Tests. - Set generic templates as default parameters, so it can match everything. - Reorder parameters to follow the message fields more closely. - Change/fix some template types in parameters which were not correct. Change-Id: I38b6c51b78772bc01e7be916ba382cb78934864c --- M library/GTPv2_Templates.ttcn 1 file changed, 21 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/35409/1 diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index c09bca8..65bc559 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -939,12 +939,11 @@ privateExtension := omit }}); template (present) PDU_GTPCv2 -tr_GTP2C_DeleteSessionReq(template (present) OCT4 d_teid, +tr_GTP2C_DeleteSessionReq(template (present) OCT4 d_teid := ?, template (present) OCT3 seq := ?, - template (omit) GTP2C_Cause cause, - template (present) FullyQualifiedTEID sender_fteid, - template FullyQualifiedTEID_List teid_list, - template (present) uint4_t bearer_id) := + template GTP2C_Cause cause := *, + template (present) uint4_t bearer_id := ?, + template FullyQualifiedTEID sender_fteid := *) := tr_PDU_GTP2C(d_teid, seq, { deleteSessionRequest := { cause := fr_GTP2C_Cause(cause), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35409?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38b6c51b78772bc01e7be916ba382cb78934864c Gerrit-Change-Number: 35409 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: S1AP_Emulation: Allow retrieving {MME,ENB}_UE_ID from UeContextReleas...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35410?usp=email ) Change subject: S1AP_Emulation: Allow retrieving {MME,ENB}_UE_ID from UeContextReleaseCmd ...................................................................... S1AP_Emulation: Allow retrieving {MME,ENB}_UE_ID from UeContextReleaseCmd It's not true that it can contain several IDs. The only difference is that it has a choice IE which can hold a pair containing both MME/ENB UE IDs, or only MME_UE_ID. Change-Id: I4fb51f3f50fa10400184b65d272530ea26a2bc8e --- M library/S1AP_Emulation.ttcn 1 file changed, 27 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/35410/1 diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index 9f36225..401a26e 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -699,7 +699,13 @@ case (tr_S1AP_UeContextReleaseReq) { return im.value_.UEContextReleaseRequest.protocolIEs[1].value_.ENB_UE_S1AP_ID; } - /* UeContextReleaseCmd needs special handling; it can contain any number of MME/UE IDs */ + case (tr_S1AP_UeContextReleaseCmd) { + if (ispresent(im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair)) { + return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair.eNB_UE_S1AP_ID; + } else { + return omit; + } + } case (tr_S1AP_ConnEstInd) { return im.value_.ConnectionEstablishmentIndication.protocolIEs[1].value_.ENB_UE_S1AP_ID; } @@ -745,7 +751,13 @@ case (tr_S1AP_UeContextReleaseReq) { return im.value_.UEContextReleaseRequest.protocolIEs[0].value_.MME_UE_S1AP_ID; } - /* UeContextReleaseCmd needs special handling; it can contain any number of MME/UE IDs */ + case (tr_S1AP_UeContextReleaseCmd) { + if (ispresent(im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair)) { + return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair.mME_UE_S1AP_ID; + } else { + return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.mME_UE_S1AP_ID; + } + } case (tr_S1AP_ConnEstInd) { return im.value_.ConnectionEstablishmentIndication.protocolIEs[0].value_.MME_UE_S1AP_ID; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35410?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fb51f3f50fa10400184b65d272530ea26a2bc8e Gerrit-Change-Number: 35410 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: S1AP_Emulation: Fix UeContextReleaseCmd not forwarded to users

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35411?usp=email ) Change subject: S1AP_Emulation: Fix UeContextReleaseCmd not forwarded to users ...................................................................... S1AP_Emulation: Fix UeContextReleaseCmd not forwarded to users We still want to forward it to the user so that it can: 1- validate the IUT sent the message 2- answer with a UeContextReleaseComplete The f_assoc_id_by_s1ap_ids() function is modified to avoir a Dynamic test error if the enb_ue_id is omit, which can happen if UeContextRleaseCmd used choice "MME UE S1AP ID". Change-Id: Iaf6a775d1cbc4f85f185bb26a0da1e5c9a4167a2 --- M library/S1AP_Emulation.ttcn 1 file changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/35411/1 diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index 401a26e..7d91c36 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -201,7 +201,8 @@ runs on S1AP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { - if (match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { + if (istemplatekind(enb_id, "omit") or + match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { if (istemplatekind(mme_id, "omit")) { return i; } else { @@ -484,8 +485,6 @@ if (isvalue(resp)) { S1AP.send(t_S1AP_Send(g_s1ap_conn_id, valueof(resp))); } - } else if (match(mrf.msg, tr_S1AP_UeContextReleaseCmd)) { - handle_S1AP_UeContextReleaseCmd(mrf.msg); } else { /* Ue-related S1AP message */ /* obtain MME + ENB UE S1AP ID */ @@ -520,6 +519,9 @@ f_s1ap_id_table_add(vc_conn, mme_ue_id, valueof(enb_ue_id)); S1AP_CLIENT.send(mrf.msg) to vc_conn; } + if (match(mrf.msg, tr_S1AP_UeContextReleaseCmd)) { + handle_S1AP_UeContextReleaseCmd(mrf.msg); + } } } [] S1AP.receive(tr_SctpAssocChange) { } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35411?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaf6a775d1cbc4f85f185bb26a0da1e5c9a4167a2 Gerrit-Change-Number: 35411 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023