- gerrit-log - lists.osmocom.org

[M] Change in osmo-dev[master]: src/_update_src_copy: don't copy deleted files
by osmith 27 Nov '25

27 Nov '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/41514?usp=email ) Change subject: src/_update_src_copy: don't copy deleted files ...................................................................... src/_update_src_copy: don't copy deleted files Fix that _update_src_copy.sh is failing with the following error on git repos with deleted but not yet commited files: updating src_copy: /home/lynxis/.cache/osmo-ttcn3-testenv/podman/make4-asan-debian-trixie/src_copy/libosmo-netif/ rsync: [sender] link_stat "/home/lynxis/projects/osmocom/repos/libosmo-netif/doc/twrtp/README" failed: No such file or directory (2) rsync: [sender] link_stat "/home/lynxis/projects/osmocom/repos/libosmo-netif/doc/twrtp/twrtp-guide.t" failed: No such file or directory (2) rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1338) [sender=3.4.1] I have implemented this with "comm" to substract the list of deleted files from the list of relevant files to copy, as there was no option for "git ls-files" to do this in one step, and as using "--exclude-from" with this file didn't work in combination with the already passed allowlist with neither "git ls-files --exclude-from" nor "rsync --exclude-from". Fixes: OS#6889 Change-Id: I232263bc5bd26c90f1e73b115480269165a1e1f8 --- M src/_update_src_copy.sh A tests/test_update_src_copy.py 2 files changed, 94 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/_update_src_copy.sh b/src/_update_src_copy.sh index f13a357..941c3a2 100644 --- a/src/_update_src_copy.sh +++ b/src/_update_src_copy.sh @@ -1,4 +1,6 @@ #!/bin/sh -e +# Copyright 2025 sysmocom - s.f.m.c. GmbH +# SPDX-License-Identifier: GPL-3.0-or-later # Update the src_copy dir with all relevant files from the original git # repository (+ submodules). Used by gen_makefile.py --autoreconf-in-src-copy. @@ -8,6 +10,13 @@ echo "updating src_copy: $dest" + # Get files that are deleted, but not committed yet + git \ + -C "$src" \ + ls-files \ + --deleted \ + | sort >"$LIST_DELETED" + # Get list of files (everything that is not in gitignore) git \ -C "$src" \ @@ -15,14 +24,21 @@ --others \ --cached \ --exclude-standard \ - > "$COPY_LIST" + | sort >"$LIST_COPY" + + # Remove the deleted files from the list + comm \ + -3 \ + "$LIST_COPY" \ + "$LIST_DELETED" \ + >"$LIST_COPY_WITHOUT_DELETED" mkdir -p "$dest" # Copy files that changed rsync \ --archive \ - --files-from="$COPY_LIST" \ + --files-from="$LIST_COPY_WITHOUT_DELETED" \ "$src" \ "$dest" } @@ -114,11 +130,16 @@ DEST_DIR_PROJ="$MAKE_DIR/src_copy/$PROJ" handle_symlink_proj -COPY_LIST="$(mktemp --suffix=-osmo-dev-rsync-copylist)" +LIST_COPY="$(mktemp --suffix=-osmo-dev-rsync-list-copy)" +LIST_DELETED="$(mktemp --suffix=-osmo-dev-rsync-list-deleted)" +LIST_COPY_WITHOUT_DELETED="$(mktemp --suffix=-osmo-dev-rsync-list-copy-without-deleted)" cd "$SRC_DIR/$PROJ" update_git_dirs_all -rm "$COPY_LIST" +rm \ + "$LIST_COPY" \ + "$LIST_DELETED" \ + "$LIST_COPY_WITHOUT_DELETED" echo "$TIME_START" >"$MARKER" # Output an empty line when done to make the Makefile output more readable diff --git a/tests/test_update_src_copy.py b/tests/test_update_src_copy.py new file mode 100644 index 0000000..bb573ae --- /dev/null +++ b/tests/test_update_src_copy.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 +# Copyright 2025 sysmocom - s.f.m.c. GmbH +# SPDX-License-Identifier: GPL-3.0-or-later +import os +import subprocess + +osmo_dev_path = os.path.realpath(os.path.join(__file__, "../../")) +script = os.path.join(osmo_dev_path, "src/_update_src_copy.sh") + + +def run_cmd(cmd, *args, **kwargs): + print(f"+ {cmd}") + return subprocess.run(cmd, check=True, *args, **kwargs) + + +def test_update_git_dir(tmp_path): + proj = "testproj" + src_dir = os.path.join(tmp_path, "src") + proj_dir = os.path.join(src_dir, proj) + make_dir = os.path.join(tmp_path, "make") + dest_dir_proj = os.path.join(make_dir, "src_copy", proj) + + run_cmd(["mkdir", "-p", proj_dir, make_dir]) + + # Create git repo + os.chdir(proj_dir) + run_cmd(["git", "init", "."]) + run_cmd(["git", "config", "user.email", "osmo-dev@test"]) + run_cmd(["git", "config", "user.name", "osmo-dev-test"]) + + # Make initial commit + run_cmd(["touch", "1.c", "2.c", "3.c"]) + run_cmd("echo '*.o' >.gitignore", shell=True) + run_cmd(["git", "add", "-A"]) + run_cmd(["git", "commit", "-m", "initial"]) + + # Make uncommitted changes + run_cmd(["touch", "1.o", "4.c", "5.c"]) + run_cmd(["rm", "1.c", "2.c"]) + + # Stage half of the changes + run_cmd(["git", "add", "1.c", "4.c"]) + + # Run _update_src_copy.sh + os.chdir(make_dir) + time_start = "1" + run_cmd(["sh", "-ex", script, src_dir, proj, time_start]) + assert sorted(os.listdir(dest_dir_proj)) == [ + ".gitignore", + "3.c", + "4.c", + "5.c", + ] + + # Commit changes + os.chdir(proj_dir) + run_cmd(["git", "add", "-A"]) + run_cmd(["git", "commit", "-m", "test"]) + + # Run _update_src_copy.sh again (this time LIST_DELETED is empty) + os.chdir(make_dir) + time_start = "2" + run_cmd(["sh", "-ex", script, src_dir, proj, time_start]) + assert sorted(os.listdir(dest_dir_proj)) == [ + ".gitignore", + "3.c", + "4.c", + "5.c", + ] -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41514?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I232263bc5bd26c90f1e73b115480269165a1e1f8 Gerrit-Change-Number: 41514 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: f_ConnHdlr_ue_ctx_release_req(): add a quirk for -latest
by osmith 27 Nov '25

27 Nov '25

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41517?usp=email ) Change subject: s1gw: f_ConnHdlr_ue_ctx_release_req(): add a quirk for -latest ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41517?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: I90c44955ad3aabfe7ca9198b3ec9b6b97a46c0ae Gerrit-Change-Number: 41517 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Nov 2025 07:04:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: f_ConnHdlr_ue_ctx_release_req(): add a quirk for -latest
by pespin 26 Nov '25

26 Nov '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41517?usp=email ) Change subject: s1gw: f_ConnHdlr_ue_ctx_release_req(): add a quirk for -latest ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41517?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: I90c44955ad3aabfe7ca9198b3ec9b6b97a46c0ae Gerrit-Change-Number: 41517 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Nov 2025 18:51:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: f_ConnHdlr_ue_ctx_release_req(): add a quirk for -latest
by fixeria 26 Nov '25

26 Nov '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41517?usp=email ) Change subject: s1gw: f_ConnHdlr_ue_ctx_release_req(): add a quirk for -latest ...................................................................... s1gw: f_ConnHdlr_ue_ctx_release_req(): add a quirk for -latest We're hitting a crash in Eclipse TITAN when running S1GW_Tests.TC_uemux_ue_ctx_release_req against the -latest version of osmo-s1gw, which is sending PFCP Session Deletion Request that we no longer expect to receive. This results in an empty junit-xml file due to early termination of the runtime. Re-introduce the f_ConnHdlr_session_delete(), only for the -latest. Change-Id: I90c44955ad3aabfe7ca9198b3ec9b6b97a46c0ae Related: 8e315ed6 ("s1gw: correct handling of UE CONTEXT RELEASE REQUEST") Related: osmo-s1gw.git If467162e871b7989f0578be30c04d1c32c263c99 Related: OS#6888, SYS#7738, SYS#7599 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/41517/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index b850f55..ec6d08a 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -1662,6 +1662,10 @@ log("[eNB -> S1GW] -> MME: UE CONTEXT RELEASE REQUEST"); f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_UeContextReleaseReq(mme_ue_id, enb_ue_id, cause)); + /* XXX: remove this quirk when osmo-s1gw > 0.3.0 is released */ + if (Misc_Helpers.f_osmo_repo_is("latest")) { + f_ConnHdlr_session_delete(erabs); + } log("eNB -> [S1GW -> MME]: UE CONTEXT RELEASE REQUEST"); f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_UeContextReleaseReq(mme_ue_id, enb_ue_id, cause)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41517?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: I90c44955ad3aabfe7ca9198b3ec9b6b97a46c0ae Gerrit-Change-Number: 41517 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in pysim[master]: card_key_provider: add PostgreSQL support
by fixeria 26 Nov '25

