lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

March 2025

  • 1 participants
  • 1378 discussions
[XS] Change in libosmo-sigtran[master]: sccp_user: Fix dynamic ASP not associated to AS
by osmith 04 Mar '25

04 Mar '25
Attention is currently required from: daniel, fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39671?usp=email ) Change subject: sccp_user: Fix dynamic ASP not associated to AS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39671?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: I16371ef813c2e12993caae16a1626d10ae8ded54 Gerrit-Change-Number: 39671 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Mar 2025 15:22:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
[XS] Change in libosmo-sigtran[master]: sccp_user: Fix dynamic ASP not associated to AS
by pespin 04 Mar '25

04 Mar '25
Attention is currently required from: daniel, fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39671?usp=email ) Change subject: sccp_user: Fix dynamic ASP not associated to AS ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This fixes regressions in HNBGW_Tests from today. I'll merge it later today if there's no review to avoid further failures. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39671?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: I16371ef813c2e12993caae16a1626d10ae8ded54 Gerrit-Change-Number: 39671 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Mar 2025 15:20:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No
1 0
0 0
[L] Change in libosmo-sigtran[master]: AS loadsharing: Introduce combined_linkset
by pespin 04 Mar '25

04 Mar '25
Attention is currently required from: osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38731?usp=email ) Change subject: AS loadsharing: Introduce combined_linkset ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38731?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: I500ec74ba975e3c93071771027e4e5fe6000e6f3 Gerrit-Change-Number: 38731 Gerrit-PatchSet: 11 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Mar 2025 15:12:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No
1 0
0 0
[M] Change in osmo-ttcn3-hacks[master]: stp: Fix brokeness in STP_Tests_M3UA.TC_tmt_loadshare
by pespin 04 Mar '25

