June 2026 - gerrit-log - lists.osmocom.org

[XS] Change in onomondo-eim[master]: es9p_client: section 6.3.2.1, rename euiccCiPKIdToBeused to match SGP...
by fixeria 24 Jun '26

24 Jun '26

Attention is currently required from: dexter. fixeria has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42874?usp=email ) Change subject: es9p_client: section 6.3.2.1, rename euiccCiPKIdToBeused to match SGP.32 V.1.2 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42874?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I44c60a2f0d1129093ea67908d2eed167643a4a87 Gerrit-Change-Number: 42874 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jun 2026 14:24:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XL] Change in onomondo-eim[master]: asn1/SGP32Definitions: upgrade ASN.1 spec to V.1.2
by fixeria 24 Jun '26

24 Jun '26

Attention is currently required from: dexter, jolly. fixeria has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42869?usp=email ) Change subject: asn1/SGP32Definitions: upgrade ASN.1 spec to V.1.2 ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > The trailing white-spaces are part of the specification Feel free to create `.checkpatch.conf` with `--exclude ^asn1/.*\.asn1$`. -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: Id4d217296f43846aa39f5dc7076465e2dab72a7c Gerrit-Change-Number: 42869 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jun 2026 14:16:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in onomondo-eim[master]: esipa_rest_utils: fix searchCritera.profileClass type conversion
by fixeria 24 Jun '26

24 Jun '26

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42834?usp=email ) Change subject: esipa_rest_utils: fix searchCritera.profileClass type conversion ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42834?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I4bd223dbef00be9c800539b8d0dc9a84e3e93b73 Gerrit-Change-Number: 42834 Gerrit-PatchSet: 3 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: Wed, 24 Jun 2026 14:12:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/master-builds: add onomondo-{eim,ipa}
by fixeria 24 Jun '26

24 Jun '26

Attention is currently required from: dexter, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/42867?usp=email ) Change subject: jobs/master-builds: add onomondo-{eim,ipa} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42867?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I07f0cff5ce31e60135dff84554f21d8b404f7c72 Gerrit-Change-Number: 42867 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jun 2026 11:08:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in onomondo-eim[master]: contrib/jenkins: run 'rebar3 fmt --check'
by fixeria 24 Jun '26

24 Jun '26

Attention is currently required from: dexter, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42868?usp=email ) Change subject: contrib/jenkins: run 'rebar3 fmt --check' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42868?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I271c90dace6e7b6f052b38054815e6dfcbfa60f5 Gerrit-Change-Number: 42868 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jun 2026 11:07:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-pcap[master]: tls: fix broken certificate hostname verification
by fixeria 24 Jun '26

