February 2025 - gerrit-log - lists.osmocom.org

Change in osmo-ccid-firmware[master]: add simple gangupdater for multiple octsim boards

by roh

roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26896 ) Change subject: add simple gangupdater for multiple octsim boards ...................................................................... add simple gangupdater for multiple octsim boards Change-Id: Ic10572c121ac55586ec43126b63d69529757132b --- A contrib/flash_all_octsim.sh 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/96/26896/1 diff --git a/contrib/flash_all_octsim.sh b/contrib/flash_all_octsim.sh new file mode 100644 index 0000000..4f4c89b --- /dev/null +++ b/contrib/flash_all_octsim.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# this script is to scan for octsim boards, sort them by usb path and call dfu-util on each to update the board +# basic flow +# - get usb path and serialno tupel from dfu-util -l +# - reformat and sort by usbpath, drop the usbpath (grep cut tr sort cut) +# - flash the boards + +# TODO: +# - error handling +# - filter dfu-util output and generate nice summary + +dfu-util -l \ + | grep "^Found" \ + | grep "\[1d50:6141\]" \ + | cut -d ' ' -f 8,13 \ + | tr -d ',' \ + | cut -d \" -f 2,4 \ + | tr \" ' ' \ + | sort \ + | cut -d ' ' -f 2 + | xargs -n 1 dfu-util -d 1d50:6141 -D sysmoOCTSIM.bin -R -p -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic10572c121ac55586ec43126b63d69529757132b Gerrit-Change-Number: 26896 Gerrit-PatchSet: 1 Gerrit-Owner: roh <jsteiger(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

2
2
0 0

[S] Change in ...pyosmocom[master]: utils: add unrpad()

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/39600?usp=email ) Change subject: utils: add unrpad() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/39600?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I48c23390926f8c9412624edb4481e7f4cd3f4b46 Gerrit-Change-Number: 39600 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[S] Change in ...pyosmocom[master]: utils: add unrpad()

by neels

Attention is currently required from: laforge. neels has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/39600?usp=email ) Change subject: utils: add unrpad() ...................................................................... Patch Set 1: (1 comment) File src/osmocom/utils.py: https://gerrit.osmocom.org/c/python/pyosmocom/+/39600/comment/2a325dac_eb17… : PS1, Line 125: """unpad string on the right side -- reverse of rpad(). > in which way is this different from the python standard library string. […] hmm indeed .. still find it nice to have something called "unrpad()", after all rpad() is just val + c * (l - len(val)) ... but will just use rstrip in pysim, then, and avoid trivial dependencies. -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/39600?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I48c23390926f8c9412624edb4481e7f4cd3f4b46 Gerrit-Change-Number: 39600 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 28 Feb 2025 22:55:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Fix brokeness in TC_tmt_loadshare

by pespin

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39651?usp=email ) Change subject: stp: Fix brokeness in TC_tmt_loadshare ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: TODO: I still need to look at STP_Tests_IPA.TC_tmt_loadshare here. -- 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: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I16d81cb2f88bb2927f248182ad4f8f27c8c24859 Gerrit-Change-Number: 39651 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: Fri, 28 Feb 2025 19:46:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

3 months, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Fix setting traffic-mode 'round-robin' over VTY

by pespin

Attention is currently required from: daniel, fixeria, laforge, osmith. Hello Jenkins Builder, daniel, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39650?usp=email to look at the new patch set (#3). Change subject: Fix setting traffic-mode 'round-robin' over VTY ...................................................................... Fix setting traffic-mode 'round-robin' over VTY String in osmo_ss7_as_traffic_mode_vals[] is "round-robin" while string in VTY command was "roundrobin", so it didn't really match when set over VTY. This has apparently broken for really long, I couldn't find the originating commit breaking this. Change-Id: I61340549c596f1c04bc2269dbc165c327bf72037 --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 3 files changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/39650/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I61340549c596f1c04bc2269dbc165c327bf72037 Gerrit-Change-Number: 39650 Gerrit-PatchSet: 3 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>

3 months, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Fix setting traffic-mode 'round-robin' over VTY

by pespin

Attention is currently required from: daniel, fixeria, laforge, osmith. Hello Jenkins Builder, daniel, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39650?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Fix setting traffic-mode 'round-robin' over VTY ...................................................................... Fix setting traffic-mode 'round-robin' over VTY Change-Id: I61340549c596f1c04bc2269dbc165c327bf72037 --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 3 files changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/39650/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I61340549c596f1c04bc2269dbc165c327bf72037 Gerrit-Change-Number: 39650 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-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>

3 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Fix brokeness in TC_tmt_loadshare

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39651?usp=email ) Change subject: stp: Fix brokeness in TC_tmt_loadshare ...................................................................... stp: Fix brokeness in 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, 105 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/39651/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 3fb3fc0..063256b 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 round-robin"); + 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, omit, omit); // TODO: rctx /* 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, omit, 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; 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,100 @@ 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 load-share" 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, omit); // TODO: rctx + + /* 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, omit, c_M3UA_ST_I_AS_ACTIVE, omit); // TODO: rctx + + /* 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 +1508,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: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I16d81cb2f88bb2927f248182ad4f8f27c8c24859 Gerrit-Change-Number: 39651 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Fix setting traffic-mode 'round-robin' over VTY