04 Mar '25
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39651?usp=email ) 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 IUT. 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(-) Approvals: laforge: 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.ttcn b/stp/STP_Tests_M3UA.ttcn index 3fb3fc0..4a3da7c 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -585,24 +585,24 @@ } } -/* test "traffic-mode load-share" behavior */ -testcase TC_tmt_loadshare() runs on RAW_M3UA_CT { +/* Test "traffic-mode roundrobin" behavior (distributing within ASPs of a given AS in roundrobin fashion). */ +testcase TC_tmt_loadshare_roundrobin() runs on RAW_M3UA_CT { var integer i; f_init_m3ua(); + f_vty_config2(VTY, {"cs7 instance 0", "as as-receiver m3ua"}, "traffic-mode roundrobin"); + var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4); var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4); - /* FIXME: configure the STP via VTY to set traffic-mode */ - /* bring up the 'sender' side (single ASP in AS) */ f_M3UA_asp_up_act(0, omit, rctx_sender); /* activate the first 'receiver' side ASP */ - f_M3UA_asp_up_act(1, c_M3UA_TMT_loadshare, omit); // TODO: rctx + f_M3UA_asp_up_act(1, c_M3UA_TMT_loadshare, rctx_receiver); /* verify traffic is routed from sender to [sole] receiver */ for (i := 0; i < 10; i := i+1) { @@ -610,12 +610,12 @@ } /* activate the second 'receiver' side ASP (no NOTIFY) */ - f_M3UA_asp_up_act(2, c_M3UA_TMT_loadshare, omit, c_M3UA_ST_I_AS_ACTIVE, omit); // TODO: rctx + f_M3UA_asp_up_act(2, c_M3UA_TMT_loadshare, rctx_receiver, c_M3UA_ST_I_AS_ACTIVE, omit); /* verify traffic is routed from sender to new receiver */ const integer iter_per_asp := 5; var Integers num_rx := {}; - for (i := 0; i < g_m3ua_num_clients; i := i + 1) { + for (i := 0; i < 3; i := i + 1) { num_rx := num_rx & {0}; } for (i := 0; i < 2*iter_per_asp; i := i+1) { @@ -640,6 +640,102 @@ setverdict(pass); f_clear_m3ua(); + + f_vty_config2(VTY, {"cs7 instance 0", "as as-receiver m3ua"}, "no traffic-mode"); +} + +private altstep as_count_rx_sls(integer idx, template (present) PDU_M3UA exp, inout Integers sls_counter, inout integer rx_counter) +runs on RAW_M3UA_CT { + var M3UA_RecvFrom rx; + [] M3UA[idx].receive(t_M3UA_RecvFrom(exp)) -> value rx { + var integer sls := oct2int(rx.msg.m3UA_DATA.messageParameters.protocol_Data.sLS); + sls_counter[sls] := sls_counter[sls] + 1; + rx_counter := rx_counter + 1; + } +} + +/* Test "traffic-mode loadshare" behavior. Validates ASP Loadsharing scenario + * (distributing traffic within ASPs of one AS). + * NOTE: This test does not validate AS Loadsharing, (distributing traffic + * within linksets/ASs of a combined linkset). */ +testcase TC_tmt_loadshare_sls() runs on RAW_M3UA_CT { + var integer i; + + f_init_m3ua(); + + f_vty_config2(VTY, {"cs7 instance 0", "as as-receiver m3ua"}, "traffic-mode loadshare"); + + var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); + var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4); + var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4); + + /* bring up the 'sender' side (single ASP in AS) */ + f_M3UA_asp_up_act(0, omit, rctx_sender); + + /* activate the first 'receiver' side ASP */ + f_M3UA_asp_up_act(1, c_M3UA_TMT_loadshare, rctx_receiver); + + /* verify traffic is routed from sender to [sole] receiver */ + for (i := 0; i < 10; i := i+1) { + f_test_traffic(0, rctx_sender, pc_sender, 1, rctx_receiver, pc_receiver); + } + + /* activate the second 'receiver' side ASP (no NOTIFY) */ + f_M3UA_asp_up_act(2, c_M3UA_TMT_loadshare, rctx_receiver, c_M3UA_ST_I_AS_ACTIVE, omit); + + /* 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 < 2*iter_per_asp; i := i+1) { + var octetstring data := f_rnd_octstring_rnd_len(100); + var template (value) M3UA_Protocol_Data tx_pd; + var template (present) M3UA_Protocol_Data rx_pd; + /* Distribute traffic over ASPs based on SLS, since OPC is always the same. + * SLS in ITU is 4 bits. */ + var OCT1 sls := int2oct(i mod 16, 1); + tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, sls, data); + rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, sls, data); + f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1); + alt { + [] as_count_rx_sls(1, tr_M3UA_DATA(rctx_receiver, rx_pd), sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(2, tr_M3UA_DATA(rctx_receiver, rx_pd), 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)); + } + + /* Check that a given SLS is not forwarded to both ASPs: */ + for (i := 0; i < NUM_SLS; i := i+1) { + if (sls_num_rx_1[i] > 0 and sls_num_rx_2[i] > 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx packets for SLS ", i, " in both ASPs!")); + } + + } + setverdict(pass); + + f_clear_m3ua(); + + f_vty_config2(VTY, {"cs7 instance 0", "as as-receiver m3ua"}, "no traffic-mode"); } /* test "traffic-mode broadcast" behavior */ @@ -1414,7 +1510,8 @@ execute( TC_asp_act_loadshare() ); execute( TC_asp_act_broadcast() ); execute( TC_tmt_override() ); - execute( TC_tmt_loadshare() ); + execute( TC_tmt_loadshare_roundrobin() ); + execute( TC_tmt_loadshare_sls() ); execute( TC_tmt_broadcast() ); execute( TC_act_rctx_data_no_rctx() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index bc9c861..a764349 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -8,7 +8,8 @@ <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_tmt_override' time='MASKED'/> - <testcase classname='STP_Tests_M3UA' name='TC_tmt_loadshare' 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'/> <testcase classname='STP_Tests_M3UA' name='TC_tmt_broadcast' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_act_rctx_data_no_rctx' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_cli' time='MASKED'/> -- 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: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I16d81cb2f88bb2927f248182ad4f8f27c8c24859 Gerrit-Change-Number: 39651 Gerrit-PatchSet: 6 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
0 0
[M] Change in osmo-ttcn3-hacks[master]: stp: Fix brokeness in STP_Tests_IPA.TC_tmt_loadshare
by pespin 04 Mar '25

