<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE<br><br>The ALIVE PDU does not have to be sent before an UNBLOCK message.<br>Ignore UNBLOCK messages in cases a single ALIVE is expected.<br><br>According to TS 48.016 v5.2.0, 7.4:<br>"Upon successful completion of an NS-VC reset procedure,<br>a BSS (or SGSN) shall start timer Tns-test, then [..]"<br>The ALIVE should arive Tns-test after the reset procedure (typ. 1s-60s).<br><br>Change-Id: I11d77b7477981998082967e5123b61636af2b980<br>---<br>M pcu/PCU_Tests_NS.ttcn<br>1 file changed, 13 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn</span><br><span>index ce2560f..f953be4 100644</span><br><span>--- a/pcu/PCU_Tests_NS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_NS.ttcn</span><br><span>@@ -109,9 +109,11 @@</span><br><span>      /* Expect inbound NS-RESET procedure */</span><br><span>      as_rx_ns_reset_ack(oneshot := true);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+      alt {</span><br><span>        /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */</span><br><span style="color: hsl(0, 100%, 40%);">-    as_rx_alive_tx_ack(oneshot := true);</span><br><span style="color: hsl(0, 100%, 40%);">-    setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+     [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { setverdict(pass); };</span><br><span style="color: hsl(120, 100%, 40%);">+  [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span> }</span><br><span> </span><br><span> /* Test for NS-RESET after NS-ALIVE timeout */</span><br><span>@@ -123,12 +125,16 @@</span><br><span>         as_rx_ns_reset_ack(oneshot := true);</span><br><span> </span><br><span>     /* wait for at least one NS-ALIVE */</span><br><span style="color: hsl(0, 100%, 40%);">-    NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE));</span><br><span style="color: hsl(120, 100%, 40%);">+   alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_rx_alive_tx_ack(oneshot := true) { };</span><br><span style="color: hsl(120, 100%, 40%);">+   [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span> </span><br><span>        /* wait for NS-RESET to re-appear, ignoring any NS-ALIVE until then */</span><br><span>       alt {</span><br><span>        [] as_rx_ns_reset_ack(oneshot := true) { setverdict(pass); }</span><br><span>         [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+     [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; }</span><br><span>  }</span><br><span> }</span><br><span> </span><br><span>@@ -140,8 +146,7 @@</span><br><span>     /* Expect inbound NS-RESET procedure */</span><br><span>      as_rx_ns_reset_ack(oneshot := true);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */</span><br><span style="color: hsl(0, 100%, 40%);">-    as_rx_alive_tx_ack(oneshot := true);</span><br><span style="color: hsl(120, 100%, 40%);">+  /* keep it alive */</span><br><span>  activate(as_rx_alive_tx_ack());</span><br><span> </span><br><span>  as_rx_ns_unblock_ack(oneshot := true);</span><br><span>@@ -156,8 +161,7 @@</span><br><span>         /* Expect inbound NS-RESET procedure */</span><br><span>      as_rx_ns_reset_ack(oneshot := true);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */</span><br><span style="color: hsl(0, 100%, 40%);">-    as_rx_alive_tx_ack(oneshot := true);</span><br><span style="color: hsl(120, 100%, 40%);">+  /* keep it alive */</span><br><span>  activate(as_rx_alive_tx_ack());</span><br><span> </span><br><span>  /* wait for first NS-UNBLOCK, don't respond */</span><br><span>@@ -176,8 +180,7 @@</span><br><span>     /* Expect inbound NS-RESET procedure */</span><br><span>      as_rx_ns_reset_ack(oneshot := true);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */</span><br><span style="color: hsl(0, 100%, 40%);">-    as_rx_alive_tx_ack(oneshot := true);</span><br><span style="color: hsl(120, 100%, 40%);">+  /* keep it alive */</span><br><span>  activate(as_rx_alive_tx_ack());</span><br><span> </span><br><span>  as_rx_ns_unblock_ack(oneshot := true);</span><br><span>@@ -203,8 +206,7 @@</span><br><span>         /* Expect inbound NS-RESET procedure */</span><br><span>      as_rx_ns_reset_ack(oneshot := true);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */</span><br><span style="color: hsl(0, 100%, 40%);">-    as_rx_alive_tx_ack(oneshot := true);</span><br><span style="color: hsl(120, 100%, 40%);">+  /* keep it alive */</span><br><span>  activate(as_rx_alive_tx_ack());</span><br><span> </span><br><span>  as_rx_ns_unblock_ack(oneshot := true);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001">change 20001</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/+/20001"/><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: I11d77b7477981998082967e5123b61636af2b980 </div>
<div style="display:none"> Gerrit-Change-Number: 20001 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>