24 Jun '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42849?usp=email ) Change subject: tls: fix broken certificate hostname verification ...................................................................... tls: fix broken certificate hostname verification verify_cert_cb() retrieved the gnutls session pointer and passed it to gnutls_certificate_verify_peers3() as the expected hostname. But the session pointer is set to the osmo_tls_session struct (it is needed by cert_callback()), not a hostname string. Hostname matching was therefore performed against raw struct bytes, rendering verification meaningless and potentially reading out of bounds, even when "tls verify-cert" was enabled. Store the configured hostname in struct osmo_tls_session and have verify_cert_cb() read it from there. Also drop the stray gnutls_certificate_verify_peers3() call in the client setup: it ran before any handshake (so there were no peer certificates yet) and its result was ignored; the real verification happens via the registered callback during the handshake. Change-Id: If64950a698bfcfbf556a37ef1be3e68abc124384 AI-Assisted: yes (Claude) --- M include/osmo-pcap/osmo_tls.h M src/osmo_tls.c 2 files changed, 18 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/include/osmo-pcap/osmo_tls.h b/include/osmo-pcap/osmo_tls.h index 716604e..6afbe71 100644 --- a/include/osmo-pcap/osmo_tls.h +++ b/include/osmo-pcap/osmo_tls.h @@ -38,6 +38,9 @@ bool need_resend; gnutls_session_t session; + /* expected peer hostname for certificate verification (may be NULL) */ + const char *tls_hostname; + /* any credentials */ bool anon_alloc; gnutls_anon_client_credentials_t anon_cred; diff --git a/src/osmo_tls.c b/src/osmo_tls.c index f06f50e..d3ed45e 100644 --- a/src/osmo_tls.c +++ b/src/osmo_tls.c @@ -139,11 +139,15 @@ static int verify_cert_cb(gnutls_session_t session) { + const struct osmo_tls_session *sess; const char *hostname; unsigned int status; int ret; - hostname = gnutls_session_get_ptr(session); + /* The session ptr is the osmo_tls_session (see gnutls_session_set_ptr()); + * the expected hostname is stored inside it. */ + sess = gnutls_session_get_ptr(session); + hostname = sess ? sess->tls_hostname : NULL; ret = gnutls_certificate_verify_peers3(session, hostname, &status); if (ret != 0) @@ -448,7 +452,6 @@ { struct osmo_tls_session *sess = &client->tls_session; struct osmo_wqueue *wq = &client->wqueue; - unsigned int status; int rc; gnutls_global_set_log_level(client->tls_log_level); @@ -518,14 +521,19 @@ gnutls_certificate_set_retrieve_function2(sess->cert_cred, cert_callback); /* set the hostname if we have one */ - if (client->tls_hostname) + if (client->tls_hostname) { gnutls_server_name_set(sess->session, GNUTLS_NAME_DNS, client->tls_hostname, strlen(client->tls_hostname)); + /* Remember it so verify_cert_cb() can match it against the peer + * certificate during the handshake. */ + sess->tls_hostname = talloc_strdup(client, client->tls_hostname); + } /* do the verification */ if (client->tls_verify) { + /* The actual verification happens during the handshake via the + * registered callback; there are no peer certificates yet here. */ gnutls_certificate_set_verify_function(sess->cert_cred, verify_cert_cb); - gnutls_certificate_verify_peers3(sess->session, client->tls_hostname, &status); } else LOGP(DTLS, LOGL_NOTICE, "Not going to validate certs as configured\n"); @@ -545,6 +553,9 @@ gnutls_deinit(session->session); + talloc_free((void *)session->tls_hostname); + session->tls_hostname = NULL; + release_keys(session); if (session->anon_alloc) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42849?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If64950a698bfcfbf556a37ef1be3e68abc124384 Gerrit-Change-Number: 42849 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: tls: fix broken certificate hostname verification
by fixeria 24 Jun '26

24 Jun '26

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-pcap/+/42849?usp=email ) Change subject: tls: fix broken certificate hostname verification ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/42849?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If64950a698bfcfbf556a37ef1be3e68abc124384 Gerrit-Change-Number: 42849 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jun 2026 09:31:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in onomondo-eim[master]: esipa_asn1_handler: re-align to SGP.32 section Section 2.11.2 and Sec...
by dexter 24 Jun '26