04 Mar '25
pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve 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: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I61c3efbf8e30533d051e2de506f7c8eaae7e297b Gerrit-Change-Number: 39661 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
0 0
[S] Change in osmo-ttcn3-hacks[master]: stp: STP_Tests.ttcn: Use M3UA PC and RCTX from config
by pespin 04 Mar '25

04 Mar '25
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39662?usp=email ) Change subject: stp: STP_Tests.ttcn: Use M3UA PC and RCTX from config ...................................................................... stp: STP_Tests.ttcn: Use M3UA PC and RCTX from config Change-Id: I81c8402d5ccd6e59f2a6869927c637fff30cb952 --- M stp/STP_Tests.ttcn M stp/STP_Tests_M3UA.ttcn 2 files changed, 22 insertions(+), 21 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index 60d68c9..b7f6ec1 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -62,15 +62,15 @@ /* Test routing of SCCP between an M3UA and an IPA ASP */ testcase TC_m3ua_to_ipa() runs on IPA_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 pc_receiver := int2oct(5, 4); - f_init_m3ua(); f_init_ipa(); + var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); + var OCT4 pc_receiver := int2oct(5, 4); + f_connect_ipa(4); - f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx + f_M3UA_asp_up_act(0, omit, rctx_sender); /* send a well-formed, encoded SCCP message via M3UA */ var octetstring data := f_rnd_octstring_rnd_len(100); @@ -90,10 +90,6 @@ /* test routing an SCCP message from IPA ASP to M3UA ASP */ testcase TC_ipa_to_m3ua() runs on IPA_M3UA_CT { - var OCT4 pc_sender := int2oct(5, 4); - var OCT4 rctx_receiver := int2oct(1023, 4); - var OCT4 pc_receiver := int2oct(23, 4); - f_init_common(); f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"}, "point-code override patch-sccp disabled"); @@ -101,8 +97,12 @@ f_init_m3ua(); f_init_ipa(); + var OCT4 pc_sender := int2oct(5, 4); + var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4); + f_connect_ipa(4); - f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx + f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ var octetstring data := f_rnd_octstring_rnd_len(100); @@ -122,9 +122,6 @@ /* test routing an SCCP message from IPA ASP to M3UA ASP using national network indicator */ testcase TC_ipa_to_m3ua_ni() runs on IPA_M3UA_CT { - var OCT4 pc_sender := int2oct(5, 4); - var OCT4 rctx_receiver := int2oct(1023, 4); - var OCT4 pc_receiver := int2oct(23, 4); f_init_common(); f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"}, @@ -133,8 +130,12 @@ f_init_m3ua(); f_init_ipa(); + var OCT4 pc_sender := int2oct(5, 4); + var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4); + f_connect_ipa(4); - f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx + f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ var octetstring data := f_rnd_octstring_rnd_len(100); @@ -157,10 +158,6 @@ /* test routing an SCCP message from IPA ASP to M3UA ASP while patching PC into SCCP addresses */ testcase TC_ipa_to_m3ua_patch_sccp() runs on IPA_M3UA_CT { - var OCT4 pc_sender := int2oct(5, 4); - var OCT4 rctx_receiver := int2oct(1023, 4); - var OCT4 pc_receiver := int2oct(23, 4); - f_init_common(); f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"}, "point-code override patch-sccp both"); @@ -168,8 +165,12 @@ f_init_m3ua(); f_init_ipa(); + var OCT4 pc_sender := int2oct(5, 4); + var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4); + f_connect_ipa(4); - f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx + f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ var octetstring data := f_rnd_octstring_rnd_len(100); diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 4a3da7c..ba44b3f 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -135,14 +135,14 @@ return g_m3ua_num_clients + idx; } -private function f_m3ua_cli_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig { +friend function f_m3ua_cli_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig { if (idx < 0 or idx >= g_m3ua_num_clients) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_cli_config(): unexpected idx"); } return g_m3ua_configs[idx]; } -private function f_m3ua_srv_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig { +friend function f_m3ua_srv_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig { if (idx < 0 or idx >= g_m3ua_num_servers) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_srv_config(): unexpected idx"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39662?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: I81c8402d5ccd6e59f2a6869927c637fff30cb952 Gerrit-Change-Number: 39662 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
0 0
[S] Change in osmo-ttcn3-hacks[master]: stp: STP_Tests.ttcn: Use M3UA PC and RCTX from config
by pespin 04 Mar '25

04 Mar '25
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39662?usp=email ) Change subject: stp: STP_Tests.ttcn: Use M3UA PC and RCTX from config ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39662?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: I81c8402d5ccd6e59f2a6869927c637fff30cb952 Gerrit-Change-Number: 39662 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> Gerrit-Comment-Date: Tue, 04 Mar 2025 15:09:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
[M] Change in osmo-ttcn3-hacks[master]: stp: Fix brokeness in STP_Tests_IPA.TC_tmt_loadshare
by pespin 04 Mar '25

04 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/+/39661?usp=email ) Change subject: stp: Fix brokeness in STP_Tests_IPA.TC_tmt_loadshare ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I61c3efbf8e30533d051e2de506f7c8eaae7e297b Gerrit-Change-Number: 39661 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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Mar 2025 15:09:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
[M] Change in osmo-ttcn3-hacks[master]: stp: Fix brokeness in STP_Tests_IPA.TC_tmt_loadshare
by pespin 04 Mar '25

