pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39765?usp=email )
Change subject: stp: STP_Tests_IPA.TC_tmt_loadshare_sls: Fix test expectancies
......................................................................
stp: STP_Tests_IPA.TC_tmt_loadshare_sls: Fix test expectancies
Change-Id: I68856e11a92b707eb11ab4813390e6faf3c54b69
---
M stp/STP_Tests_IPA.ttcn
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn
index 088b280..88c9312 100644
--- a/stp/STP_Tests_IPA.ttcn
+++ b/stp/STP_Tests_IPA.ttcn
@@ -304,9 +304,14 @@
}
}
- /* 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!");
+ /* All traffic should not still be sent to the same receiver, since
+ * OPC+SLS cannot change in IPA ASPs.
+ * However, depending on how the SLS seed tables were allocated, it can
+ * be that STP was routing through Alternative Route and now that the
+ * 2nd receiver is up it is now routing to it (Normal Route). Account
+ * for both scenarios. */
+ if (not ((num_rx_1 == iter_per_asp and num_rx_2 == 0) or (num_rx_2 == iter_per_asp and num_rx_1 == 0))) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through same receiver!");
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39765?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: I68856e11a92b707eb11ab4813390e6faf3c54b69
Gerrit-Change-Number: 39765
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>
Attention is currently required from: laforge.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?usp=email )
Change subject: sccp: Improve logging receiving unexpected msg
......................................................................
Patch Set 2:
(1 comment)
File sccp/SCCP_Tests_RAW.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767/comment/bf31647d_40ba… :
PS2, Line 154: {
: Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
: log2str("Unexpected MTP/SCCP received: got (ASP_MTP3_PAUSE|ASP_MTP3_RESUME|ASP_MTP3_STATUS) vs exp ", exp
> this is a bit "unelegant" as it basically is the default case. […]
still easier to find out the log message with those in it than without. One still needs to debug further in this event, but at least it's easier now.
This patch helped me in debugging related issues.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?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: I90c5236882e96fc038fee0d2f4551cfc58767c78
Gerrit-Change-Number: 39767
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: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 11 Mar 2025 16:17:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Attention is currently required from: pespin.
laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39769?usp=email )
Change subject: SCCP_Templates: Expect either proto class0 or class1 upon rx SCCP
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39769?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: Ia1e05b24f1b56404d951eece0e9314d784d375db
Gerrit-Change-Number: 39769
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: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 11 Mar 2025 16:16:09 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: pespin.
laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?usp=email )
Change subject: sccp: Improve logging receiving unexpected msg
......................................................................
Patch Set 2: Code-Review+1
(1 comment)
File sccp/SCCP_Tests_RAW.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767/comment/6f0a31d4_b2e4… :
PS2, Line 154: {
: Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
: log2str("Unexpected MTP/SCCP received: got (ASP_MTP3_PAUSE|ASP_MTP3_RESUME|ASP_MTP3_STATUS) vs exp ", exp
this is a bit "unelegant" as it basically is the default case. Todays M3UA implementation may just know of ASP_MTP3_{PAUSE,RESUME,STATUS} but that might of course change at whcih point the code here is no longer valid. Not critical, just saying...
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?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: I90c5236882e96fc038fee0d2f4551cfc58767c78
Gerrit-Change-Number: 39767
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: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 11 Mar 2025 16:15:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?usp=email )
Change subject: m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer
......................................................................
m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer
Recent commit reworked those code paths to return an error type instead
of an err message, but wrongly left the negative error of
osmo_fsm_inst_dispatch() code path as is, without converting it to a
positive m3ua error code value, which ended up in an ERR msg not being
generated.
Fixes: 82c1d2c8c6699349258869bce690293b590a6b0d
Change-Id: I16042c97453854c78e55bfe6bd6925506eae82c5
---
M src/m3ua.c
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/71/39771/1
diff --git a/src/m3ua.c b/src/m3ua.c
index 39c799e..04ee7c5 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -734,6 +734,8 @@
/* deliver that event to the ASP FSM */
rc = osmo_fsm_inst_dispatch(asp->fi, event, xua);
+ if (rc < 0)
+ rc = M3UA_ERR_UNEXPECTED_MSG;
ret_free:
xua_msg_free(xua);
return rc;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?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: I16042c97453854c78e55bfe6bd6925506eae82c5
Gerrit-Change-Number: 39771
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: laforge, osmith.
Hello Jenkins Builder, laforge, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/docker-playground/+/39770?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: nplab-m3ua-test: Record pcap of all testsuite run
......................................................................
nplab-m3ua-test: Record pcap of all testsuite run
Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10
---
M debian-buster-build/Dockerfile
M nplab-m3ua-test/Dockerfile
M nplab-m3ua-test/jenkins.sh
M nplab-m3ua-test/osmo-stp.cfg
A nplab-m3ua-test/tcpdump-start.sh
A nplab-m3ua-test/tcpdump-stop.sh
A nplab-m3ua-test/test.sh
7 files changed, 223 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/39770/2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10
Gerrit-Change-Number: 39770
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-Attention: laforge <laforge(a)osmocom.org>
Attention is currently required from: laforge, osmith.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email )
Change subject: nplab-m3ua-test: Record pcap of all testsuite run
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Same will be needed for nplab-sua-test.
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10
Gerrit-Change-Number: 39770
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(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-Comment-Date: Tue, 11 Mar 2025 15:29:00 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No