<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23179">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns: SNS: ensure all current testcase are only executed with IPACCESS or RESET_BLOCK dialect<br><br>All current test cases are for those 2 dialect. In preparation<br>of SNS test cases ensure those testcase have the correct dependency.<br><br>Change-Id: Ifda066553eabb0ace4aca12e60797c4950fcc498<br>---<br>M ns/NS_Tests.ttcn<br>1 file changed, 28 insertions(+), 28 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/79/23179/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ns/NS_Tests.ttcn b/ns/NS_Tests.ttcn</span><br><span>index 59ab765..77b96cd 100644</span><br><span>--- a/ns/NS_Tests.ttcn</span><br><span>+++ b/ns/NS_Tests.ttcn</span><br><span>@@ -456,24 +456,23 @@</span><br><span> }</span><br><span> </span><br><span> control {</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_tx_reset() );</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK or mp_dialect == NS2_DIALECT_IPACCESS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_tx_reset() );</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 48.016 7.2 Block procedure */</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_tx_block() );</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_tx_block_by_vty() );</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_tx_block_by_vty_reset() );</span><br><span style="color: hsl(0, 100%, 40%);">- // execute( TC_block_other_nsvc() ); // reset, unblock, sleep(1), block over another nsvci </span><br><span style="color: hsl(0, 100%, 40%);">- /* 48.016 7.2 Unblock procedure */</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_tx_unblock() );</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_tx_unblock_retries() );</span><br><span style="color: hsl(0, 100%, 40%);">- // execute( TC_rx_unblock_tx_unblock() ); // wait for an rx unblock pdu, send an unblock pdu, expect unblock ack pdu</span><br><span style="color: hsl(0, 100%, 40%);">- // execute( TC_unblockable() ); // block a NS-VCI via vty, try block procedure</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 48.016 7.2 Block procedure */</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_tx_block() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_tx_block_by_vty() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_tx_block_by_vty_reset() );</span><br><span style="color: hsl(120, 100%, 40%);">+ // execute( TC_block_other_nsvc() ); // reset, unblock, sleep(1), block over another nsvci</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 48.016 7.2 Unblock procedure */</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_tx_unblock() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_tx_unblock_retries() );</span><br><span style="color: hsl(120, 100%, 40%);">+ // execute( TC_rx_unblock_tx_unblock() ); // wait for an rx unblock pdu, send an unblock pdu, expect unblock ack pdu</span><br><span style="color: hsl(120, 100%, 40%);">+ // execute( TC_unblockable() ); // block a NS-VCI via vty, try block procedure</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 48.016 7.2.1 Block Abnormal Condition */</span><br><span style="color: hsl(0, 100%, 40%);">- /* 48.016 7.2.1 Unblock Abnormal Condition */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* 48.016 7.3.1 Abnormal Condition */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 48.016 7.2.1 Block Abnormal Condition */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 48.016 7.2.1 Unblock Abnormal Condition */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 48.016 7.3.1 Abnormal Condition */</span><br><span> execute( TC_reset_wrong_nsei() );</span><br><span> execute( TC_reset_wrong_nsvci() );</span><br><span> execute( TC_reset_wrong_nsei_nsvci() );</span><br><span>@@ -482,21 +481,22 @@</span><br><span> execute( TC_reset_ack_wrong_nsei_nsvci() );</span><br><span> execute( TC_reset_retries() );</span><br><span> execute( TC_reset_on_block_reset() );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_ignore_reset_ack() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_ignore_reset_ack() );</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 48.016 7.4 Test procedure on frame relay */</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_tx_reset_tx_alive() );</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_tx_reset_rx_alive() );</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 48.016 7.4 Test procedure on frame relay */</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_tx_reset_tx_alive() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_tx_reset_rx_alive() );</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 48.016 7.4.1 Abnormal Condition */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK) {</span><br><span style="color: hsl(0, 100%, 40%);">- // execute( TC_alive_retries_multi() ); // check if alive retries works and block over an alive nsvc</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_alive_retries_single_reset() );</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (mp_dialect == NS2_DIALECT_IPACCESS) {</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_alive_retries_single_no_resp() );</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 48.016 7.4.1 Abnormal Condition */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ // execute( TC_alive_retries_multi() ); // check if alive retries works and block over an alive nsvc</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_alive_retries_single_reset() );</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (mp_dialect == NS2_DIALECT_IPACCESS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_alive_retries_single_no_resp() );</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%);">+ execute( TC_no_reset_alive_ack() );</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_no_reset_alive_ack() );</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/+/23179">change 23179</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/+/23179"/><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: Ifda066553eabb0ace4aca12e60797c4950fcc498 </div>
<div style="display:none"> Gerrit-Change-Number: 23179 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>