- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: stp: Fix brokeness in STP_Tests_IPA.TC_tmt_loadshare
by pespin 03 Mar '25

03 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39661?usp=email ) Change subject: stp: Fix brokeness in STP_Tests_IPA.TC_tmt_loadshare ...................................................................... stp: Fix brokeness in STP_Tests_IPA.TC_tmt_loadshare Similar to previous commit for M3UA, this time for IPA. Since in IPA so far the SLS is fixed per ASP, we need to add an extra sender ASP which will get a new asp_id (and hence SLS) so that we can also test traffic being sent/distributed to the 2nd receiver. Change-Id: I61c3efbf8e30533d051e2de506f7c8eaae7e297b --- M stp/STP_Tests.ttcn M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml M stp/osmo-stp.cfg 4 files changed, 150 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/39661/1 diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index e2e5336..60d68c9 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -69,7 +69,7 @@ f_init_m3ua(); f_init_ipa(); - f_connect_ipa(3); + f_connect_ipa(4); f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via M3UA */ @@ -83,7 +83,7 @@ f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1); /* expect to receive it via IPA */ - f_IPA_exp(3, sccp_enc); + f_IPA_exp(4, sccp_enc); f_clear_m3ua(); } @@ -101,7 +101,7 @@ f_init_m3ua(); f_init_ipa(); - f_connect_ipa(3); + f_connect_ipa(4); f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ @@ -110,7 +110,7 @@ var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); var octetstring sccp_enc := enc_PDU_SCCP(sccp); - f_IPA_send(3, sccp_enc); + f_IPA_send(4, sccp_enc); /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; @@ -133,7 +133,7 @@ f_init_m3ua(); f_init_ipa(); - f_connect_ipa(3); + f_connect_ipa(4); f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ @@ -143,7 +143,7 @@ var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); var octetstring sccp_enc := enc_PDU_SCCP(sccp); f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator national"); - f_IPA_send(3, sccp_enc); + f_IPA_send(4, sccp_enc); /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; @@ -168,7 +168,7 @@ f_init_m3ua(); f_init_ipa(); - f_connect_ipa(3); + f_connect_ipa(4); f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ @@ -176,7 +176,7 @@ var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - f_IPA_send(3, enc_PDU_SCCP(sccp)); + f_IPA_send(4, enc_PDU_SCCP(sccp)); /* patch point codes into addresses */ called := valueof(ts_SccpAddr_PC_GT(oct2int(pc_receiver), '83'O, "mtp3_itu", '1234'H)); diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 10367ad..088b280 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -15,6 +15,7 @@ import from General_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from TELNETasp_PortType all; import from Osmocom_VTY_Functions all; @@ -33,7 +34,7 @@ import from STP_Tests_Common all; -private const integer NR_IPA := 7; +private const integer NR_IPA := 8; type record of charstring AspNameArray; @@ -43,6 +44,7 @@ integer mp_stp_ipa_port := 5000; integer mp_local_ipa_port := 20000; AspNameArray mp_ipa_as_names := {"ipa-as-loadshare-sender", + "ipa-as-loadshare-sender", "ipa-as-loadshare-receiver", "ipa-as-loadshare-receiver", "ipa-as-dynamic-asp", @@ -170,18 +172,18 @@ f_init_ipa(); /* bring up the 'sender' side (single ASP in AS) */ - f_connect_ipa(4, unknwon_dynamic_asp); - /* activate the first 'receiver' side ASP */ f_connect_ipa(5, unknwon_dynamic_asp); - - /* verify traffic is routed from sender to [sole] receiver */ - f_test_traffic(4, 5); - - /* activate the second 'receiver' side ASP */ + /* activate the first 'receiver' side ASP */ f_connect_ipa(6, unknwon_dynamic_asp); + /* verify traffic is routed from sender to [sole] receiver */ + f_test_traffic(5, 6); + + /* activate the second 'receiver' side ASP */ + f_connect_ipa(7, unknwon_dynamic_asp); + /* verify traffic is routed from sender to new receiver */ - f_test_traffic(4, 6); + f_test_traffic(5, 7); setverdict(pass); } @@ -202,54 +204,156 @@ } } -private function f_tc_tmt_loadshare(boolean unknwon_dynamic_asp) +private function f_tc_tmt_loadshare_roundrobin(boolean unknwon_dynamic_asp) runs on IPA_CT { var integer i; f_init_ipa(); + f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "traffic-mode roundrobin"); + /* bring up the 'sender' side (single ASP in AS) */ f_connect_ipa(0, unknwon_dynamic_asp); /* activate the first 'receiver' side ASP */ - f_connect_ipa(1, unknwon_dynamic_asp); + f_connect_ipa(2, unknwon_dynamic_asp); /* verify traffic is routed from sender to [sole] receiver */ for (i := 0; i < 10; i := i+1) { - f_test_traffic(0, 1); + f_test_traffic(0, 2); } /* activate the second 'receiver' side ASP */ - f_connect_ipa(2, unknwon_dynamic_asp); + f_connect_ipa(3, unknwon_dynamic_asp); /* verify traffic is routed from sender to new receiver */ const integer iter_per_asp := 5; - var integer num_rx[3] := { 0, 0, 0 }; + var integer num_rx[2] := { 0, 0 }; for (i := 0; i < 2*iter_per_asp; i := i+1) { var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); f_IPA_send(0, data); alt { - [] as_count_rx(1, data, num_rx[1]); - [] as_count_rx(2, data, num_rx[2]); + [] as_count_rx(2, data, num_rx[0]); + [] as_count_rx(3, data, num_rx[1]); } } /* FIXME: check for extraneous messages? */ - for (i := 1; i <= 2; i := i+1) { + for (i := 0; i < 2; i := i+1) { if (num_rx[i] != iter_per_asp) { setverdict(fail, "Received ", num_rx[i], " out of expected ", iter_per_asp, "DATA messages at IPA port ", i); } } setverdict(pass); + + f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "no traffic-mode"); } /* test "traffic-mode load-share" behavior */ -testcase TC_tmt_loadshare() runs on IPA_CT { - f_tc_tmt_loadshare(false); +testcase TC_tmt_loadshare_roundrobin() runs on IPA_CT { + f_tc_tmt_loadshare_roundrobin(false); } -/* test "traffic-mode override" behavior, with "accept-asp-connections dynamic-permitted" and clients from unknown ASPs */ +private altstep as_count_rx_sls(integer idx, template (present) octetstring exp, inout Integers sls_counter, inout integer rx_counter) +runs on IPA_CT { + var ASP_MTP3_TRANSFERind rx; + [] IPA[idx].receive(t_ASP_MTP3_TRANSFERind(?, ?, ?, ?, exp)) -> value rx { + var integer sls := rx.sls; /* This should in general be 0 in IPA. */ + sls_counter[sls] := sls_counter[sls] + 1; + rx_counter := rx_counter + 1; + } +} + +private function f_tc_tmt_loadshare_sls(boolean unknwon_dynamic_asp) +runs on IPA_CT { + var integer i; + + f_init_ipa(); + + f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "traffic-mode loadshare"); + + /* bring up the 'sender' side (single ASP in AS) */ + f_connect_ipa(0, unknwon_dynamic_asp); + /* activate the first 'receiver' side ASP */ + f_connect_ipa(2, unknwon_dynamic_asp); + + /* verify traffic is routed from sender to [sole] receiver */ + for (i := 0; i < 10; i := i+1) { + f_test_traffic(0, 2); + } + + /* activate the second 'receiver' side ASP */ + f_connect_ipa(3, unknwon_dynamic_asp); + + /* verify traffic is routed from sender to new receiver */ + const integer iter_per_asp := 20; + const integer NUM_SLS := 16; /* SLS in ITU is 4 bits. */ + var integer num_rx_1 := 0; + var integer num_rx_2 := 0; + var Integers sls_num_rx_1 := {}; + var Integers sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < iter_per_asp; i := i+1) { + var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); + f_IPA_send(0, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2); + } + } + + /* All traffic should have still be sent to the first receiver, since OPC+SLS cannot change in IPA ASPs. */ + if (num_rx_1 != iter_per_asp and num_rx_2 != 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through 1st receiver!"); + } + + + /* activate the second 'sender' side ASP */ + f_connect_ipa(1, unknwon_dynamic_asp); + + + num_rx_1 := 0; + num_rx_2 := 0; + sls_num_rx_1 := {}; + sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < 2*iter_per_asp; i := i+1) { + var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); + f_IPA_send(i mod 2, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2); + } + } + /* Make sure traffic was sent over both ASPs and that it was distributed: */ + if (num_rx_1 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 1st ASP!"); + } + if (num_rx_2 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 2nd ASP!"); + } + if (num_rx_1 + num_rx_2 != 2*iter_per_asp) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx ", num_rx_1 + num_rx_2 ," packets in total vs exp ", 2*iter_per_asp)); + } + setverdict(pass); + + f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "no traffic-mode"); +} + +/* test "traffic-mode load-share" behavior */ +testcase TC_tmt_loadshare_sls() runs on IPA_CT { + f_tc_tmt_loadshare_sls(false); +} + +/* test "traffic-mode loadshare" behavior, with "accept-asp-connections dynamic-permitted" and clients from unknown ASPs */ testcase TC_unknown_client_dynamic_tmt_loadshare() runs on IPA_CT { - f_tc_tmt_override(true); + f_tc_tmt_loadshare_sls(true); } control { @@ -258,7 +362,8 @@ execute( TC_unknown_client_dynamic() ); execute( TC_tmt_override() ); execute( TC_unknown_client_dynamic_tmt_override() ); - execute( TC_tmt_loadshare() ); + execute( TC_tmt_loadshare_roundrobin() ); + execute( TC_tmt_loadshare_sls() ); execute( TC_unknown_client_dynamic_tmt_loadshare() ); } diff --git a/stp/expected-results.xml b/stp/expected-results.xml index a764349..3fbe1a5 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='50' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='52' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/> @@ -47,7 +47,8 @@ <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_tmt_override' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_override' time='MASKED'/> - <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_roundrobin' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_sls' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' time='MASKED'/> <testcase classname='STP_Tests' name='TC_m3ua_to_ipa' time='MASKED'/> <testcase classname='STP_Tests' name='TC_ipa_to_m3ua' time='MASKED'/> diff --git a/stp/osmo-stp.cfg b/stp/osmo-stp.cfg index f727d03..355bf20 100644 --- a/stp/osmo-stp.cfg +++ b/stp/osmo-stp.cfg @@ -115,19 +115,23 @@ ! ! IPA AS/ASP: ! - asp ipa-asp-loadshare-sender 20000 5000 ipa + asp ipa-asp-loadshare-sender0 20000 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + asp ipa-asp-loadshare-sender1 20001 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 as ipa-as-loadshare-sender ipa routing-key 0 6 point-code override dpc 31 - asp ipa-asp-loadshare-sender - asp ipa-asp-loadshare-receiver0 20001 5000 ipa + asp ipa-asp-loadshare-sender0 + asp ipa-asp-loadshare-sender1 + asp ipa-asp-loadshare-receiver0 20002 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg sctp-role server - asp ipa-asp-loadshare-receiver1 20002 5000 ipa + asp ipa-asp-loadshare-receiver1 20003 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg @@ -138,20 +142,21 @@ point-code override dpc 32 asp ipa-asp-loadshare-receiver0 asp ipa-asp-loadshare-receiver1 +! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3. ! OVERRIDE: - asp ipa-asp-override-sender 20004 5000 ipa + asp ipa-asp-override-sender 20005 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 as ipa-as-override-sender ipa routing-key 0 6 point-code override dpc 33 asp ipa-asp-override-sender - asp ipa-asp-override-receiver0 20005 5000 ipa + asp ipa-asp-override-receiver0 20006 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg sctp-role server - asp ipa-asp-override-receiver1 20006 5000 ipa + asp ipa-asp-override-receiver1 20007 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I61c3efbf8e30533d051e2de506f7c8eaae7e297b Gerrit-Change-Number: 39661 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Fix brokeness in STP_Tests_M3UA.TC_tmt_loadshare
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: fixeria, laforge, osmith, pespin. Hello Jenkins Builder, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39651?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by osmith Change subject: stp: Fix brokeness in STP_Tests_M3UA.TC_tmt_loadshare ...................................................................... stp: Fix brokeness in STP_Tests_M3UA.TC_tmt_loadshare The test was not even setting the traffic-mode in the UIT. Furthermore, it was expecting pure round-robin behavior, which was the older behavior of osmo-stp when loadshare traffic-mode was selected. Actually split the test into 2, naming them properly (since round robin is not a AS traffic mode in itself, but a possible implementation of the loadshare traffic-mode. The new test validates the usual loadshare traffic-mode based on SLS distribution. Related: SYS#7112 Depends: libosmo-sigtran.git Change-Id I61340549c596f1c04bc2269dbc165c327bf72037 Change-Id: I16d81cb2f88bb2927f248182ad4f8f27c8c24859 --- M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml 2 files changed, 107 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/39651/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39651?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: I16d81cb2f88bb2927f248182ad4f8f27c8c24859 Gerrit-Change-Number: 39651 Gerrit-PatchSet: 5 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Pass M3UA conn idx to f_M3UA_rkm_register()
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39644?usp=email ) Change subject: stp: Pass M3UA conn idx to f_M3UA_rkm_register() ...................................................................... stp: Pass M3UA conn idx to f_M3UA_rkm_register() Change-Id: I9295a2c3518f82e8c82625fb573e414b1d634146 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 195ce81..57aede4 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -684,12 +684,12 @@ f_clear_m3ua(); } -private function f_M3UA_rkm_register(OCT4 id, OCT3 dpc, OCT4 rctx, +private function f_M3UA_rkm_register(integer idx, OCT4 local_id, OCT3 dpc, OCT4 rctx, template (present) OCT4 exp_status := c_M3UA_REGSTS_SUCCESS) runs on RAW_M3UA_CT { - f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:=id, dpc:=dpc, rctx:=rctx)})); - f_M3UA_exp(0, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:=id, status:=exp_status, rctx:=rctx)})); + f_M3UA_send(idx, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:=local_id, dpc:=dpc, rctx:=rctx)})); + f_M3UA_exp(idx, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:=local_id, status:=exp_status, rctx:=rctx)})); } /* Send RKM registration; expect -EPERM as RCTX doesn't match config and dynamic not permitted */ @@ -759,7 +759,7 @@ f_init_m3ua(); /* first register the routing key */ - f_M3UA_rkm_register(id:='30000099'O, dpc:=dpc, rctx:=rctx); + f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctx); /* then try to de-register */ f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctx))); @@ -779,7 +779,7 @@ f_init_m3ua(); /* first register the routing key */ - f_M3UA_rkm_register(id:='30000099'O, dpc:=dpc, rctx:=rctx); + f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctx); /* then activate the ASP */ f_M3UA_asp_up_act(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39644?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: I9295a2c3518f82e8c82625fb573e414b1d634146 Gerrit-Change-Number: 39644 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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 osmo-ttcn3-hacks[master]: stp: NOTIFY expectancy fixes
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39646?usp=email ) Change subject: stp: NOTIFY expectancy fixes ...................................................................... stp: NOTIFY expectancy fixes Fix expected behavior of STP according to specs (RFC 4666 4.3.4.5), after osmo-stp got several related fixes in libosmo-sigtran.git Change-Id I85948ab98623a8a53521eb2d2e84244011b39a93 and Change-Id I3dffa2e9c554f03c7c721b757ff33a89961665b5. Change-Id: I3a56b4fcb8c119a31815f3175db2d7899fbfddd7 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 33 insertions(+), 20 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 57aede4..674097a 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -564,8 +564,10 @@ /* verify traffic is routed from sender to [sole] receiver */ f_test_traffic(0, rctx_sender, pc_sender, 1, rctx_receiver, pc_receiver); - /* activate the second 'receiver' side ASP (no NOTIFY as AS state doesn't change) */ - f_M3UA_asp_up_act(2, c_M3UA_TMT_override, rctx_receiver, omit, omit); + /* activate the second 'receiver' side ASP: + * Expect NOTIFY always after ASPUP (RFC4666 4.3.4.5), don't expect + * NOTIFY after ACTIVE as AS state doesn't change) */ + f_M3UA_asp_up_act(2, c_M3UA_TMT_override, rctx_receiver, c_M3UA_ST_I_AS_ACTIVE, omit); /* we expect a NOTIFY to the *other* ASP Other/Alternat-ASP-Active */ f_M3UA_exp(1, tr_M3UA_NOTIFY(c_M3UA_ST_T_OTHER, c_M3UA_ST_I_ALTERNATE_ASP, *)); @@ -608,7 +610,7 @@ } /* activate the second 'receiver' side ASP (no NOTIFY) */ - f_M3UA_asp_up_act(2, c_M3UA_TMT_loadshare, omit, omit, omit); // TODO: rctx + f_M3UA_asp_up_act(2, c_M3UA_TMT_loadshare, omit, c_M3UA_ST_I_AS_ACTIVE, omit); // TODO: rctx /* verify traffic is routed from sender to new receiver */ const integer iter_per_asp := 5; @@ -665,7 +667,7 @@ } /* activate the second 'receiver' side ASP */ - f_M3UA_asp_up_act(2, c_M3UA_TMT_broadcast, omit, omit, omit); // TODO: rctx + f_M3UA_asp_up_act(2, c_M3UA_TMT_broadcast, omit, c_M3UA_ST_I_AS_ACTIVE, omit); // TODO: rctx /* verify traffic is routed from sender to new receiver */ for (i := 0; i < 10; i := i+1) { @@ -685,11 +687,16 @@ } private function f_M3UA_rkm_register(integer idx, OCT4 local_id, OCT3 dpc, OCT4 rctx, - template (present) OCT4 exp_status := c_M3UA_REGSTS_SUCCESS) + template (present) OCT4 exp_status := c_M3UA_REGSTS_SUCCESS, + template (omit) OCT2 ntfy_after_reg := c_M3UA_ST_I_AS_INACTIVE +) runs on RAW_M3UA_CT { f_M3UA_send(idx, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:=local_id, dpc:=dpc, rctx:=rctx)})); f_M3UA_exp(idx, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:=local_id, status:=exp_status, rctx:=rctx)})); + if (not istemplatekind(ntfy_after_reg, "omit")) { + f_M3UA_exp(idx, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, ntfy_after_reg, *)); + } } /* Send RKM registration; expect -EPERM as RCTX doesn't match config and dynamic not permitted */ @@ -759,7 +766,7 @@ f_init_m3ua(); /* first register the routing key */ - f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctx); + f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctx, ntfy_after_reg := omit); /* then try to de-register */ f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctx))); @@ -771,31 +778,37 @@ /* try to de-register a routing key for an active ASP -> ERROR */ testcase TC_rkm_unreg_active() runs on RAW_M3UA_CT { - var OCT3 dpc := int2oct(123, 3); - var OCT4 rctx := int2oct(1234, 4); - f_init_common(); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); f_init_m3ua(); - /* first register the routing key */ - f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctx); + var OCT3 dpc := int2oct(123, 3); + var OCT4 rctxA := int2oct(1234, 4); + var OCT4 rctxB := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); // must match config - /* then activate the ASP */ - f_M3UA_asp_up_act(0); - f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctx)); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, *)); - f_M3UA_exp(0, tr_M3UA_DAVA({*}, *)); + /* first register the routing key */ + f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, 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: */ + 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_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_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_DAVA({*}, rctxB)); /* then try to de-register -> ERR_ASP_ACTIVE */ - f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctx))); + f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctxA))); f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_ERR_ASP_ACTIVE)})); /* 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(rctx))); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, *)); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, *)); + 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_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/+/39646?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: I3a56b4fcb8c119a31815f3175db2d7899fbfddd7 Gerrit-Change-Number: 39646 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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 osmo-ttcn3-hacks[master]: stp: NOTIFY expectancy fixes
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39646?usp=email ) Change subject: stp: NOTIFY expectancy fixes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39646?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: I3a56b4fcb8c119a31815f3175db2d7899fbfddd7 Gerrit-Change-Number: 39646 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 12:48:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: NOTIFY expectancy fixes
by laforge 03 Mar '25

