September 2026 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: SGSN: add TC_attach_gmm_attach_req_while_gmm_attach_changed
by pespin 02 Sep '26

02 Sep '26

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39256?usp=email ) Change subject: SGSN: add TC_attach_gmm_attach_req_while_gmm_attach_changed ...................................................................... Patch Set 16: (2 comments) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39256/comment/de6e07c3_3b51… : PS15, Line 2199: // f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[0]); > This can be removed? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39256/comment/baee1859_91c0… : PS15, Line 2228: Misc_Helpers.f_shutdown(__BFILE__, __LINE__); > Why do you need to shutdown like this here? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39256?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia721d3c29bf09014b197670ae02d1cd1901750bc Gerrit-Change-Number: 39256 Gerrit-PatchSet: 16 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 02 Sep 2026 10:39:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN: as_service_request(): use as_ciph_utran() to parse the Security...
by fixeria 02 Sep '26

02 Sep '26

Attention is currently required from: daniel, lynxis lazus, pespin. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43454?usp=email ) Change subject: SGSN: as_service_request(): use as_ciph_utran() to parse the Security Command ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43454?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ice385045c96e2d2eac7aa3c523c7b7c3c39e8bf4 Gerrit-Change-Number: 43454 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 02 Sep 2026 10:37:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_asp_act_multias
by pespin 02 Sep '26

02 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43488?usp=email ) Change subject: stp: Introduce test TC_asp_act_multias ...................................................................... stp: Introduce test TC_asp_act_multias Depends: libosmo-sigtran.git Change-Id I252f9e16ab92a264559385d47690552d75837569 Change-Id: I6469b9cba6a4ce8b1d90ade7e95bfcf238176126 --- M stp/STP_Tests_M3UA.cfg M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml M stp/osmo-stp-m3ua.confmerge 4 files changed, 67 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg index 3bdd716..b2f6df1 100644 --- a/stp/STP_Tests_M3UA.cfg +++ b/stp/STP_Tests_M3UA.cfg @@ -115,6 +115,23 @@ routing_ctx := omit } } + }, + { + asp_name := "asp-multias", + is_server := false, + use_tcp := false, + remote_port := 2905, + local_port := 1004, + as := { + { /* as-multias0 */ + point_code := 50, + routing_ctx := 2000 + }, + { /* as-multias1 */ + point_code := 51, + routing_ctx := 2001 + } + } } }; diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index b263e70..7633b2e 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -38,7 +38,7 @@ import from STP_Tests_Common all; -private const integer MAX_NR_M3UA := 8; /* Maximum number of M3UA clients+servers in ATS */ +private const integer MAX_NR_M3UA := 9; /* Maximum number of M3UA clients+servers in ATS */ modulepar { /* STP-side IP addresses */ @@ -747,6 +747,36 @@ f_clear_m3ua(); } +/* Test the ASP-ACTIVATE procedure with multiple Routing Context */ +testcase TC_asp_act_multias() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-multias" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var octetstring rctx := f_m3ua_config_get_all_rctx(m3ua_configs[0]); + var OCT4 rctxA := f_m3ua_config_get_rctx(m3ua_configs[0], 0); + var OCT4 rctxB := f_m3ua_config_get_rctx(m3ua_configs[0], 1); + var OCT4 dpcA := f_m3ua_config_get_pc(m3ua_configs[0], 0); + var OCT4 dpcB := f_m3ua_config_get_pc(m3ua_configs[0], 1); + f_init_m3ua(m3ua_configs := m3ua_configs); + + f_M3UA_asp_up(0, ntfy_after_up := omit); + f_M3UA_wait_NOTIFY_all_rctx(0, rctx, c_M3UA_ST_I_AS_INACTIVE); + + f_M3UA_asp_act(0, rctx := rctx, ntfy_after_act := omit); + /* rctxA becomes active: */ + 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_DAVA({ts_M3UA_PC(oct2int(dpcA))}, rctxB)); + if (g_iut_supports_rfc666_4_5_1_duna_after_act) { + f_M3UA_exp(0, tr_M3UA_DUNA({*}, rctxA)); + } + /* rctxB becomes active: */ + 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_DAVA({ts_M3UA_PC(oct2int(dpcB))}, rctxA)); + if (g_iut_supports_rfc666_4_5_1_duna_after_act) { + f_M3UA_exp(0, tr_M3UA_DUNA({*}, rctxB)); + } + f_clear_m3ua(); +} + /* test whether the STP accepts M3UA DATA without Routing Context IE */ testcase TC_act_rctx_data_no_rctx() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0" }; @@ -2036,6 +2066,7 @@ execute( TC_asp_act_override() ); execute( TC_asp_act_loadshare() ); execute( TC_asp_act_broadcast() ); + execute( TC_asp_act_multias() ); execute( TC_tmt_override() ); execute( TC_tmt_loadshare_roundrobin() ); execute( TC_tmt_loadshare_sls() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 2243959..69187c9 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -9,6 +9,7 @@ <testcase classname='STP_Tests_M3UA' name='TC_asp_act_override' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_asp_act_loadshare' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_asp_act_broadcast' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_asp_act_multias' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_tmt_override' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_tmt_loadshare_roundrobin' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_tmt_loadshare_sls' time='MASKED'/> diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge index 5bc337f..179ca0f 100644 --- a/stp/osmo-stp-m3ua.confmerge +++ b/stp/osmo-stp-m3ua.confmerge @@ -59,6 +59,14 @@ remote-ip ::1 role asp sctp-role client + ! ASP serving multiple AS: + asp asp-multias 1004 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server as as-sender m3ua asp asp-sender routing-key 1023 23 @@ -82,6 +90,13 @@ as as-client61-norctx m3ua routing-key 0 61 asp asp-client61-norctx0 + ! ASP serving multiple AS: + as as-multias0 m3ua + routing-key 2000 50 + asp asp-multias + as as-multias1 m3ua + routing-key 2001 51 + asp asp-multias ! ! ROUTING TABLE: ! @@ -93,6 +108,8 @@ update route 55 16777215 linkset as-client update route 60 16777215 linkset as-client60-norctx update route 61 16777215 linkset as-client61-norctx + update route 50 16777215 linkset as-multias0 + update route 51 16777215 linkset as-multias1 ! !SERVERS: ! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43488?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6469b9cba6a4ce8b1d90ade7e95bfcf238176126 Gerrit-Change-Number: 43488 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_ssnm_distribution_scon_asp_multias
by pespin 02 Sep '26

02 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43499?usp=email ) Change subject: stp: Introduce test TC_ssnm_distribution_scon_asp_multias ...................................................................... stp: Introduce test TC_ssnm_distribution_scon_asp_multias Related: OS#7062 Change-Id: I06004bbf409c407a8243b85a17edeb83be13e1c9 --- M stp/STP_Tests_M3UA.cfg M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml M stp/osmo-stp-m3ua.confmerge 4 files changed, 59 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg index b2f6df1..5034333 100644 --- a/stp/STP_Tests_M3UA.cfg +++ b/stp/STP_Tests_M3UA.cfg @@ -132,6 +132,23 @@ routing_ctx := 2001 } } + }, + { + asp_name := "asp-client-multias", + is_server := true, + use_tcp := false, + remote_port := 2908, + local_port := 10008, + as := { + { /* as-client-multias0 */ + point_code := 52, + routing_ctx := 2002 + }, + { /* as-client-multias1 */ + point_code := 53, + routing_ctx := 2003 + } + } } }; diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 7633b2e..60add43 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -1729,6 +1729,30 @@ f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0)); } +/* Same as TC_ssnm_distribution_scon, but SCON is received on an ASP serving 2 Routing Context (AS). */ +testcase TC_ssnm_distribution_scon_asp_multias() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client-multias" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx0 := f_m3ua_config_get_rctx(m3ua_configs[0]); + var octetstring rctxS := f_m3ua_config_get_all_rctx(m3ua_configs[1]); + /* some random point code whose availability we advertise */ + var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); + + f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs); + + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate SG-role ASP (ASP on STP) */ + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(1, rctx := rctxS); + + /* transmit a SCON to the remote ASP */ + f_M3UA_send(1, ts_M3UA_SCON({adv_pc}, rctxS)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0)); +} + private function f_asp_cfg_str(in M3uaConfig cfg) return charstring { var charstring str; @@ -2121,6 +2145,7 @@ execute( TC_ssnm_distribution_dava_duna_multipc() ); execute( TC_ssnm_distribution_dupu() ); execute( TC_ssnm_distribution_scon() ); + execute( TC_ssnm_distribution_scon_asp_multias() ); /* put this one last as it changes the stp side config */ execute( TC_clnt_asp_act_tmt_loadshare() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 69187c9..f760eb3 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -49,6 +49,7 @@ <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dava_duna_multipc' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dupu' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_scon' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_scon_asp_multias' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_act_tmt_loadshare' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_cli' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_cli_srv' time='MASKED'/> diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge index 179ca0f..c69714c 100644 --- a/stp/osmo-stp-m3ua.confmerge +++ b/stp/osmo-stp-m3ua.confmerge @@ -67,6 +67,13 @@ remote-ip ::1 role sg sctp-role server + asp asp-client-multias 10008 2908 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client as as-sender m3ua asp asp-sender routing-key 1023 23 @@ -97,6 +104,13 @@ as as-multias1 m3ua routing-key 2001 51 asp asp-multias + ! ASP client serving multiple AS: + as as-client-multias0 m3ua + routing-key 2002 52 + asp asp-client-multias + as as-client-multias1 m3ua + routing-key 2003 53 + asp asp-client-multias ! ! ROUTING TABLE: ! @@ -110,6 +124,8 @@ update route 61 16777215 linkset as-client61-norctx update route 50 16777215 linkset as-multias0 update route 51 16777215 linkset as-multias1 + update route 52 16777215 linkset as-client-multias0 + update route 53 16777215 linkset as-client-multias1 ! !SERVERS: ! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43499?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I06004bbf409c407a8243b85a17edeb83be13e1c9 Gerrit-Change-Number: 43499 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Fix expectations of TC_rkm_unreg_active
by pespin 02 Sep '26

