dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41233?usp=email )

Change subject: smdpp_Tests: rename smdp_server_url to smdp_server_fqdn ......................................................................

smdpp_Tests: rename smdp_server_url to smdp_server_fqdn

The member name "smdp_server_url" is technically not correct as the content is an FQDN. Let's rename it to "smdp_server_fqdn".

Let's also put a comment in which we explain why FQDN is hardcoded and not available as configurable module parameter.

Related: SYS#7339 Change-Id: I0224c838a368656821fff6014b0df7eb49466b0a --- M smdpp/smdpp_Tests.ttcn 1 file changed, 13 insertions(+), 10 deletions(-)

Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved

diff --git a/smdpp/smdpp_Tests.ttcn b/smdpp/smdpp_Tests.ttcn index 8ba125a..548b33a 100644 --- a/smdpp/smdpp_Tests.ttcn +++ b/smdpp/smdpp_Tests.ttcn @@ -360,7 +360,7 @@ }

type record smdpp_ConnHdlrPars { - charstring smdp_server_url, + charstring smdp_server_fqdn, integer smdp_es9p_server_port, integer smdp_es2p_server_port, charstring cert_path, @@ -381,7 +381,10 @@

private function f_init_pars() runs on MTC_CT return smdpp_ConnHdlrPars { var smdpp_ConnHdlrPars pars := { - smdp_server_url := "testsmdpplus1.example.com", + /* Unfortunately the SMDP server FQDN cannot be made configurable via a module parameter since it always + * to match the FQDN in the test SSL certificates. To resolve the server FQDN to an IP address, an entry + * in /etc/hosts is sufficient. */ + smdp_server_fqdn := "testsmdpplus1.example.com", smdp_es9p_server_port := 8000, smdp_es2p_server_port := 8000, cert_path := "./sgp26/CertificateIssuer", @@ -444,7 +447,7 @@ ext_logInfo("Initializing RSP client");

g_rsp_client_handle := ext_RSPClient_create( - g_pars_smdpp.smdp_server_url, + g_pars_smdpp.smdp_server_fqdn, g_pars_smdpp.smdp_es9p_server_port, g_pars_smdpp.cert_path, g_pars_smdpp.cert_name_filter @@ -675,7 +678,7 @@ var RemoteProfileProvisioningRequest request := { initiateAuthenticationRequest := { euiccChallenge := g_euiccChallenge, - smdpAddress := g_pars_smdpp.smdp_server_url, + smdpAddress := g_pars_smdpp.smdp_server_fqdn, euiccInfo1 := euiccInfo1 } }; @@ -1204,7 +1207,7 @@ ) runs on smdpp_ConnHdlr return EuiccSigned1 { return { transactionId := g_transactionId, - serverAddress := g_pars_smdpp.smdp_server_url, + serverAddress := g_pars_smdpp.smdp_server_fqdn, serverChallenge := g_serverChallenge, euiccInfo2 := euiccInfo2, ctxParams1 := ctxParams @@ -1540,7 +1543,7 @@ var NotificationMetadata notifMeta := { seqNumber := 1, profileManagementOperation := c_notificationInstall, - notificationAddress := g_pars_smdpp.smdp_server_url, + notificationAddress := g_pars_smdpp.smdp_server_fqdn, iccid := omit };

@@ -1642,7 +1645,7 @@

var EuiccSigned1 euiccSigned1 := { transactionId := actualTransactionId, - serverAddress := g_pars_smdpp.smdp_server_url, + serverAddress := g_pars_smdpp.smdp_server_fqdn, serverChallenge := serverChallenge, euiccInfo2 := actualEuiccInfo2, ctxParams1 := ctxParams @@ -1993,7 +1996,7 @@ /* Build euiccSigned1 */ var EuiccSigned1 euiccSigned1 := { transactionId := transactionId, - serverAddress := g_pars_smdpp.smdp_server_url, + serverAddress := g_pars_smdpp.smdp_server_fqdn, serverChallenge := serverChallenge, euiccInfo2 := euiccInfo2, ctxParams1 := ctxParams @@ -3736,7 +3739,7 @@

var EuiccSigned1 euiccSig := { transactionId := g_transactionId, - serverAddress := g_pars_smdpp.smdp_server_url, + serverAddress := g_pars_smdpp.smdp_server_fqdn, serverChallenge := g_serverChallenge, euiccInfo2 := euic2, ctxParams1 := ctxpar @@ -4101,7 +4104,7 @@ var NotificationMetadata notifMeta := { seqNumber := 2, /* Different sequence number from PIR */ profileManagementOperation := c_notificationEnable, - notificationAddress := g_pars_smdpp.smdp_server_url, + notificationAddress := g_pars_smdpp.smdp_server_fqdn, iccid := omit /* No specific ICCID for this test */ };