s1gw: cosmetic: ts_SCTP -> c_SctpTuple_S1AP

Change-Id: Ifc7768014f54645e57090102548649c971ed934b
Related: SYS#6772
---
M s1gw/S1AP_Server.ttcn
M s1gw/S1GW_Tests.ttcn
2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/s1gw/S1AP_Server.ttcn b/s1gw/S1AP_Server.ttcn
index 1128e76..904f106 100644
--- a/s1gw/S1AP_Server.ttcn
+++ b/s1gw/S1AP_Server.ttcn
@@ -92,9 +92,9 @@
 	msg := msg
 };
 
-template (value) SctpTuple ts_SCTP(template (omit) integer ppid := 18) := {
+const SctpTuple c_SctpTuple_S1AP := {
 	sinfo_stream := omit,
-	sinfo_ppid := ppid,
+	sinfo_ppid := 18, /* S1AP */
 	remSocks := omit,
 	assocId := omit
 };
@@ -195,7 +195,7 @@
 runs on S1AP_Server_CT {
 	log("Closing an eNB connection (id=", conn_id, ")");
 	S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP, conn_id,
-					      { sctp := valueof(ts_SCTP) });
+					      { sctp := c_SctpTuple_S1AP });
 	f_conn_del(conn_id);
 }
 
@@ -356,7 +356,7 @@
 	map(self:S1AP, system:S1AP_CODEC_PT);
 	res := S1AP_CodecPort_CtrlFunct.f_IPL4_listen(S1AP,
 						      cpars.local_ip, cpars.local_port,
-						      { sctp := valueof(ts_SCTP) });
+						      { sctp := c_SctpTuple_S1AP });
 	if (not ispresent(res.connId)) {
 		setverdict(fail, "Could not create an S1AP socket, check your configuration");
 		mtc.stop;
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index 55d302e..6b569eb 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -103,7 +103,7 @@
 	res := S1AP_CodecPort_CtrlFunct.f_IPL4_connect(S1AP_ENB,
 						       mp_s1gw_ip, 36412,
 						       "0.0.0.0", 0, -1,
-						       { sctp := valueof(ts_SCTP) });
+						       { sctp := c_SctpTuple_S1AP });
 	if (not ispresent(res.connId)) {
 		setverdict(fail, "Could not create an S1AP socket, check your configuration");
 		mtc.stop;
@@ -117,7 +117,7 @@
 	var Result res;
 
 	S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP_ENB, g_s1ap_conn_id,
-					      { sctp := valueof(ts_SCTP) });
+					      { sctp := c_SctpTuple_S1AP });
 	g_s1ap_conn_id := -1;
 	unmap(self:S1AP_ENB, system:S1AP_CODEC_PT);
 

