3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.


GTPv2_Templates: Allow passing servingNetwork IE

Change-Id: I627652f5c08db1de4d541ba3dfc950b7e75d865b
---
M library/GTPv2_Templates.ttcn
M pgw/PGW_Session_CT.ttcn
M smf/SMF_Session_CT_4G.ttcn
3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 6f8b0cb..3073a64 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -956,12 +956,17 @@
 }
 
 template (present) PDU_GTPCv2
-ts_GTP2C_CreateSessionReq(template (value) hexstring imsi, template (omit) hexstring msisdn,
-			  integer rat_type, template (value) FullyQualifiedTEID sender_fteid,
-			  template (value) octetstring apn, template (value) BIT3 pdn_type,
+ts_GTP2C_CreateSessionReq(template (value) hexstring imsi,
+			  template (omit) hexstring msisdn,
+			  template (value) integer rat_type,
+			  template (value) FullyQualifiedTEID sender_fteid,
+			  template (value) octetstring apn,
+			  template (value) BIT3 pdn_type,
 			  template (omit) FullyQualifiedTEID_List teid_list,
-			  template (value) OCT2 chg_car, template (value) uint4_t bearer_id,
+			  template (value) OCT2 chg_car,
+			  template (value) uint4_t bearer_id,
 			  template (omit) UserLocationInfo uli := omit,
+			  template (omit) ServingNetwork servingNetwork := omit,
 			  template (value) Bearer_QoS qos := ts_GTP2C_BearerQos('09'O, 0,0,0,0),
 			  template (omit) APCO apco := omit) :=
 ts_PDU_GTP2C('00000000'O, '000000'O, '20'O, {
@@ -970,7 +975,7 @@
 		mSISDN := fs_GTP2C_msisdn(msisdn),
 		mEI := omit,
 		userLocationInfo := uli,
-		servingNetwork := omit,
+		servingNetwork := servingNetwork,
 		rAT_Type := ts_GTP2C_RatType(rat_type),
 		indication := omit,
 		fullyQualifiedTEID := { sender_fteid },
diff --git a/pgw/PGW_Session_CT.ttcn b/pgw/PGW_Session_CT.ttcn
index 74aadfb..146c3f2 100644
--- a/pgw/PGW_Session_CT.ttcn
+++ b/pgw/PGW_Session_CT.ttcn
@@ -367,8 +367,8 @@
 					  chg_car := '0000'O,
 					  bearer_id := g_pars.bearer.ebi,
 					  uli := uli_ie,
+					  servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H),
 					  apco := apco);
-	g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H);
 
 	GTP2.send(g2c);
 	if (do_s6b and DIAMETER[DIA_S6b].checkstate("Connected")) {
diff --git a/smf/SMF_Session_CT_4G.ttcn b/smf/SMF_Session_CT_4G.ttcn
index 9ea12f8..dbde8f4 100644
--- a/smf/SMF_Session_CT_4G.ttcn
+++ b/smf/SMF_Session_CT_4G.ttcn
@@ -237,8 +237,8 @@
 					  chg_car := '0000'O,
 					  bearer_id := g_pars.bearer.ebi,
 					  uli := uli_ie,
+					  servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H),
 					  apco := apco);
-	g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H);
 
 	/////////// START MUTUAL EXCLUSION ZONE ////////////
 	/* This code block cannot be executed by more than one component at a time because