03 Mar '25

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39646?usp=email ) Change subject: stp: NOTIFY expectancy fixes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39646?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: I3a56b4fcb8c119a31815f3175db2d7899fbfddd7 Gerrit-Change-Number: 39646 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 12:46:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN)
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39659?usp=email ) Change subject: Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN) ...................................................................... Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN) As specified in RFC4666, "roundrobin" is not a M3UA traffic mode but simply a specific possible implementation of "loadshare" traffic mode. Hence, when converting to M3UA Traffic Mode Type, if AS was configured by user as "roundrobin", on the wire it is actually configured as "loadshare" traffic mode. Change-Id: I56447024936c8518cfd3f947971e3d7d0616e4f7 --- M src/osmo_ss7.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 5965cd5..902479d 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -196,6 +196,9 @@ return M3UA_TMOD_LOADSHARE; case OSMO_SS7_AS_TMOD_BCAST: return M3UA_TMOD_BCAST; + case OSMO_SS7_AS_TMOD_ROUNDROBIN: + /* Round-robin is a Loadshare implementation: */ + return M3UA_TMOD_LOADSHARE; default: return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39659?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: I56447024936c8518cfd3f947971e3d7d0616e4f7 Gerrit-Change-Number: 39659 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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

[S] Change in libosmo-sigtran[master]: Improve docuemntation of enum osmo_ss7_as_traffic_mode
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39658?usp=email ) Change subject: Improve docuemntation of enum osmo_ss7_as_traffic_mode ...................................................................... Improve docuemntation of enum osmo_ss7_as_traffic_mode Change-Id: Icc4dcbe37208a64b73a07d4432d353edf03af978 --- M include/osmocom/sigtran/osmo_ss7.h M include/osmocom/sigtran/protocol/m3ua.h 2 files changed, 12 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index d35b870..51c1cbd 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -172,10 +172,20 @@ * SS7 AS Traffic Mode ***********************************************************************/ + /* Traffic mode implementations which can be configured on an AS, either by + * peer (eg. RFC4666 M3UA "Traffic Mode Type") or locally through VTY. + * Note: This is related but not exactly RFC4666 M3UA "Traffic Mode Type" (enum + * m3ua_traffic_mode). */ enum osmo_ss7_as_traffic_mode { - OSMO_SS7_AS_TMOD_OVERRIDE = 0, /* default */ + /* RFC4666 M3UA "Traffic Mode Type" "Override". Default traffic mode: */ + OSMO_SS7_AS_TMOD_OVERRIDE = 0, + /* RFC4666 M3UA "Traffic Mode Type" "Broadcast": */ OSMO_SS7_AS_TMOD_BCAST, + /* RFC4666 M3UA "Traffic Mode Type" "Loadshare", + * traffic distribution based on OPC+SLS: */ OSMO_SS7_AS_TMOD_LOADSHARE, + /* RFC4666 M3UA "Traffic Mode Type" "Loadshare", + * traffic distribution implemented as round-robin: */ OSMO_SS7_AS_TMOD_ROUNDROBIN, _NUM_OSMO_SS7_ASP_TMOD }; diff --git a/include/osmocom/sigtran/protocol/m3ua.h b/include/osmocom/sigtran/protocol/m3ua.h index ecbe37b..0f237d4 100644 --- a/include/osmocom/sigtran/protocol/m3ua.h +++ b/include/osmocom/sigtran/protocol/m3ua.h @@ -172,6 +172,7 @@ M3UA_ERR_NO_CONFGD_AS_FOR_ASP = 0x1a, }; +/* Traffic Mode Type */ enum m3ua_traffic_mode { M3UA_TMOD_OVERRIDE = 1, M3UA_TMOD_LOADSHARE = 2, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39658?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: Icc4dcbe37208a64b73a07d4432d353edf03af978 Gerrit-Change-Number: 39658 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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

[S] Change in osmo-ttcn3-hacks[master]: stp: Pass M3UA conn idx to f_M3UA_rkm_register()
by laforge 03 Mar '25

03 Mar '25

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39644?usp=email ) Change subject: stp: Pass M3UA conn idx to f_M3UA_rkm_register() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39644?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: I9295a2c3518f82e8c82625fb573e414b1d634146 Gerrit-Change-Number: 39644 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 12:45:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN)
by laforge 03 Mar '25

03 Mar '25

Attention is currently required from: daniel, fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39659?usp=email ) Change subject: Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39659?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: I56447024936c8518cfd3f947971e3d7d0616e4f7 Gerrit-Change-Number: 39659 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 12:45:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log