04 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/+/39661?usp=email ) Change subject: stp: Fix brokeness in STP_Tests_IPA.TC_tmt_loadshare ...................................................................... Patch Set 2: (1 comment) File stp/STP_Tests_IPA.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39661/comment/20e308f9_7159… : PS2, Line 272: f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "traffic-mode loadshare"); > How about resetting this in f_init_ipa()? Otherwise with Misc_Helpers. […] I'd say it's not much of a problem since usually tests, unless validating specific stuff, are using 1 ASP with 1 AS, so it doesn't really matter in that scenario. Tests willing to test a specific feature should anyway be setting this explicitly anyway. -- 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: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I61c3efbf8e30533d051e2de506f7c8eaae7e297b Gerrit-Change-Number: 39661 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Mar 2025 15:09:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
1 0
0 0
[XS] Change in libosmo-sigtran[master]: sccp_user: Fix dynamic ASP not associated to AS
by pespin 04 Mar '25

04 Mar '25
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39671?usp=email ) Change subject: sccp_user: Fix dynamic ASP not associated to AS ...................................................................... sccp_user: Fix dynamic ASP not associated to AS Recent commit introduced a regression when applying default_layer_manager to all ASPs in m3ua-mode ASP. The call to osmo_ss7_as_add_asp() was moved to an inner code path but forgot to add it in another code path. Fixes: ce63d3b2027cefb8412179497100d14ed3fee0dd Change-Id: I16371ef813c2e12993caae16a1626d10ae8ded54 --- M src/sccp_user.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/71/39671/1 diff --git a/src/sccp_user.c b/src/sccp_user.c index b5b6b4b..cada057 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -652,6 +652,7 @@ ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); if (default_remote_ip) ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); + osmo_ss7_as_add_asp(as, asp->cfg.name); /* Make sure proper defaults are applied if app didn't provide specific default values, then restart the ASP: */ ss7_asp_restart_after_reconfigure(asp); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39671?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I16371ef813c2e12993caae16a1626d10ae8ded54 Gerrit-Change-Number: 39671 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 121
  • 122
  • 123
  • 124
  • 125
  • 126
  • 127
  • ...
  • 138
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.