<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11012">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: test Classmark Enquiry<br><br>Enhance TC_classmark to also include the BSSMAP Classmark Request -> RR<br>Classmark Enquiry part. So far it was only testing the return path of RR<br>Classmark Change -> BSSMAP Classmark Update.<br><br>This test will thus fail with current osmo-bsc master, and will succeed as soon<br>as osmo-bsc If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf is merged.<br><br>Add:<br><br>* ts_BSSMAP_ClassmarkRequest in BSSMAP_Templates.ttcn<br>* tr_RRM_CM_ENQUIRY in L3_Templates.ttcn<br><br>Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/BSSMAP_Templates.ttcn<br>M library/L3_Templates.ttcn<br>3 files changed, 33 insertions(+), 1 deletion(-)<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 b44de9f..a99214b 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -1940,13 +1940,18 @@</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* test if L3 RR CLASSMARK CHANGE is translated to BSSMAP CLASSMARK UPDATE */</span><br><span style="color: hsl(120, 100%, 40%);">+/* test the procedure of the MSC requesting a Classmark Update:</span><br><span style="color: hsl(120, 100%, 40%);">+ * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY,</span><br><span style="color: hsl(120, 100%, 40%);">+ * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */</span><br><span> private function f_tc_classmark(charstring id) runs on MSC_ConnHdlr {</span><br><span> g_pars := valueof(t_def_TestHdlrPars);</span><br><span> f_create_chan_and_exp();</span><br><span> /* we should now have a COMPL_L3 at the MSC */</span><br><span> BSSAP.receive(tr_BSSMAP_ComplL3);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSMAP_ClassmarkRequest);</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_CM_ENQUIRY));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> f_rsl_send_l3(ts_RRM_CM_CHG(valueof(ts_CM2)));</span><br><span> BSSAP.receive(tr_BSSMAP_ClassmarkUpd(?, omit));</span><br><span> setverdict(pass);</span><br><span>diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn</span><br><span>index d92ea61..a3a50de 100644</span><br><span>--- a/library/BSSMAP_Templates.ttcn</span><br><span>+++ b/library/BSSMAP_Templates.ttcn</span><br><span>@@ -944,6 +944,18 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_BSSAP ts_BSSMAP_ClassmarkRequest</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%);">+ classmarkRequest := {</span><br><span style="color: hsl(120, 100%, 40%);">+ messageType := '58'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ talkerPriority := 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> /* return Layer3 octetstring inside BSSAP PDU */</span><br><span> function f_bssap_extract_l3(PDU_BSSAP bssap) return template octetstring {</span><br><span> if (ischosen(bssap.pdu.bssmap)) {</span><br><span>diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn</span><br><span>index 557b1b8..1ce84cf 100644</span><br><span>--- a/library/L3_Templates.ttcn</span><br><span>+++ b/library/L3_Templates.ttcn</span><br><span>@@ -525,6 +525,21 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template PDU_ML3_NW_MS tr_RRM_CM_ENQUIRY := {</span><br><span style="color: hsl(120, 100%, 40%);">+ discriminator := '0110'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ tiOrSkip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ skipIndicator := '0000'B</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ msgs := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rrm := {</span><br><span style="color: hsl(120, 100%, 40%);">+ classmarkEnquiry := {</span><br><span style="color: hsl(120, 100%, 40%);">+ messageType := '00010011'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ classmarkEnquiryMask := *</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> template (value) PDU_ML3_MS_NW ts_RRM_UL_REL(OCT1 cause) := {</span><br><span> discriminator := '0110'B,</span><br><span> tiOrSkip := {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11012">change 11012</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/11012"/><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: Idaab4d568cf986b4897ba008f6262c839d1592fb </div>
<div style="display:none"> Gerrit-Change-Number: 11012 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: Vadim Yanitskiy <axilirator@gmail.com> </div>