pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37590?usp=email )
Change subject: sgsn: Rename vc_GTP -> vc_GGSN_GTP ......................................................................
sgsn: Rename vc_GTP -> vc_GGSN_GTP
GTPv1U will also be used by emulated HNBGWs, hence we want to differentiate them in name.
Change-Id: I663e667956935372809c1c42ebe8d4312d6a4d41 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 21 insertions(+), 9 deletions(-)
Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 01aab2b..9b9831a 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -183,7 +183,7 @@ port BSSGP_PT RIM[NUM_GB]; port GTPEM_PT GTPC;
- var GTP_Emulation_CT vc_GTP; + var GTP_Emulation_CT vc_GGSN_GTP;
port TELNETasp_PT SGSNVTY;
@@ -267,8 +267,8 @@ } }
-private function f_init_gtp(charstring id) runs on test_CT { - id := id & "-GTP"; +private function f_init_ggsn_gtp(charstring id) runs on test_CT { + id := id & "-GGSN_GTP";
var GtpEmulationCfg gtp_cfg := { gtpc_bind_ip := mp_ggsn_ip, @@ -278,8 +278,8 @@ sgsn_role := false };
- vc_GTP := GTP_Emulation_CT.create(id); - vc_GTP.start(GTP_Emulation.main(gtp_cfg)); + vc_GGSN_GTP := GTP_Emulation_CT.create(id); + vc_GGSN_GTP.start(GTP_Emulation.main(gtp_cfg)); }
friend function f_init_vty() runs on test_CT { @@ -383,7 +383,7 @@ } } f_init_gsup("SGSN_Test"); - f_init_gtp("SGSN_Test"); + f_init_ggsn_gtp("SGSN_Test"); f_vty_enable_echo_interval(g_use_echo); }
@@ -469,8 +469,8 @@ connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC);
- connect(vc_conn:GTP, vc_GTP:CLIENT); - connect(vc_conn:GTP_PROC, vc_GTP:CLIENT_PROC); + connect(vc_conn:GTP, vc_GGSN_GTP:CLIENT); + connect(vc_conn:GTP_PROC, vc_GGSN_GTP:CLIENT_PROC);
vc_conn.start(f_handler_init(fn, id, pars)); return vc_conn; @@ -2655,7 +2655,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); /* connect RIM related port */ - connect(vc_GTP:CLIENT_DEFAULT, self:GTPC); + connect(vc_GGSN_GTP:CLIENT_DEFAULT, self:GTPC);
var Gtp1cPeer peer := { connId := 1,
-
pespin