jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43278?usp=email )
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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/78/43278/1
diff --git a/ipad/IPAd_Tests.ttcn b/ipad/IPAd_Tests.ttcn
index 2bdda7b..ec541fe 100644
--- a/ipad/IPAd_Tests.ttcn
+++ b/ipad/IPAd_Tests.ttcn
@@ -700,7 +700,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)));
@@ -713,7 +714,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 5304c2c..faf97c8 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) := {
@@ -1482,7 +1486,7 @@
}
}
template (present) EimPackageResult
-tr_eimPackageResult_euiccDataResp := {
+tr_eimPackageResult_euiccDataResp(template octetstring eimTransactionId := *)
:= {
ipaEuiccDataResponse := {
ipaEuiccData := {
notificationsList := *,
@@ -1494,7 +1498,7 @@
associationToken := *,
eumCertificate := *,
euiccCertificate := *,
- eimTransactionId := *,
+ eimTransactionId := eimTransactionId,
ipaCapabilities := *,
deviceInfo := *
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43278?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: I1bb68e1befbc208b84e866450eb51041bc5ea772
Gerrit-Change-Number: 43278
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <[email protected]>