24 Jun '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42877?usp=email ) Change subject: esipa_asn1_handler: re-align to SGP.32 section Section 2.11.2 and Section 5.14.6 ...................................................................... esipa_asn1_handler: re-align to SGP.32 section Section 2.11.2 and Section 5.14.6 Section 2.11.2: eIM package result (EuiccPackageResult case) is now concatenated with PendingNotificationList instead of RetrieveNotificationsListResponse Section 5.14.6: ESipa.ProvideEimPackageResult: Significant change in parameters Change-Id: Ic0872edefc1844166943c60528557c6b7a6602ce Related: SYS#8100 --- M src/esipa_asn1_handler.erl 1 file changed, 9 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-eim refs/changes/77/42877/1 diff --git a/src/esipa_asn1_handler.erl b/src/esipa_asn1_handler.erl index ae9bfa9..63afdb2 100644 --- a/src/esipa_asn1_handler.erl +++ b/src/esipa_asn1_handler.erl @@ -363,7 +363,8 @@ {getEimPackageResponse, EsipaResp}; %GSMA SGP.32, section 6.3.2.7 handle_asn1(Pid, {provideEimPackageResult, EsipaReq}) -> - case EsipaReq of + EimPackageResult = maps:get(eimPackageResult, EsipaReq), + case EimPackageResult of {euiccPackageResult, EuiccPackageResult} -> ok = esipa_asn1_handler_utils:handle_euiccPackageResult( Pid, EuiccPackageResult, EsipaReq @@ -375,25 +376,8 @@ Pid, EuiccPackageResult, EsipaReq ), % then forward the notifications in the included notification list - RetrieveNotificationsListResponse = maps:get(notificationList, EPRAndNotifications), - case RetrieveNotificationsListResponse of - {notificationList, NotificationList} -> - handle_asn1_notificationList(Pid, NotificationList); - {notificationsListResultError, NotificationsListResultError} -> - logger:notice( - "Ipad is reporting a problem to retrieve notifications,~nNotificationsListResultError=~p,~nPid=~p~n", - [NotificationsListResultError, Pid] - ); - UnhandledObject -> - % TODO: The RetrieveNotificationsListResponse may also contain other objects, in particular - % euiccPackageResultList and notificationAndEprList, which again includes either a - % notificationList or an euiccPackageResultList The spec is a bit unclear on how exactly and when - % those data objects shall be used, so we ignore them for now and display a notice in the log - logger:notice( - "RetrieveNotificationsListResponse with unhandled object,~UnhandledObject=~p,~nPid=~p~n", - [UnhandledObject, Pid] - ) - end; + NotificationList = maps:get(notificationList, EPRAndNotifications), + handle_asn1_notificationList(Pid, NotificationList); {ipaEuiccDataResponse, IpaEuiccDataResponse} -> % drive-by store the eUICC public key so that we can use it later to sign PSMOs or eCOs {EidValue, _, _} = mnesia_db:work_pickup(Pid, none), @@ -401,17 +385,18 @@ IpaEuiccDataResponse, EidValue ), Outcome = esipa_rest_utils:ipaEuiccDataResponse_to_outcome(IpaEuiccDataResponse), - mnesia_db:work_finish(Pid, Outcome, EsipaReq); + ok = mnesia_db:work_finish(Pid, Outcome, EsipaReq); {profileDownloadTriggerResult, _} -> % The profileDownloadTriggerResult is sent by the IPAd in case a profile was downloaded directly from an % RSP server, bypassing the eIM (see also SGP.32, section 3.2.3.1). This is a feature that this eIM does % not support. throw("unsuppported message type \"profileDownloadTriggerResult\""); - {eimPackageError, EimPackageError} -> - Outcome = [{[{eimPackageError, EimPackageError}]}], + {eimPackageResultResponseError, EimPackageResultResponseError} -> + EimPackageResultErrorCode = maps:get(eimPackageResultErrorCode, EimPackageResultResponseError), + Outcome = [{[{eimPackageError, EimPackageResultErrorCode}]}], ok = mnesia_db:work_finish(Pid, Outcome, EsipaReq) end, - {provideEimPackageResultResponse, undefined}; + {provideEimPackageResultResponse, {emptyResponse, #{}}}; %Unsupported request handle_asn1(Pid, Request) -> mnesia_db:work_finish(Pid, [{[{procedureError, abortedOrder}]}], unsupported), -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42877?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: Ic0872edefc1844166943c60528557c6b7a6602ce Gerrit-Change-Number: 42877 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in onomondo-eim[master]: esipa_rest_utils: re-align to SGP.32 Section 2.11.2
by dexter 24 Jun '26

