lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/42762?usp=email )
Change subject: osmo_interact: improve vty transcript language by a regular rexex
......................................................................
osmo_interact: improve vty transcript language by a regular rexex
Currently the transcript language understand 3 different tokens:
... (ignore all lines until the following line matches)
... !REGEX (ignore all lines except REXEX)
But to support osmo-stp with different compile options, the
vty help is indented with different amount of spaces depending on the compile options.
To support those add a regular regex using the prefix !r!
E.g.
```
OsmoSTP(config-cs7-as)# ?
- description Save human-readable description of the object
vs
+ description Save human-readable description of the object
```
To use the new regex, the line would be:
```
!r! description[ ]+Save human-readable description of the object
```
Further all regex special characters needs to be escaped.
```
description Save human-readable description of the object (for humans)
!r! description[ ]+Save human-readable description of the object \(for humans\)
```
Change-Id: Iadcd7a8c3677548a6405e098fe53d0614ef2012c
---
M osmopy/osmo_interact/common.py
1 file changed, 16 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
lynxis lazus: Looks good to me, approved
diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py
index 87eca6a..c989fe9 100644
--- a/osmopy/osmo_interact/common.py
+++ b/osmopy/osmo_interact/common.py
@@ -218,14 +218,28 @@
- If an 'expect' line is '... !regex', it matches any number of
lines like '...', but the given regex must not match any of those
lines.
+ - If the line starts with '!r!' following the regex, but a exact
+ match has priority
Return 'True' on match, or a string describing the mismatch.
'''
- def match_line(expect_line, got_line):
- return expect_line == got_line
ANY = '...'
ANY_EXCEPT = '... !'
+ REGEX = '!r!'
+
+ def match_line(expect_line, got_line):
+ if expect_line == got_line:
+ return True
+
+ # try to parse the expect_line as regex
+ if expect_line.startswith(REGEX):
+ try:
+ if re.compile(expect_line[len(REGEX):]).match(got_line):
+ return True
+ except:
+ pass
+ return False
e = 0
g = 0
--
To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/42762?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: python/osmo-python-tests
Gerrit-Branch: master
Gerrit-Change-Id: Iadcd7a8c3677548a6405e098fe53d0614ef2012c
Gerrit-Change-Number: 42762
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Attention is currently required from: daniel, laforge, neels, osmith.
lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/42762?usp=email )
Change subject: osmo_interact: improve vty transcript language by a regular rexex
......................................................................
Patch Set 3:
(1 comment)
File osmopy/osmo_interact/common.py:
https://gerrit.osmocom.org/c/python/osmo-python-tests/+/42762/comment/db7fa… :
PS1, Line 221: - If the line starts with '!r!' following the regex, but a exact match has priority
> ```suggestion […]
Done
--
To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/42762?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: python/osmo-python-tests
Gerrit-Branch: master
Gerrit-Change-Id: Iadcd7a8c3677548a6405e098fe53d0614ef2012c
Gerrit-Change-Number: 42762
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 27 May 2026 19:21:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Attention is currently required from: laforge, lynxis lazus, pespin.
Hello Jenkins Builder, daniel, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42760?usp=email
to look at the new patch set (#8).
Change subject: tcap loadshare: allow to define the fallback mechanism for unroutable TCAP messages
......................................................................
tcap loadshare: allow to define the fallback mechanism for unroutable TCAP messages
When a TCAP Continue/End/Abort message is received, but no TCAP session entry can be found
and no valid TCAP range is available for the dtid, the message can be either:
- rejected by returning an error with udts
- routed by round robin to all available ASP of this AS
To define the behaviour, a new vty option is introduced:
```
tcap-unroutable-sessions (reject-udts | load-share-over-as)
```
Defaults to reject-udts.
Related: SYS#5432
Change-Id: Ic1c876da30b05065a476d3a7c1bbf0680adf55bd
---
M src/ss7_as.c
M src/ss7_as.h
M src/ss7_as_vty.c
M src/tcap_as_loadshare.c
M tests/vty/osmo_stp_test_tcap.vty
5 files changed, 72 insertions(+), 19 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/60/42760/8
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42760?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: Ic1c876da30b05065a476d3a7c1bbf0680adf55bd
Gerrit-Change-Number: 42760
Gerrit-PatchSet: 8
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: laforge, pespin.
lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42764?usp=email )
Change subject: vty-tests: remove help from expected output
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
The commit only covers the generic test case and not anymore the tcap vty test as Daniel recommended. The tcap vty test is only ran when tcap is enabled, which is fine.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42764?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: I0d8141c00525f49c0a9f9f63b73fee531f591e5c
Gerrit-Change-Number: 42764
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 27 May 2026 19:12:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: laforge, lynxis lazus, pespin.
Hello Jenkins Builder, daniel, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42760?usp=email
to look at the new patch set (#7).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: tcap loadshare: allow to define the fallback mechanism for unroutable TCAP messages
......................................................................
tcap loadshare: allow to define the fallback mechanism for unroutable TCAP messages
When a TCAP Continue/End/Abort message is received, but no TCAP session entry can be found
and no valid TCAP range is available for the dtid, the message can be either:
- rejected by returning an error with udts
- routed by round robin to all available ASP of this AS
To define the behaviour, a new vty option is introduced:
```
tcap-unroutable-sessions (reject-udts | load-share-over-as)
```
Defaults to reject-udts.
Related: SYS#5432
Change-Id: Ic1c876da30b05065a476d3a7c1bbf0680adf55bd
---
M src/ss7_as.c
M src/ss7_as.h
M src/ss7_as_vty.c
M src/tcap_as_loadshare.c
M tests/vty/osmo_stp_test_tcap.vty
5 files changed, 70 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/60/42760/7
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42760?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: Ic1c876da30b05065a476d3a7c1bbf0680adf55bd
Gerrit-Change-Number: 42760
Gerrit-PatchSet: 7
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: laforge, lynxis lazus, pespin.
Hello Jenkins Builder, daniel, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42764?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: vty-tests: remove help from expected output
......................................................................
vty-tests: remove help from expected output
Until the vty tests support regex, remove the help message
as it depends on the compile option TCAP Routing and can't
handle both compile options.
It will be re-introduced later
Change-Id: I0d8141c00525f49c0a9f9f63b73fee531f591e5c
---
M tests/vty/osmo_stp_test.vty
1 file changed, 0 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/64/42764/3
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42764?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: I0d8141c00525f49c0a9f9f63b73fee531f591e5c
Gerrit-Change-Number: 42764
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: lynxis lazus.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42761?usp=email
to look at the new patch set (#6).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
The change is no longer submittable: Verified is unsatisfied now.
Change subject: tcap loadshare: move last_asp_idx_sent from cfg to runtime struct
......................................................................
tcap loadshare: move last_asp_idx_sent from cfg to runtime struct
The last_asp_idx_sent is a runtime information and not configurable.
Move it to the other runtime state.
Change-Id: Id52bb0f6c67949b5e03f7ad36996f37a0d25214a
---
M src/ss7_as.h
M src/tcap_as_loadshare.c
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/61/42761/6
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42761?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: Id52bb0f6c67949b5e03f7ad36996f37a0d25214a
Gerrit-Change-Number: 42761
Gerrit-PatchSet: 6
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: lynxis lazus.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42765?usp=email
to look at the new patch set (#5).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: vty-tests: Re-introduce the check on the help
......................................................................
vty-tests: Re-introduce the check on the help
With the support of regex within vty tests,
the help message can be checked again.
Depends-on: Iadcd7a8c3677548a6405e098fe53d0614ef2012c (osmo-python-tests)
Change-Id: I3fad268b7a8925f378f6331fcab073637bd80e08
---
M tests/vty/osmo_stp_test.vty
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/65/42765/5
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42765?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: I3fad268b7a8925f378f6331fcab073637bd80e08
Gerrit-Change-Number: 42765
Gerrit-PatchSet: 5
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: pespin.
lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42755?usp=email )
Change subject: tcap loadshare: Rework initial selection of a node
......................................................................
Patch Set 3:
(1 comment)
File src/tcap_as_loadshare.c:
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42755/comment/8f605706_fb3fc… :
PS3, Line 525: asp = select_asp_tcap_enabled_rr(as);
> They are still in use, but they are only used when the session tracking don't have an entry for an o […]
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42755?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: I151e6acb59e1f3c481487e76d2b01236fcee755f
Gerrit-Change-Number: 42755
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 27 May 2026 19:05:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>