Attention is currently required from: neels, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28214 )
Change subject: BSC_Tests: add TC_chan_alloc_algo_{a,de}scending
......................................................................
Patch Set 3:
(1 comment)
File bsc/BSC_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28214/comment/a5203e57_01da…
PS1, Line 11551: /* HACK: work around "Couldn't find Expect for CRCX" */
> (maybe you want to […]
Pau: osmo-bsc is sending CRCX message, which gets forwarded to the MGCP_Emulation_CT. Given that we haven't registered an 'expect', this emulation component terminates the test case (see ExpectedCreateCallback()).
Neels: thanks, but f_create_mgcp_expect() runs on MSC_ConnHdlr, it's not going to work on test_CT. I am currently not spawning MSC_ConnHdlr components at all, everything runs on test_CT for the sake of simplicity.
As a quick hack, it's easier to stop the MGCP_Emulation_CT. This is exactly what I did while working on the freq. hopping test cases.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28214
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ic74a9cd264320a9a17648f9331b67fb2c2404122
Gerrit-Change-Number: 28214
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 03 Jun 2022 10:20:53 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28220 )
Change subject: BSC_Tests: fix a race condition in TC_imm_ass_pre_[ts,chan]_ack
......................................................................
BSC_Tests: fix a race condition in TC_imm_ass_pre_[ts,chan]_ack
These test cases sporadically fail on Jenkins and 9/10 times on my
machine. The problem appears to be that we are sending both the
RSL CHANnel ReQuireD and the VTY command simultaneously, and the
later may be handled earlier than the former by osmo-bsc.
Ensure that the RSL message is handled first by sending the VTY
command after we have received the RSL CHANnel ACTivation message.
Change-Id: I38cd31041741b69eb15098a089b4d4b6b918ffd4
---
M bsc/BSC_Tests.ttcn
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index feb8bfb..2e804e1 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -10902,9 +10902,6 @@
var uint8_t ra := 2;
f_ipa_tx(0, ts_RSL_CHAN_RQD(int2oct(ra, 1), fn));
- /* (set bts 0 cfg back to default) */
- f_vty_set_imm_ass(BSCVTY);
-
chan_act := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV));
var RslChannelNr chan_nr := chan_act.ies[0].body.chan_nr;
var DchanTuple dt;
@@ -10915,6 +10912,9 @@
mtc.stop;
}
+ /* (set bts 0 cfg back to default) */
+ f_vty_set_imm_ass(BSCVTY);
+
/* *FIRST* expect the Immediate Assignment, before we ACK the chan act */
imm_ass := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0));
f_verify_imm_ass(imm_ass, ra, fn, chan_nr, chan_ident_ie.chan_ident.ch_desc.v.arfcn,
@@ -10951,9 +10951,6 @@
var uint8_t ra := 2;
f_ipa_tx(0, ts_RSL_CHAN_RQD(int2oct(ra, 1), fn));
- /* (set bts 0 cfg back to default) */
- f_vty_set_imm_ass(BSCVTY);
-
chan_act := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV));
var RslChannelNr chan_nr := chan_act.ies[0].body.chan_nr;
var DchanTuple dt;
@@ -10964,6 +10961,9 @@
mtc.stop;
}
+ /* (set bts 0 cfg back to default) */
+ f_vty_set_imm_ass(BSCVTY);
+
/* *FIRST* expect the Immediate Assignment, before we ACK the chan act */
imm_ass := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0));
f_verify_imm_ass(imm_ass, ra, fn, chan_nr, chan_ident_ie.chan_ident.ch_desc.v.arfcn,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28220
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I38cd31041741b69eb15098a089b4d4b6b918ffd4
Gerrit-Change-Number: 28220
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: neels.
Hello Jenkins Builder, neels,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219
to look at the new patch set (#2).
Change subject: DIAMETER: Send QoS AVPs in Gx CCA
......................................................................
DIAMETER: Send QoS AVPs in Gx CCA
This way we can trigger code paths in GGSN/PGW parsing those.
Change-Id: Ib758d4e3acc331954aca6423372410cb1e341ebd
---
M library/DIAMETER_Templates.ttcn
1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/28219/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ib758d4e3acc331954aca6423372410cb1e341ebd
Gerrit-Change-Number: 28219
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219 )
Change subject: DIAMETER: Send QoS AVPs in Gx CCA
......................................................................
Patch Set 1:
(2 comments)
File library/DIAMETER_Templates.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219/comment/3e38719f_1a57…
PS1, Line 863: P_
> should this also be called _PCC_?
Ack
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219/comment/d87a9d78_01d3…
PS1, Line 871:
> ts_AVP_3GPP_QosClassId() dropped intentionally?
It was renamed to ts_AVP_PCC_3GPP_QoS_Class_Identifier, all the Diameter AVP stuff is a nightmare, in specs and also in here.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ib758d4e3acc331954aca6423372410cb1e341ebd
Gerrit-Change-Number: 28219
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 03 Jun 2022 10:02:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28162 )
Change subject: pySim-shell: catch exceptions from walk() while exporting
......................................................................
pySim-shell: catch exceptions from walk() while exporting
When we run the exporter we also get an error summary at the end.
However, if walk() throws an eception this stops the exporter
immediately and we won't get the summpary. Lets catch exceptions from
walk as well so that we are able to end gracefully.
Change-Id: I3edc250ef2a84550c5b821a72e207e4d685790a5
---
M pySim-shell.py
1 file changed, 12 insertions(+), 5 deletions(-)
Approvals:
dexter: Verified
laforge: Looks good to me, approved
diff --git a/pySim-shell.py b/pySim-shell.py
index 0ed4b7c..f498dea 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -648,10 +648,17 @@
context = {'ERR': 0, 'COUNT': 0, 'BAD': [],
'DF_SKIP': 0, 'DF_SKIP_REASON': []}
kwargs_export = {'as_json': opts.json}
+ exception_str_add = ""
+
if opts.filename:
self.export_ef(opts.filename, context, **kwargs_export)
else:
- self.walk(0, self.export_ef, None, context, **kwargs_export)
+ try:
+ self.walk(0, self.export_ef, None, context, **kwargs_export)
+ except Exception as e:
+ print("# Stopping early here due to exception: " + str(e))
+ print("#")
+ exception_str_add = ", also had to stop early due to exception:" + str(e)
self._cmd.poutput(boxed_heading_str("Export summary"))
@@ -666,14 +673,14 @@
self._cmd.poutput("# " + b)
if context['ERR'] and context['DF_SKIP']:
- raise RuntimeError("unable to export %i elementary file(s) and %i dedicated file(s)" % (
- context['ERR'], context['DF_SKIP']))
+ raise RuntimeError("unable to export %i elementary file(s) and %i dedicated file(s)%s" % (
+ context['ERR'], context['DF_SKIP'], exception_str_add))
elif context['ERR']:
raise RuntimeError(
- "unable to export %i elementary file(s)" % context['ERR'])
+ "unable to export %i elementary file(s)%s" % (context['ERR'], exception_str_add))
elif context['DF_SKIP']:
raise RuntimeError(
- "unable to export %i dedicated files(s)" % context['ERR'])
+ "unable to export %i dedicated files(s)%s" % (context['ERR'], exception_str_add))
def do_reset(self, opts):
"""Reset the Card."""
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28162
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I3edc250ef2a84550c5b821a72e207e4d685790a5
Gerrit-Change-Number: 28162
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged