s1gw: rework module parameter naming, add mp_s1gw_mme_ip
Change-Id: Ice665662c8448c8314d5e6cc1e401e62b635872c
Related: SYS#6772
diff --git a/s1gw/S1GW_Tests.cfg b/s1gw/S1GW_Tests.cfg
index 336be14..536f0ec 100644
--- a/s1gw/S1GW_Tests.cfg
+++ b/s1gw/S1GW_Tests.cfg
@@ -11,6 +11,9 @@
[TESTPORT_PARAMETERS]
[MODULE_PARAMETERS]
+S1GW_Tests.mp_s1gw_enb_ip := "127.0.1.1";
+S1GW_Tests.mp_s1gw_mme_ip := "127.0.2.1";
+S1GW_Tests.mp_mme_bind_ip := "127.0.2.10";
[MAIN_CONTROLLER]
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index df988d5..c7c55ef 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -32,8 +32,9 @@
import from S1AP_Server all;
modulepar {
- charstring mp_s1gw_ip := "127.0.1.1";
- charstring mp_mme_bind_ip := "127.0.2.10";
+ charstring mp_s1gw_enb_ip; /* eNB facing address of the S1GW */
+ charstring mp_s1gw_mme_ip; /* MME facing address of the S1GW */
+ charstring mp_mme_bind_ip; /* MME address on which we get connections from S1GW */
}
private type record of ConnHdlr ConnHdlrList;
@@ -112,7 +113,7 @@
/* initiate SCTP connection establishment */
res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP_ENB,
- mp_s1gw_ip, 36412,
+ mp_s1gw_enb_ip, 36412,
"0.0.0.0", 0, -1,
{ sctp := c_SctpTuple_S1AP });
if (not ispresent(res.connId)) {