02 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43487?usp=email ) Change subject: stp: Fix expectations of TC_rkm_unreg_active ...................................................................... stp: Fix expectations of TC_rkm_unreg_active Newer libosmo-sigtran has been fixed to avoid sending Routing Contexts for all AS associated to the ASP. Adapt test to expect correct set of NOTIFY messages. Depends: libosmo-sigtran.git Change-Id I252f9e16ab92a264559385d47690552d75837569 Change-Id: I635272693e481f3938bbadf09990d8e4d0dd66b0 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 36 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 94134e9..b263e70 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -505,6 +505,33 @@ * Test the STP in M3UA SG role (we are ASP) ***********************************************************************/ +private function f_M3UA_split_rctxs(octetstring rctx_raw) return Osmocom_Types.ro_integer +{ + var Osmocom_Types.ro_integer rctx_list := {}; + while (lengthof(rctx_raw) >= 4) { + var OCT4 rctx := substr(rctx_raw, 0, 4); + ro_integer_add_unique(rctx_list, oct2int(rctx)); + rctx_raw := substr(rctx_raw, 4, lengthof(rctx_raw) - 4); + } + return rctx_list; +} +friend function f_M3UA_wait_NOTIFY_all_rctx(integer idx, octetstring rctx, OCT2 st_change := c_M3UA_ST_I_AS_INACTIVE) +runs on RAW_M3UA_CT { + var M3UA_RecvFrom rx; + var Osmocom_Types.ro_integer exp_rctx_list := f_M3UA_split_rctxs(rctx); + var Osmocom_Types.ro_integer rx_rctx_list; + + while (lengthof(exp_rctx_list) > 0) { + log("Waiting to receive NOTIFY ", st_change, " for RCTX ", exp_rctx_list); + rx := f_M3UA_exp(idx, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, st_change, *)); + rx_rctx_list := f_M3UA_split_rctxs(rx.msg.m3UA_NOTIFY.messageParameters.routing_Context.routingContext); + for (var integer i := 0; i < (lengthof(rx_rctx_list)); i := i + 1) { + ro_integer_del(exp_rctx_list, rx_rctx_list[i]); + } + } + log ("Done waiting to receive NOTIFY ", st_change) +} + /* perform an outbound ASP-UP procedure */ friend function f_M3UA_asp_up(integer idx, template (omit) OCT4 aspid := omit, template (omit) OCT2 ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE) runs on RAW_M3UA_CT { @@ -1189,6 +1216,7 @@ var OCT4 rctxA := int2oct(1234, 4); var OCT3 dpcB := f_m3ua_config_get_pc_OCT3(m3ua_configs[0]); // must match config var OCT4 rctxB := f_m3ua_config_get_rctx(m3ua_configs[0]); // must match config + var octetstring rctx := rctxA & rctxB; f_init_common(); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); @@ -1197,18 +1225,18 @@ /* first register the routing key */ f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpcA, rctx:=rctxA, ntfy_after_reg := omit); - /* then activate the ASP, this turns the 2 AS (one for each rctx, 1234 and default 1023) - * INACTIVE, handle the 2 NOTIFY manually afterwards: */ + /* then activate the 2 AS (one for each rctx, 1234 and default 1023) + * handle the 2 NOTIFY manually afterwards: */ f_M3UA_asp_up(0, ntfy_after_up := omit); - 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, ntfy_after_act := omit); - 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_wait_NOTIFY_all_rctx(0, rctx, c_M3UA_ST_I_AS_INACTIVE); + + f_M3UA_asp_act(0, omit, rctx, ntfy_after_act := omit); + 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_DAVA({ts_M3UA_PC(oct2int(dpcB))}, rctxA)); if (g_iut_supports_rfc666_4_5_1_duna_after_act) { f_M3UA_exp(0, tr_M3UA_DUNA({*}, 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_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, rctxA)); f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(oct2int(dpcA))}, rctxB)); if (g_iut_supports_rfc666_4_5_1_duna_after_act) { f_M3UA_exp(0, tr_M3UA_DUNA({*}, rctxA)); @@ -1221,8 +1249,7 @@ /* 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, 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_wait_NOTIFY_all_rctx(0, rctx, c_M3UA_ST_I_AS_PENDING); 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 https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I635272693e481f3938bbadf09990d8e4d0dd66b0 Gerrit-Change-Number: 43487 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: stp: Support configuring M3UA ASPs serving multiple AS
by pespin 02 Sep '26

02 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43486?usp=email ) Change subject: stp: Support configuring M3UA ASPs serving multiple AS ...................................................................... stp: Support configuring M3UA ASPs serving multiple AS Change-Id: I734e1e2bef2063c46a0ea63245ff2a9888e6b054 Related: OS#7062 --- M stp/STP_Tests_IPA_M3UA.cfg M stp/STP_Tests_IPA_M3UA.ttcn M stp/STP_Tests_M3UA.cfg M stp/STP_Tests_M3UA.ttcn M stp/STP_Tests_M3UA_TCP.cfg M stp/STP_Tests_M3UA_TCP.ttcn 6 files changed, 254 insertions(+), 143 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/stp/STP_Tests_IPA_M3UA.cfg b/stp/STP_Tests_IPA_M3UA.cfg index 5870747..b6b8302 100644 --- a/stp/STP_Tests_IPA_M3UA.cfg +++ b/stp/STP_Tests_IPA_M3UA.cfg @@ -29,8 +29,12 @@ use_tcp := false, remote_port := 2905, local_port := 9999, - point_code := 23, - routing_ctx := 1023 + as := { + { + point_code := 23, + routing_ctx := 1023 + } + } } }; diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn index 1e7189d..fe924ad 100644 --- a/stp/STP_Tests_IPA_M3UA.ttcn +++ b/stp/STP_Tests_IPA_M3UA.ttcn @@ -49,8 +49,8 @@ var IpaConfigs ipa_configs := ipa_build_configs(ipa_asps); var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); var OCT4 pc_receiver := int2oct(ipa_configs[0].point_code, 4); f_init_m3ua(m3ua_configs := m3ua_configs); @@ -79,8 +79,8 @@ var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps); var OCT4 pc_sender := int2oct(ipa_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[0]); f_init_common(); f_vty_cs7_ipa_as_cmd(ipa_configs[0].as_name, "point-code override patch-sccp disabled"); @@ -111,8 +111,8 @@ var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps); var OCT4 pc_sender := int2oct(ipa_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[0]); f_init_common(); f_vty_cs7_ipa_as_cmd(ipa_configs[0].as_name, "point-code override patch-sccp disabled"); @@ -146,8 +146,8 @@ var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps); var OCT4 pc_sender := int2oct(ipa_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[0]); f_init_common(); f_vty_cs7_ipa_as_cmd(ipa_configs[0].as_name, "point-code override patch-sccp both"); diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg index 860bdd7..3bdd716 100644 --- a/stp/STP_Tests_M3UA.cfg +++ b/stp/STP_Tests_M3UA.cfg @@ -18,8 +18,12 @@ use_tcp := false, remote_port := 2905, local_port := 9999, - point_code := 23, - routing_ctx := 1023 + as := { + { + point_code := 23, + routing_ctx := 1023 + } + } }, { asp_name := "asp-receiver0", @@ -27,8 +31,12 @@ use_tcp := false, remote_port := 2905, local_port := 10000, - point_code := 42, - routing_ctx := 1042 + as := { + { + point_code := 42, + routing_ctx := 1042 + } + } }, { asp_name := "asp-receiver1", @@ -36,8 +44,12 @@ use_tcp := false, remote_port := 2905, local_port := 10001, - point_code := 42, - routing_ctx := 1042 + as := { + { + point_code := 42, + routing_ctx := 1042 + } + } }, { asp_name := "asp-LS0-0-0", @@ -45,8 +57,12 @@ use_tcp := false, remote_port := 2905, local_port := 10002, - point_code := 44, - routing_ctx := 1044 + as := { + { + point_code := 44, + routing_ctx := 1044 + } + } }, { asp_name := "asp-LS0-1-0", @@ -54,8 +70,12 @@ use_tcp := false, remote_port := 2905, local_port := 10003, - point_code := 45, - routing_ctx := 1045 + as := { + { + point_code := 45, + routing_ctx := 1045 + } + } }, { asp_name := "asp-client0", @@ -63,8 +83,12 @@ use_tcp := false, remote_port := 2906, local_port := 10002, - point_code := 55, - routing_ctx := 1055 + as := { + { + point_code := 55, + routing_ctx := 1055 + } + } }, { asp_name := "asp-client60-norctx0", @@ -72,8 +96,12 @@ use_tcp := false, remote_port := 2907, local_port := 11060, - point_code := 60, - routing_ctx := omit + as := { + { + point_code := 60, + routing_ctx := omit + } + } }, { asp_name := "asp-client61-norctx0", @@ -81,8 +109,12 @@ use_tcp := false, remote_port := 2907, local_port := 11061, - point_code := 61, - routing_ctx := omit + as := { + { + point_code := 61, + routing_ctx := omit + } + } } }; diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index ff8f08a..94134e9 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -57,6 +57,15 @@ OCT1 mp_ni := '00'O; } +type record M3uaConfigAS { + /* point code routed via this M3U */ + integer point_code, + /* associated routing context */ + integer routing_ctx optional +} + +type record of M3uaConfigAS M3uaConfigASs; + type record M3uaConfig { /* Name of the ASP in the STP, (eg. to access it over VTY) */ charstring asp_name, @@ -68,10 +77,8 @@ integer remote_port, /* local M3UA base port on TTCN3 side */ integer local_port, - /* point code routed via this M3U */ - integer point_code, - /* associated routing context */ - integer routing_ctx optional + /* ASs served by this ASP: */ + M3uaConfigASs as }; type record of M3uaConfig M3uaConfigs; @@ -82,6 +89,48 @@ var boolean g_iut_supports_rfc666_4_5_1_duna_after_act := true; /* RFC4666 4.5.1 */ } +friend function f_m3ua_config_get_rctx(M3uaConfig m3ua_config, integer idx := 0) return OCT4 +{ + return int2oct(m3ua_config.as[idx].routing_ctx, 4); +} + +friend function f_m3ua_config_get_all_rctx(M3uaConfig m3ua_config) return octetstring +{ + var octetstring rctx := ''O; + for (var integer i := 0; i < lengthof(m3ua_config.as); i := i + 1) { + rctx := rctx & int2oct(m3ua_config.as[i].routing_ctx, 4); + } + return rctx; +} + +friend function f_m3ua_config_get_pc(M3uaConfig m3ua_config, integer idx := 0) return OCT4 +{ + return int2oct(m3ua_config.as[idx].point_code, 4); +} + +friend function f_m3ua_config_get_pc_OCT3(M3uaConfig m3ua_config, integer idx := 0) return OCT3 +{ + return int2oct(m3ua_config.as[idx].point_code, 3); +} + +friend function f_m3ua_config_get_all_pc(M3uaConfig m3ua_config) return octetstring +{ + var octetstring pc := ''O; + for (var integer i := 0; i < lengthof(m3ua_config.as); i := i + 1) { + pc := pc & int2oct(m3ua_config.as[i].point_code, 4); + } + return pc; +} + +friend function f_m3ua_config_get_all_affected_pc(M3uaConfig m3ua_config) return M3UA_Point_Codes +{ + var M3UA_Point_Codes aff_pcs := {}; + for (var integer i := 0; i < lengthof(m3ua_config.as); i := i + 1) { + aff_pcs := aff_pcs & { valueof(ts_M3UA_PC(m3ua_config.as[i].point_code)) } + } + return aff_pcs; +} + friend function f_m3ua_get_config_idx(charstring asp_name) runs on RAW_M3UA_CT return integer { for (var integer i := 0; i < lengthof(g_m3ua_configs); i := i + 1) { if (g_m3ua_configs[i].asp_name == asp_name) { @@ -480,7 +529,7 @@ /* perform an outbound ASP-ACTIVATE procedure */ friend function f_M3UA_asp_act(integer idx, template (omit) M3UA_Traffic_Mode_Type tmt := omit, - template (omit) OCT4 rctx := omit, + template (omit) octetstring rctx := omit, template (omit) OCT2 ntfy_after_act := c_M3UA_ST_I_AS_ACTIVE) runs on RAW_M3UA_CT { f_M3UA_send(idx, ts_M3UA_ASPAC(tmt, rctx)); f_M3UA_exp(idx, tr_M3UA_ASPAC_ACK(tmt, rctx)); @@ -491,14 +540,14 @@ } /* perform an outbound ASP-INACTIVATE procedure */ -friend function f_M3UA_asp_inact(integer idx, template (omit) OCT4 rctx := omit) runs on RAW_M3UA_CT { +friend function f_M3UA_asp_inact(integer idx, template (omit) octetstring rctx := omit) runs on RAW_M3UA_CT { f_M3UA_send(idx, ts_M3UA_ASPIA(rctx)); f_M3UA_exp(idx, tr_M3UA_ASPIA_ACK(rctx)); } /* perform outbound ASP-UP and ASP-ACT, optionally expect intermittent NOTIFY */ friend function f_M3UA_asp_up_act(integer idx, template (omit) M3UA_Traffic_Mode_Type tmt := omit, - template (omit) OCT4 rctx := omit, + template (omit) octetstring rctx := omit, template (omit) OCT2 ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE, template (omit) OCT2 ntfy_after_act := c_M3UA_ST_I_AS_ACTIVE, template (omit) boolean exp_duna_after_act := omit /* auto */) @@ -557,7 +606,7 @@ if (m3ua_configs[0].is_server) { f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(0, rctx := int2oct(m3ua_configs[0].routing_ctx, 4)); + f_M3UA_CLNT_asp_up_act(0, rctx := f_m3ua_config_get_all_rctx(m3ua_configs[0])); } else { f_M3UA_asp_up(0, ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE); } @@ -617,7 +666,7 @@ if (m3ua_configs[0].is_server) { f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(0, rctx := int2oct(m3ua_configs[0].routing_ctx, 4)); + f_M3UA_CLNT_asp_up_act(0, rctx := f_m3ua_config_get_all_rctx(m3ua_configs[0])); } else { f_M3UA_asp_up(0, ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE); } @@ -675,10 +724,10 @@ testcase TC_act_rctx_data_no_rctx() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[1]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[1]); f_init_m3ua(m3ua_configs := m3ua_configs); @@ -698,7 +747,7 @@ testcase TC_adm_block_act_err() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); f_init_m3ua(m3ua_configs := m3ua_configs); f_vty_cs7_asp_cmd(g_m3ua_configs[0], "block"); @@ -721,7 +770,7 @@ testcase TC_adm_block_after_act() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_asp_up_act(0, rctx := rctx_sender); @@ -774,8 +823,8 @@ } /* Test if traffic is routed from idx_tx/pc_tx to idx_rx/pc_rx */ -friend function f_test_traffic(integer idx_tx, template (omit) OCT4 rctx_sender, OCT4 pc_tx, - integer idx_rx, template (omit) OCT4 rctx_receiver, OCT4 pc_rx, +friend function f_test_traffic(integer idx_tx, template (omit) octetstring rctx_sender, OCT4 pc_tx, + integer idx_rx, template (omit) octetstring rctx_receiver, OCT4 pc_rx, OCT1 si := '02'O, OCT1 ni := mp_ni, OCT1 mp := '00'O, OCT1 sls := '00'O) runs on RAW_M3UA_CT { var octetstring data := f_rnd_octstring_rnd_len(100); @@ -790,10 +839,10 @@ testcase TC_tmt_override() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[1]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[1]); f_init_m3ua(m3ua_configs := m3ua_configs); @@ -832,10 +881,10 @@ var integer i; var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[1]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[1]); f_init_m3ua(m3ua_configs := m3ua_configs); @@ -905,10 +954,10 @@ var integer i; var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[1]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[1]); f_init_m3ua(m3ua_configs := m3ua_configs); @@ -988,10 +1037,10 @@ var integer i; var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[1]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[1]); f_init_m3ua(m3ua_configs := m3ua_configs); @@ -1058,8 +1107,8 @@ testcase TC_rkm_reg_static_permitted() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT3 dpc := int2oct(m3ua_configs[0].point_code, 3); // must match config - var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); // must match config + var OCT3 dpc := f_m3ua_config_get_pc_OCT3(m3ua_configs[0]); // must match config + var OCT4 rctx := f_m3ua_config_get_rctx(m3ua_configs[0]); // must match config f_init_m3ua(m3ua_configs := m3ua_configs); @@ -1091,7 +1140,7 @@ testcase TC_rkm_unreg_never_registered() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var octetstring rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + var octetstring rctx := f_m3ua_config_get_rctx(m3ua_configs[0]); f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctx))); @@ -1138,8 +1187,8 @@ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); var OCT3 dpcA := int2oct(123, 3); var OCT4 rctxA := int2oct(1234, 4); - var OCT3 dpcB := int2oct(m3ua_configs[0].point_code, 4); // must match config - var OCT4 rctxB := int2oct(m3ua_configs[0].routing_ctx, 4); // must match config + var OCT3 dpcB := f_m3ua_config_get_pc_OCT3(m3ua_configs[0]); // must match config + var OCT4 rctxB := f_m3ua_config_get_rctx(m3ua_configs[0]); // must match config f_init_common(); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); @@ -1190,11 +1239,15 @@ use_tcp := false, remote_port := 2905, local_port := 2222, - point_code := 22, - routing_ctx := 220 + as := { + { + point_code := 22, + routing_ctx := 220 + } + } } }; - var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctx0 := f_m3ua_config_get_rctx(m3ua_configs[0]); f_init_common(); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); f_init_m3ua(m3ua_configs := m3ua_configs); @@ -1204,7 +1257,7 @@ /* REG REQ + RESP */ f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='00000001'O, - dpc:=int2oct(m3ua_configs[0].point_code, 3), + dpc:=f_m3ua_config_get_pc_OCT3(m3ua_configs[0]), tmt := c_M3UA_TMT_loadshare, rctx := rctx0)})); f_M3UA_exp(0, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:='00000001'O, status:=c_M3UA_REGSTS_SUCCESS, @@ -1228,20 +1281,28 @@ use_tcp := false, remote_port := 2905, local_port := 2222, - point_code := 22, - routing_ctx := 220 + as := { + { + point_code := 22, + routing_ctx := 220 + } + } }, { asp_name := "unknown1", is_server := false, use_tcp := false, remote_port := 2905, local_port := 2223, - point_code := 22, - routing_ctx := 220 + as := { + { + point_code := 22, + routing_ctx := 220 + } + } } }; - var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 rctx1 := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctx0 := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 rctx1 := f_m3ua_config_get_rctx(m3ua_configs[0]); f_init_common(); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); f_init_m3ua(m3ua_configs := m3ua_configs); @@ -1252,7 +1313,7 @@ /* REG REQ + RESP */ f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='00000001'O, - dpc:=int2oct(m3ua_configs[0].point_code, 3), + dpc := f_m3ua_config_get_pc_OCT3(m3ua_configs[0]), tmt := c_M3UA_TMT_loadshare, rctx := rctx0)})); f_M3UA_exp(0, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:='00000001'O, status:=c_M3UA_REGSTS_SUCCESS, @@ -1268,7 +1329,7 @@ /* REG REQ + RESP */ f_M3UA_send(1, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='00000001'O, - dpc:=int2oct(m3ua_configs[1].point_code, 3), + dpc := f_m3ua_config_get_pc_OCT3(m3ua_configs[1]), tmt := c_M3UA_TMT_loadshare, rctx := rctx1)})); f_M3UA_exp(1, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:='00000001'O, status:=c_M3UA_REGSTS_SUCCESS, @@ -1299,14 +1360,14 @@ /* expect/perform an inbound ASP-ACTIVATE procedure */ friend function f_M3UA_CLNT_asp_act(integer idx, template M3UA_Traffic_Mode_Type tmt := omit, - template (omit) OCT4 rctx := omit) runs on RAW_M3UA_CT { + template (omit) octetstring rctx := omit) runs on RAW_M3UA_CT { f_M3UA_exp(idx, tr_M3UA_ASPAC(tmt, rctx)); f_M3UA_send(idx, ts_M3UA_ASPAC_ACK(tmt, rctx)); } /* expect/perform inbound ASP-UP and ASP-ACT, optionally send interemittent NOTIFY */ friend function f_M3UA_CLNT_asp_up_act(integer idx, template M3UA_Traffic_Mode_Type tmt := omit, - template OCT4 rctx := omit, + template octetstring rctx := omit, template (omit) OCT2 ntfy_after_up := c_M3UA_ST_I_AS_INACTIVE, template (omit) OCT2 ntfy_after_act := c_M3UA_ST_I_AS_ACTIVE) runs on RAW_M3UA_CT { @@ -1348,7 +1409,7 @@ testcase TC_clnt_asp_act() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctx := f_m3ua_config_get_rctx(m3ua_configs[0]); f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); @@ -1361,7 +1422,7 @@ testcase TC_clnt_asp_act_tmt_loadshare() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctx := f_m3ua_config_get_rctx(m3ua_configs[0]); f_init_common(); f_vty_config2(VTY, {"cs7 instance 0", "as as-client m3ua"}, "traffic-mode loadshare"); @@ -1378,10 +1439,10 @@ testcase TC_clnt_sg_to_asp() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[1]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[1]); f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_asp_up_act(0); @@ -1402,10 +1463,10 @@ testcase TC_clnt_asp_to_sg() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[1].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[1]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[1]); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[0]); f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_asp_up_act(0); @@ -1425,10 +1486,10 @@ testcase TC_clnt_sg_to_asp_norctx() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client60-norctx0", "asp-client61-norctx0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); - var OCT4 pc_receiver2 := int2oct(m3ua_configs[2].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[1]); + var OCT4 pc_receiver2 := f_m3ua_config_get_pc(m3ua_configs[2]); /* activate the sender side (ATS is client to STP in SG role) */ f_init_m3ua(m3ua_configs := m3ua_configs); @@ -1455,10 +1516,10 @@ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client60-norctx0", "asp-client61-norctx0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[1].point_code, 4); - var OCT4 pc_sender2 := int2oct(m3ua_configs[2].point_code, 4); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[1]); + var OCT4 pc_sender2 := f_m3ua_config_get_pc(m3ua_configs[2]); /* activate the sender side (ATS is client to STP in SG role) */ f_init_m3ua(m3ua_configs := m3ua_configs); @@ -1483,8 +1544,8 @@ testcase TC_ssnm_aspac_dava_aspia_duna() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); - var integer pc0 := m3ua_configs[1].point_code; + var OCT4 rctx0 := f_m3ua_config_get_rctx(m3ua_configs[0]); + var M3UA_Point_Codes aff_pcs0 := f_m3ua_config_get_all_affected_pc(m3ua_configs[1]); f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs); /* activate the first ASP */ @@ -1493,13 +1554,13 @@ /* activate the second ASP */ f_M3UA_asp_up_act(1, c_M3UA_TMT_override, omit); /* expect DAVA for PC of second ASP on first ASP */ - f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(pc0, 0)}, rctx0)); + f_M3UA_exp(0, tr_M3UA_DAVA(aff_pcs0, rctx0)); /* TODO: expect no DAVA on second ASP */ /* deactivate the second ASP */ f_M3UA_asp_inact(1); /* expect DUNA for PC of second ASP on first ASP */ - f_M3UA_exp(0, tr_M3UA_DUNA({ts_M3UA_PC(pc0, 0)}, rctx0)); + f_M3UA_exp(0, tr_M3UA_DUNA(aff_pcs0, rctx0)); /* TODO: expect no DUNA on second ASP */ f_clear_m3ua(); @@ -1509,8 +1570,8 @@ testcase TC_ssnm_distribution_dava_duna() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 rctx0 := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 rctxS0 := f_m3ua_config_get_rctx(m3ua_configs[1]); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); @@ -1538,8 +1599,8 @@ testcase TC_ssnm_distribution_dava_duna_multipc() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 rctx0 := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 rctxS0 := f_m3ua_config_get_rctx(m3ua_configs[1]); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Codes adv_pcs := { ts_M3UA_PC(1234, 0), ts_M3UA_PC(5678, 0) }; @@ -1567,8 +1628,8 @@ testcase TC_ssnm_distribution_dupu() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 rctx0 := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 rctxS0 := f_m3ua_config_get_rctx(m3ua_configs[1]); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); @@ -1591,8 +1652,8 @@ testcase TC_ssnm_distribution_scon() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 rctx0 := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 rctxS0 := f_m3ua_config_get_rctx(m3ua_configs[1]); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); @@ -1650,7 +1711,7 @@ f_quirk("no_notify"); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(0, rctx := int2oct(g_m3ua_configs[0].routing_ctx, 4), + f_M3UA_CLNT_asp_up_act(0, rctx := f_m3ua_config_get_rctx(g_m3ua_configs[0]), ntfy_after_up := omit, ntfy_after_act := omit); f_no_quirk("no_notify"); f_clear_m3ua(); @@ -1660,9 +1721,8 @@ testcase TC_clnt_no_daud_in_asp() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); - var integer pc := m3ua_configs[0].point_code; - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) }; + var OCT4 rctx := f_m3ua_config_get_rctx(m3ua_configs[0]); + var template (value) M3UA_Point_Codes aff_pcs := f_m3ua_config_get_all_affected_pc(m3ua_configs[0]); f_init_m3ua(m3ua_configs := m3ua_configs); f_no_quirk("daud_in_asp"); @@ -1681,9 +1741,8 @@ testcase TC_clnt_quirk_daud_in_asp() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); - var integer pc := m3ua_configs[0].point_code; - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) }; + var OCT4 rctx := f_m3ua_config_get_rctx(m3ua_configs[0]); + var template (value) M3UA_Point_Codes aff_pcs := f_m3ua_config_get_all_affected_pc(m3ua_configs[0]); f_init_m3ua(m3ua_configs := m3ua_configs); f_quirk("daud_in_asp"); @@ -1703,7 +1762,7 @@ testcase TC_clnt_no_snm_inactive() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(m3ua_configs[0].point_code) }; + var template (value) M3UA_Point_Codes aff_pcs := f_m3ua_config_get_all_affected_pc(m3ua_configs[0]); f_init_m3ua(m3ua_configs := m3ua_configs); f_quirk("no_notify"); @@ -1728,7 +1787,7 @@ testcase TC_clnt_quirk_snm_inactive() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-client0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(m3ua_configs[0].point_code) }; + var template (value) M3UA_Point_Codes aff_pcs := f_m3ua_config_get_all_affected_pc(m3ua_configs[0]); f_init_m3ua(m3ua_configs := m3ua_configs); f_quirk("no_notify"); @@ -1759,7 +1818,7 @@ f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); - var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctx := f_m3ua_config_get_rctx(m3ua_configs[0]); f_M3UA_CLNT_asp_up_act(0, rctx := rctx); f_sleep(1.0); f_vty_cs7_asp_cmd(m3ua_configs[0], "shutdown"); @@ -1798,10 +1857,10 @@ var integer i; var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-LS0-0-0", "asp-LS0-1-0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); - var OCT4 rctx_receiver2 := int2oct(m3ua_configs[2].routing_ctx, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[1]); + var OCT4 rctx_receiver2 := f_m3ua_config_get_rctx(m3ua_configs[2]); var OCT4 pc_receiver := int2oct(99, 4); f_init_m3ua(m3ua_configs := m3ua_configs); @@ -1872,8 +1931,8 @@ f_clear_m3ua(); } -private function f_tc_inaccessible_sp_duna(integer idx_tx, OCT4 pc_sender, OCT4 rctx_sender, - OCT4 pc_receiver, OCT4 rctx_receiver) runs on RAW_M3UA_CT { +private function f_tc_inaccessible_sp_duna(integer idx_tx, OCT4 pc_sender, octetstring rctx_sender, + OCT4 pc_receiver, octetstring rctx_receiver) runs on RAW_M3UA_CT { var octetstring data := f_rnd_octstring_rnd_len(100); var template (value) M3UA_Protocol_Data m3ua_data; /* Max for T8 is 1200 msec, so we leave some more time. to avodi race conditions: */ @@ -1912,8 +1971,8 @@ testcase TC_inaccessible_sp_duna() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); var OCT4 rctx_receiver := int2oct(3, 4); var OCT4 pc_receiver := int2oct(mp_inaccessible_pc, 4); @@ -1928,10 +1987,10 @@ testcase TC_inaccessible_sp_duna2() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 rctx_sender := f_m3ua_config_get_rctx(m3ua_configs[0]); + var OCT4 pc_sender := f_m3ua_config_get_pc(m3ua_configs[0]); + var OCT4 rctx_receiver := f_m3ua_config_get_rctx(m3ua_configs[1]); + var OCT4 pc_receiver := f_m3ua_config_get_pc(m3ua_configs[1]); f_init_m3ua(m3ua_configs := m3ua_configs); diff --git a/stp/STP_Tests_M3UA_TCP.cfg b/stp/STP_Tests_M3UA_TCP.cfg index 704de7a..7508ed0 100644 --- a/stp/STP_Tests_M3UA_TCP.cfg +++ b/stp/STP_Tests_M3UA_TCP.cfg @@ -18,8 +18,12 @@ use_tcp := false, remote_port := 2905, local_port := 9999, - point_code := 23, - routing_ctx := 1023 + as := { + { + point_code := 23, + routing_ctx := 1023 + } + } }, { asp_name := "asp-sender-tcp", @@ -27,8 +31,12 @@ use_tcp := true, remote_port := 2905, local_port := 9999, - point_code := 123, - routing_ctx := 1123 + as := { + { + point_code := 123, + routing_ctx := 1123 + } + } }, { asp_name := "asp-client0", @@ -36,8 +44,12 @@ use_tcp := false, remote_port := 2906, local_port := 10002, - point_code := 55, - routing_ctx := 1055 + as := { + { + point_code := 55, + routing_ctx := 1055 + } + } }, { asp_name := "asp-client0-tcp", @@ -45,8 +57,12 @@ use_tcp := true, remote_port := 2906, local_port := 10002, - point_code := 155, - routing_ctx := 1155 + as := { + { + point_code := 155, + routing_ctx := 1155 + } + } } }; diff --git a/stp/STP_Tests_M3UA_TCP.ttcn b/stp/STP_Tests_M3UA_TCP.ttcn index 4e0706b..8cb026f 100644 --- a/stp/STP_Tests_M3UA_TCP.ttcn +++ b/stp/STP_Tests_M3UA_TCP.ttcn @@ -45,10 +45,10 @@ private function f_TC_m3ua_tcp(integer idx_a, integer idx_b) runs on RAW_M3UA_CT { var M3uaConfig cfg_a := g_m3ua_configs[idx_a]; var M3uaConfig cfg_b := g_m3ua_configs[idx_b]; - var OCT4 rctx_a := int2oct(cfg_a.routing_ctx, 4); - var OCT4 rctx_b := int2oct(cfg_b.routing_ctx, 4); - var OCT4 pc_a := int2oct(cfg_a.point_code, 4); - var OCT4 pc_b := int2oct(cfg_b.point_code, 4); + var OCT4 rctx_a := f_m3ua_config_get_rctx(cfg_a); + var OCT4 rctx_b := f_m3ua_config_get_rctx(cfg_b); + var OCT4 pc_a := f_m3ua_config_get_pc(cfg_a); + var OCT4 pc_b := f_m3ua_config_get_pc(cfg_b); /* establish connection with ASP 'A' */ if (g_m3ua_configs[idx_a].is_server) { @@ -166,7 +166,7 @@ f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); - var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctx := f_m3ua_config_get_rctx(m3ua_configs[0]); f_M3UA_CLNT_asp_up_act(0, rctx := rctx); f_sleep(1.0); f_vty_cs7_asp_cmd(m3ua_configs[0], "shutdown"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43486?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I734e1e2bef2063c46a0ea63245ff2a9888e6b054 Gerrit-Change-Number: 43486 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: xua_as_fsm: Do not send NOTIFY with all AS of ASP
by pespin 02 Sep '26