26 Nov '25

Attention is currently required from: dexter. fixeria has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41508?usp=email ) Change subject: card_key_provider: add PostgreSQL support ...................................................................... Patch Set 4: (5 comments) File contrib/csv-to-pgsql.py: https://gerrit.osmocom.org/c/pysim/+/41508/comment/bca5d7b1_fe5f280e?usp=em… : PS4, Line 16: # cmd2 >= 2.3.0 has deprecated the bg/fg in favor of Bg/Fg :( Other than `YELLOW`, `cmd2` API is not used in this script. I would avoid importing it just because you want a color in logging. I believe you can just use an ASCII color code? https://gerrit.osmocom.org/c/pysim/+/41508/comment/8cd99406_fee94e2b?usp=em… : PS4, Line 225: log.info("CSV file: %s" % opts.csv) BTW, for logging API it's recommended to use lazy format-sting evaluation: ``` log.info("CSV file: %s", opts.csv) ``` https://gerrit.osmocom.org/c/pysim/+/41508/comment/ee7844fb_d607dda4?usp=em… : PS4, Line 227: if not csv_file: Does `open()` return `None` at all? It raises an exception on error. File pySim/card_key_provider.py: https://gerrit.osmocom.org/c/pysim/+/41508/comment/3cf45c38_64837df4?usp=em… : PS4, Line 242: break; cosmetic: semicolon is not needed here File setup.py: https://gerrit.osmocom.org/c/pysim/+/41508/comment/1548a453_b40f2048?usp=em… : PS4, Line 37: psycopg2-binary Not blocking here, but do we really want this as a required dependency? This list is already quite long, giving headaches to those trying to package pySim... -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41508?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icba625c02a60d7e1f519b506a46bda5ded0537d3 Gerrit-Change-Number: 41508 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Nov 2025 17:49:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-dev[master]: src/_update_src_copy: don't copy deleted files
by fixeria 26 Nov '25

26 Nov '25

Attention is currently required from: lynxis lazus, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/41514?usp=email ) Change subject: src/_update_src_copy: don't copy deleted files ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41514?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I232263bc5bd26c90f1e73b115480269165a1e1f8 Gerrit-Change-Number: 41514 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 26 Nov 2025 17:28:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: tcap: Fix s/utds/udts/g typo
by pespin 26 Nov '25

