Attention is currently required from: laforge, fixeria.
falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27986 )
Change subject: BTS_Tests: fix expectations in TC_speech_no_rtp_tch[fh]
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
The principal idea, described in the commit message, looks correct to me. However, I currently don't know TTCN3 well enough to do a proper review of the actual code change.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27986
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: Ic680002f60e598cfeeb448c517581b3506355e5b
Gerrit-Change-Number: 27986
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Jul 2023 21:19:06 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725 )
Change subject: BTS_Tests: also test TCH/EFS (EFR) in TC_speech_no_rtp_tchf
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
Marking as WIP, somehow this causes a DTE in `BTS_Tests.TC_speech_no_rtp_tchf`.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725
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: I272b4343f895889f6cb3e0d3aba2c63b4eab08a2
Gerrit-Change-Number: 33725
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Wed, 12 Jul 2023 21:08:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32727 )
Change subject: osmo-bts-trx: implement CSD scheduling support
......................................................................
Patch Set 17:
(1 comment)
Patchset:
PS17:
I think we can already merge this patchset. I will be adding the rate adaptation in a separate patch, if you don't mind. My WIP TTCN-3 testcases are all passing, no regressions observed by running the exiting testcases from ttcn3-bts-test.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32727
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I08ffbf8e79ce76a586d61f5463890c6e72a6d9b9
Gerrit-Change-Number: 32727
Gerrit-PatchSet: 17
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Jul 2023 20:46:52 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32727 )
Change subject: osmo-bts-trx: implement CSD scheduling support
......................................................................
Patch Set 16:
(3 comments)
Patchset:
PS16:
> not super critical, but there still are two unresolved comments regarding magic numbers
Done in a separate patch, see https://gerrit.osmocom.org/c/osmo-bts/+/33726.
File include/osmo-bts/scheduler.h:
https://gerrit.osmocom.org/c/osmo-bts/+/32727/comment/7ad6c67f_fbfe6e9e
PS14, Line 135: struct l1sched_meas_set buf[24]; /* up to 24 entries */
> it may be good to document here where this 24 comes from.
Done
File include/osmo-bts/scheduler.h:
https://gerrit.osmocom.org/c/osmo-bts/+/32727/comment/24ec218d_8e830f31
PS4, Line 134: struct l1sched_me
> This is needed in order to have proper measurements attached to `L1SAP TRAFFIC.ind` primitive. […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32727
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I08ffbf8e79ce76a586d61f5463890c6e72a6d9b9
Gerrit-Change-Number: 32727
Gerrit-PatchSet: 16
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Jul 2023 20:44:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33726 )
Change subject: osmo-bts-trx: document/clarify the meaning of BUFMAX=24
......................................................................
osmo-bts-trx: document/clarify the meaning of BUFMAX=24
Change-Id: I95d4e4ee3938cfabc1695959cc82a1efbbf0d7ed
Related: OS#1572
---
M include/osmo-bts/scheduler.h
M src/osmo-bts-trx/sched_utils.h
2 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/26/33726/1
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index 23d01fb..94333ea 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -132,7 +132,7 @@
/* Uplink measurements */
struct {
/* Active channel measurements (simple ring buffer) */
- struct l1sched_meas_set buf[24]; /* up to 24 entries */
+ struct l1sched_meas_set buf[24]; /* up to 24 (BUFMAX) entries */
unsigned int current; /* current position */
/* Interference measurements */
diff --git a/src/osmo-bts-trx/sched_utils.h b/src/osmo-bts-trx/sched_utils.h
index 4521a2e..4091168 100644
--- a/src/osmo-bts-trx/sched_utils.h
+++ b/src/osmo-bts-trx/sched_utils.h
@@ -26,7 +26,9 @@
/* Burst Payload LENgth (short alias) */
#define BPLEN GSM_NBITS_NB_GMSK_PAYLOAD
-/* Burst BUFfer capacity (in BPLEN units) */
+/* Burst BUFfer capacity (in BPLEN units). Why 24? Because CSD frames
+ * are interleaved over 22 bursts, but on TCH/F we decode every 4th burst,
+ * so it must be a multiple of 4. See also 'doc/trx_sched_tch.txt'. */
#define BUFMAX 24
/* Burst BUFfer position macros */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33726
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I95d4e4ee3938cfabc1695959cc82a1efbbf0d7ed
Gerrit-Change-Number: 33726
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725
to look at the new patch set (#2).
Change subject: BTS_Tests: also test TCH/EFS (EFR) in TC_speech_no_rtp_tchf
......................................................................
BTS_Tests: also test TCH/EFS (EFR) in TC_speech_no_rtp_tchf
Also add TODO comments for TCH/AFS and TCH/AHS.
Change-Id: I272b4343f895889f6cb3e0d3aba2c63b4eab08a2
Related: SYS#5919, OS#4823
---
M bts/BTS_Tests.ttcn
1 file changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/33725/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725
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: I272b4343f895889f6cb3e0d3aba2c63b4eab08a2
Gerrit-Change-Number: 33725
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
Attention is currently required from: falconia, laforge.
Hello Jenkins Builder, falconia, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27986
to look at the new patch set (#3).
Change subject: BTS_Tests: fix expectations in TC_speech_no_rtp_tch[fh]
......................................................................
BTS_Tests: fix expectations in TC_speech_no_rtp_tch[fh]
This testcase is currently passing for both -master and -latest
versions of osmo-bts, despite their behavior is different:
* the -latest is sending FACCH frames with dummy LAPDm func=UI,
* the -master is sending invalid speech frames with inverted CRC3.
There is a bug in the 'tr_bad_frame' template definition: we expect
the payload to be present, while in real BFIs it's omitted. So these
two testcases would always pass, even if the IUT would be sending dummy
bursts or sending nothing at all, because they were designed to fail on
receipt of a never-matching TRAFFIC.ind template.
Let's fix this and align our expectations with the current behavior
of the -master version of osmo-bts. Note that sending invalid speech
frames with inverted CRC3 is not osmo-bts-trx specific behavior;
it's actually a replicated behavior of DSP based osmo-bts-sysmo.
Change-Id: Ic680002f60e598cfeeb448c517581b3506355e5b
Related: osmo-bts.git I78106802a0aa4af39859c75d29fe0e77037899fe
Related: SYS#5919, OS#4823
---
M bts/BTS_Tests.ttcn
1 file changed, 48 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/27986/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27986
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: Ic680002f60e598cfeeb448c517581b3506355e5b
Gerrit-Change-Number: 27986
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27986 )
Change subject: BTS_Tests: fix expectations in TC_speech_no_rtp_tch[fh]
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27986
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: Ic680002f60e598cfeeb448c517581b3506355e5b
Gerrit-Change-Number: 27986
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 12 Jul 2023 20:24:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725 )
Change subject: BTS_Tests: also test TCH/EFS (EFR) in TC_speech_no_rtp_tchf
......................................................................
BTS_Tests: also test TCH/EFS (EFR) in TC_speech_no_rtp_tchf
Also add TODO comments for TCH/AFS and TCH/AHS.
Change-Id: I272b4343f895889f6cb3e0d3aba2c63b4eab08a2
Related: SYS#5919, OS#4823
---
M bts/BTS_Tests.ttcn
1 file changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/33725/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 5a34a8c..552d259 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -8289,6 +8289,14 @@
pars := valueof(t_Pars(ts_RslChanNr_Bm(1), ts_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM1)));
vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars);
vc_conn.done;
+
+ /* TS1, TCH/F, V2 (EFR codec) */
+ pars := valueof(t_Pars(ts_RslChanNr_Bm(1), ts_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM2)));
+ vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars);
+ vc_conn.done;
+
+ /* TODO: we don't know what's the expected behavior for TCH/AFS, so we don't test it here.
+ * Current osmo-bts is sending FACCH/F with dummy LAPDm func=UI frames. */
}
testcase TC_speech_no_rtp_tchh() runs on test_CT {
var ConnHdlr vc_conn;
@@ -8300,6 +8308,9 @@
pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), ts_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM1)));
vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars);
vc_conn.done;
+
+ /* TODO: we don't know what's the expected behavior for TCH/AHS, so we don't test it here.
+ * Current osmo-bts is sending FACCH/F with dummy LAPDm func=UI frames (whenever possible). */
}
/* Verify handling of Downlink and Uplink speech frames */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725
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: I272b4343f895889f6cb3e0d3aba2c63b4eab08a2
Gerrit-Change-Number: 33725
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange