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

[M] Change in pysim[master]: ara_m: use class byte of current lchan

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37840?usp=email ) Change subject: ara_m: use class byte of current lchan ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37840?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: Ie3e48678f178a488bfaea6cc2b9a3e18145a8d10 Gerrit-Change-Number: 37840 Gerrit-PatchSet: 9 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Aug 2024 04:30:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

10 months, 1 week

1
0
0 0

[XL] Change in pysim[master]: Testsuite for pySim-shell with real cards

by Jenkins Builder

Attention is currently required from: laforge. Jenkins Builder has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37819?usp=email ) Change subject: Testsuite for pySim-shell with real cards ...................................................................... Patch Set 15: (1 comment) File tests/pySim-shell_test/README.txt: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18122): https://gerrit.osmocom.org/c/pysim/+/37819/comment/b885a402_855a7a14?usp=em… : PS15, Line 10: Each testcase has its own subdirectory and can be executed separatly. The sub 'separatly' may be misspelled - perhaps 'separately'? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37819?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: Ieae1330767a6e55e62437f5f988a0d33b727b5de Gerrit-Change-Number: 37819 Gerrit-PatchSet: 15 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 29 Aug 2024 16:25:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

10 months, 1 week

1
0
0 0

[M] Change in pysim[master]: suci-tutorial: add section about SUCI calculation by the USIM

by Jenkins Builder

Jenkins Builder has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37947?usp=email ) Change subject: suci-tutorial: add section about SUCI calculation by the USIM ...................................................................... Patch Set 1: (1 comment) File docs/suci-tutorial.rst: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18120): https://gerrit.osmocom.org/c/pysim/+/37947/comment/6f4fe508_23163eee?usp=em… : PS1, Line 211: specifiy any file or file format to store the key material. This means the exact 'specifiy' may be misspelled - perhaps 'specify'? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37947?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: I45d47f9278b30d99ebde6891de0ba8cc74b1a0a0 Gerrit-Change-Number: 37947 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 29 Aug 2024 16:25:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

10 months, 1 week

1
0
0 0

[XL] Change in pysim[master]: Testsuite for pySim-shell with real cards

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37819?usp=email ) Change subject: Testsuite for pySim-shell with real cards ...................................................................... Patch Set 15: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37819?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: Ieae1330767a6e55e62437f5f988a0d33b727b5de Gerrit-Change-Number: 37819 Gerrit-PatchSet: 15 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 29 Aug 2024 16:24:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

10 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: suci-tutorial: fix incorrect hnet_pubkey value

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37946?usp=email ) Change subject: suci-tutorial: fix incorrect hnet_pubkey value ...................................................................... suci-tutorial: fix incorrect hnet_pubkey value The first hnet_pubkey value with the identifier 27 seems to be incorrect. It differs from the value suggested in 3GPP TS 31.121, section 4.9.4 and also does not work with the on card SUCI calculation. The tutorial also contains a reference to 3GPP TS 33.501, Annex C.4. This spec specifies an ECIES Profile A and an ECIES Profile B. The tutorial recommends to use a key from profile B, but it actually uses a key from profile A. Related: OS#6531 Change-Id: I6fddf8a6efc28ad0d40b1715973429904e00d2b2 --- M docs/suci-tutorial.rst 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/37946/1 diff --git a/docs/suci-tutorial.rst b/docs/suci-tutorial.rst index b4c950f..60d2190 100644 --- a/docs/suci-tutorial.rst +++ b/docs/suci-tutorial.rst @@ -97,7 +97,7 @@ {"priority": 2, "identifier": 0, "key_index": 0}], "hnet_pubkey_list": [ {"hnet_pubkey_identifier": 27, - "hnet_pubkey": "0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1"}, + "hnet_pubkey": "0472DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD15A7DED52FCBB097A4ED250E036C7B9C8C7004C4EEDC4F068CD7BF8D3F900E3B4"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5A8D38864820197C3394B92613B20B91633CBD897119273BF8E4A6F4EEC0A650"}] } @@ -106,7 +106,7 @@ :: - pySIM-shell (00:MF/ADF.USIM/DF.5GS/EF.SUCI_Calc_Info)> update_binary_decoded '{ "prot_scheme_id_list": [ {"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}, {"priority": 2, "identifier": 0, "key_index": 0}], "hnet_pubkey_list": [ {"hnet_pubkey_identifier": 27, "hnet_pubkey": "0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5A8D38864820197C3394B92613B20B91633CBD897119273BF8E4A6F4EEC0A650"}]}' + pySIM-shell (00:MF/ADF.USIM/DF.5GS/EF.SUCI_Calc_Info)> update_binary_decoded '{ "prot_scheme_id_list": [ {"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}, {"priority": 2, "identifier": 0, "key_index": 0}], "hnet_pubkey_list": [ {"hnet_pubkey_identifier": 27, "hnet_pubkey": "0472DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD15A7DED52FCBB097A4ED250E036C7B9C8C7004C4EEDC4F068CD7BF8D3F900E3B4"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5A8D38864820197C3394B92613B20B91633CBD897119273BF8E4A6F4EEC0A650"}]}' WARNING: These are TEST KEYS with publicly known/specified private keys, and hence unsafe for live/secure deployments! For use in production networks, you need to generate your own set[s] of keys. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37946?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6fddf8a6efc28ad0d40b1715973429904e00d2b2 Gerrit-Change-Number: 37946 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: ts_31_102: Add mssing help string for get_identity parameter --nswo-c...

