dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37495?usp=email )

Change subject: eIM_Tests: Use real notificationAddress in ProfileINstallationResultData ......................................................................

eIM_Tests: Use real notificationAddress in ProfileINstallationResultData

The ProfileInstallationResultData currently contains a dummy address as notificationAddress. This means that the eIM may try to send the ProfileInstallationResultData to that dummy address instead to the testsuite. To prevent this, let's use the actual address as notificationAddress

Related: SYS#6824 Change-Id: I337ef32a424875ca9d9be178ae96f1a76383dd38 --- M eim/eIM_Tests.ttcn M library/euicc/RSPDefinitions_Templates.ttcn M library/euicc/SGP32Definitions_Templates.ttcn 3 files changed, 26 insertions(+), 9 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/37495/1

diff --git a/eim/eIM_Tests.ttcn b/eim/eIM_Tests.ttcn index 7930e4f..da5d571 100644 --- a/eim/eIM_Tests.ttcn +++ b/eim/eIM_Tests.ttcn @@ -468,7 +468,8 @@ private function f_TC_proc_indirect_prfle_dwnld(charstring id) runs on eIM_ConnHdlr { var charstring resource_id; var HTTP_Adapter_Params http_adapter_pars; - var charstring activationCode := "1$" & mp_es9p_ip & ":" & int2str(mp_es9p_port) & "$MyMatchingId" + var charstring smdpp_add := mp_es9p_ip & ":" & int2str(mp_es9p_port) + var charstring activationCode := "1$" & smdpp_add & "$MyMatchingId"

f_http_register();

@@ -496,7 +497,7 @@ f_esipa_receive(tr_getBoundProfilePackageResponseEsipa);

/* Handle notification */ - f_esipa_send(valueof(ts_handleNotificationEsipa_prfleInstRslt)); + f_esipa_send(valueof(ts_handleNotificationEsipa_prfleInstRslt(notificationAddress := smdpp_add))); f_es9p_transceive_empty_response(tr_handleNotification);

f_rest_lookup_resource(resource_id, "download", tr_JSON_REST_success); diff --git a/library/euicc/RSPDefinitions_Templates.ttcn b/library/euicc/RSPDefinitions_Templates.ttcn index 4791cf5..ebc2490 100644 --- a/library/euicc/RSPDefinitions_Templates.ttcn +++ b/library/euicc/RSPDefinitions_Templates.ttcn @@ -211,24 +211,24 @@

/* GSMA SGP.22, section 2.5.6 */ template (present) ProfileInstallationResultData -tr_profileInstallationResultData := { +tr_profileInstallationResultData(template (present) charstring notificationAddress := ?) := { transactionId := ?, notificationMetadata := { seqNumber := ?, profileManagementOperation := ?, - notificationAddress := ?, + notificationAddress := notificationAddress, iccid := * }, smdpOid := ?, finalResult := ? } template (value) ProfileInstallationResultData -ts_profileInstallationResultData := { +ts_profileInstallationResultData(template (value) charstring notificationAddress := "smdp.example.com") := { transactionId := 'AABBCC'O, notificationMetadata := { seqNumber := 1234, profileManagementOperation := '01'B, /* is this correct? (notificationInstall) */ - notificationAddress := "smdp.example.com", + notificationAddress := notificationAddress, iccid := '123456789ABCDEFFAAAA'O }, smdpOid := id_rsp, /* random OBJECT IDENTIFIER for testing */ diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn index d602d8e..fa21cd4 100644 --- a/library/euicc/SGP32Definitions_Templates.ttcn +++ b/library/euicc/SGP32Definitions_Templates.ttcn @@ -684,7 +684,7 @@

/* GSMA SGP.32, section 6.3.2.4 */ template (present) EsipaMessageFromIpaToEim -tr_handleNotificationEsipa_prfleInstRslt := { +tr_handleNotificationEsipa_prfleInstRslt(template (present) charstring notificationAddress := ?) := { handleNotificationEsipa := { pendingNotification := { profileInstallationResult := { @@ -695,11 +695,11 @@ } } template (value) EsipaMessageFromIpaToEim -ts_handleNotificationEsipa_prfleInstRslt := { +ts_handleNotificationEsipa_prfleInstRslt(template (value) charstring notificationAddress := "smdp.example.com") := { handleNotificationEsipa := { pendingNotification := { profileInstallationResult := { - profileInstallationResultData := ts_profileInstallationResultData, + profileInstallationResultData := ts_profileInstallationResultData(notificationAddress), euiccSignPIR := '5252525252525252525252525252525252525252525252525252525252525252 5353535353535353535353535353535353535353535353535353535353535353'O }