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

Change subject: mme: Introduce f_init() helper
......................................................................

mme: Introduce f_init() helper

Change-Id: I89f0dfb9c79c3edb7b42751a76f36a983da59c1d
---
M mme/MME_Tests.ttcn
1 file changed, 37 insertions(+), 38 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  laforge: Looks good to me, but someone else must approve




diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn
index 59d10d5..5c26f64 100644
--- a/mme/MME_Tests.ttcn
+++ b/mme/MME_Tests.ttcn
@@ -378,6 +378,33 @@
        vc_GTP2.start(GTPv2_Emulation.main(cfg));
 }

+private function f_init(integer imsi_suffix := 0,
+                       boolean init_diameter := false,
+                       boolean init_gtpv2c_s11 := false,
+                       boolean init_gtpv1c_gn := false,
+                       boolean init_sgsap := false) runs on MTC_CT {
+       var charstring id := testcasename();
+
+       if (init_diameter) {
+               f_init_diameter(id);
+               f_sleep(10.0);
+       }
+
+       if (init_sgsap) {
+               f_init_sgsap(id);
+       }
+
+       f_init_s1ap(id, imsi_suffix);
+
+       if (init_gtpv2c_s11) {
+               f_init_gtpv2c_s11(id);
+       }
+
+       if (init_gtpv1c_gn) {
+               f_init_gtpv1c_gn(id);
+       }
+}
+
 friend template (value) S1AP_IEs.TAI ts_enb_S1AP_TAI(EnbParams enb) := {
        pLMNidentity := enb.global_enb_id.pLMNidentity,
        tAC := enb.supported_tas[0].tAC,
@@ -495,24 +522,21 @@
 /* S1 Setup procedure to MME using a Global eNB ID containing unknown/foreign 
PLMN.
  * Related: https://github.com/open5gs/open5gs/issues/3544 */
 testcase TC_s1ap_setup_unknown_global_enb_id_plmn() runs on MTC_CT {
-       var charstring id := testcasename();
-       f_init_s1ap(id, 1);
+       f_init(1);
        g_enb_pars[0].global_enb_id.pLMNidentity := '62F224'O;
        f_s1ap_setup(0);
 }

 /* Unsuccessful S1 Setup procedure to MME (wrong PLMN) */
 testcase TC_s1ap_setup_wrong_tac() runs on MTC_CT {
-       var charstring id := testcasename();
-       f_init_s1ap(id, 2);
+       f_init(2);
        g_enb_pars[0].supported_tas[0].broadcastPLMNs[0] := '62F224'O;
        f_s1ap_setup(0, {misc:=unknown_PLMN});
 }

 /* Successful S1 Setup procedure to MME */
 testcase TC_s1ap_setup() runs on MTC_CT {
-       var charstring id := testcasename();
-       f_init_s1ap(id, 3);
+       f_init(3);
        f_s1ap_setup(0);
 }

@@ -1099,12 +1123,7 @@
        f_attach();
 }
 testcase TC_s1ap_attach() runs on MTC_CT {
-       var charstring id := testcasename();
-
-       f_init_diameter(id);
-       f_sleep(10.0);
-       f_init_s1ap(id, 4);
-       f_init_gtpv2c_s11(id);
+       f_init(4, init_diameter := true, init_gtpv2c_s11 := true);
        f_s1ap_setup(0);

        var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
@@ -1133,12 +1152,8 @@
        }
 }
 testcase TC_gn_echo_request() runs on MTC_CT {
-       var charstring id := testcasename();
-
-       f_init_diameter(id);
-       f_init_s1ap(id, 0);
+       f_init(0, init_gtpv1c_gn := true);
        f_s1ap_setup(0);
-       f_init_gtpv1c_gn(id);

        var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
        var ConnHdlr vc_conn;
@@ -1374,12 +1389,8 @@
 }

 testcase TC_RIM_RAN_INF() runs on MTC_CT {
-       var charstring id := testcasename();
-
-       f_init_diameter(id);
-       f_init_s1ap(id, 0);
+       f_init(0, init_diameter := true, init_gtpv1c_gn := true);
        f_s1ap_setup(0);
-       f_init_gtpv1c_gn(id);

        var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
        var ConnHdlr vc_conn;
@@ -1390,8 +1401,7 @@

 /* Successful RESET procedure from eNB to MME */
 testcase TC_s1ap_reset() runs on MTC_CT {
-       var charstring id := testcasename();
-       f_init_s1ap(id, 0);
+       f_init(0);
        f_s1ap_setup(0);

        var template (value) S1AP_IEs.Cause reset_cause := {misc := 
om_intervention};
@@ -1450,10 +1460,7 @@
        as_s1ap_handle_UeContextReleaseCmd();
 }
 testcase TC_s1ap_tau_unknown_guti() runs on MTC_CT {
-       var charstring id := testcasename();
-
-       f_init_diameter(id);
-       f_init_s1ap(id, 5);
+       f_init(5, init_diameter := true);
        f_s1ap_setup(0);

        var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
@@ -1491,11 +1498,8 @@
 testcase TC_ue_cell_reselect_eutran_to_geran() runs on MTC_CT {
        var charstring id := testcasename();

-       f_init_diameter(id);
-       f_init_s1ap(id, 6);
-       f_init_gtpv2c_s11(id);
+       f_init(6, init_diameter := true, init_gtpv2c_s11:= true, init_gtpv1c_gn 
:= true);
        f_s1ap_setup(0);
-       f_init_gtpv1c_gn(id);

        var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
        var ConnHdlr vc_conn;
@@ -1597,13 +1601,8 @@
        f_sleep(1.0);
 }
 testcase TC_ue_cell_reselect_geran_to_eutran() runs on MTC_CT {
-       var charstring id := testcasename();
-
-       f_init_diameter(id);
-       f_init_s1ap(id, 7);
-       f_init_gtpv2c_s11(id);
+       f_init(7, init_diameter := true, init_gtpv2c_s11:= true, init_gtpv1c_gn 
:= true);
        f_s1ap_setup(0);
-       f_init_gtpv1c_gn(id);

        var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
        var ConnHdlr vc_conn;

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41062?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: I89f0dfb9c79c3edb7b42751a76f36a983da59c1d
Gerrit-Change-Number: 41062
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>

Reply via email to