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

[M] Change in osmo-ttcn3-hacks[master]: WIP: hss: Initial validation of Prometheus metrics

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38019?usp=email ) Change subject: WIP: hss: Initial validation of Prometheus metrics ...................................................................... WIP: hss: Initial validation of Prometheus metrics Change-Id: I001e7ae9a06e6f765965a5d4d442a53d5c5dffad --- M hss/HSS_Tests.default M hss/HSS_Tests.ttcn M hss/gen_links.sh M hss/open5gs-hss.yaml M hss/regen_makefile.sh M library/Misc_Helpers.ttcn A library/Prometheus_Checker.ttcn 7 files changed, 202 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/38019/1 diff --git a/hss/HSS_Tests.default b/hss/HSS_Tests.default index 4c0b502..3a78848 100644 --- a/hss/HSS_Tests.default +++ b/hss/HSS_Tests.default @@ -1,6 +1,8 @@ [LOGGING] [TESTPORT_PARAMETERS] +*.TCP.noDelay := "yes" // turn off nagle +*.HTTP.use_notification_ASPs := "yes" [MODULE_PARAMETERS] diff --git a/hss/HSS_Tests.ttcn b/hss/HSS_Tests.ttcn index a5503a7..de0e9f6 100644 --- a/hss/HSS_Tests.ttcn +++ b/hss/HSS_Tests.ttcn @@ -10,11 +10,16 @@ import from DIAMETER_ts29_272_Templates all; import from DIAMETER_Emulation all; +import from Prometheus_Checker all; + type record of hexstring SubscriberConfigs; modulepar { charstring mp_hss_hostname := "127.0.0.4"; integer mp_hss_port := 3868; + charstring mp_hss_prometheus_hostname := "127.0.0.5"; + integer mp_hss_prometheus_port := c_prometheus_default_http_port; + integer mp_hss_prometheus_stats_interval := 1; /* in seconds, match open5gs yml cfg. */ charstring mp_diam_local_hostname := "127.0.0.1"; integer mp_diam_local_port := 3868; charstring mp_diam_orig_realm := "localdomain"; @@ -78,11 +83,12 @@ } /* per-session component; we typically have 1..N per testcase */ -type component Cli_Session_CT { +type component Cli_Session_CT extends Prometheus_Checker_CT { var SessionPars g_pars; port DIAMETER_Conn_PT S6a; port DIAMETEREM_PROC_PT S6a_PROC; + } function f_diam_connhldr_expect_eteid(UINT32 ete_id) runs on Cli_Session_CT { S6a_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) { @@ -181,6 +187,7 @@ private function f_handler_init(void_fn fn, SessionPars pars) runs on Cli_Session_CT { g_pars := valueof(pars); + f_prometheus_init(mp_hss_prometheus_hostname, mp_hss_prometheus_port); fn.apply(); } @@ -228,6 +235,13 @@ ); f_dia_ulr_ula(sub_data); + + var template (value) PrometheusExpects expects := { + ts_PrometheusExpect("s6a_rx_ulr", COUNTER, min := 1, max := 1), + ts_PrometheusExpect("s6a_tx_ula", COUNTER, min := 1, max := 1) + } + f_sleep(int2float(mp_hss_prometheus_stats_interval) + 0.1); + f_prometheus_snapshot(); setverdict(pass); } testcase TC_ulr_ula() runs on MTC_CT { diff --git a/hss/gen_links.sh b/hss/gen_links.sh index 276eb1e..d06175a 100755 --- a/hss/gen_links.sh +++ b/hss/gen_links.sh @@ -21,11 +21,20 @@ FILES="DIAMETER_EncDec.cc" gen_links $DIR $FILES +DIR=$BASEDIR/titan.TestPorts.Common_Components.Abstract_Socket/src +FILES="Abstract_Socket.cc Abstract_Socket.hh " +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.HTTPmsg/src +FILES="HTTPmsg_MessageLen.ttcn HTTPmsg_MessageLen_Function.cc HTTPmsg_PT.cc HTTPmsg_PT.hh HTTPmsg_PortType.ttcn HTTPmsg_Types.ttcn " +gen_links $DIR $FILES + DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn " FILES+="SCTP_Templates.ttcn " +FILES+="HTTP_Adapter.ttcn Prometheus_Checker.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/hss/open5gs-hss.yaml b/hss/open5gs-hss.yaml index 6b90bdc..c536cd8 100644 --- a/hss/open5gs-hss.yaml +++ b/hss/open5gs-hss.yaml @@ -11,7 +11,11 @@ hss: freeDiameter: freediameter.conf - + diameter_stats_interval: 1 + metrics: + server: + - address: 127.0.0.5 + port: 9090 parameter: max: diff --git a/hss/regen_makefile.sh b/hss/regen_makefile.sh index 23fbd73..ac05766 100755 --- a/hss/regen_makefile.sh +++ b/hss/regen_makefile.sh @@ -4,8 +4,11 @@ FILES=" *.ttcn + Abstract_Socket.cc DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_EncDec.cc + HTTPmsg_MessageLen_Function.cc + HTTPmsg_PT.cc IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index a742b0b..967c8d1 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -79,6 +79,16 @@ return count; } +/* Return true if str starts exactly with token: */ +function f_str_startswith(charstring str, charstring token) return boolean +{ + if (lengthof(str) < lengthof(token)) { + return false; + } + var charstring str_start := substr(str, 0, lengthof(token)); + return str_start == token; +} + /* Return true if str ends exactly with token: */ function f_str_endswith(charstring str, charstring token) return boolean { diff --git a/library/Prometheus_Checker.ttcn b/library/Prometheus_Checker.ttcn new file mode 100644 index 0000000..83d7e79 --- /dev/null +++ b/library/Prometheus_Checker.ttcn @@ -0,0 +1,158 @@ +module Prometheus_Checker { + +/* (C) 2024 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from Misc_Helpers all; +import from Socket_API_Definitions all; + +import from General_Types all; +import from Osmocom_Types all; + +import from HTTP_Adapter all; +import from HTTPmsg_Types all; + +const integer c_prometheus_default_http_port := 9090; + +type enumerated PrometheusMetricType { + COUNTER, + GAUGE +}; + +type record PrometheusMetricKey { + charstring name, + PrometheusMetricType mtype +}; +type set of PrometheusMetricKey PrometheusMetricKeys; + +type record PrometheusMetric { + PrometheusMetricKey key, + integer val +}; +type set of PrometheusMetric PrometheusMetrics; + +type record PrometheusExpect { + PrometheusMetricKey key, + integer min, + integer max +}; +type set of PrometheusExpect PrometheusExpects; + +modulepar { + boolean mp_enable_stats := true +} + +type component Prometheus_Checker_CT extends http_CT { + var float g_tout_http := 5.0; +}; + +template (value) PrometheusMetricKey +ts_PrometheusMetricKey(template (value) charstring name, + template (value) PrometheusMetricType mtype) := { + name := name, + mtype := mtype +}; + +template (value) PrometheusMetric +ts_PrometheusMetric(template (value) charstring name, + template (value) PrometheusMetricType mtype, + template (value) integer val) := { + key := ts_PrometheusMetricKey(name, mtype), + val := val +}; + +template (value) PrometheusExpect +ts_PrometheusExpect(template (value) charstring name, + template (value) PrometheusMetricType mtype, + template (value) integer min, + template (value) integer max) := { + key := ts_PrometheusMetricKey(name, mtype), + min := min, + max := max +}; + +function f_prometheus_init(charstring http_host, integer http_port := c_prometheus_default_http_port) runs on Prometheus_Checker_CT { + var HTTP_Adapter_Params http_adapter_pars := { + http_host := http_host, + http_port := http_port, + use_ssl := false + }; + f_http_init(http_adapter_pars); +} + +private function f_prometheus_metric_mtype_from_string(charstring str) return PrometheusMetricType +{ + var PrometheusMetricType mtype; + if (str == "counter") { + mtype := COUNTER; + } else if (str == "gauge") { + mtype:= GAUGE; + } else { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unknown Prometheus metric type: ", str)); + } + return mtype; +} + +private function f_prometheus_parse_http_response(charstring body) return PrometheusMetrics +{ + var PrometheusMetrics metrics := {}; + var Misc_Helpers.ro_charstring lines := f_str_split(body, "\n"); + log("PESPIN lines: ", lines); + for (var integer i := 0; i + 2 < lengthof(lines); i := i + 3) { + var PrometheusMetric it; + /* HELP line, example: "# HELP cx_rx_unknown Received Cx unknown messages" */ + if (not f_str_startswith(lines[i], "# HELP ")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Failed parsing Prometheus HTTP response line: ", lines[i])); + } + + /* TYPE line, example: "# TYPE cx_rx_unknown counter" */ + if (not f_str_startswith(lines[i + 1], "# TYPE ")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Failed parsing Prometheus HTTP response line: ", lines[i + 1])); + } + var Misc_Helpers.ro_charstring type_tokens := f_str_split(lines[i + 1], " "); + if (lengthof(type_tokens) < 4) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Failed parsing Prometheus HTTP response line: ", type_tokens)); + } + it.key.name := type_tokens[2]; + it.key.mtype := f_prometheus_metric_mtype_from_string(type_tokens[3]); + + /* Value line, example: "cx_rx_unknown 0" */ + if (not f_str_startswith(lines[i + 2], it.key.name)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Failed parsing Prometheus HTTP response line: ", lines[i + 2])); + } + var Misc_Helpers.ro_charstring value_tokens := f_str_split(lines[i + 2], " "); + it.val := str2int(value_tokens[1]); + + metrics := metrics & { it }; + } + return metrics; +} + +function f_prometheus_snapshot() runs on Prometheus_Checker_CT return PrometheusMetrics { + var HTTPMessage http_resp; + var PrometheusMetrics metrics := {}; + + if (not mp_enable_stats) { + return metrics; + } + f_http_tx_request(url := "/metrics", method := "GET", tout := g_tout_http); + http_resp := f_http_rx_response(tr_HTTP_Resp(200), tout := g_tout_http); + + metrics := f_prometheus_parse_http_response(http_resp.response.body); + + return metrics; +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38019?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I001e7ae9a06e6f765965a5d4d442a53d5c5dffad Gerrit-Change-Number: 38019 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