02 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43485?usp=email ) Change subject: xua_as_fsm: Do not send NOTIFY with all AS of ASP ...................................................................... xua_as_fsm: Do not send NOTIFY with all AS of ASP The NOTIFY message is sharing Routing Context (AS) state change. When the FSM of a given AS changes, we don't want to signal the state change of that single AS to all its ASPs, not all other AS served by those ASPs. This partially reverts old commit e4fc91b9fc3aa3194eea02ef10635323b7558c18. Related: OS#7062 Change-Id: I252f9e16ab92a264559385d47690552d75837569 --- M src/xua_as_fsm.c 1 file changed, 10 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 0ba1b2a..9460cf8 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -43,14 +43,6 @@ return msg; } -static int fill_notify_route_ctx(const struct osmo_ss7_asp *asp, struct osmo_xlm_prim_notify *npar) -{ - npar->route_ctx_count = ss7_asp_get_all_rctx(asp, npar->route_ctx, ARRAY_SIZE(npar->route_ctx), NULL); - if (npar->route_ctx_count > 0) - npar->presence |= NOTIFY_PAR_P_ROUTE_CTX; - return 0; -} - static void tx_notify(struct osmo_ss7_asp *asp, struct osmo_xlm_prim_notify *npar) { const char *type_name, *info_name, *info_str; @@ -60,7 +52,6 @@ LOGPASP(asp, DLSS7, LOGL_INFO, "Tx NOTIFY Type %s:%s (%s)\n", type_name, info_name, info_str); - fill_notify_route_ctx(asp, npar); struct msgb *msg = encode_notify(npar); osmo_ss7_asp_send(asp, msg); } @@ -139,8 +130,6 @@ npar->presence &= ~NOTIFY_PAR_P_ASP_ID; } - fill_notify_route_ctx(asp, npar); - msg = encode_notify(npar); osmo_ss7_asp_send(asp, msg); sent++; @@ -248,10 +237,20 @@ static void fill_notify_statchg_pars(const struct osmo_fsm_inst *fi, struct osmo_xlm_prim_notify *npar) { + struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv; + struct osmo_ss7_as *as = xafp->as; + *npar = (struct osmo_xlm_prim_notify){ .status_type = M3UA_NOTIFY_T_STATCHG, }; + /* Add the routing context, if it is configured */ + if (as->cfg.routing_key.context > 0) { + npar->presence |= NOTIFY_PAR_P_ROUTE_CTX; + npar->route_ctx[0] = as->cfg.routing_key.context; + npar->route_ctx_count = 1; + } + switch (fi->state) { case XUA_AS_S_INACTIVE: npar->status_info = M3UA_NOTIFY_I_AS_INACT; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I252f9e16ab92a264559385d47690552d75837569 Gerrit-Change-Number: 43485 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: xUA: Validate multiple Routing Context in SNM messages
by pespin 02 Sep '26

