<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP<br><br>Change-Id: I2b52cc637c20d5644f413030edd9040a6e6bfe2f<br>---<br>M sccp/SCCP_Tests_RAW.ttcn<br>1 file changed, 21 insertions(+), 8 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/70/16970/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn</span><br><span>index 6acb4c7..cd0708c 100644</span><br><span>--- a/sccp/SCCP_Tests_RAW.ttcn</span><br><span>+++ b/sccp/SCCP_Tests_RAW.ttcn</span><br><span>@@ -39,6 +39,8 @@</span><br><span> </span><br><span> var MSC_SCCP_MTP3_parameters g_param;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT3 g_own_lref := '000001'O</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*Configure T(tias) over VTY, seconds */</span><br><span> var integer g_demo_sccp_timer_ias := 7 * 60;</span><br><span> /*Configure T(tiar) over VTY, seconds */</span><br><span>@@ -109,7 +111,9 @@</span><br><span> MTP3.send(tx);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_exp_sccp(template PDU_SCCP sccp) runs on SCCP_Test_RAW_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_exp_sccp(template PDU_SCCP sccp)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on SCCP_Test_RAW_CT return SCCP_MTP3_TRANSFERind {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> var SCCP_MTP3_TRANSFERind rx;</span><br><span> var template SCCP_MTP3_TRANSFERind exp := {</span><br><span> sio := g_param.sio,</span><br><span>@@ -122,7 +126,7 @@</span><br><span> T.start;</span><br><span> alt {</span><br><span> [] MTP3.receive(exp) -> value rx {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rx;</span><br><span> }</span><br><span> [] MTP3.receive {</span><br><span> setverdict(fail, "Unexpected MTP/SCCP received");</span><br><span>@@ -133,12 +137,17 @@</span><br><span> self.stop</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ return rx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_establish_conn(SCCP_PAR_Address calling, SCCP_PAR_Address called) runs on SCCP_Test_RAW_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_establish_conn(SCCP_PAR_Address calling, SCCP_PAR_Address called)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on SCCP_Test_RAW_CT return OCT3 {</span><br><span style="color: hsl(120, 100%, 40%);">+ var SCCP_MTP3_TRANSFERind mtp3_rx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_sccp(ts_SCCP_CR('000001'O, calling, called));</span><br><span style="color: hsl(0, 100%, 40%);">- f_exp_sccp(tr_SCCP_CC('000000'O, '000001'O));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_sccp(ts_SCCP_CR(g_own_lref, calling, called));</span><br><span style="color: hsl(120, 100%, 40%);">+ mtp3_rx := f_exp_sccp(tr_SCCP_CC(?, g_own_lref));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return mtp3_rx.data.connconfirm.sourceLocRef;</span><br><span> }</span><br><span> </span><br><span> private function f_tx_udt_exp(SCCP_PAR_Address calling, SCCP_PAR_Address called, octetstring data) runs on SCCP_Test_RAW_CT {</span><br><span>@@ -159,6 +168,7 @@</span><br><span> calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn,</span><br><span> mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type));</span><br><span> f_establish_conn(calling, called);</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span> }</span><br><span> </span><br><span> /* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */</span><br><span>@@ -175,11 +185,13 @@</span><br><span> mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type));</span><br><span> </span><br><span> f_tx_udt_exp(calling, called, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span> }</span><br><span> </span><br><span> /* Verify T(iar) triggers and releases the channel */</span><br><span> testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT {</span><br><span> var SCCP_PAR_Address calling, called;</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT3 remote_lref;</span><br><span> var octetstring data := f_rnd_octstring(f_rnd_int(100));</span><br><span> </span><br><span> /* Set T(iar) in sccp_demo_user low enough that it will trigger before other side</span><br><span>@@ -194,7 +206,7 @@</span><br><span> mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type));</span><br><span> calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn,</span><br><span> mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type));</span><br><span style="color: hsl(0, 100%, 40%);">- f_establish_conn(calling, called);</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_lref := f_establish_conn(calling, called);</span><br><span> f_tx_udt_exp(calling, called, data);</span><br><span> </span><br><span> log("Waiting for first IT");</span><br><span>@@ -203,8 +215,9 @@</span><br><span> f_exp_sccp(tr_SCCP_IT(?, ?));</span><br><span> </span><br><span> log("Waiting for RLSD");</span><br><span style="color: hsl(0, 100%, 40%);">- f_exp_sccp(tr_SCCP_RLSD(?, ?, hex2int('0D'H))); /* Cause: Expiration of Rx Inactivity Timer */</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_sccp(ts_SCCP_RLC('000001'O, '000000'O));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_exp_sccp(tr_SCCP_RLSD(remote_lref, g_own_lref, hex2int('0D'H))); /* Cause: Expiration of Rx Inactivity Timer */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_sccp(ts_SCCP_RLC(g_own_lref, remote_lref));</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span> }</span><br><span> </span><br><span> control {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970">change 16970</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/+/16970"/><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: I2b52cc637c20d5644f413030edd9040a6e6bfe2f </div>
<div style="display:none"> Gerrit-Change-Number: 16970 </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>