<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26441">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">break GTP_Templates dependency on Osmo_Gb_Types, BSSGP_Types, NS_Types<br><br>The resulting set of dependencies needed just to have one simple CellId<br>struct is huge. That was fine for sgsn testsuite since anyway those were<br>being used, but it's not acceptable for other testsuites (hnodeb) which<br>only really require the GTP side.<br><br>After this change, GTP_Templates only requires GSM_Types, which ends up<br>in a much smaller subset of dependencies being pulled in.<br><br>Change-Id: Icd8234908af445b798517fe110cd0648969179a4<br>---<br>M library/GTP_Templates.ttcn<br>M sgsn/SGSN_Tests.ttcn<br>2 files changed, 36 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/26441/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn</span><br><span>index 1bd56e1..9c8d1b6 100644</span><br><span>--- a/library/GTP_Templates.ttcn</span><br><span>+++ b/library/GTP_Templates.ttcn</span><br><span>@@ -17,7 +17,17 @@</span><br><span> import from GTPU_Types all;</span><br><span> import from GTP_CodecPort all;</span><br><span> import from IPCP_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">- import from Osmocom_Gb_Types all; // BssgpCellId</span><br><span style="color: hsl(120, 100%, 40%);">+ import from GSM_Types all; // RoutingAreaIdentification, CellIdentity</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ type record GTP_CellId {</span><br><span style="color: hsl(120, 100%, 40%);">+ RoutingAreaIdentification ra_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ CellIdentity cell_id</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { encode "RAW" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) GTP_CellId ts_GTP_CellId(template (value) RoutingAreaIdentification rai, CellIdentity cell_id) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ra_id := rai,</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_id := cell_id</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> </span><br><span> /* Table 38 of 3GPP TS 29.060 */</span><br><span> type enumerated GTP_Cause {</span><br><span>@@ -673,7 +683,7 @@</span><br><span> },</span><br><span> rIMProtocolVersionNumber := int2oct(ver, 1)</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- function tr_GTPC_Cell_Identifier_V(template BssgpCellId cid) return template Cell_Identifier_V_GTPC {</span><br><span style="color: hsl(120, 100%, 40%);">+ function tr_GTPC_Cell_Identifier_V(template GTP_CellId cid) return template Cell_Identifier_V_GTPC {</span><br><span> var template Cell_Identifier_V_GTPC ret := {</span><br><span> mccDigit1 := ?,</span><br><span> mccDigit2 := ?,</span><br><span>@@ -713,7 +723,7 @@</span><br><span> }</span><br><span> return ret;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) Cell_Identifier_V_GTPC ts_GTPC_Cell_Identifier_V(BssgpCellId cid) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) Cell_Identifier_V_GTPC ts_GTPC_Cell_Identifier_V(GTP_CellId cid) := {</span><br><span> mccDigit1 := cid.ra_id.lai.mcc_mnc[0],</span><br><span> mccDigit2 := cid.ra_id.lai.mcc_mnc[1],</span><br><span> mccDigit3 := cid.ra_id.lai.mcc_mnc[2],</span><br><span>@@ -724,10 +734,10 @@</span><br><span> rac := int2oct(cid.ra_id.rac, 1),</span><br><span> cI_value := int2oct(cid.cell_id, 2)</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- template RIM_Routing_Address_GTPC t_GTPC_RIM_Routing_Address_cid(BssgpCellId cid) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template RIM_Routing_Address_GTPC t_GTPC_RIM_Routing_Address_cid(GTP_CellId cid) := {</span><br><span> cell_Identifier := ts_GTPC_Cell_Identifier_V(cid)</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- function tr_GTPC_ENB_Identifier(template BssgpCellId cid, template integer tac, template octetstring gnbid) return template ENB_Identifier {</span><br><span style="color: hsl(120, 100%, 40%);">+ function tr_GTPC_ENB_Identifier(template GTP_CellId cid, template integer tac, template octetstring gnbid) return template ENB_Identifier {</span><br><span> var template ENB_Identifier ret := {</span><br><span> mccDigit1 := ?,</span><br><span> mccDigit2 := ?,</span><br><span>@@ -764,7 +774,7 @@</span><br><span> </span><br><span> return ret;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) ENB_Identifier ts_GTPC_ENB_Identifier(BssgpCellId cid, integer tac, octetstring gnbid) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) ENB_Identifier ts_GTPC_ENB_Identifier(GTP_CellId cid, integer tac, octetstring gnbid) := {</span><br><span> mccDigit1 := cid.ra_id.lai.mcc_mnc[0],</span><br><span> mccDigit2 := cid.ra_id.lai.mcc_mnc[1],</span><br><span> mccDigit3 := cid.ra_id.lai.mcc_mnc[2],</span><br><span>@@ -774,7 +784,7 @@</span><br><span> tAC := int2oct(tac, 2),</span><br><span> globalENB_ID := gnbid</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- template RIM_Routing_Address_GTPC t_GTPC_RIM_Routing_Address_enbid(BssgpCellId cid, integer tac, octetstring gnbid) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template RIM_Routing_Address_GTPC t_GTPC_RIM_Routing_Address_enbid(GTP_CellId cid, integer tac, octetstring gnbid) := {</span><br><span> eNB_Identifier := ts_GTPC_ENB_Identifier(cid, tac, gnbid)</span><br><span> }</span><br><span> template RIM_Routing_Information_GTPC</span><br><span>@@ -801,7 +811,7 @@</span><br><span> }</span><br><span> /* 3GPP TS 48.018 11.3.63.1.1 */</span><br><span> template RAN_Information_Request_Application_Container_NACC_GTPC</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GTPC_RAN_Information_Request_Application_Container_NACC(template BssgpCellId cid) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_GTPC_RAN_Information_Request_Application_Container_NACC(template GTP_CellId cid) := {</span><br><span> iEI := '4D'O,</span><br><span> ext := '1'B,</span><br><span> lengthIndicator := {</span><br><span>@@ -810,7 +820,7 @@</span><br><span> reporting_Cell_Identifier := tr_GTPC_Cell_Identifier_V(cid)</span><br><span> }</span><br><span> template (value) RAN_Information_Request_Application_Container_NACC_GTPC</span><br><span style="color: hsl(0, 100%, 40%);">- ts_GTPC_RAN_Information_Request_Application_Container_NACC(BssgpCellId cid) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_GTPC_RAN_Information_Request_Application_Container_NACC(GTP_CellId cid) := {</span><br><span> iEI := '4D'O,</span><br><span> ext := '1'B,</span><br><span> lengthIndicator := {</span><br><span>@@ -820,16 +830,16 @@</span><br><span> }</span><br><span> /* 3GPP TS 48.018 11.3.63.1 */</span><br><span> template RAN_Information_Request_Application_Container_GTPC</span><br><span style="color: hsl(0, 100%, 40%);">- tru_GTPC_RAN_Information_Request_Application_Container_NACC(template BssgpCellId cid) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ tru_GTPC_RAN_Information_Request_Application_Container_NACC(template GTP_CellId cid) := {</span><br><span> nacc := tr_GTPC_RAN_Information_Request_Application_Container_NACC(cid)</span><br><span> }</span><br><span> template (value) RAN_Information_Request_Application_Container_GTPC</span><br><span style="color: hsl(0, 100%, 40%);">- tsu_GTPC_RAN_Information_Request_Application_Container_NACC(BssgpCellId cid) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ tsu_GTPC_RAN_Information_Request_Application_Container_NACC(GTP_CellId cid) := {</span><br><span> nacc := ts_GTPC_RAN_Information_Request_Application_Container_NACC(cid)</span><br><span> }</span><br><span> /* 3GPP TS 48.018 11.3.63.2.1 */</span><br><span> template RAN_Information_Application_Container_NACC_GTPC</span><br><span style="color: hsl(0, 100%, 40%);">- tr_GTPC_RAN_Information_Application_Container_NACC(template BssgpCellId cid, boolean psi_type, integer si_psi_num, octetstring si_psi) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_GTPC_RAN_Information_Application_Container_NACC(template GTP_CellId cid, boolean psi_type, integer si_psi_num, octetstring si_psi) := {</span><br><span> iEI := '4E'O,</span><br><span> ext := '1'B,</span><br><span> lengthIndicator := {</span><br><span>@@ -841,7 +851,7 @@</span><br><span> sI_PSI := si_psi</span><br><span> }</span><br><span> template (value) RAN_Information_Application_Container_NACC_GTPC</span><br><span style="color: hsl(0, 100%, 40%);">- ts_GTPC_RAN_Information_Application_Container_NACC(BssgpCellId cid, boolean psi_type, integer si_psi_num, octetstring si_psi) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_GTPC_RAN_Information_Application_Container_NACC(GTP_CellId cid, boolean psi_type, integer si_psi_num, octetstring si_psi) := {</span><br><span> iEI := '4E'O,</span><br><span> ext := '1'B,</span><br><span> lengthIndicator := {</span><br><span>@@ -892,11 +902,11 @@</span><br><span> </span><br><span> /* RAN_Information */</span><br><span> template ApplContainer_or_ApplErrContainer_NACC_GTPC</span><br><span style="color: hsl(0, 100%, 40%);">- tru_GTPC_ApplContainer_NACC(BssgpCellId cid, boolean psi_type, integer si_psi_num, octetstring si_psi) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ tru_GTPC_ApplContainer_NACC(GTP_CellId cid, boolean psi_type, integer si_psi_num, octetstring si_psi) := {</span><br><span> application_Container := tr_GTPC_RAN_Information_Application_Container_NACC(cid, psi_type, si_psi_num, si_psi)</span><br><span> }</span><br><span> template (value) ApplContainer_or_ApplErrContainer_NACC_GTPC</span><br><span style="color: hsl(0, 100%, 40%);">- tsu_GTPC_ApplContainer_NACC(BssgpCellId cid, boolean psi_type, integer si_psi_num, octetstring si_psi) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ tsu_GTPC_ApplContainer_NACC(GTP_CellId cid, boolean psi_type, integer si_psi_num, octetstring si_psi) := {</span><br><span> application_Container := ts_GTPC_RAN_Information_Application_Container_NACC(cid, psi_type, si_psi_num, si_psi)</span><br><span> }</span><br><span> template ApplContainer_or_ApplErrContainer_GTPC</span><br><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index 2461962..3386f71 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -250,6 +250,12 @@</span><br><span> return ret;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_BssgpCellId_to_GTP_CellId(in BssgpCellId cell_id) return GTP_CellId</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) GTP_CellId ret := ts_GTP_CellId(cell_id.ra_id, cell_id.cell_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ return valueof(ret);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT {</span><br><span> gb.vc_NS := NS_CT.create(id & "-NS" & int2str(offset));</span><br><span> gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset));</span><br><span>@@ -3373,20 +3379,21 @@</span><br><span> remName := mp_sgsn_gtp_ip,</span><br><span> remPort := GTP1C_PORT</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ var GTP_CellId gtp_ci := f_BssgpCellId_to_GTP_CellId(g_gb[1].cfg.bvc[0].cell_id);</span><br><span> </span><br><span> var template (value) RIM_Routing_Address_GTPC gtpc_dst_addr, gtpc_src_addr;</span><br><span> var template (value) RAN_Information_Request_RIM_Container_GTPC gtpc_rim_req_cont;</span><br><span> var template (value) PDU_BSSGP_RAN_INFORMATION_REQUEST_GTPC gtpc_bssgp_cont;</span><br><span> var template (value) Gtp1cUnitdata gtpc_pdu;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gtpc_dst_addr := t_GTPC_RIM_Routing_Address_cid(g_gb[1].cfg.bvc[0].cell_id);</span><br><span style="color: hsl(0, 100%, 40%);">- gtpc_src_addr := t_GTPC_RIM_Routing_Address_enbid(g_gb[1].cfg.bvc[0].cell_id, tac := 3, gnbid := '12345678123456'O);</span><br><span style="color: hsl(120, 100%, 40%);">+ gtpc_dst_addr := t_GTPC_RIM_Routing_Address_cid(gtp_ci);</span><br><span style="color: hsl(120, 100%, 40%);">+ gtpc_src_addr := t_GTPC_RIM_Routing_Address_enbid(gtp_ci, tac := 3, gnbid := '12345678123456'O);</span><br><span> </span><br><span> gtpc_rim_req_cont := ts_GTPC_RAN_Information_Request_RIM_Container(ts_GTPC_RIM_Application_Identity(RIM_APP_ID_NACC),</span><br><span> ts_GTPC_RIM_Sequence_Number(1),</span><br><span> ts_GTPC_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP),</span><br><span> ts_GTPC_RIM_Protocol_Version_Number(1),</span><br><span style="color: hsl(0, 100%, 40%);">- tsu_GTPC_RAN_Information_Request_Application_Container_NACC(g_gb[1].cfg.bvc[0].cell_id),</span><br><span style="color: hsl(120, 100%, 40%);">+ tsu_GTPC_RAN_Information_Request_Application_Container_NACC(gtp_ci),</span><br><span> omit);</span><br><span> gtpc_bssgp_cont := ts_GTPC_RAN_Information_Request(ts_GTPC_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, gtpc_dst_addr),</span><br><span> ts_GTPC_RIM_Routing_Information(RIM_ADDR_EUTRAN_NODEB_ID, gtpc_src_addr),</span><br><span>@@ -3439,7 +3446,7 @@</span><br><span> ts_GTPC_RIM_Sequence_Number(2),</span><br><span> ts_GTPC_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP),</span><br><span> ts_GTPC_RIM_Protocol_Version_Number(1),</span><br><span style="color: hsl(0, 100%, 40%);">- tru_GTPC_ApplContainer_or_ApplErrContainer_NACC(tru_GTPC_ApplContainer_NACC(g_gb[1].cfg.bvc[0].cell_id, false, 3, si_default)),</span><br><span style="color: hsl(120, 100%, 40%);">+ tru_GTPC_ApplContainer_or_ApplErrContainer_NACC(tru_GTPC_ApplContainer_NACC(gtp_ci, false, 3, si_default)),</span><br><span> omit);</span><br><span> gtpc_bssgp_cont_ack := tr_GTPC_RAN_Information(tr_GTPC_RIM_Routing_Information(RIM_ADDR_EUTRAN_NODEB_ID, gtpc_src_addr),</span><br><span> tr_GTPC_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, gtpc_dst_addr),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26441">change 26441</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26441"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icd8234908af445b798517fe110cd0648969179a4 </div>
<div style="display:none"> Gerrit-Change-Number: 26441 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>