<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25560">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns: add test case TC_tx_blocked_foreign_nsvc<br><br>Check if a BLOCK PDU over a different/foreign connection is parsed.<br>* 2x initialize NSVC (RESET/UNBLOCK)<br>* TTCN 0-> NS: block (nsvci 1)<br>* TTCN <-0 NS: block ack (nsvci 1)<br>* TTCN 1-> NS: unit data (nsvci 1)<br>* TTCN <-1 NS: status (blocked)<br><br>Change-Id: I2b37a712bd70037b35b9deb8dab4a72d1e1d29fb<br>---<br>M ns/NS_Tests.ttcn<br>M ns/NS_Tests.udp.cfg<br>M ns/osmo-ns.udp.cfg<br>3 files changed, 54 insertions(+), 0 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/60/25560/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 b57d686..722f8ec 100644</span><br><span>--- a/ns/NS_Tests.ttcn</span><br><span>+++ b/ns/NS_Tests.ttcn</span><br><span>@@ -992,6 +992,43 @@</span><br><span> f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* 48.016 7.2 ensure tx status (blocked) is correctly parsed over a foreign NSVC</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * 2x initialize NSVC (RESET/UNBLOCK)</span><br><span style="color: hsl(120, 100%, 40%);">+ * TTCN 0-> NS: block (nsvci 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ * TTCN <-0 NS: block ack (nsvci 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ * TTCN 1-> NS: unit data (nsvci 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ * TTCN <-1 NS: status (blocked)</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_tx_blocked_foreign_nsvc() runs on RAW_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_vty();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config2(NSVTY, {}, "mirror-mode enable");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, idx := 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, idx := 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* do a NS Reset procedure */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_outgoing_ns_reset(idx := 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_outgoing_ns_reset(idx := 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* send alive acks */</span><br><span style="color: hsl(120, 100%, 40%);">+ activate(as_rx_alive_tx_ack(idx := 0));</span><br><span style="color: hsl(120, 100%, 40%);">+ activate(as_rx_alive_tx_ack(idx := 1));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_outgoing_ns_unblock(idx := 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_outgoing_ns_unblock(idx := 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* both NSVC are alive and unblocked */</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[0].send(ts_NS_BLOCK(NS_CAUSE_TRANSIT_NETWORK_FAILURE, g_nsconfig.nsvc[1].nsvci));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ns_exp(tr_NS_BLOCK_ACK(g_nsconfig.nsvc[1].nsvci));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[1].send(ts_NS_UNITDATA(t_SduCtrlB, 42, '0011234242230101'O));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ns_exp(tr_NS_STATUS(NS_CAUSE_NSVC_BLOCKED), idx := 1);</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%);">+ f_clean_ns_codec();</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> control {</span><br><span> if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK or mp_dialect == NS2_DIALECT_IPACCESS) {</span><br><span> execute( TC_tx_reset() );</span><br><span>@@ -1003,6 +1040,7 @@</span><br><span> execute( TC_tx_block_unitdata_over_blocked() );</span><br><span> execute( TC_rx_block_unitdata_over_blocked() );</span><br><span> execute( TC_mirror_unitdata_tx_status_blocked() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_tx_blocked_foreign_nsvc() );</span><br><span> // execute( TC_block_other_nsvc() ); // reset, unblock, sleep(1), block over another nsvci</span><br><span> /* 48.016 7.2 Unblock procedure */</span><br><span> execute( TC_tx_unblock() );</span><br><span>diff --git a/ns/NS_Tests.udp.cfg b/ns/NS_Tests.udp.cfg</span><br><span>index f040998..cdb071d 100644</span><br><span>--- a/ns/NS_Tests.udp.cfg</span><br><span>+++ b/ns/NS_Tests.udp.cfg</span><br><span>@@ -21,6 +21,18 @@</span><br><span> }</span><br><span> },</span><br><span> nsvci := 1234</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%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 22001,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 23001</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%);">+ nsvci := 1235</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/ns/osmo-ns.udp.cfg b/ns/osmo-ns.udp.cfg</span><br><span>index 9591427..b327c32 100644</span><br><span>--- a/ns/osmo-ns.udp.cfg</span><br><span>+++ b/ns/osmo-ns.udp.cfg</span><br><span>@@ -91,5 +91,9 @@</span><br><span> bind udp local</span><br><span> listen 127.0.0.1 23000</span><br><span> accept-ipaccess</span><br><span style="color: hsl(120, 100%, 40%);">+ bind udp local2</span><br><span style="color: hsl(120, 100%, 40%);">+ listen 127.0.0.1 23001</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-ipaccess</span><br><span> nse 1234</span><br><span> nsvc ipa local 127.0.0.1 22000 nsvci 1234</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc ipa local2 127.0.0.1 22001 nsvci 1235</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25560">change 25560</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/+/25560"/><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: I2b37a712bd70037b35b9deb8dab4a72d1e1d29fb </div>
<div style="display:none"> Gerrit-Change-Number: 25560 </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>