24 Jun '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42878?usp=email ) Change subject: esipa_rest_utils: re-align to SGP.32 Section 2.11.2 ...................................................................... esipa_rest_utils: re-align to SGP.32 Section 2.11.2 Section 2.11.2: rename EuiccPackageResultDataSigned.configureAutoEnableResult to EuiccPackageResultDataSigned.configureImmediateEnableResult Change-Id: Ib4e6a4b4cb4d26a391346169b9047515496dd308 Related: SYS#8100 --- M contrib/rest_api_resource_schema.json M contrib/rest_api_response_schema.json R contrib/tryme_configureImmediateEnable.sh M src/esipa_rest_utils.erl 4 files changed, 44 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-eim refs/changes/78/42878/1 diff --git a/contrib/rest_api_resource_schema.json b/contrib/rest_api_resource_schema.json index 5f18d75..27726ff 100644 --- a/contrib/rest_api_resource_schema.json +++ b/contrib/rest_api_resource_schema.json @@ -136,24 +136,24 @@ } }, { - "configureAutoEnable": { - "description": "order the execution of a configureAutoEnable PSMO, see also GSMA SGP.32, section 5.13.6", + "configureImmediateEnable": { + "description": "order the execution of a configureImmediateEnable PSMO, see also GSMA SGP.32, section 5.13.6", "type": "object", "properties": { - "autoEnableFlag": { + "immediateEnableFlag": { "description": "enable/disable automatic profile enabeling", "type": "boolean" }, - "objid": { + "defaultSmdpOid": { "description": "object ID of the default SMDP+", "type": "string" }, - "smdpAddress": { + "defaultSmdpAddress": { "description": "FQDN of the default SMDP+", "type": "string" }, "required": [ - "autoEnableFlag" + "immediateEnableFlag" ] } } diff --git a/contrib/rest_api_response_schema.json b/contrib/rest_api_response_schema.json index bf0c843..5b00450 100644 --- a/contrib/rest_api_response_schema.json +++ b/contrib/rest_api_response_schema.json @@ -195,8 +195,8 @@ } }, { - "configureAutoEnableResult": { - "description": "configureAutoEnableResult (automatic profile enabeling) PSMO result, see also SGP32Definitions.asn1", + "configureImmediateEnableResult": { + "description": "configureImmediateEnableResult (automatic profile enabeling) PSMO result, see also SGP32Definitions.asn1", "type": "string", "enum": [ "ok", diff --git a/contrib/tryme_configureAutoEnable.sh b/contrib/tryme_configureImmediateEnable.sh similarity index 74% rename from contrib/tryme_configureAutoEnable.sh rename to contrib/tryme_configureImmediateEnable.sh index 89c08dd..9cf4fde 100755 --- a/contrib/tryme_configureAutoEnable.sh +++ b/contrib/tryme_configureImmediateEnable.sh @@ -1,7 +1,7 @@ #!/bin/bash . ./tryme.cfg -JSON='{ "eidValue" : "'$EID'", "order" : { "psmo": [ { "configureAutoEnable" : { "autoEnableFlag" : true, "smdpAddress" : "rsp.truphone.com" } } ] } }' +JSON='{ "eidValue" : "'$EID'", "order" : { "psmo": [ { "configureImmediateEnable" : { "immediateEnableFlag" : true, "defaultSmdpAddress" : "testsmdpplus1.example.com" } } ] } }' RC=`./restop.py -c -f psmo -j "$JSON"` echo $RC diff --git a/src/esipa_rest_utils.erl b/src/esipa_rest_utils.erl index efbf985..2d2c7fe 100644 --- a/src/esipa_rest_utils.erl +++ b/src/esipa_rest_utils.erl @@ -100,34 +100,39 @@ error end. -psmo_to_asn_configureAutoEnable(Psmo) -> +psmo_to_asn_configureImmediateEnable(Psmo) -> case Psmo of - {[{<<"autoEnableFlag">>, true}, {<<"smdpOid">>, SmdpOid}, {<<"smdpAddress">>, SmdpAddress}]} -> - {configureAutoEnable, #{ - autoEnableFlag => null, - smdpOid => binary_to_list(SmdpOid), - smdpAddress => SmdpAddress - }}; - {[{<<"autoEnableFlag">>, true}, {<<"smdpOid">>, SmdpOid}]} -> - {configureAutoEnable, #{autoEnableFlag => null, smdpOid => binary_to_list(SmdpOid)}}; - {[{<<"autoEnableFlag">>, true}, {<<"smdpAddress">>, SmdpAddress}]} -> - {configureAutoEnable, #{autoEnableFlag => null, smdpAddress => SmdpAddress}}; - {[{<<"autoEnableFlag">>, true}]} -> - {configureAutoEnable, #{autoEnableFlag => null}}; - {[ - {<<"autoEnableFlag">>, false}, - {<<"smdpOid">>, SmdpOid}, - {<<"smdpAddress">>, SmdpAddress} - ]} -> - {configureAutoEnable, #{mdpOid => binary_to_list(SmdpOid), smdpAddress => SmdpAddress}}; - {[{<<"autoEnableFlag">>, false}, {<<"smdpOid">>, SmdpOid}]} -> - {configureAutoEnable, #{smdpOid => binary_to_list(SmdpOid)}}; - {[{<<"autoEnableFlag">>, false}, {<<"smdpAddress">>, SmdpAddress}]} -> - {configureAutoEnable, #{smdpAddress => SmdpAddress}}; - {[{<<"autoEnableFlag">>, false}]} -> - {configureAutoEnable, #{}}; + {[{<<"immediateEnableFlag">>, true}, + {<<"defaultSmdpOid">>, DefaultSmdpOid}, + {<<"defaultSmdpAddress">>, DefaultSmdpAddress}]} -> + {configureImmediateEnable, #{immediateEnableFlag => null, + defaultSmdpOid => binary_to_list(DefaultSmdpOid), + defaultSmdpAddress => DefaultSmdpAddress}}; + {[{<<"immediateEnableFlag">>, true}, + {<<"defaultSmdpOid">>, DefaultSmdpOid}]} -> + {configureImmediateEnable, #{immediateEnableFlag => null, + defaultSmdpOid => binary_to_list(DefaultSmdpOid)}}; + {[{<<"immediateEnableFlag">>, true}, + {<<"defaultSmdpAddress">>, DefaultSmdpAddress}]} -> + {configureImmediateEnable, #{immediateEnableFlag => null, + defaultSmdpAddress => DefaultSmdpAddress}}; + {[{<<"immediateEnableFlag">>, true}]} -> + {configureImmediateEnable, #{immediateEnableFlag => null}}; + {[{<<"immediateEnableFlag">>, false}, + {<<"defaultSmdpOid">>, DefaultSmdpOid}, + {<<"defaultSmdpAddress">>, DefaultSmdpAddress}]} -> + {configureImmediateEnable, #{defaultSmdpOid => binary_to_list(DefaultSmdpOid), + defaultSmdpAddress => DefaultSmdpAddress}}; + {[{<<"immediateEnableFlag">>, false}, + {<<"defaultSmdpOid">>, DefaultSmdpOid}]} -> + {configureImmediateEnable, #{defaultSmdpOid => binary_to_list(DefaultSmdpOid)}}; + {[{<<"immediateEnableFlag">>, false}, + {<<"defaultSmdpAddress">>, DefaultSmdpAddress}]} -> + {configureImmediateEnable, #{defaultSmdpAddress => DefaultSmdpAddress}}; + {[{<<"immediateEnableFlag">>, false}]} -> + {configureImmediateEnable, #{}}; _ -> - logger:error("REST: order with bad configureAutoEnable PSMO: ~p~n", [Psmo]), + logger:error("REST: order with bad configureImmediateEnable PSMO: ~p~n", [Psmo]), error end. @@ -162,8 +167,8 @@ psmo_to_asn_listProfileInfo(Psmo); {[{<<"getRAT">>, Psmo}]} -> psmo_to_asn_getRAT(Psmo); - {[{<<"configureAutoEnable">>, Psmo}]} -> - psmo_to_asn_configureAutoEnable(Psmo); + {[{<<"configureImmediateEnable">>, Psmo}]} -> + psmo_to_asn_configureImmediateEnable(Psmo); _ -> logger:error("REST: order with unknown/unsupported PSMO: ~p~n", [PsmoOrder]), error @@ -389,8 +394,8 @@ result_to_json_listProfileInfoResult(ListProfileInfoResult); {getRATResult, GetRATResult} -> result_to_json_getRATResult(GetRATResult); - {configureAutoEnableResult, ConfigureAutoEnableResult} -> - {[{configureAutoEnableResult, ConfigureAutoEnableResult}]}; + {configureImmediateEnableResult, ConfigureImmediateEnableResult} -> + {[{configureImmediateEnableResult, ConfigureImmediateEnableResult}]}; {addEimResult, AddEimResult} -> result_to_json_addEimResult(AddEimResult); {deleteEimResult, DeleteEimResult} -> -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42878?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: Ib4e6a4b4cb4d26a391346169b9047515496dd308 Gerrit-Change-Number: 42878 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in onomondo-eim[master]: rest_api: move "required" member to the correct level
by dexter 24 Jun '26

24 Jun '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42880?usp=email ) Change subject: rest_api: move "required" member to the correct level ...................................................................... rest_api: move "required" member to the correct level In some locations in the JSON schema files we find the "required" member on the same lavel as the "properties" (likewise "items") members. This is incorrect, the "required" member should always be on the same level as the "properties" member (At the moment the JSON schema files serve only documentation purposes, they are not used to do any actual validation yet.) Change-Id: I07d51d0e809a718144bd51a6540ab51187bb4daa Related: SYS#8100 --- M contrib/rest_api_resource_schema.json M contrib/rest_api_response_schema.json 2 files changed, 69 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-eim refs/changes/80/42880/1 diff --git a/contrib/rest_api_resource_schema.json b/contrib/rest_api_resource_schema.json index 12fd049..1bc0fcf 100644 --- a/contrib/rest_api_resource_schema.json +++ b/contrib/rest_api_resource_schema.json @@ -21,11 +21,11 @@ "activationCode": { "description": "see GSMA SGP.22, section 4.1", "type": "string" - }, - "required": [ - "activationCode" - ] - } + } + }, + "required": [ + "activationCode" + ] } }, { @@ -121,11 +121,11 @@ "description": "concatonation of the BER-TLV tags that shall be included in the response", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "searchCriteria" - ] - } + } + }, + "required": [ + "searchCriteria" + ] } }, { @@ -151,11 +151,11 @@ "defaultSmdpAddress": { "description": "FQDN of the default SMDP+", "type": "string" - }, - "required": [ - "immediateEnableFlag" - ] - } + } + }, + "required": [ + "immediateEnableFlag" + ] } } ] @@ -239,11 +239,11 @@ "description": "see GSMA SGP.32, section 2.11.1.2", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "tagList" - ] - } + } + }, + "required": [ + "tagList" + ] } }, { diff --git a/contrib/rest_api_response_schema.json b/contrib/rest_api_response_schema.json index 45ccb79..c36c6c7 100644 --- a/contrib/rest_api_response_schema.json +++ b/contrib/rest_api_response_schema.json @@ -129,11 +129,11 @@ } } } - }, - "required": [ - "finalResult" - ] - } + } + }, + "required": [ + "finalResult" + ] } }, { @@ -173,24 +173,24 @@ "description": "referring to content of EF GID2 (file identifier '6F3F') as defined in 3GPP TS 31.102", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "mccMnc" - ] - } + } + }, + "required": [ + "mccMnc" + ] }, "consentRequired": { "description": "indicates that the End User consent is required", "type": "boolean" - }, - "required": [ - "pprUpdateControl", - "ppr1", - "ppr2", - "allowedOperators", - "consentRequired" - ] - } + } + }, + "required": [ + "pprUpdateControl", + "ppr1", + "ppr2", + "allowedOperators", + "consentRequired" + ] } } }, @@ -228,11 +228,11 @@ "associationToken": { "description": "resulting association token, see also GSMA SGP.32, section 2.11.1.1.1", "type": "integer" - }, - "required": [ - "addEimResultCode" - ] - } + } + }, + "required": [ + "addEimResultCode" + ] } }, { @@ -291,16 +291,16 @@ "eimIdTypeFqdn", "eimIdTypeProprietary" ] - }, - "required": [ - "eimId" - ] - } - }, - "required": [ - "finalResult" - ] - } + } + }, + "required": [ + "eimId" + ] + } + }, + "required": [ + "finalResult" + ] } }, { @@ -360,11 +360,11 @@ "description": "ICCID of the profile. (ICCID in nibble-swapped raw format)", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "finalResult" - ] - } + } + }, + "required": [ + "finalResult" + ] } }, { @@ -445,11 +445,11 @@ "pattern": "^[0-9,A-F]{2,32}$" } } - }, - "required": [ - "edrResult" - ] - } + } + }, + "required": [ + "edrResult" + ] } }, { @@ -483,10 +483,10 @@ "description": "Erlang ETS encoded debug information string, for debugging/diagnosis only", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "status" - ] + } } - } + }, + "required": [ + "status" + ] } -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42880?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I07d51d0e809a718144bd51a6540ab51187bb4daa Gerrit-Change-Number: 42880 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log June 2026