9 months, 3 weeks

1
0
0 0

[XS] Change in pysim[master]: pySim-prog_test: supress stderr when probing for cards

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38007?usp=email ) Change subject: pySim-prog_test: supress stderr when probing for cards ...................................................................... pySim-prog_test: supress stderr when probing for cards When probing for cards, the probing might fail in case the terminal is empty. This results into lengthy error log output that is not of interest. Related: OS#6532 Change-Id: I1d44f9458a05992d79b0152d3affcfeb783cccff --- M tests/pySim-prog_test/pySim-prog_test.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/pySim-prog_test/pySim-prog_test.sh b/tests/pySim-prog_test/pySim-prog_test.sh index 215ebee..9279c6c 100755 --- a/tests/pySim-prog_test/pySim-prog_test.sh +++ b/tests/pySim-prog_test/pySim-prog_test.sh @@ -119,7 +119,7 @@ # reader function probe_card { TERMINAL=$1 - RESULT=$(timeout 5 $PYSIM_PROG -p $TERMINAL -T | cut -d ":" -f 2 | tail -n 1 | xargs) + RESULT=$(timeout 5 $PYSIM_PROG -p $TERMINAL -T 2> /dev/null | cut -d ":" -f 2 | tail -n 1 | xargs) echo $RESULT } -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38007?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: I1d44f9458a05992d79b0152d3affcfeb783cccff Gerrit-Change-Number: 38007 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 3 weeks

