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

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix hardcoded sccp_demo_user path

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?usp=email ) Change subject: sccp: testenv: fix hardcoded sccp_demo_user path ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?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: Id6e0b669dcb71cab9e789fe011e60827a8e07f77 Gerrit-Change-Number: 39923 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Apr 2025 14:05:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: fix OSMO_DEV_MAKE_DIR env var

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39922?usp=email ) Change subject: testenv: fix OSMO_DEV_MAKE_DIR env var ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39922?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: Ia46ebe1240806995960545afbb34e6533580f209 Gerrit-Change-Number: 39922 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Apr 2025 14:04:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Cosmetic: testenv/testdir: fix formatting

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39924?usp=email ) Change subject: Cosmetic: testenv/testdir: fix formatting ...................................................................... Cosmetic: testenv/testdir: fix formatting This wasn't caught by previous ruff versions, fix it. Change-Id: Ib770ee2e14811777efdb2c5867b29ba379abde7c --- M _testenv/testenv/testdir.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/_testenv/testenv/testdir.py b/_testenv/testenv/testdir.py index 2f21d23..929d19c 100644 --- a/_testenv/testenv/testdir.py +++ b/_testenv/testenv/testdir.py @@ -28,9 +28,9 @@ prefix = f"testenv-{testenv.args.testsuite}-" if testenv.args.config: - prefix += f"{'-'.join(testenv.args.config).replace('*','')}-" + prefix += f"{'-'.join(testenv.args.config).replace('*', '')}-" if testenv.args.binary_repo: - prefix += f"{testenv.args.binary_repo.replace(':','-')}-" + prefix += f"{testenv.args.binary_repo.replace(':', '-')}-" prefix += datetime.datetime.now().strftime("%Y%m%d-%H%M") prefix += f"-{str(uuid.uuid4()).split('-', 1)[0]}" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39924?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: Ib770ee2e14811777efdb2c5867b29ba379abde7c Gerrit-Change-Number: 39924 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Cosmetic: testenv/testdir: fix formatting

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39924?usp=email ) Change subject: Cosmetic: testenv/testdir: fix formatting ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39924?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: Ib770ee2e14811777efdb2c5867b29ba379abde7c Gerrit-Change-Number: 39924 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Apr 2025 14:03:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix hardcoded sccp_demo_user path

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?usp=email to look at the new patch set (#3). Change subject: sccp: testenv: fix hardcoded sccp_demo_user path ...................................................................... sccp: testenv: fix hardcoded sccp_demo_user path The current path only worked for with podman and with osmo-dev. Make it work for the following use cases too: * without podman, with osmo-dev * with podman, with binary packages (instead of osmo-dev) Removing package=no is required, so testenv builds sccp_demo_user from source when running with --binary-packages. This is needed as sccp_demo_user is not packaged (OS#5899). Change-Id: Id6e0b669dcb71cab9e789fe011e60827a8e07f77 --- A sccp/run_sccp_demo_user.sh M sccp/testenv.cfg 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/39923/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?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: Id6e0b669dcb71cab9e789fe011e60827a8e07f77 Gerrit-Change-Number: 39923 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Cosmetic: testenv/testdir: fix formatting

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39924?usp=email ) Change subject: Cosmetic: testenv/testdir: fix formatting ...................................................................... Cosmetic: testenv/testdir: fix formatting This wasn't caught by previous ruff versions, fix it. Change-Id: Ib770ee2e14811777efdb2c5867b29ba379abde7c --- M _testenv/testenv/testdir.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/39924/1 diff --git a/_testenv/testenv/testdir.py b/_testenv/testenv/testdir.py index 2f21d23..929d19c 100644 --- a/_testenv/testenv/testdir.py +++ b/_testenv/testenv/testdir.py @@ -28,9 +28,9 @@ prefix = f"testenv-{testenv.args.testsuite}-" if testenv.args.config: - prefix += f"{'-'.join(testenv.args.config).replace('*','')}-" + prefix += f"{'-'.join(testenv.args.config).replace('*', '')}-" if testenv.args.binary_repo: - prefix += f"{testenv.args.binary_repo.replace(':','-')}-" + prefix += f"{testenv.args.binary_repo.replace(':', '-')}-" prefix += datetime.datetime.now().strftime("%Y%m%d-%H%M") prefix += f"-{str(uuid.uuid4()).split('-', 1)[0]}" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39924?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: Ib770ee2e14811777efdb2c5867b29ba379abde7c Gerrit-Change-Number: 39924 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix hardcoded sccp_demo_user path

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?usp=email ) Change subject: sccp: testenv: fix hardcoded sccp_demo_user path ...................................................................... sccp: testenv: fix hardcoded sccp_demo_user path The current path only worked for with podman and with osmo-dev. Make it work for the following use cases too: * without podman, with osmo-dev * with podman, with binary packages (instead of osmo-dev) Removing package=no is required, so testenv build sccp_demo_user from source when running with --binary-packages. This is needed as sccp_demo_user is not packaged (OS#5899). Change-Id: Id6e0b669dcb71cab9e789fe011e60827a8e07f77 --- A sccp/run_sccp_demo_user.sh M sccp/testenv.cfg 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/39923/1 diff --git a/sccp/run_sccp_demo_user.sh b/sccp/run_sccp_demo_user.sh new file mode 100755 index 0000000..88cd507 --- /dev/null +++ b/sccp/run_sccp_demo_user.sh @@ -0,0 +1,11 @@ +#!/bin/sh -ex + +if [ -n "$OSMO_DEV_MAKE_DIR" ]; then + # Using osmo-dev: either with or without --podman + exec "$OSMO_DEV_MAKE_DIR"/libosmo-sigtran/examples/sccp_demo_user "$@" +fi + +# Using binary packages: as sccp_demo_user is not packaged it gets +# built by testenv/podman_install.py:from_source_sccp_demo_user() +# and symlinked to /usr/local/bin. +exec sccp_demo_user "$@" diff --git a/sccp/testenv.cfg b/sccp/testenv.cfg index 44ba8ce..de7b630 100644 --- a/sccp/testenv.cfg +++ b/sccp/testenv.cfg @@ -3,7 +3,6 @@ config=SCCP_Tests.cfg [sccp_demo_user] -program=~/.cache/osmo-ttcn3-testenv/podman/make/libosmo-sigtran/examples/.libs/sccp_demo_user -l 127.0.0.2 -r 127.0.0.1 -C sccp_demo_user.cfg +program=run_sccp_demo_user.sh -l 127.0.0.2 -r 127.0.0.1 -C sccp_demo_user.cfg make=libosmo-sigtran -package=no copy=sccp_demo_user.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?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: Id6e0b669dcb71cab9e789fe011e60827a8e07f77 Gerrit-Change-Number: 39923 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: fix OSMO_DEV_MAKE_DIR env var

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39922?usp=email ) Change subject: testenv: fix OSMO_DEV_MAKE_DIR env var ...................................................................... testenv: fix OSMO_DEV_MAKE_DIR env var When --autoreconf-in-src-copy was made the default, the make dir name has been changed to make2 but this variable was not adjusted. Fix it. Fixes: dacbca96 ("testenv: use --autoreconf-in-src-copy by default") Change-Id: Ia46ebe1240806995960545afbb34e6533580f209 --- M _testenv/testenv/cmd.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/39922/1 diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 5e651bd..864b8b9 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -45,9 +45,9 @@ env_extra["TESTENV_GIT_DIR"] = testenv.podman_install.git_dir else: if testenv.args.podman: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "podman", "make") + env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "podman", "make2") else: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "host", "make") + env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "host", "make2") if testenv.args.kernel == "debian": env_extra["TESTENV_QEMU_KERNEL"] = "debian" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39922?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: Ia46ebe1240806995960545afbb34e6533580f209 Gerrit-Change-Number: 39922 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: vty: Introduce AS node cmd 'binding-table reset'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39917?usp=email ) Change subject: vty: Introduce AS node cmd 'binding-table reset' ...................................................................... vty: Introduce AS node cmd 'binding-table reset' This is useful when reconfiguring a deployed osmo-stp where new ASPs are added/removed to the config, or when changing the binding seed calculation to improve distribution based on current traffic. This will also be used by tests validating loadshare feature, to start with a clean state every time. Change-Id: I56c34072a9ded42c13dbfc105a0ab3353ca353ec --- M src/osmo_ss7_as.c M src/osmo_ss7_vty.c M src/ss7_as.h M tests/vty/osmo_stp_test.vty 4 files changed, 24 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c index 525f394..e84a36d 100644 --- a/src/osmo_ss7_as.c +++ b/src/osmo_ss7_as.c @@ -350,6 +350,15 @@ return asp; } +/* Reset loadshare bindings table. It will be filled in as needed. + * This is useful for instance when user changes the ASP set inside an AS, or + * changes the way the binding seed (eSLS) is calculated. */ +void ss7_as_loadshare_binding_table_reset(struct osmo_ss7_as *as) +{ + memset(&as->aesls_table[0], 0, sizeof(as->aesls_table)); + as->cfg.last_asp_idx_assigned = 0; +} + static as_ext_sls_t osmo_ss7_instance_calc_itu_as_ext_sls(const struct osmo_ss7_as *as, uint32_t opc, uint8_t sls) { uint16_t opc12; diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index bcf3ffe..bf3bec2 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -2185,6 +2185,17 @@ return CMD_SUCCESS; } +DEFUN_ATTR(as_bindingtable_reset, as_bindingtable_reset_cmd, + "binding-table reset", + "AS Loadshare binding table operations\n" + "Reset loadshare binding table\n", + CMD_ATTR_IMMEDIATE) +{ + struct osmo_ss7_as *as = vty->index; + ss7_as_loadshare_binding_table_reset(as); + return CMD_SUCCESS; +} + DEFUN_ATTR(as_recov_tout, as_recov_tout_cmd, "recovery-timeout <1-2000>", "Specifies the recovery timeout value in milliseconds\n" @@ -3440,6 +3451,7 @@ install_lib_element(L_CS7_AS_NODE, &as_traf_mode_loadshare_cmd); install_lib_element(L_CS7_AS_NODE, &as_no_traf_mode_cmd); install_lib_element(L_CS7_AS_NODE, &as_sls_shift_cmd); + install_lib_element(L_CS7_AS_NODE, &as_bindingtable_reset_cmd); install_lib_element(L_CS7_AS_NODE, &as_recov_tout_cmd); install_lib_element(L_CS7_AS_NODE, &as_qos_class_cmd); install_lib_element(L_CS7_AS_NODE, &as_rout_key_cmd); diff --git a/src/ss7_as.h b/src/ss7_as.h index 13592e9..bc17726 100644 --- a/src/ss7_as.h +++ b/src/ss7_as.h @@ -131,6 +131,7 @@ unsigned int osmo_ss7_as_count_asp(const struct osmo_ss7_as *as); int ss7_as_add_asp(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp); +void ss7_as_loadshare_binding_table_reset(struct osmo_ss7_as *as); #define LOGPAS(as, subsys, level, fmt, args ...) \ _LOGSS7((as)->inst, subsys, level, "AS(%s) " fmt, (as)->cfg.name, ## args) diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index fbe69a8..e56e0ff 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -363,6 +363,7 @@ traffic-mode loadshare [bindings] [sls] [opc-sls] [opc-shift] [<0-2>] no traffic-mode sls-shift <0-3> + binding-table reset recovery-timeout <1-2000> qos-class <0-7> routing-key RCONTEXT DPC @@ -379,6 +380,7 @@ no Negate a command or set its defaults traffic-mode Specifies traffic mode of operation of the ASP within the AS sls-shift Shift SLS bits used during routing decision + binding-table AS Loadshare binding table operations recovery-timeout Specifies the recovery timeout value in milliseconds qos-class Specity QoS Class of AS routing-key Define a routing key -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39917?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: I56c34072a9ded42c13dbfc105a0ab3353ca353ec Gerrit-Change-Number: 39917 Gerrit-PatchSet: 2 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>

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: TC_tmt_loadshare*: Use new vty command 'binding-table reset'

by osmith

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39918?usp=email ) Change subject: stp: TC_tmt_loadshare*: Use new vty command 'binding-table reset' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39918?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: I40b7724edcc06a3df641e316be4770d0e56bb72d Gerrit-Change-Number: 39918 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Apr 2025 11:44:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025