<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18945">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: Add CommonID Test: Send CommonID from MSC and check it is processed<br><br>Related: OS#2969<br>Change-Id: I501108bc6c19b17d3fc680211c7290a31770a159<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>M library/BSSMAP_Templates.ttcn<br>3 files changed, 60 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 84f8eaf..9cb15f2 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -2777,6 +2777,33 @@</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Send a CommonID from the simulated MSC and verify that the information is used to</span><br><span style="color: hsl(120, 100%, 40%);">+ * fill BSC-internal data structures (specifically, bsc_subscr associated with subscr_conn) */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tc_common_id(charstring id) runs on MSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars := f_gen_test_hdlr_pars();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_MscConnHdlr_init_vty();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_create_chan_and_exp();</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we should now have a COMPL_L3 at the MSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.receive(tr_BSSMAP_ComplL3);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send CommonID */</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSMAP_CommonId(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Use VTY to verify that the IMSI of the subscr_conn is set */</span><br><span style="color: hsl(120, 100%, 40%);">+ var charstring regex := "*(IMSI: " & hex2str(g_pars.imsi) & ")*";</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive_match_regexp_retry(BSCVTY, "show conns", regex, 0, 4, 1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_common_id() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var MSC_ConnHdlr vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init(1, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_tc_common_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private function f_est_single_l3(template PDU_ML3_MS_NW l3) runs on MSC_ConnHdlr {</span><br><span> g_pars := f_gen_test_hdlr_pars();</span><br><span> f_create_chan_and_exp();</span><br><span>@@ -5206,6 +5233,7 @@</span><br><span> execute( TC_oml_unknown_unit_id() );</span><br><span> </span><br><span> execute( TC_classmark() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_common_id() );</span><br><span> execute( TC_unsol_ass_fail() );</span><br><span> execute( TC_unsol_ass_compl() );</span><br><span> execute( TC_unsol_ho_fail() );</span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index 0d4c81b..7d8fce1 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -431,9 +431,7 @@</span><br><span> var boolean g_vty_initialized := false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* initialize all parameters */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_MscConnHdlr_init(integer i, HostName bts, HostName mgw, BSSMAP_FIELD_CodecType codecType) runs on MSC_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- f_MediaState_init(g_media, i, bts, mgw, codecType);</span><br><span style="color: hsl(120, 100%, 40%);">+function f_MscConnHdlr_init_vty() runs on MSC_ConnHdlr {</span><br><span> if (not g_vty_initialized) {</span><br><span> map(self:BSCVTY, system:BSCVTY);</span><br><span> f_vty_set_prompts(BSCVTY);</span><br><span>@@ -442,6 +440,12 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* initialize all parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_MscConnHdlr_init(integer i, HostName bts, HostName mgw, BSSMAP_FIELD_CodecType codecType) runs on MSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_MediaState_init(g_media, i, bts, mgw, codecType);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_MscConnHdlr_init_vty();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private function get_next_trans_id() runs on MSC_ConnHdlr return MgcpTransId {</span><br><span> var MgcpTransId tid := int2str(g_trans_id);</span><br><span> g_trans_id := g_trans_id + 1;</span><br><span>diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn</span><br><span>index 406dfc5..776e8be 100644</span><br><span>--- a/library/BSSMAP_Templates.ttcn</span><br><span>+++ b/library/BSSMAP_Templates.ttcn</span><br><span>@@ -1599,6 +1599,31 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_BSSAP ts_BSSMAP_CommonId(hexstring imsi_digits)</span><br><span style="color: hsl(120, 100%, 40%);">+modifies ts_BSSAP_BSSMAP := {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu := {</span><br><span style="color: hsl(120, 100%, 40%);">+ bssmap := {</span><br><span style="color: hsl(120, 100%, 40%);">+ commonID := {</span><br><span style="color: hsl(120, 100%, 40%);">+ messageType := '2F'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ iMSI := ts_BSSMAP_Imsi(imsi_digits),</span><br><span style="color: hsl(120, 100%, 40%);">+ sNAAccessInformation := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_BSSAP tr_BSSMAP_CommonId(template hexstring imsi_digits)</span><br><span style="color: hsl(120, 100%, 40%);">+modifies tr_BSSAP_BSSMAP := {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu := {</span><br><span style="color: hsl(120, 100%, 40%);">+ bssmap := {</span><br><span style="color: hsl(120, 100%, 40%);">+ commonID := {</span><br><span style="color: hsl(120, 100%, 40%);">+ messageType := '2F'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ iMSI := tr_BSSMAP_Imsi(imsi_digits),</span><br><span style="color: hsl(120, 100%, 40%);">+ sNAAccessInformation := *</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18945">change 18945</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/+/18945"/><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: I501108bc6c19b17d3fc680211c7290a31770a159 </div>
<div style="display:none"> Gerrit-Change-Number: 18945 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>