1
0
0 0

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

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37949?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )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(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/docs/suci-tutorial.rst b/docs/suci-tutorial.rst index eb442d5..9227d1d 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: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If98c0b1093c7d19ea0278758c635b8405b465a2e Gerrit-Change-Number: 37949 Gerrit-PatchSet: 2 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>

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: pySim-prog_test: tolerate missing .data files

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38006?usp=email ) Change subject: pySim-prog_test: tolerate missing .data files ...................................................................... pySim-prog_test: tolerate missing .data files When the test detects a card, but does not find the .data faile for it, then it fails. This can be a problem in case we want to intentionally exclude a specific card model. Related: OS#6532 Change-Id: Iba196ada0076385de7bffcb157a85fda0a6c1852 --- M tests/pySim-prog_test/pySim-prog_test.sh 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/pySim-prog_test/pySim-prog_test.sh b/tests/pySim-prog_test/pySim-prog_test.sh index e768d8f..215ebee 100755 --- a/tests/pySim-prog_test/pySim-prog_test.sh +++ b/tests/pySim-prog_test/pySim-prog_test.sh @@ -134,6 +134,11 @@ continue fi echo "Card is of type: $CARD_NAME" + + if ! [ -r "$CARD_NAME.data" ]; then + echo "Warning: no .data file for this card, skipping..." + continue + fi gen_ok_file $I $CARD_NAME done } @@ -163,6 +168,11 @@ ADM_HEX="" ADM_OPT="-a" + if ! [ -r "$CARD_NAME.data" ]; then + echo "Warning: no .data file for this card, skipping..." + continue + fi + source "$CARD_NAME.data" if [ -n "$ADM_HEX" ]; then ADM_OPT="-A" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38006?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: Iba196ada0076385de7bffcb157a85fda0a6c1852 Gerrit-Change-Number: 38006 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: pySim-prog_test: tolerate empty reader slots

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38005?usp=email ) Change subject: pySim-prog_test: tolerate empty reader slots ...................................................................... pySim-prog_test: tolerate empty reader slots The test currently expects all reader slots to be populated. This means the cards may plugged into a random order, but there may not be any empty slots in the system at all. This requirement is easy to meet when each card has its own single-slot USB PCSC-reader, but as soon as multislot readers are used there may be some empty slots. Related: OS#6532 Change-Id: I7ba1d1350b6998d65e90408184accdb212556a7c --- M tests/pySim-prog_test/pySim-prog_test.sh 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/pySim-prog_test/pySim-prog_test.sh b/tests/pySim-prog_test/pySim-prog_test.sh index 173822a..e768d8f 100755 --- a/tests/pySim-prog_test/pySim-prog_test.sh +++ b/tests/pySim-prog_test/pySim-prog_test.sh @@ -130,8 +130,8 @@ echo "Probing card in terminal #$I" CARD_NAME=$(probe_card $I) if [ -z "$CARD_NAME" ]; then - echo "Error: Unresponsive card!" - exit 1 + echo "Warning: Unresponsive card!" + continue fi echo "Card is of type: $CARD_NAME" gen_ok_file $I $CARD_NAME @@ -146,8 +146,8 @@ echo "Probing card in terminal #$I" CARD_NAME=$(probe_card $I) if [ -z "$CARD_NAME" ]; then - echo "Error: Unresponsive card!" - exit 1 + echo "Warning: Unresponsive card, trying next terminal..." + continue fi echo "Card is of type: $CARD_NAME" @@ -216,7 +216,8 @@ # then the number of cards will be used as reader number. gen_card_list if [ $N_TERMINALS -eq 0 ]; then - N_TERMINALS=$N_CARDS + N_TERMINALS=`pcsc_scan -r | sed '$!d' | cut -d ':' -f 1` + ((N_TERMINALS++)) fi echo "Number of card terminals installed: $N_TERMINALS" echo "" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38005?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: I7ba1d1350b6998d65e90408184accdb212556a7c Gerrit-Change-Number: 38005 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 3 weeks

1
0
0 0

[XS] Change in pysim[master]: pySim-prog_test: supress stderr when probing for cards

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38007?usp=email ) Change subject: pySim-prog_test: supress stderr when probing for cards ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38007?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: I1d44f9458a05992d79b0152d3affcfeb783cccff Gerrit-Change-Number: 38007 Gerrit-PatchSet: 1 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, 03 Sep 2024 16:03:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: pySim-prog_test: tolerate missing .data files

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38006?usp=email ) Change subject: pySim-prog_test: tolerate missing .data files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38006?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: Iba196ada0076385de7bffcb157a85fda0a6c1852 Gerrit-Change-Number: 38006 Gerrit-PatchSet: 1 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, 03 Sep 2024 16:03:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: pySim-prog_test: tolerate empty reader slots

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38005?usp=email ) Change subject: pySim-prog_test: tolerate empty reader slots ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38005?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: I7ba1d1350b6998d65e90408184accdb212556a7c Gerrit-Change-Number: 38005 Gerrit-PatchSet: 1 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, 03 Sep 2024 16:03:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 3 weeks

1
0
0 0

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

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37948?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/docs/suci-tutorial.rst b/docs/suci-tutorial.rst index 60d2190..eb442d5 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: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibcbc6bb5d836d32c381922a35afa3b73b5f90621 Gerrit-Change-Number: 37948 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 3 weeks

1
0
0 0

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

by laforge

Attention is currently required from: dexter. laforge 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 3: (1 comment) File docs/suci-tutorial.rst: https://gerrit.osmocom.org/c/pysim/+/37947/comment/527f64f5_b111243e?usp=em… : PS3, Line 210: accessed "not accessed" means like "it's there but could be accessed, but it is not". In reality the point is of course that it's impossible for the UE to read/access the key. The entire point is that the key is never exposed outside of the USIM. -- 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: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Sep 2024 15:43:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

9 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024