26 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41516?usp=email ) Change subject: stp: tcap: Fix s/utds/udts/g typo ...................................................................... stp: tcap: Fix s/utds/udts/g typo Change-Id: Ie30f665ecff2cefc1acbfd1aa65d9bebdd9311ec --- M stp/STP_Tests_TCAP.ttcn M stp/expected-results.xml 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/stp/STP_Tests_TCAP.ttcn b/stp/STP_Tests_TCAP.ttcn index 2f26547..3341de9 100644 --- a/stp/STP_Tests_TCAP.ttcn +++ b/stp/STP_Tests_TCAP.ttcn @@ -572,12 +572,12 @@ setverdict(pass); } -/* Test if UTDS is sent back when sending a TCAP messages with a OTID not valid +/* Test if UDTS is sent back when sending a TCAP messages with a OTID not valid * * node a: 0..99 * node b: 100..199 */ -testcase TC_tcap_loadshare_ipa_tcap_utds() runs on TCAP_CT { +testcase TC_tcap_loadshare_ipa_tcap_udts() runs on TCAP_CT { var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-0-0", "asp-m3ua-loadshare-0-1", @@ -609,7 +609,7 @@ setverdict(pass); } [] T.timeout { - setverdict(fail, __SCOPE__, "(): Timeout waiting for UTDS"); + setverdict(fail, __SCOPE__, "(): Timeout waiting for UDTS"); Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } } @@ -636,7 +636,7 @@ execute( TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn() ); execute( TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn2() ); execute( TC_tcap_loadshare_ipa_tcap_range_fail_pc_ssn_overlap() ); - execute( TC_tcap_loadshare_ipa_tcap_utds() ); + execute( TC_tcap_loadshare_ipa_tcap_udts() ); } diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 53cf703..e0170de 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -80,5 +80,5 @@ <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn' time='MASKED'/> <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn2' time='MASKED'/> <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_range_fail_pc_ssn_overlap' time='MASKED'/> - <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_utds' time='MASKED'/> + <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_udts' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41516?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: Ie30f665ecff2cefc1acbfd1aa65d9bebdd9311ec Gerrit-Change-Number: 41516 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: tcap: Fix s/utds/udts/g typo
by daniel 26 Nov '25

26 Nov '25

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41516?usp=email ) Change subject: stp: tcap: Fix s/utds/udts/g typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41516?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: Ie30f665ecff2cefc1acbfd1aa65d9bebdd9311ec Gerrit-Change-Number: 41516 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Nov 2025 13:02:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: tcap: Fix s/utds/udts/g typo
by pespin 26 Nov '25

26 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41516?usp=email ) Change subject: stp: tcap: Fix s/utds/udts/g typo ...................................................................... stp: tcap: Fix s/utds/udts/g typo Change-Id: Ie30f665ecff2cefc1acbfd1aa65d9bebdd9311ec --- M stp/STP_Tests_TCAP.ttcn M stp/expected-results.xml 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/41516/1 diff --git a/stp/STP_Tests_TCAP.ttcn b/stp/STP_Tests_TCAP.ttcn index 2f26547..3341de9 100644 --- a/stp/STP_Tests_TCAP.ttcn +++ b/stp/STP_Tests_TCAP.ttcn @@ -572,12 +572,12 @@ setverdict(pass); } -/* Test if UTDS is sent back when sending a TCAP messages with a OTID not valid +/* Test if UDTS is sent back when sending a TCAP messages with a OTID not valid * * node a: 0..99 * node b: 100..199 */ -testcase TC_tcap_loadshare_ipa_tcap_utds() runs on TCAP_CT { +testcase TC_tcap_loadshare_ipa_tcap_udts() runs on TCAP_CT { var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-0-0", "asp-m3ua-loadshare-0-1", @@ -609,7 +609,7 @@ setverdict(pass); } [] T.timeout { - setverdict(fail, __SCOPE__, "(): Timeout waiting for UTDS"); + setverdict(fail, __SCOPE__, "(): Timeout waiting for UDTS"); Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } } @@ -636,7 +636,7 @@ execute( TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn() ); execute( TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn2() ); execute( TC_tcap_loadshare_ipa_tcap_range_fail_pc_ssn_overlap() ); - execute( TC_tcap_loadshare_ipa_tcap_utds() ); + execute( TC_tcap_loadshare_ipa_tcap_udts() ); } diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 53cf703..e0170de 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -80,5 +80,5 @@ <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn' time='MASKED'/> <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn2' time='MASKED'/> <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_range_fail_pc_ssn_overlap' time='MASKED'/> - <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_utds' time='MASKED'/> + <testcase classname='STP_Tests_TCAP' name='TC_tcap_loadshare_ipa_tcap_udts' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41516?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: Ie30f665ecff2cefc1acbfd1aa65d9bebdd9311ec Gerrit-Change-Number: 41516 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: xua_asp_fsm: Move common ipa/xua ASP_DOWN onenter code to helper func...
by pespin 26 Nov '25

26 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41515?usp=email ) Change subject: xua_asp_fsm: Move common ipa/xua ASP_DOWN onenter code to helper function ...................................................................... xua_asp_fsm: Move common ipa/xua ASP_DOWN onenter code to helper function This is a preparation patch since that function (and AS loop inside it) will be doing more stuff in the future, like tearing down TCAP loadsharing state. Change-Id: Ia445ebc9a3bbad903d26259453e403fd450e8075 --- M src/xua_asp_fsm.c M src/xua_internal.h M src/xua_rkm.c 3 files changed, 26 insertions(+), 32 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index d10420f..7a6979d 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -477,6 +477,30 @@ } +static void common_asp_fsm_down_onenter(struct osmo_ss7_asp *asp) +{ + struct osmo_ss7_as *as, *as2; + struct osmo_ss7_instance *inst = asp->inst; + + /* First notify all AS associated to the ASP that it went down: */ + dispatch_to_all_as(asp->fi, XUA_ASPAS_ASP_DOWN_IND, asp); + + /* Implicit clean up tasks: */ + llist_for_each_entry_safe(as, as2, &inst->as_list, list) { + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + if (as->rkm_dyn_allocated) { + /* RFC 4666 4.4.2: "An ASP SHOULD deregister from all Application Servers + * of which it is a member before attempting to move to the ASP-Down state [...] + * If a Deregistration results in no more ASPs in an Application Server, + * an SG MAY delete the Routing Key data." + * In case it didn't deregsitrer explicitly, make sure to implicitly deregister it: + */ + ss7_as_del_asp(as, asp); + } + } +} + #define ENSURE_ASP_OR_IPSP(fi, event) \ do { \ struct xua_asp_fsm_priv *_xafp = fi->priv; \ @@ -513,14 +537,7 @@ struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; xua_t_beat_stop(fi); - dispatch_to_all_as(fi, XUA_ASPAS_ASP_DOWN_IND, asp); - /* RFC 4666 4.4.2: "An ASP SHOULD deregister from all Application Servers of which it is a - * member before attempting to move to the ASP-Down state [...] - * If a Deregistration results in no more ASPs in an Application Server, an SG MAY delete - * the Routing Key data." - * In case it didn't deregsitrer explicitly, make sure to implicitly deregister it: - */ - xua_rkm_cleanup_dyn_as_for_asp(asp); + common_asp_fsm_down_onenter(asp); } static void xua_asp_fsm_down(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -1107,14 +1124,7 @@ struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; ipa_t_beat_stop(fi); - dispatch_to_all_as(fi, XUA_ASPAS_ASP_DOWN_IND, asp); - /* RFC 4666 4.4.2: "An ASP SHOULD deregister from all Application Servers of which it is a - * member before attempting to move to the ASP-Down state [...] - * If a Deregistration results in no more ASPs in an Application Server, an SG MAY delete - * the Routing Key data." - * In case it didn't deregsitrer explicitly, make sure to implicitly deregister it: - */ - xua_rkm_cleanup_dyn_as_for_asp(asp); + common_asp_fsm_down_onenter(asp); } static void ipa_asp_fsm_down(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/xua_internal.h b/src/xua_internal.h index 90a68be..a6cb961 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -92,7 +92,6 @@ int m3ua_decode_notify(struct osmo_xlm_prim_notify *npar, void *ctx, const struct xua_msg *xua); int m3ua_rx_rkm(struct osmo_ss7_asp *asp, struct xua_msg *xua); -void xua_rkm_cleanup_dyn_as_for_asp(struct osmo_ss7_asp *asp); struct osmo_xlm_prim *xua_xlm_prim_alloc(enum osmo_xlm_prim_type prim_type, enum osmo_prim_operation op); diff --git a/src/xua_rkm.c b/src/xua_rkm.c index 2de830f..9713e3a 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -623,18 +623,3 @@ msgb_free(prim->oph.msg); return 0; } - -/* clean-up any dynamically created ASs + routes */ -void xua_rkm_cleanup_dyn_as_for_asp(struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_instance *inst = asp->inst; - struct osmo_ss7_as *as, *as2; - - llist_for_each_entry_safe(as, as2, &inst->as_list, list) { - if (!as->rkm_dyn_allocated) - continue; - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - ss7_as_del_asp(as, asp); - } -} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41515?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: Ia445ebc9a3bbad903d26259453e403fd450e8075 Gerrit-Change-Number: 41515 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2025

2024

2023

2022

gerrit-log