by dexter

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37944?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: ts_31_102: Add mssing help string for get_identity parameter --nswo-context ...................................................................... ts_31_102: Add mssing help string for get_identity parameter --nswo-context Related: OS#6531 Change-Id: I3ebd3a2ceb7f2580f4cd939b3f002f38f236d7f2 --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/44/37944/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37944?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: I3ebd3a2ceb7f2580f4cd939b3f002f38f236d7f2 Gerrit-Change-Number: 37944 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

10 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: suci-tutorial: put download links for specs to the front

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37948?usp=email ) Change subject: suci-tutorial: put download links for specs to the front ...................................................................... suci-tutorial: put download links for specs to the front The section Technical References has direct download links for the relevant specs. Then later in th Key Provisioning section another download link follows and another one is redundant. Let's put all download links into the Technical References section and then only use the spec numbers in the following. This way we have all download links in one location. Related: OS#6531 Change-Id: Ibcbc6bb5d836d32c381922a35afa3b73b5f90621 --- M docs/suci-tutorial.rst 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/37948/1 diff --git a/docs/suci-tutorial.rst b/docs/suci-tutorial.rst index 3dc183a..667c321 100644 --- a/docs/suci-tutorial.rst +++ b/docs/suci-tutorial.rst @@ -27,8 +27,9 @@ This guide covers the basic workflow of provisioning SIM cards with the 5G SUCI feature. For detailed information on the SUCI feature and file contents, the following documents are helpful: -* USIM files and structure: `TS 31.102 <https://www.etsi.org/deliver/etsi_ts/131100_131199/131102/16.06.00_60/ts_13…>`__ -* USIM tests (incl. file content examples) `TS 31.121 <https://www.etsi.org/deliver/etsi_ts/131100_131199/131121/16.01.00_60/ts_13…>`__ +* USIM files and structure: `3GPP TS 31.102 <https://www.etsi.org/deliver/etsi_ts/131100_131199/131102/16.06.00_60/ts_13…>`__ +* USIM tests (incl. file content examples): `3GPP TS 31.121 <https://www.etsi.org/deliver/etsi_ts/131100_131199/131121/16.01.00_60/ts_13…>`__ +* Test keys for SUCI calculation: `3GPP TS 33.501 <https://www.etsi.org/deliver/etsi_ts/133500_133599/133501/16.05.00_60/ts_13…>`__ For specific information on sysmocom SIM cards, refer to Section 9.1 of the `sysmoUSIM User Manual <https://www.sysmocom.de/manuals/sysmousim-manual.pdf>`__. @@ -83,8 +84,8 @@ missing Protection Scheme Identifier List data object tag 9000: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> {} -The following JSON config defines the testfile from `TS 31.121 <https://www.etsi.org/deliver/etsi_ts/131100_131199/131121/16.01.00_60/ts_13…>`__ Section 4.9.4 with -test keys from `TS 33.501 <hhttps://www.etsi.org/deliver/etsi_ts/133500_133599/133501/16.05.00_60/ts_1…>`__ Annex C.4. Highest priority (``0``) has a +The following JSON config defines the testfile from 3GPP TS 31.121, Section 4.9.4 with +test keys from 3GPP TS 33.501, Annex C.4. Highest priority (``0``) has a Profile-B (``identifier: 2``) key in key slot ``1``, which means the key with ``hnet_pubkey_identifier: 27``. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibcbc6bb5d836d32c381922a35afa3b73b5f90621 Gerrit-Change-Number: 37948 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[M] Change in pysim[master]: suci-tutorial: add section about SUCI calculation by the USIM

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37947?usp=email ) Change subject: suci-tutorial: add section about SUCI calculation by the USIM ...................................................................... suci-tutorial: add section about SUCI calculation by the USIM The tutorial describes how SUCI calculation in the UE is configure, let's now ad a section about SUCI calculation by the USIM. Related: OS#6531 Change-Id: I45d47f9278b30d99ebde6891de0ba8cc74b1a0a0 --- M docs/suci-tutorial.rst 1 file changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/37947/1 diff --git a/docs/suci-tutorial.rst b/docs/suci-tutorial.rst index 60d2190..3dc183a 100644 --- a/docs/suci-tutorial.rst +++ b/docs/suci-tutorial.rst @@ -193,3 +193,54 @@ whole modem shutting 5G down. If you don’t need SUCI concealment but the smartphone refuses to connect to any 5G network, try to disable the UST service 124. + +SUCI calculation by the USIM +---------------------------- + +The SUCI calculation can also be performed by the USIM application on the UICC +directly. The UE then uses the GET IDENTITY command (see also 3GPP TS 31.102, +section 7.5) to retrieve a SUCI value. + +The sysmoISIM-SJA5-S17 *SUCI calculation by the USIM*. The configuration is not +much different to the above described configuration of *SUCI calculation in the +UE*. + +The main difference is how the key provisioning is done. When the SUCI +calculation is done by the USIM, then the key material is not accessed by the +UE. The specification (see also 3GPP TS 31.102, section 7.5.1.1), also does not +specifiy any file or file format to store the key material. This means the exact +way to perform the key provisioning is an implementation detail of the USIM +card application. + +In the case of sysmoISIM-SJA5-S17 the key material is stored in EF.SUCI_Calc_Info, +which is located in DF.SAIP instead of DF.5GS + +:: + + pySIM-shell (00:MF)> select MF + pySIM-shell (00:MF)> select ADF.USIM + pySIM-shell (00:MF/ADF.USIM)> select DF.SAIP + pySIM-shell (00:MF/ADF.USIM/DF.5GS)> select EF.SUCI_Calc_Info + +The file format is exactly the same as specified in 3GPP TS 31.102, section +4.4.11.8. This means the above described key provisioning procedure can be +applied without any changed, except that the file location is different. + +To signal to the UE that the USIM is setup up for SUCI calculation, service +125 must be enabled as well (see also 3GPP TS 31.102, section 5.3.48) + +:: + pySIM-shell (00:MF/ADF.USIM/EF.UST)> ust_service_activate 124 + pySIM-shell (00:MF/ADF.USIM/EF.UST)> ust_service_activate 125 + +To verify that the SUCI calculation works as expected, it is possible to issue +a GET IDENTITY command using pySim-shell: + +:: + select ADF.USIM + get_identity + +The USIM should then return a SUCI TLV Data object that looks like this: + +:: + SUCI TLV Data Object: 0199f90717ff021b027a2c58ce1c6b89df088a9eb4d242596dd75746bb5f3503d2cf58a7461e4fd106e205c86f76544e9d732226a4e1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37947?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I45d47f9278b30d99ebde6891de0ba8cc74b1a0a0 Gerrit-Change-Number: 37947 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: suci-tutorial: fix spec reference

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37949?usp=email ) Change subject: suci-tutorial: fix spec reference ...................................................................... suci-tutorial: fix spec reference Related: OS#6531 Change-Id: If98c0b1093c7d19ea0278758c635b8405b465a2e --- M docs/suci-tutorial.rst 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/49/37949/1 diff --git a/docs/suci-tutorial.rst b/docs/suci-tutorial.rst index 667c321..c117aca 100644 --- a/docs/suci-tutorial.rst +++ b/docs/suci-tutorial.rst @@ -151,7 +151,7 @@ pySIM-shell (00:MF/ADF.USIM/EF.UST)> read_binary_decoded 9000: beff9f9de73e0408400170730000002e00000000 -> [2, 3, 4, 5, 6, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 21, 25, 27, 28, 29, 33, 34, 35, 38, 39, 42, 43, 44, 45, 46, 51, 60, 71, 73, 85, 86, 87, 89, 90, 93, 94, 95, 122, 123, 124, 126] -.. list-table:: From TS31.102 +.. list-table:: From 3GPP TS 31.102 :widths: 15 40 :header-rows: 1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37949?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If98c0b1093c7d19ea0278758c635b8405b465a2e Gerrit-Change-Number: 37949 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: Rename functions to include s1ap information

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37945?usp=email ) Change subject: s1gw: Rename functions to include s1ap information ...................................................................... s1gw: Rename functions to include s1ap information Change-Id: Ic4b06712f3222bada71ff5ca8a6c65ec9c92ae1e --- M s1gw/ConnHdlr.ttcn M s1gw/S1AP_Server.ttcn M s1gw/S1GW_Tests.ttcn 3 files changed, 25 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/s1gw/ConnHdlr.ttcn b/s1gw/ConnHdlr.ttcn index 12c7414..071b69d 100644 --- a/s1gw/ConnHdlr.ttcn +++ b/s1gw/ConnHdlr.ttcn @@ -73,7 +73,7 @@ } -function f_ConnHdlr_connect(charstring local_addr, charstring remote_addr) runs on ConnHdlr { +function f_ConnHdlr_s1ap_connect(charstring local_addr, charstring remote_addr) runs on ConnHdlr { var Result res; timer T; @@ -104,7 +104,7 @@ } } -function f_ConnHdlr_disconnect() runs on ConnHdlr { +function f_ConnHdlr_s1ap_disconnect() runs on ConnHdlr { var Result res; S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP_ENB, g_s1ap_conn_id, @@ -117,7 +117,7 @@ log("eNB connection closed"); } -function f_ConnHdlr_expect_shutdown() runs on ConnHdlr { +function f_ConnHdlr_s1ap_expect_shutdown() runs on ConnHdlr { S1AP_ENB.receive(tr_SctpShutDownEvent(g_s1ap_conn_id)); S1AP_ENB.receive(tr_SctpAssocChange(SCTP_SHUTDOWN_COMP, g_s1ap_conn_id)); S1AP_ENB.receive(PortEvent:{connClosed := ?}); @@ -182,7 +182,7 @@ } } -function f_ConnHdlr_setup(Global_ENB_ID genb_id, float Tval := 5.0) runs on ConnHdlr { +function f_ConnHdlr_s1ap_setup(Global_ENB_ID genb_id, float Tval := 5.0) runs on ConnHdlr { var S1AP_PDU pdu; timer T; diff --git a/s1gw/S1AP_Server.ttcn b/s1gw/S1AP_Server.ttcn index 904f106..5bd83a4 100644 --- a/s1gw/S1AP_Server.ttcn +++ b/s1gw/S1AP_Server.ttcn @@ -325,21 +325,21 @@ inout S1APSRV_close_conn; } with { extension "internal" }; -function f_ConnHdlr_register(Global_ENB_ID genb_id) +function f_ConnHdlr_s1ap_register(Global_ENB_ID genb_id) runs on S1APSRV_ConnHdlr { S1AP_PROC.call(S1APSRV_register:{self, genb_id}) { [] S1AP_PROC.getreply(S1APSRV_register:{?, ?}) { }; } } -function f_ConnHdlr_unregister(Global_ENB_ID genb_id) +function f_ConnHdlr_s1ap_unregister(Global_ENB_ID genb_id) runs on S1APSRV_ConnHdlr { S1AP_PROC.call(S1APSRV_unregister:{self, genb_id}) { [] S1AP_PROC.getreply(S1APSRV_unregister:{?, ?}) { }; } } -function f_ConnHdlr_close_conn(Global_ENB_ID genb_id) +function f_ConnHdlr_s1ap_close_conn(Global_ENB_ID genb_id) runs on S1APSRV_ConnHdlr { S1AP_PROC.call(S1APSRV_close_conn:{self, genb_id}) { [] S1AP_PROC.getreply(S1APSRV_close_conn:{?, ?}) { }; diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 9448ed5..257ca96 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -116,14 +116,14 @@ function f_TC_setup(charstring id) runs on ConnHdlr { f_ConnHdlr_register_pfcp(); - f_ConnHdlr_register(g_pars.genb_id); + f_ConnHdlr_s1ap_register(g_pars.genb_id); - f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); - f_ConnHdlr_setup(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_sleep(0.5); /* keep the connection idle for some time */ - f_ConnHdlr_disconnect(); + f_ConnHdlr_s1ap_disconnect(); - f_ConnHdlr_unregister(g_pars.genb_id); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_setup() runs on test_CT { var ConnHdlrPars pars := valueof(t_ConnHdlrPars); @@ -154,18 +154,18 @@ /* MME terminates connection, expect S1GW to terminate the eNB connection */ function f_TC_conn_term_by_mme(charstring id) runs on ConnHdlr { f_ConnHdlr_register_pfcp(); - f_ConnHdlr_register(g_pars.genb_id); + f_ConnHdlr_s1ap_register(g_pars.genb_id); - f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); - f_ConnHdlr_setup(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_sleep(0.5); /* keep the connection idle for some time */ /* MME (S1AP_Server_CT) terminates connection */ - f_ConnHdlr_close_conn(g_pars.genb_id); + f_ConnHdlr_s1ap_close_conn(g_pars.genb_id); /* expect our eNB connection to be released gracefully */ - f_ConnHdlr_expect_shutdown(); + f_ConnHdlr_s1ap_expect_shutdown(); - f_ConnHdlr_unregister(g_pars.genb_id); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_conn_term_by_mme() runs on test_CT { var ConnHdlrPars pars := valueof(t_ConnHdlrPars); @@ -182,9 +182,9 @@ function f_TC_conn_term_mme_unavail(charstring id) runs on ConnHdlr { f_ConnHdlr_register_pfcp(); /* establish an eNB connection to the S1GW */ - f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); /* expect our eNB connection to be released gracefully */ - f_ConnHdlr_expect_shutdown(); + f_ConnHdlr_s1ap_expect_shutdown(); setverdict(pass); } testcase TC_conn_term_mme_unavail() runs on test_CT { @@ -204,9 +204,9 @@ var S1AP_PDU pdu; f_ConnHdlr_register_pfcp(); - f_ConnHdlr_register(g_pars.genb_id); - f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); - f_ConnHdlr_setup(g_pars.genb_id); + 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"); var template (value) E_RABToBeSetupListBearerSUReq items_req; @@ -259,8 +259,8 @@ 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_disconnect(); - f_ConnHdlr_unregister(g_pars.genb_id); + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_e_rab_setup() runs on test_CT { var ConnHdlrPars pars := valueof(t_ConnHdlrPars); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37945?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: Ic4b06712f3222bada71ff5ca8a6c65ec9c92ae1e Gerrit-Change-Number: 37945 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

10 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024