<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13170">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: move sms sending to BSC_ConnHdlr and send from within test flow<br><br>For the sole reason that f_vty_sms_send() was put on MTC_CT for no apparent<br>reason, we start the test function and send an SMS with an arbitrary two<br>seconds delay.<br><br>Instead move it to BSC_ConnHdlr and place SMS sending in the actual test<br>function flow where it belongs.<br><br>Change-Id: I5f348b3d30342b7c4871a1fc8f94648923e82eea<br>---<br>M msc/MSC_Tests.ttcn<br>1 file changed, 4 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 1edc7ad..06dad47 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -1973,7 +1973,7 @@</span><br><span> }</span><br><span> </span><br><span> private function f_vty_sms_send(charstring imsi, charstring msisdn, charstring text)</span><br><span style="color: hsl(0, 100%, 40%);">-runs on MTC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+runs on BSC_ConnHdlr {</span><br><span>        f_vty_transceive(MSCVTY, "subscriber imsi "&imsi&" sms sender msisdn "&msisdn&" send "&text);</span><br><span> }</span><br><span> </span><br><span>@@ -1995,7 +1995,7 @@</span><br><span>     }</span><br><span>    f_bssmap_register_imsi(g_pars.imsi, tmsi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  /* FIXME: actually cause MSC to send a SMS via VTY or SMPP */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span> </span><br><span>     /* MSC->BSC: expect PAGING from MSC */</span><br><span>    BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));</span><br><span>@@ -2013,8 +2013,6 @@</span><br><span>        f_init();</span><br><span>    pars := f_init_pars(43);</span><br><span>     vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_sms), pars);</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(2.0);</span><br><span style="color: hsl(0, 100%, 40%);">-   f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span>         vc_conn.done;</span><br><span> }</span><br><span> </span><br><span>@@ -2036,6 +2034,8 @@</span><br><span>       }</span><br><span>    f_bssmap_register_imsi(g_pars.imsi, tmsi);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       /* Expect the MSC to page exactly 10 times before giving up */</span><br><span>       alt {</span><br><span>                [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi))</span><br><span>@@ -2079,8 +2079,6 @@</span><br><span>      f_init();</span><br><span>    pars := f_init_pars(1843);</span><br><span>   vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_sms_paging_and_nothing), pars);</span><br><span style="color: hsl(0, 100%, 40%);">-      f_sleep(2.0);</span><br><span style="color: hsl(0, 100%, 40%);">-   f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span>         vc_conn.done;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13170">change 13170</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/13170"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5f348b3d30342b7c4871a1fc8f94648923e82eea </div>
<div style="display:none"> Gerrit-Change-Number: 13170 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>