02 Sep '26

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43500?usp=email ) Change subject: xUA: Validate multiple Routing Context in SNM messages ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-sigtran/+/43500/comment/9278a0ec_1b043… : PS1, Line 14: work. > Depending on how long this will take to implement, it might make sense to print a warning if there i […] It's being tracked in a ticket, and it now becomes obvious in the code that only the first one is being picked, so I think it's fine.It's obvious anyway that people is not using that feature so far, since it's not really ready yet. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43500?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic3a9dc13d128a0c5777981616923ee1856210b21 Gerrit-Change-Number: 43500 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Sep 2026 10:36:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN: f_routing_area_update(): expect a Location Update by default
by fixeria 02 Sep '26

02 Sep '26

Attention is currently required from: lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43453?usp=email ) Change subject: SGSN: f_routing_area_update(): expect a Location Update by default ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43453/comment/6994f43a_12e9… : PS1, Line 10: location is still located location located? Do you mean the MS? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43453?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib67af3197399f1bf94e8d691f4e356f9a926c0d5 Gerrit-Change-Number: 43453 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 02 Sep 2026 10:31:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN: TC_attach_gmm_attach_req_while_gmm_attach: fix test case
by lynxis lazus 02 Sep '26

02 Sep '26

Attention is currently required from: lynxis lazus. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39254?usp=email to look at the new patch set (#12). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: SGSN: TC_attach_gmm_attach_req_while_gmm_attach: fix test case ...................................................................... SGSN: TC_attach_gmm_attach_req_while_gmm_attach: fix test case The SGSN has changed the behavior: - removed auth-policy - not supported anymore - require authentication - remove ID Req(IMEI), not used by new libvlr SGSN Change-Id: I026499844940d4c3d82b0fbd61be636c6ca348e6 --- M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 18 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/39254/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I026499844940d4c3d82b0fbd61be636c6ca348e6 Gerrit-Change-Number: 39254 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

2026

2025

2024

2023

2022

gerrit-log September 2026