jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43278?usp=email )
(
5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: IPAd: Add eimTransactionId to TC_proc_euicc_data_req ......................................................................
IPAd: Add eimTransactionId to TC_proc_euicc_data_req
As we now have an optional transaction ID within euiccDataReq, check if the same transaction ID is received with the euiccDataResp.
Related: SYS#8101 Change-Id: I1bb68e1befbc208b84e866450eb51041bc5ea772 --- M ipad/IPAd_Tests.ttcn M library/euicc/SGP32Definitions_Templates.ttcn 2 files changed, 17 insertions(+), 12 deletions(-)
Approvals: osmith: Looks good to me, but someone else must approve jolly: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/ipad/IPAd_Tests.ttcn b/ipad/IPAd_Tests.ttcn index b368e45..75ac26e 100644 --- a/ipad/IPAd_Tests.ttcn +++ b/ipad/IPAd_Tests.ttcn @@ -715,7 +715,8 @@ f_http_register();
/* IPAd requests a package, we tell it to execute an ipaEuiccDataRequest */ - f_esipa_transceive(valueof(ts_getEimPackageResponse_euiccDataReq), tr_getEimPackageRequest); + f_esipa_transceive(valueof(ts_getEimPackageResponse_euiccDataReq(ts_ipaEuiccDataRequest(eimTransactionId := '42'O))), + tr_getEimPackageRequest);
/* IPAd will obtain the data from the eUICC */ f_vpcd_transceive(enc_EuiccConfiguredAddressesResponse(valueof(ts_euiccConfiguredAddressesResponse))); @@ -728,7 +729,7 @@
/* IPAd will return the data to us */ f_esipa_transceive(valueof(ts_provideEimPackageResultResponse_eimAck(eimAcknowledgements := {1,2,3,4})), - tr_provideEimPackageResult(*, tr_eimPackageResult_euiccDataResp)); + tr_provideEimPackageResult(*, tr_eimPackageResult_euiccDataResp(eimTransactionId := '42'O)));
/* IPAd will poll again. */ f_terminate_poll_cycle(); diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn index ff6dcd0..74c9cd1 100644 --- a/library/euicc/SGP32Definitions_Templates.ttcn +++ b/library/euicc/SGP32Definitions_Templates.ttcn @@ -330,20 +330,24 @@
/* GSMA SGP.32, section 6.3.2.6 and 2.11.1.2 */ template (present) IpaEuiccDataRequest -tr_ipaEuiccDataRequest := { - tagList := ?, - euiccCiPKIdentifierToBeUsed := *, +tr_ipaEuiccDataRequest(template (present) octetstring tagList := ?, + template octetstring euiccCiPKIdentifierToBeUsed := *, + template octetstring eimTransactionId := *) := { + tagList := tagList, + euiccCiPKIdentifierToBeUsed := euiccCiPKIdentifierToBeUsed, searchCriteriaNotification := *, searchCriteriaEuiccPackageResult := *, - eimTransactionId := * + eimTransactionId := eimTransactionId } template (value) IpaEuiccDataRequest -ts_ipaEuiccDataRequest := { - tagList := '81BF20BF228384A5A6A8A9A0A2'O, - euiccCiPKIdentifierToBeUsed := omit, +ts_ipaEuiccDataRequest(template (value) octetstring tagList := '81BF20BF228384A5A6A8A9A0A2'O, + template (omit) octetstring euiccCiPKIdentifierToBeUsed := omit, + template (omit) octetstring eimTransactionId := omit) := { + tagList := tagList, + euiccCiPKIdentifierToBeUsed := euiccCiPKIdentifierToBeUsed, searchCriteriaNotification := omit, searchCriteriaEuiccPackageResult := omit, - eimTransactionId := omit + eimTransactionId := eimTransactionId } template (present) EsipaMessageFromEimToIpa tr_getEimPackageResponse_euiccDataReq(template (present) IpaEuiccDataRequest ipaEuiccDataRequest := tr_ipaEuiccDataRequest) := { @@ -1484,7 +1488,7 @@ } } template (present) EimPackageResult -tr_eimPackageResult_euiccDataResp := { +tr_eimPackageResult_euiccDataResp(template octetstring eimTransactionId := *) := { ipaEuiccDataResponse := { ipaEuiccData := { notificationsList := *, @@ -1496,7 +1500,7 @@ associationToken := *, eumCertificate := *, euiccCertificate := *, - eimTransactionId := *, + eimTransactionId := eimTransactionId, ipaCapabilities := *, deviceInfo := * }