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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stp: fix TC_rkm_unreg_active<br><br>Create the routing key dynamically, before trying to unregister it, so<br>osmo-stp doesn't answer with ERR_NOT_REG instead of the expected<br>ERR_ASP_ACTIVE. While at it, add missing clean up logic.<br><br>Related: OS#4239<br>Change-Id: I31fcba85d23a8767eb0ceb513ff5b440558a475b<br>---<br>M stp/STP_Tests_M3UA.ttcn<br>1 file changed, 16 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn</span><br><span>index 0bc398d..13703d0 100644</span><br><span>--- a/stp/STP_Tests_M3UA.ttcn</span><br><span>+++ b/stp/STP_Tests_M3UA.ttcn</span><br><span>@@ -637,9 +637,11 @@</span><br><span> </span><br><span> /* try to de-register a routing key for an active ASP -> ERROR */</span><br><span> testcase TC_rkm_unreg_active() runs on RAW_M3UA_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var OCT3 dpc := int2oct(mp_m3ua_configs[0].point_code, 3); // must match config</span><br><span style="color: hsl(0, 100%, 40%);">- var OCT4 rctx := int2oct(mp_m3ua_configs[0].routing_ctx, 4);  // must match config</span><br><span style="color: hsl(120, 100%, 40%);">+    var OCT3 dpc := int2oct(123, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+      var OCT4 rctx := int2oct(1234, 4);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        f_init_common();</span><br><span style="color: hsl(120, 100%, 40%);">+      f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted");</span><br><span>      f_init_m3ua();</span><br><span> </span><br><span>   /* first register the routing key */</span><br><span>@@ -647,12 +649,22 @@</span><br><span> </span><br><span>     /* then activate the ASP */</span><br><span>  f_M3UA_asp_up_act(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctx));</span><br><span style="color: hsl(120, 100%, 40%);">+       f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, *));</span><br><span style="color: hsl(120, 100%, 40%);">+       f_M3UA_exp(0, tr_M3UA_DAVA({*}, *));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        /* then try to de-regsiter */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* then try to de-register -> ERR_ASP_ACTIVE */</span><br><span>   f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctx)));</span><br><span>        f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_ERR_ASP_ACTIVE)}));</span><br><span style="color: hsl(0, 100%, 40%);">-        /* FIXME: we now may have changed the state on the STP side! */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   /* deactivate ASP and properly de-register to clean up */</span><br><span style="color: hsl(120, 100%, 40%);">+     f_M3UA_asp_inact(0);</span><br><span style="color: hsl(120, 100%, 40%);">+  f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctx)));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, *));</span><br><span style="color: hsl(120, 100%, 40%);">+      f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, *));</span><br><span style="color: hsl(120, 100%, 40%);">+      f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_SUCCESS)}));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation static-only");</span><br><span>    f_clear_m3ua();</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/+/25028">change 25028</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/+/25028"/><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: I31fcba85d23a8767eb0ceb513ff5b440558a475b </div>
<div style="display:none"> Gerrit-Change-Number: 25028 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>