- gerrit-log - lists.osmocom.org

[XS] Change in libosmo-sigtran[master]: Improve format of logline prefix in LOGAS(P) macro
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39648?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Improve format of logline prefix in LOGAS(P) macro ...................................................................... Improve format of logline prefix in LOGAS(P) macro Adding "as-" and "asp" is totally misleading, because it's usual that we name ASs "as-XYZ" and ASPs "asp-XYZ". Intead, better use a usual prefix formatting to indicate the context. Change-Id: Ib7b6652f2a96bf5c2a2233043755e0c639d41544 --- M src/ss7_as.h M src/ss7_asp.h 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/48/39648/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ib7b6652f2a96bf5c2a2233043755e0c639d41544 Gerrit-Change-Number: 39648 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-sigtran[master]: ASP loadsharing: Implement based on VTY configuration
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: daniel, fixeria, laforge, osmith, pespin. Hello Jenkins Builder, daniel, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39408?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ASP loadsharing: Implement based on VTY configuration ...................................................................... ASP loadsharing: Implement based on VTY configuration Calculate AS Extended SLS (7 bit) out of OPC (12 bits) and SLS (4 bits) based on VTY configuration. Assign a normal destination ASP for each AS-eSLS and try to use it whenever possible; fallback to an alternative ASP when normal ASP is not available. Related: SYS#7112 Change-Id: I5f47e40b70ed566034cd1533b71e21fc03e94f6c --- M src/osmo_ss7_as.c M src/osmo_ss7_vty.c M src/ss7_as.h M src/xua_as_fsm.c M tests/vty/osmo_stp_test.vty 5 files changed, 247 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/08/39408/7 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39408?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5f47e40b70ed566034cd1533b71e21fc03e94f6c Gerrit-Change-Number: 39408 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: allow requests to different hosts
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: dexter. pespin has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39657?usp=email ) Change subject: HTTP_Adapter: allow requests to different hosts ...................................................................... Patch Set 1: Code-Review-1 (3 comments) File library/HTTP_Adapter.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39657/comment/6ebf9751_18ed… : PS1, Line 32: function f_http_init(template HTTP_Adapter_Params http_pars := omit) runs on http_CT { template (omit) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39657/comment/fb03fad0_485f… : PS1, Line 184: template HTTP_Adapter_Params http_pars := omit) template (omit) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39657/comment/6b08779a_8718… : PS1, Line 282: template HTTP_Adapter_Params http_pars := omit) template (omit) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39657?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic87674f2381b3c6a1be6d0ce28a9e5403cda201b Gerrit-Change-Number: 39657 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 10:39:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: es9p_Types_JSON: add decoder/encoder functions for opposite direction
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: dexter. pespin has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39656?usp=email ) Change subject: es9p_Types_JSON: add decoder/encoder functions for opposite direction ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic7e3390bd09cc9e0c91ca90ac60cdde5d2ce1384 Gerrit-Change-Number: 39656 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 10:37:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: add missing default values
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: dexter. pespin has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39655?usp=email ) Change subject: RSPDefinitions_Templates: add missing default values ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia55d17a00462c7c7729eb0d8d24ab0556c4c6918 Gerrit-Change-Number: 39655 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 10:37:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: es9p_Types_JSON: split headers into separate module
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: dexter. pespin has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39654?usp=email ) Change subject: es9p_Types_JSON: split headers into separate module ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0242c877805003fa67445800960f75ce27752383 Gerrit-Change-Number: 39654 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 10:37:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: allow requests to different hosts
by dexter 03 Mar '25

03 Mar '25

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39657?usp=email ) Change subject: HTTP_Adapter: allow requests to different hosts ...................................................................... HTTP_Adapter: allow requests to different hosts The host that is requested via the HTTP_Adapter is configured once on initialization. This is fine if the test scenario only has exactly one destination to query. For multiple destinations, this model does not work. Let's add an http_pars parameter to the request functions, so that the user can direct the requests to different hosts dynamically. Related: SYS#7339 Change-Id: Ic87674f2381b3c6a1be6d0ce28a9e5403cda201b --- M library/HTTP_Adapter.ttcn 1 file changed, 27 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/39657/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index d970416..d9f4a82 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -20,7 +20,7 @@ type component http_CT { port HTTPmsg_PT HTTP; /* double underscore to have "g_pars" available on components extending this one: */ - var HTTP_Adapter_Params g_http_pars; + var template HTTP_Adapter_Params g_http_pars; }; type record HTTP_Adapter_Params { @@ -29,9 +29,9 @@ boolean use_ssl }; -function f_http_init(HTTP_Adapter_Params pars) runs on http_CT { +function f_http_init(template HTTP_Adapter_Params http_pars := omit) runs on http_CT { map(self:HTTP, system:HTTP); - g_http_pars := pars; + g_http_pars := http_pars; } template (value) Connect ts_HTTP_Connect(template (value) charstring hostname, @@ -180,15 +180,31 @@ template octetstring binary_body := omit, HeaderLines custom_hdr := { }, float tout := 2.0, - template integer client_id := omit) + template integer client_id := omit, + template HTTP_Adapter_Params http_pars := omit) runs on http_CT { var Connect_result rc; timer T := tout; var template integer use_client_id := omit; + var HTTP_Adapter_Params use_http_pars; + + if (istemplatekind(http_pars, "omit")) { + if (istemplatekind(g_http_pars, "omit")) { + /* The user is expected to either pass global http_pars with on initialization (f_http_init) or + * to pass individual http_pars with each request. */ + setverdict(fail, "no HTTP parameters set"); + self.stop; + } + /* Use globally set HTTP parameters */ + use_http_pars := valueof(g_http_pars); + } else { + /* Use request-individual HTTP parameters */ + use_http_pars := valueof(http_pars); + } /* In case the caller didn't specify a client_id, we will create a new connection. */ if (istemplatekind(client_id, "omit")) { - HTTP.send(ts_HTTP_Connect(g_http_pars.http_host, g_http_pars.http_port, g_http_pars.use_ssl)); + HTTP.send(ts_HTTP_Connect(use_http_pars.http_host, use_http_pars.http_port, use_http_pars.use_ssl)); T.start; alt { [] HTTP.receive(Connect_result:?) -> value rc; @@ -208,16 +224,16 @@ if (not istemplatekind(body, "omit") and istemplatekind(binary_body, "omit")) { /* HTTP message with ASCII content */ - HTTP.send(ts_HTTP_Req(url, method, body, host := g_http_pars.http_host & ":" & int2str(g_http_pars.http_port), + HTTP.send(ts_HTTP_Req(url, method, body, host := use_http_pars.http_host & ":" & int2str(use_http_pars.http_port), custom_hdr := custom_hdr, client_id := use_client_id)); } else if (not istemplatekind(binary_body, "omit") and istemplatekind(body, "omit")) { /* HTTP message with binary content */ HTTP.send(ts_HTTP_Req_Bin(url, method, binary_body, - host := g_http_pars.http_host & ":" & int2str(g_http_pars.http_port), + host := use_http_pars.http_host & ":" & int2str(use_http_pars.http_port), custom_hdr := custom_hdr, client_id := use_client_id)); } else if (istemplatekind(binary_body, "omit") and istemplatekind(body, "omit")) { /* HTTP message without content (e.g. a GET request) */ - HTTP.send(ts_HTTP_Req(url, method, host := g_http_pars.http_host & ":" & int2str(g_http_pars.http_port), + HTTP.send(ts_HTTP_Req(url, method, host := use_http_pars.http_host & ":" & int2str(use_http_pars.http_port), custom_hdr := custom_hdr, client_id := use_client_id)); } else { setverdict(fail, "either binary_body or body must be used (a request can contain either ASCII data or binary data, not both!"); @@ -262,9 +278,10 @@ template HTTPMessage exp := tr_HTTP_Resp2xx, float tout := 2.0, HeaderLines custom_hdr := { }, template integer client_id := omit, - boolean keep_connection := false) + boolean keep_connection := false, + template HTTP_Adapter_Params http_pars := omit) runs on http_CT return HTTPMessage { - f_http_tx_request(url, method, body, binary_body, custom_hdr, tout, client_id); + f_http_tx_request(url, method, body, binary_body, custom_hdr, tout, client_id, http_pars); return f_http_rx_response(exp, tout, client_id, keep_connection); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39657?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: Ic87674f2381b3c6a1be6d0ce28a9e5403cda201b Gerrit-Change-Number: 39657 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: add missing default values
by dexter 03 Mar '25

03 Mar '25

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39655?usp=email ) Change subject: RSPDefinitions_Templates: add missing default values ...................................................................... RSPDefinitions_Templates: add missing default values The template parameters of some templates lack a reasonable default. Let's add default values to those. Related: SYS#7339 Change-Id: Ia55d17a00462c7c7729eb0d8d24ab0556c4c6918 --- M library/euicc/RSPDefinitions_Templates.ttcn 1 file changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/39655/1 diff --git a/library/euicc/RSPDefinitions_Templates.ttcn b/library/euicc/RSPDefinitions_Templates.ttcn index 2a7df8b..f717d6a 100644 --- a/library/euicc/RSPDefinitions_Templates.ttcn +++ b/library/euicc/RSPDefinitions_Templates.ttcn @@ -209,6 +209,13 @@ bppEuiccOtpk := omit } +template (present) PendingNotification tr_pendingNotification(template (present) ProfileInstallationResult profileInstallationResult := ?) := { + profileInstallationResult := profileInstallationResult +} +template (value) PendingNotification ts_pendingNotification(template (value) ProfileInstallationResult profileInstallationResult := ts_profileInstallationResult) := { + profileInstallationResult := profileInstallationResult +} + /* GSMA SGP.22, section 2.5.6 */ template (present) ProfileInstallationResultData tr_profileInstallationResultData(template (present) charstring notificationAddress := ?) := { @@ -352,8 +359,8 @@ } } template (value) RemoteProfileProvisioningRequest -ts_authenticateClientRequest(template (value) octetstring transactionId, - template (value) AuthenticateServerResponse authenticateServerResponse) := { +ts_authenticateClientRequest(template (value) octetstring transactionId := 'AABBCC'O, + template (value) AuthenticateServerResponse authenticateServerResponse := ts_authenticateServerResponse) := { authenticateClientRequest := { transactionId := transactionId, authenticateServerResponse := authenticateServerResponse @@ -400,7 +407,7 @@ } } template (value) RemoteProfileProvisioningRequest -ts_handleNotification(template (value) PendingNotification pendingNotification) := { +ts_handleNotification(template (value) PendingNotification pendingNotification := ts_pendingNotification) := { handleNotification := { pendingNotification := pendingNotification } @@ -416,8 +423,8 @@ } } template (value) RemoteProfileProvisioningRequest -ts_cancelSessionRequestEs9(template (value) octetstring transactionId, - template (value) CancelSessionResponse cancelSessionResponse) := { +ts_cancelSessionRequestEs9(template (value) octetstring transactionId := 'ABCDEF'O, + template (value) CancelSessionResponse cancelSessionResponse := ts_cancelSessionResponse) := { cancelSessionRequestEs9 := { transactionId := transactionId, cancelSessionResponse := cancelSessionResponse -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39655?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: Ia55d17a00462c7c7729eb0d8d24ab0556c4c6918 Gerrit-Change-Number: 39655 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: es9p_Types_JSON: add decoder/encoder functions for opposite direction
by dexter 03 Mar '25

03 Mar '25

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39656?usp=email ) Change subject: es9p_Types_JSON: add decoder/encoder functions for opposite direction ...................................................................... es9p_Types_JSON: add decoder/encoder functions for opposite direction We currently only have ES9p encoder/decoder functions to emulate an ES9p server, however, we will need to emulate ES9p clients too Change-Id: Ic7e3390bd09cc9e0c91ca90ac60cdde5d2ce1384 Related: SYS#7339 --- M library/euicc/es9p_Types_JSON.ttcn 1 file changed, 88 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/39656/1 diff --git a/library/euicc/es9p_Types_JSON.ttcn b/library/euicc/es9p_Types_JSON.ttcn index 79d5381..601ea8f 100644 --- a/library/euicc/es9p_Types_JSON.ttcn +++ b/library/euicc/es9p_Types_JSON.ttcn @@ -163,6 +163,94 @@ } } with { extension "prototype(fast)" } +/* Converter function to encode an ASN.1 ES9+ request record to its JSON formatted ES9+ representation */ +function enc_RemoteProfileProvisioningRequest_to_JSON(in RemoteProfileProvisioningRequest asn1_pdu_dec, out charstring json_pdu_enc) { + var JSON_ES9p_RemoteProfileProvisioningRequest json_pdu; + + var charstring functionRequesterIdentifier := "TTCN3"; + var charstring functionCallIdentifier := "testsuite"; + + if (ispresent(asn1_pdu_dec.initiateAuthenticationRequest)) { + json_pdu.initiateAuthenticationRequest.header.functionRequesterIdentifier := functionRequesterIdentifier; + json_pdu.initiateAuthenticationRequest.header.functionCallIdentifier := functionCallIdentifier; + json_pdu.initiateAuthenticationRequest.euiccChallenge := encode_base64(asn1_pdu_dec.initiateAuthenticationRequest.euiccChallenge); + json_pdu.initiateAuthenticationRequest.smdpAddress := unichar2char(asn1_pdu_dec.initiateAuthenticationRequest.smdpAddress); + json_pdu.initiateAuthenticationRequest.euiccInfo1 := encode_base64(enc_EUICCInfo1(asn1_pdu_dec.initiateAuthenticationRequest.euiccInfo1)); + json_pdu_enc := oct2char(enc_JSON_ES9p_RemoteProfileProvisioningRequest(json_pdu)); + } else if (ispresent(asn1_pdu_dec.getBoundProfilePackageRequest)) { + json_pdu.getBoundProfilePackageRequest.header.functionRequesterIdentifier := functionRequesterIdentifier; + json_pdu.getBoundProfilePackageRequest.header.functionCallIdentifier := functionCallIdentifier; + json_pdu.getBoundProfilePackageRequest.transactionId := oct2str(asn1_pdu_dec.getBoundProfilePackageRequest.transactionId); + json_pdu.getBoundProfilePackageRequest.prepareDownloadResponse := + encode_base64(enc_PrepareDownloadResponse(asn1_pdu_dec.getBoundProfilePackageRequest.prepareDownloadResponse)); + json_pdu_enc := oct2char(enc_JSON_ES9p_RemoteProfileProvisioningRequest(json_pdu)); + } else if (ispresent(asn1_pdu_dec.authenticateClientRequest)) { + json_pdu.authenticateClientRequest.header.functionRequesterIdentifier := functionRequesterIdentifier; + json_pdu.authenticateClientRequest.header.functionCallIdentifier := functionCallIdentifier; + json_pdu.authenticateClientRequest.transactionId := oct2str(asn1_pdu_dec.authenticateClientRequest.transactionId); + json_pdu.authenticateClientRequest.authenticateServerResponse := + encode_base64(enc_AuthenticateServerResponse(asn1_pdu_dec.authenticateClientRequest.authenticateServerResponse)) + json_pdu_enc := oct2char(enc_JSON_ES9p_RemoteProfileProvisioningRequest(json_pdu)); + } else if (ispresent(asn1_pdu_dec.handleNotification)) { + json_pdu.handleNotification.header.functionRequesterIdentifier := functionRequesterIdentifier; + json_pdu.handleNotification.header.functionCallIdentifier := functionCallIdentifier; + json_pdu.handleNotification.pendingNotification := + encode_base64(enc_PendingNotification(asn1_pdu_dec.handleNotification.pendingNotification)) + json_pdu_enc := oct2char(enc_JSON_ES9p_RemoteProfileProvisioningRequest(json_pdu)); + } else if (ispresent(asn1_pdu_dec.cancelSessionRequestEs9)) { + json_pdu.cancelSessionRequestEs9.header.functionRequesterIdentifier := functionRequesterIdentifier; + json_pdu.cancelSessionRequestEs9.header.functionCallIdentifier := functionCallIdentifier; + json_pdu.cancelSessionRequestEs9.transactionId := oct2str(asn1_pdu_dec.cancelSessionRequestEs9.transactionId); + json_pdu.cancelSessionRequestEs9.cancelSessionResponse := + encode_base64(enc_CancelSessionResponse(asn1_pdu_dec.cancelSessionRequestEs9.cancelSessionResponse)) + json_pdu_enc := oct2char(enc_JSON_ES9p_RemoteProfileProvisioningRequest(json_pdu)); + } else { + setverdict(fail, "encoder path not implemented for JSON ES9+ message"); + } +} with { extension "prototype(fast)" } + +/* Converter function to decode a JSON formatted ES9+ response to its ASN.1 ES9+ record representation */ +function dec_RemoteProfileProvisioningResponse_from_JSON(in charstring json_pdu_enc, out RemoteProfileProvisioningResponse asn1_pdu_dec) { + var JSON_ES9p_RemoteProfileProvisioningResponse json_pdu; + json_pdu := dec_JSON_ES9p_RemoteProfileProvisioningResponse(char2oct(json_pdu_enc)); + + if (ispresent(json_pdu.initiateAuthenticationResponse)) { + if (not match(json_pdu.initiateAuthenticationResponse.header, ts_responseHeader)) { + setverdict(fail, "unsuccessful request"); + } + asn1_pdu_dec := valueof(ts_initiateAuthenticationResponse( + str2oct(json_pdu.initiateAuthenticationResponse.transactionId), + dec_ServerSigned1(decode_base64(json_pdu.initiateAuthenticationResponse.serverSigned1)), + decode_base64(json_pdu.initiateAuthenticationResponse.serverSignature1), + dec_SubjectKeyIdentifier(decode_base64(json_pdu.initiateAuthenticationResponse.euiccCiPKIdToBeUsed)), + dec_Certificate(decode_base64(json_pdu.initiateAuthenticationResponse.serverCertificate)))); + } else if (ispresent(json_pdu.getBoundProfilePackageResponse)) { + if (not match(json_pdu.getBoundProfilePackageResponse.header, ts_responseHeader)) { + setverdict(fail, "unsuccessful request"); + } + asn1_pdu_dec := valueof(ts_getBoundProfilePackageResponse( + str2oct(json_pdu.getBoundProfilePackageResponse.transactionId), + dec_BoundProfilePackage(decode_base64(json_pdu.getBoundProfilePackageResponse.boundProfilePackage)))); + } else if (ispresent(json_pdu.authenticateClientResponseEs9)) { + if (not match(json_pdu.authenticateClientResponseEs9.header, ts_responseHeader)) { + setverdict(fail, "unsuccessful request"); + } + asn1_pdu_dec := valueof(ts_authenticateClientResponseEs9( + str2oct(json_pdu.authenticateClientResponseEs9.transactionId), + dec_StoreMetadataRequest(decode_base64(json_pdu.authenticateClientResponseEs9.profileMetadata)), + dec_SmdpSigned2(decode_base64(json_pdu.authenticateClientResponseEs9.smdpSigned2)), + decode_base64(json_pdu.authenticateClientResponseEs9.smdpSignature2), + dec_Certificate(decode_base64(json_pdu.authenticateClientResponseEs9.smdpCertificate)))); + } else if (ispresent(json_pdu.emptyResponse)) { + if (not match(json_pdu.emptyResponse.header, ts_responseHeader)) { + setverdict(fail, "unsuccessful request"); + } + /* Empty response, do nothing? */ + } else { + setverdict(fail, "decoder path not implemented for JSON ES9+ message"); + } +} with { extension "prototype(fast)" } + /* Converter function to encode an ASN.1 ES9+ response record to its JSON formatted ES9+ representation */ function enc_RemoteProfileProvisioningResponse_to_JSON(in RemoteProfileProvisioningResponse asn1_pdu_dec, out charstring json_pdu_enc) { var JSON_ES9p_RemoteProfileProvisioningResponse json_pdu; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39656?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: Ic7e3390bd09cc9e0c91ca90ac60cdde5d2ce1384 Gerrit-Change-Number: 39656 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: es9p_Types_JSON: split headers into separate module
by dexter 03 Mar '25

03 Mar '25

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39654?usp=email ) Change subject: es9p_Types_JSON: split headers into separate module ...................................................................... es9p_Types_JSON: split headers into separate module The headers used in the JSON binding of ES9+ are also used in ES2+, ES11 and ES12. Let's split the headers into a separate module, so that we can re-use them in other definitions too. Change-Id: I0242c877805003fa67445800960f75ce27752383 Related: SYS#7339 --- M eim/gen_links.sh M library/euicc/es9p_Types_JSON.ttcn A library/euicc/esx_header_Types_JSON.ttcn 3 files changed, 63 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/39654/1 diff --git a/eim/gen_links.sh b/eim/gen_links.sh index 1996da9..9fa3ac2 100755 --- a/eim/gen_links.sh +++ b/eim/gen_links.sh @@ -36,7 +36,7 @@ FILES+="PKIX1Implicit88_Types.ttcn RSPDefinitions_Templates.ttcn RSPDefinitions_Types.ttcn " FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn " FILES+="PKIX1Explicit88_EncDec.cc PKIX1Implicit88_EncDec.cc RSPDefinitions_EncDec.cc SGP32Definitions_EncDec.cc " -FILES+="es9p_Types_JSON.ttcn" +FILES+="es9p_Types_JSON.ttcn esx_header_Types_JSON.ttcn" gen_links $DIR $FILES DIR=../library diff --git a/library/euicc/es9p_Types_JSON.ttcn b/library/euicc/es9p_Types_JSON.ttcn index 5a8587b..79d5381 100644 --- a/library/euicc/es9p_Types_JSON.ttcn +++ b/library/euicc/es9p_Types_JSON.ttcn @@ -10,6 +10,8 @@ module es9p_Types_JSON { +import from esx_header_Types_JSON all; + import from RSPDefinitions all; import from RSPDefinitions_Types all; import from RSPDefinitions_Templates all; @@ -22,30 +24,15 @@ import from PKIX1Implicit88_Templates all; import from PKIX1Implicit88_Types all; - -/* GSMA SGP.22, section 6.5.1.3 */ -type record JSON_ES9p_RequestHeader { - charstring functionRequesterIdentifier, - charstring functionCallIdentifier -}; - -/* GSMA SGP.22, section 6.5.1.4 */ -type record JSON_ES9p_FunctionExecutionStatus { - charstring status -}; -type record JSON_ES9p_ResponseHeader { - JSON_ES9p_FunctionExecutionStatus functionExecutionStatus -}; - /* GSMA SGP.22, section 6.5.2.6 */ type record JSON_ES9p_InitiateAuthenticationRequest { - JSON_ES9p_RequestHeader header, + JSON_ESx_RequestHeader header, charstring euiccChallenge, charstring euiccInfo1, charstring smdpAddress }; type record JSON_ES9p_InitiateAuthenticationResponse { - JSON_ES9p_ResponseHeader header, + JSON_ESx_ResponseHeader header, charstring transactionId, charstring serverSigned1, charstring serverSignature1, @@ -55,24 +42,24 @@ /* GSMA SGP.22, section 6.5.2.7 */ type record JSON_ES9p_GetBoundProfilePackageRequest { - JSON_ES9p_RequestHeader header, + JSON_ESx_RequestHeader header, charstring transactionId, charstring prepareDownloadResponse }; type record JSON_ES9p_GetBoundProfilePackageResponse { - JSON_ES9p_ResponseHeader header, + JSON_ESx_ResponseHeader header, charstring transactionId, charstring boundProfilePackage }; /* GSMA SGP.22, section 6.5.2.8 */ type record JSON_ES9p_AuthenticateClientRequest { - JSON_ES9p_RequestHeader header, + JSON_ESx_RequestHeader header, charstring transactionId, charstring authenticateServerResponse }; type record JSON_ES9p_AuthenticateClientResponseEs9 { - JSON_ES9p_ResponseHeader header, + JSON_ESx_ResponseHeader header, charstring transactionId, charstring profileMetadata, charstring smdpSigned2, @@ -82,20 +69,20 @@ /* GSMA SGP.22, section 6.5.2.9 */ type record JSON_ES9p_HandleNotification { - JSON_ES9p_RequestHeader header, + JSON_ESx_RequestHeader header, charstring pendingNotification }; /* GSMA SGP.22, section 6.5.2.10 */ type record JSON_ES9p_CancelSessionRequestEs9 { - JSON_ES9p_RequestHeader header, + JSON_ESx_RequestHeader header, charstring transactionId, charstring cancelSessionResponse }; /* An empty response that is used when the response only consists of a JSON header */ type record JSON_ES9p_EmptyResponse { - JSON_ES9p_ResponseHeader header + JSON_ESx_ResponseHeader header }; diff --git a/library/euicc/esx_header_Types_JSON.ttcn b/library/euicc/esx_header_Types_JSON.ttcn new file mode 100644 index 0000000..4a4f4ca --- /dev/null +++ b/library/euicc/esx_header_Types_JSON.ttcn @@ -0,0 +1,51 @@ +/* JSON message definitions for ES2+ + * + * Author: Philipp Maier <pmaier(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * + * 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 + */ + +module esx_header_Types_JSON { + +/* GSMA SGP.22, section 6.5.1.3 */ +type record JSON_ESx_RequestHeader { + charstring functionRequesterIdentifier, + charstring functionCallIdentifier +}; + +/* GSMA SGP.22, section 6.5.1.4 */ +type record JSON_ESx_FunctionExecutionStatus { + charstring status +}; +type record JSON_ESx_ResponseHeader { + JSON_ESx_FunctionExecutionStatus functionExecutionStatus +}; + +template (value) JSON_ESx_ResponseHeader +ts_responseHeader := { + functionExecutionStatus := { + status := "Executed-Success" + } +} +template (present) JSON_ESx_ResponseHeader +tr_responseHeader := { + functionExecutionStatus := { + status := ? + } +} + +template (value) JSON_ESx_RequestHeader +ts_requestHeader := { + functionRequesterIdentifier := "TTCN3", + functionCallIdentifier := "testsuite" +} +template (present) JSON_ESx_RequestHeader +tr_requestHeader := { + functionRequesterIdentifier := ?, + functionCallIdentifier := ? +} + +} \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39654?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: I0242c877805003fa67445800960f75ce27752383 Gerrit-Change-Number: 39654 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log