Attention is currently required from: msuraev.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32278 )
Change subject: gprs_rlcmac: convert from C++ to C
......................................................................
Patch Set 6: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32278
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7260ad1a67ebdc09767a679e579fead262f1627a
Gerrit-Change-Number: 32278
Gerrit-PatchSet: 6
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Apr 2023 20:44:20 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: msuraev.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32276 )
Change subject: abis_rsl: include osmo_ortp.h explicitly
......................................................................
Patch Set 5: Code-Review-2
(1 comment)
File src/osmo-bsc/abis_rsl.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/32276/comment/f5bd3a28_f25abb94
PS5, Line 49: osmocom/netif/rtp.h
AFAICS, these constants are not only defined in libosmo-abis.git, but also in libosmo-netif.git. Specifically in this header file. So I think it's fine as it is.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32276
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I11297f2ba2ff431153e541c745cf59b7fbb733c0
Gerrit-Change-Number: 32276
Gerrit-PatchSet: 5
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Apr 2023 20:41:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32285 )
Change subject: osmo-bts-virtual: properly activate [CBCH/]BCCH/CCCH
......................................................................
osmo-bts-virtual: properly activate [CBCH/]BCCH/CCCH
In change 8e04613e I overlooked that osmo-bts-virtual is re-using the
scheduler of osmo-bts-trx and forgot to update its OML logic. As a
result, osmo-bts-virtual is broken and does not transmit anything on
the broadcast channels.
Change-Id: I2276f7e5e4042e56ddf1fd1642c917dba0005ac4
Fixes: 8e04613e "osmo-bts-trx: properly activate [CBCH/]BCCH/CCCH"
Related: OS#6001, OS#1572
---
M src/osmo-bts-virtual/bts_model.c
M src/osmo-bts-virtual/l1_if.c
2 files changed, 38 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/32285/1
diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c
index eb71138..5ea517e 100644
--- a/src/osmo-bts-virtual/bts_model.c
+++ b/src/osmo-bts-virtual/bts_model.c
@@ -125,6 +125,28 @@
if (trx_sched_set_pchan(ts, pchan) != 0)
return NM_NACK_RES_NOTAVAIL;
+ /* activate lchans for [CBCH/]BCCH/CCCH */
+ switch (pchan) {
+ case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:
+ /* using RSL_CHAN_OSMO_CBCH4 is correct here, because the scheduler
+ * does not distinguish between SDCCH/4+CBCH abd SDCCH/8+CBCH. */
+ trx_sched_set_lchan(&ts->lchan[CBCH_LCHAN],
+ RSL_CHAN_OSMO_CBCH4, LID_DEDIC, true);
+ break;
+ case GSM_PCHAN_CCCH_SDCCH4_CBCH:
+ trx_sched_set_lchan(&ts->lchan[CBCH_LCHAN],
+ RSL_CHAN_OSMO_CBCH4, LID_DEDIC, true);
+ /* fall-through */
+ case GSM_PCHAN_CCCH_SDCCH4:
+ case GSM_PCHAN_CCCH:
+ trx_sched_set_bcch_ccch(&ts->lchan[CCCH_LCHAN], true);
+ ts->lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML;
+ lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE);
+ break;
+ default:
+ break;
+ }
+
return 0;
}
diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c
index 469e84f..6410d9d 100644
--- a/src/osmo-bts-virtual/l1_if.c
+++ b/src/osmo-bts-virtual/l1_if.c
@@ -192,14 +192,6 @@
if (vbts_sched_start(pinst->trx->bts) < 0)
return -ENOLINK;
- /* Only start the scheduler for the transceiver on C0.
- * If we have multiple transceivers, CCCH is always on C0
- * and has to be auto active */
- pinst->trx->ts[0].lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML;
-
- /* Other TRX are activated via OML by a PRIM_INFO_MODIFY / PRIM_INFO_ACTIVATE */
- lchan_set_state(&pinst->trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_ACTIVE);
-
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32285
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I2276f7e5e4042e56ddf1fd1642c917dba0005ac4
Gerrit-Change-Number: 32285
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/32284 )
Change subject: ttcn3-ggsn: Speed up tests by lowering retransmission T3,N3 timers
......................................................................
ttcn3-ggsn: Speed up tests by lowering retransmission T3,N3 timers
Every test needs to wait for T3*N3 seconds before exiting in order to
make sure the queues waiting for duplicates are cleared, otherwise state
from previous state may affect next tests.
Since 1.10.0, osmo-ggsn supports having those timers changed through
VTY. Let's set them to a lower value than default specified by spec, in
order to speed up each test 15 seconds -> 2 seconds.
Only ttcn3-ggsn (against osmo-ggsn) and not ttcn3-ggsn-ogs (against
open5gs-smfd) is updated, since the later doesn't support changing the
default timer values using the config files yet.
Related: OS#5485
Change-Id: Ica346bd791a67b72fad597702d750383e8ac5895
---
M ttcn3-ggsn-test/GGSN_Tests.cfg
M ttcn3-ggsn-test/osmo-ggsn.cfg
2 files changed, 29 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/84/32284/1
diff --git a/ttcn3-ggsn-test/GGSN_Tests.cfg b/ttcn3-ggsn-test/GGSN_Tests.cfg
index 36603c8..cb548b3 100644
--- a/ttcn3-ggsn-test/GGSN_Tests.cfg
+++ b/ttcn3-ggsn-test/GGSN_Tests.cfg
@@ -19,5 +19,10 @@
GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201"
GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::201"
+# local T3-RESPONSE timeout, seconds:
+GGSN_Tests.mp_t3_response := 1
+# local N3-REQUESTS counter:
+GGSN_Tests.mp_n3_requests := 2
+
[EXECUTE]
GGSN_Tests.control
diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg
index b27a6e4..2f09990 100644
--- a/ttcn3-ggsn-test/osmo-ggsn.cfg
+++ b/ttcn3-ggsn-test/osmo-ggsn.cfg
@@ -44,6 +44,9 @@
ggsn ggsn0
gtp state-dir /tmp
gtp bind-ip 172.18.3.201
+ timer gtp T3 1
+ timer gtp T1003 2
+ timer gtp X3 2
apn internet
gtpu-mode tun
tun-device tun4
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/32284
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ica346bd791a67b72fad597702d750383e8ac5895
Gerrit-Change-Number: 32284
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283 )
Change subject: ggsn: Speed up tests by lowering retransmission T3,N3 timers
......................................................................
ggsn: Speed up tests by lowering retransmission T3,N3 timers
The params are set in GGSN_Tests.default and not in GGSN_Tests.default,
because those lower values are not really good default ones as per spec.
For instance when running against open5gs-smfd, these values should be
left to the default in code of 5 and 3 seconds, because open5gs-smfd
doesn't support changing the values through cfg file yet.
Related: OS#5485
Change-Id: I3798fba89c2c357afeaa83a73759442c6c433cea
---
M ggsn_tests/GGSN_Tests.cfg
M ggsn_tests/osmo-ggsn.cfg
2 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/32283/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283
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: I3798fba89c2c357afeaa83a73759442c6c433cea
Gerrit-Change-Number: 32283
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: newpatchset
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283 )
Change subject: ggsn: Speedup tests by lowering retransmission T3,N3 timers
......................................................................
ggsn: Speedup tests by lowering retransmission T3,N3 timers
The params are set in GGSN_Tests.default and not in GGSN_Tests.default,
because those lower values are not really good default ones as per spec.
For instance when running against open5gs-smfd, these values should be
left to the default in code of 5 and 3 seconds, because open5gs-smfd
doesn't support changing the values through cfg file yet.
Related: OS#5485
Change-Id: I3798fba89c2c357afeaa83a73759442c6c433cea
---
M ggsn_tests/GGSN_Tests.cfg
M ggsn_tests/osmo-ggsn.cfg
2 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/32283/1
diff --git a/ggsn_tests/GGSN_Tests.cfg b/ggsn_tests/GGSN_Tests.cfg
index e849ed4..b542108 100644
--- a/ggsn_tests/GGSN_Tests.cfg
+++ b/ggsn_tests/GGSN_Tests.cfg
@@ -13,6 +13,10 @@
[TESTPORT_PARAMETERS]
[MODULE_PARAMETERS]
+# local T3-RESPONSE timeout, seconds:
+GGSN_Tests.mp_t3_response := 1;
+# local N3-REQUESTS counter:
+GGSN_Tests.mp_n3_requests := 2;
[EXECUTE]
GGSN_Tests.control
diff --git a/ggsn_tests/osmo-ggsn.cfg b/ggsn_tests/osmo-ggsn.cfg
index 5fdcf15..28284e7 100644
--- a/ggsn_tests/osmo-ggsn.cfg
+++ b/ggsn_tests/osmo-ggsn.cfg
@@ -45,6 +45,9 @@
ggsn ggsn0
gtp state-dir /tmp
gtp bind-ip 127.0.0.2
+ timer gtp T3 1
+ timer gtp T1003 2
+ timer gtp X3 2
apn internet
gtpu-mode tun
tun-device tun4
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283
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: I3798fba89c2c357afeaa83a73759442c6c433cea
Gerrit-Change-Number: 32283
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange