pespin has uploaded this change for review.
stp: Update TC_rkm_unreg_active to expect multiple routing contexts
That test is registering a new routcing context (AS) into an
existing/pre-configured ASP.
As a result, the ASP serves 2 AS. When we receive notifications on that
ASP then we'll be receiving info on 2 routing contexts, one for the
pre-confgiured AS and one for the dynamically registered one.
Depends: libosmo-sigtran.git I646301ec3d08ef98f227cf4d19da1039e40cedd2
Change-Id: I2dc4d197e6de38781b63e3079ada4c4b4a0db31d
---
M stp/STP_Tests_M3UA.ttcn
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/40191/1
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 89be9e0..18076bd 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -889,12 +889,12 @@
/* then activate the ASP, this turns the 2 AS (one for each rctx, 1234 and default 1023)
* INACTIVE, handle the 2 NOTIFY manually afterwards: */
f_M3UA_asp_up(0, omit);
- f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA, rctxB)));
- f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA, rctxB)));
+ f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA & rctxB, rctxB & rctxA)));
+ f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA & rctxB, rctxB & rctxA)));
f_M3UA_asp_act(0, omit, rctxB);
- f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, rctxB));
+ f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, (rctxA & rctxB, rctxB & rctxA)));
f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctxA));
- f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, rctxA));
+ f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, (rctxA & rctxB, rctxB & rctxA)));
f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctxB));
/* then try to de-register -> ERR_ASP_ACTIVE */
@@ -904,8 +904,8 @@
/* deactivate ASP and properly de-register to clean up */
f_M3UA_asp_inact(0);
f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctxA)));
- f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA, rctxB)));
- f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA, rctxB)));
+ f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA & rctxB, rctxB & rctxA)));
+ f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA & rctxB, rctxB & rctxA)));
f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_SUCCESS)}));
f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation static-only");
To view, visit change 40191. To unsubscribe, or for help writing mail filters, visit settings.