by pespin

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/+/39650?usp=email ) Change subject: Fix setting traffic-mode 'round-robin' over VTY ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: @laforge@gnumonks.org I don't even get why we have the "round-robin" traffic mode (OSMO_SS7_AS_TMOD_ROUNDROBIN), it doesn't even show up in RFC4666, so it cannot be requested over the wire.... I think this ended up as a confusion. The "round-robin" thing afaiu is actually one of the possible implementations of the "loadshare" traffic mode. Hence, imho we should: 1- remove the OSMO_SS7_AS_TMOD_ROUNDROBIN field and remove it from "traffic-mode" VTY command too. 2- Add a new "enum osmo_ss7_as_traffic_loadshare_impl" where we have enum fields "SLS" and "ROUNDROBIN", and then in the vty command "loadshare" (see https://gerrit.osmocom.org/c/libosmo-sigtran/+/39408/6/src/osmo_ss7_vty.c, following Cisco ITP) add a new "traffic-mode loadshare round-robin" (also as specified in Cisco ITP). So basically, rounrobin vs SLS distributon are options of the "loadshare" traffic mode. I plan to provide those patches on top of the ASP loadsharing patchset unless somebody has any other opinion. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39650?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: I61340549c596f1c04bc2269dbc165c327bf72037 Gerrit-Change-Number: 39650 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: Fri, 28 Feb 2025 19:23:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

3 months, 3 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Fix setting traffic-mode 'round-robin' over VTY

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39650?usp=email ) Change subject: Fix setting traffic-mode 'round-robin' over VTY ...................................................................... Fix setting traffic-mode 'round-robin' over VTY String in osmo_ss7_as_traffic_mode_vals[] is "round-robin" while string in VTY command was "roundrobin", so it didn't really match when set over VTY. This has apparently broken for really long, I couldn't find the originating commit breaking this. Change-Id: I61340549c596f1c04bc2269dbc165c327bf72037 --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 3 files changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/39650/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 576ad7c..23d4ecc 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1987,7 +1987,7 @@ DEFUN_USRATTR(as_traf_mode, as_traf_mode_cmd, OSMO_SCCP_LIB_ATTR_RSTRT_ASP, - "traffic-mode (broadcast | loadshare | roundrobin | override)", + "traffic-mode (broadcast | loadshare | round-robin | override)", "Specifies traffic mode of operation of the ASP within the AS\n" "Broadcast to all ASP within AS\n" "Share Load among all ASP within AS\n" @@ -1995,8 +1995,12 @@ "Override\n") { struct osmo_ss7_as *as = vty->index; - - as->cfg.mode = get_string_value(osmo_ss7_as_traffic_mode_vals, argv[0]); + int rc = get_string_value(osmo_ss7_as_traffic_mode_vals, argv[0]); + if (rc < 0) { + vty_out(vty, "%% Wrong traffic-mode '%s'%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + as->cfg.mode = rc; as->cfg.mode_set_by_vty = true; return CMD_SUCCESS; } diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 747c7b7..9ecbc1b 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -347,7 +347,7 @@ description .TEXT asp NAME no asp NAME - traffic-mode (broadcast | loadshare | roundrobin | override) + traffic-mode (broadcast | loadshare | round-robin | override) no traffic-mode recovery-timeout <1-2000> qos-class <0-7> diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index b565557..7fe6a95 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -338,7 +338,7 @@ description .TEXT asp NAME no asp NAME - traffic-mode (broadcast | loadshare | roundrobin | override) + traffic-mode (broadcast | loadshare | round-robin | override) no traffic-mode recovery-timeout <1-2000> qos-class <0-255> -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39650?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: I61340549c596f1c04bc2269dbc165c327bf72037 Gerrit-Change-Number: 39650 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[L] Change in libosmo-sigtran[master]: ASP loadsharing: Implement based on VTY configuration

by pespin

Attention is currently required from: daniel, fixeria, laforge, osmith, pespin. Hello Jenkins Builder, daniel, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39408?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ASP loadsharing: Implement based on VTY configuration ...................................................................... ASP loadsharing: Implement based on VTY configuration Calculate AS Extended SLS (7 bit) out of OPC (12 bits) and SLS (4 bits) based on VTY configuration. Assign a normal destination ASP for each AS-eSLS and try to use it whenever possible; fallback to an alternative ASP when normal ASP is not available. Related: SYS#7112 Change-Id: I5f47e40b70ed566034cd1533b71e21fc03e94f6c --- M src/osmo_ss7_as.c M src/osmo_ss7_vty.c M src/ss7_as.h M src/xua_as_fsm.c M tests/vty/osmo_stp_test.vty 5 files changed, 247 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/08/39408/6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39408?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5f47e40b70ed566034cd1533b71e21fc03e94f6c Gerrit-Change-Number: 39408 Gerrit-PatchSet: 6 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025