pespin submitted this change.

View Change

mme: Rename GTP related functions

Better express what they are about. For instance, they only work on
GTPC, not GTPU.

Change-Id: I84b25b2c64f2d5b473e08949e8501dc5dae5b393
---
M mme/MME_Tests.ttcn
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn
index e039cfe..59d10d5 100644
--- a/mme/MME_Tests.ttcn
+++ b/mme/MME_Tests.ttcn
@@ -348,8 +348,8 @@
 	f_diameter_wait_capability(DIAMETER_UNIT);
 }
 
-friend function f_init_gtp(charstring id) runs on MTC_CT {
-	id := id & "-GTP";
+friend function f_init_gtpv1c_gn(charstring id) runs on MTC_CT {
+	id := id & "-GTPv1C-Gn";
 
 	var GtpEmulationCfg gtp_cfg := {
 		gtpc_bind_ip := mp_gn_local_ip,
@@ -361,8 +361,8 @@
 	vc_GTP.start(GTP_Emulation.main(gtp_cfg));
 }
 
-friend function f_init_gtpv2_s11(charstring id) runs on MTC_CT {
-	id := id & "-GTPV2";
+friend function f_init_gtpv2c_s11(charstring id) runs on MTC_CT {
+	id := id & "-GTPv2C-S11";
 
 	var Gtp2EmulationCfg cfg := {
 		gtpc_bind_ip := mp_s11_local_ip,
@@ -1104,7 +1104,7 @@
 	f_init_diameter(id);
 	f_sleep(10.0);
 	f_init_s1ap(id, 4);
-	f_init_gtpv2_s11(id);
+	f_init_gtpv2c_s11(id);
 	f_s1ap_setup(0);
 
 	var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
@@ -1138,7 +1138,7 @@
 	f_init_diameter(id);
 	f_init_s1ap(id, 0);
 	f_s1ap_setup(0);
-	f_init_gtp(id);
+	f_init_gtpv1c_gn(id);
 
 	var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
 	var ConnHdlr vc_conn;
@@ -1379,7 +1379,7 @@
 	f_init_diameter(id);
 	f_init_s1ap(id, 0);
 	f_s1ap_setup(0);
-	f_init_gtp(id);
+	f_init_gtpv1c_gn(id);
 
 	var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
 	var ConnHdlr vc_conn;
@@ -1493,9 +1493,9 @@
 
 	f_init_diameter(id);
 	f_init_s1ap(id, 6);
-	f_init_gtpv2_s11(id);
+	f_init_gtpv2c_s11(id);
 	f_s1ap_setup(0);
-	f_init_gtp(id);
+	f_init_gtpv1c_gn(id);
 
 	var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
 	var ConnHdlr vc_conn;
@@ -1601,9 +1601,9 @@
 
 	f_init_diameter(id);
 	f_init_s1ap(id, 7);
-	f_init_gtpv2_s11(id);
+	f_init_gtpv2c_s11(id);
 	f_s1ap_setup(0);
-	f_init_gtp(id);
+	f_init_gtpv1c_gn(id);
 
 	var ConnHdlrPars pars := f_init_pars(ue_idx := 0);
 	var ConnHdlr vc_conn;

To view, visit change 41061. To unsubscribe, or for help writing mail filters, visit settings.