dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41234?usp=email )
Change subject: smdpp_Tests: make ES9+ and ES2+ ports configurable
......................................................................
smdpp_Tests: make ES9+ and ES2+ ports configurable
Change-Id: I17f2713088c583bec26a0a8cdff40c796e0a490b
Related: SYS#7339
---
M smdpp/smdpp_Tests.cfg
M smdpp/smdpp_Tests.ttcn
2 files changed, 15 insertions(+), 9 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/smdpp/smdpp_Tests.cfg b/smdpp/smdpp_Tests.cfg
index 35f3140..1b34dae 100644
--- a/smdpp/smdpp_Tests.cfg
+++ b/smdpp/smdpp_Tests.cfg
@@ -20,6 +20,9 @@
system.HTTP_server_port.CERTIFICATEFILE :=
"../ipad/example_ca/pki/issued/alttest.crt"
[MODULE_PARAMETERS]
+smdpp_Tests.mp_es9plus_server_port_nist := 8000
+smdpp_Tests.mp_es9plus_server_port_brp := 8001
+smdpp_Tests.mp_es2plus_server_port := 8000
[MAIN_CONTROLLER]
diff --git a/smdpp/smdpp_Tests.ttcn b/smdpp/smdpp_Tests.ttcn
index 548b33a..d40d6df 100644
--- a/smdpp/smdpp_Tests.ttcn
+++ b/smdpp/smdpp_Tests.ttcn
@@ -385,8 +385,8 @@
* 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,
+ smdp_es9p_server_port := mp_es9plus_server_port_nist,
+ smdp_es2p_server_port := mp_es2plus_server_port,
cert_path := "./sgp26/CertificateIssuer",
cert_name_filter := "", // Load all certificates (both NIST
and BRP) or "NIST" or "BRP"
euicc_cert_path := "./sgp26/eUICC/CERT_EUICC_ECDSA_NIST.der",
@@ -408,6 +408,9 @@
modulepar {
boolean mp_use_custom_tls_cert := true;
charstring mp_custom_tls_cert_path := ""; // Empty means use cert pool
only
+ integer mp_es9plus_server_port_nist := 8000;
+ integer mp_es9plus_server_port_brp := 8001;
+ integer mp_es2plus_server_port := 8000;
}
private altstep as_Tguard() runs on MTC_CT {
@@ -5568,7 +5571,7 @@
testcase TC_SM_DP_ES9_InitiateAuthenticationBRP_01_Nominal() runs on MTC_CT {
var smdpp_ConnHdlrPars pars := f_init_pars();
- pars.smdp_es9p_server_port := 8001; /* BRP server port */
+ pars.smdp_es9p_server_port := mp_es9plus_server_port_brp; /* BRP server
port */
pars.cert_name_filter := "BRP"; /* Use Brainpool certificates */
pars.euicc_cert_path := "./sgp26/eUICC/CERT_EUICC_ECDSA_BRP.der";
pars.euicc_key_path := "./sgp26/eUICC/SK_EUICC_ECDSA_BRP.pem";
@@ -5581,7 +5584,7 @@
testcase TC_SM_DP_ES9_AuthenticateClientBRP_01_Nominal() runs on MTC_CT {
var smdpp_ConnHdlrPars pars := f_init_pars();
- pars.smdp_es9p_server_port := 8001; /* BRP server port */
+ pars.smdp_es9p_server_port := mp_es9plus_server_port_brp; /* BRP server
port */
pars.cert_name_filter := "BRP"; /* Use Brainpool certificates */
pars.euicc_cert_path := "./sgp26/eUICC/CERT_EUICC_ECDSA_BRP.der";
pars.euicc_key_path := "./sgp26/eUICC/SK_EUICC_ECDSA_BRP.pem";
@@ -5594,7 +5597,7 @@
testcase TC_SM_DP_ES9_GetBoundProfilePackageBRP_01_Nominal() runs on MTC_CT {
var smdpp_ConnHdlrPars pars := f_init_pars();
- pars.smdp_es9p_server_port := 8001; /* BRP server port */
+ pars.smdp_es9p_server_port := mp_es9plus_server_port_brp; /* BRP server
port */
pars.cert_name_filter := "BRP"; /* Use Brainpool certificates */
pars.euicc_cert_path := "./sgp26/eUICC/CERT_EUICC_ECDSA_BRP.der";
pars.euicc_key_path := "./sgp26/eUICC/SK_EUICC_ECDSA_BRP.pem";
@@ -5607,7 +5610,7 @@
testcase TC_rsp_complete_flow_BRP() runs on MTC_CT {
var smdpp_ConnHdlrPars pars := f_init_pars();
- pars.smdp_es9p_server_port := 8001; /* BRP server port */
+ pars.smdp_es9p_server_port := mp_es9plus_server_port_brp; /* BRP server
port */
pars.cert_name_filter := "BRP"; /* Use Brainpool certificates */
pars.euicc_cert_path := "./sgp26/eUICC/CERT_EUICC_ECDSA_BRP.der";
pars.euicc_key_path := "./sgp26/eUICC/SK_EUICC_ECDSA_BRP.pem";
@@ -5620,7 +5623,7 @@
testcase TC_SM_DP_ES9_HandleNotificationBRP() runs on MTC_CT {
var smdpp_ConnHdlrPars pars := f_init_pars();
- pars.smdp_es9p_server_port := 8001; /* BRP server port */
+ pars.smdp_es9p_server_port := mp_es9plus_server_port_brp; /* BRP server
port */
pars.cert_name_filter := "BRP"; /* Use Brainpool certificates */
pars.euicc_cert_path := "./sgp26/eUICC/CERT_EUICC_ECDSA_BRP.der";
pars.euicc_key_path := "./sgp26/eUICC/SK_EUICC_ECDSA_BRP.pem";
@@ -5633,7 +5636,7 @@
testcase TC_SM_DP_ES9_CancelSession_After_AuthenticateClientBRP() runs on
MTC_CT {
var smdpp_ConnHdlrPars pars := f_init_pars();
- pars.smdp_es9p_server_port := 8001; /* BRP server port */
+ pars.smdp_es9p_server_port := mp_es9plus_server_port_brp; /* BRP server
port */
pars.cert_name_filter := "BRP"; /* Use Brainpool certificates */
pars.euicc_cert_path := "./sgp26/eUICC/CERT_EUICC_ECDSA_BRP.der";
pars.euicc_key_path := "./sgp26/eUICC/SK_EUICC_ECDSA_BRP.pem";
@@ -5646,7 +5649,7 @@
testcase TC_SM_DP_ES9_CancelSession_After_GetBoundProfilePackageBRP() runs on
MTC_CT {
var smdpp_ConnHdlrPars pars := f_init_pars();
- pars.smdp_es9p_server_port := 8001; /* BRP server port */
+ pars.smdp_es9p_server_port := mp_es9plus_server_port_brp; /* BRP server
port */
pars.cert_name_filter := "BRP"; /* Use Brainpool certificates */
pars.euicc_cert_path := "./sgp26/eUICC/CERT_EUICC_ECDSA_BRP.der";
pars.euicc_key_path := "./sgp26/eUICC/SK_EUICC_ECDSA_BRP.pem";
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41234?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I17f2713088c583bec26a0a8cdff40c796e0a490b
Gerrit-Change-Number: 41234
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
