Attention is currently required from: osmith.
Hello Jenkins Builder, pespin, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/33457
to look at the new patch set (#10).
Change subject: osmo-bts-sysmo: mute PHY until OML is ready
......................................................................
osmo-bts-sysmo: mute PHY until OML is ready
Connecting to OML and PHY is done in parallel. The PHY connection will
always be done first, mute PHY until OML is also ready.
As Pau suggested, move dispatch of NM_EV_SW_ACT to a callback of
trx_rf_lock to have the events serialized and therefore deterministic.
Fixes: SYS#6496
Change-Id: Ia1769f952fa787202a442a33db5ed4a1f7cbe9c3
---
M src/osmo-bts-sysmo/l1_if.c
M src/osmo-bts-sysmo/oml.c
2 files changed, 42 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/57/33457/10
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33457
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ia1769f952fa787202a442a33db5ed4a1f7cbe9c3
Gerrit-Change-Number: 33457
Gerrit-PatchSet: 10
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33521 )
Change subject: ttcn3-bts-test/jenkins.sh: set mp_pcuif_version
......................................................................
ttcn3-bts-test/jenkins.sh: set mp_pcuif_version
OsmoBTS currently uses PCUIF v.10 but will move to v.11 soon. (see
Depends). Unfortuantely this means that we have to execute the TTCN3
testsuite in master with PCUIF v.11 and in latest with PCUIF v.10. This
will be the case until the current master becomes the new latest on the
next release.
Depends: osmo-bts.git I25816ac12e63cc6b641eb414e6bc7eaa9c85fc25
Depends: osmo-ttcn3-hacks.git I08de02e951e10bc8b4381cc2ad32e63f2747e3c4
Change-Id: Ia28bc0d6d3cbfe63be19443db86631fb67bb80fb
Related: OS#5927
---
M ttcn3-bts-test/generic/BTS_Tests.cfg
M ttcn3-bts-test/jenkins.sh
M ttcn3-bts-test/oml/BTS_Tests.cfg
M ttcn3-bts-test/virtphy/BTS_Tests.cfg
4 files changed, 38 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/21/33521/1
diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg
index f6a0552..7015111 100644
--- a/ttcn3-bts-test/generic/BTS_Tests.cfg
+++ b/ttcn3-bts-test/generic/BTS_Tests.cfg
@@ -18,6 +18,7 @@
BTS_Tests.mp_rtpem_bind_ip := "172.18.9.10"
BTS_Tests.mp_osmuxem_bind_ip := "172.18.9.10"
BTS_Tests.mp_l1_supports_gprs := true
+PCUIF_Types.mp_pcuif_version := 10;
[MAIN_CONTROLLER]
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index ed1e095..edf7e6a 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -121,17 +121,34 @@
$REPO_USER/ttcn3-bts-test
}
+set_pcuif_version() {
+ # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is
+ # executed for current master. For latest the PCUIF module parameter must stay at v.10
+ # since in osmo-btw-latest PCUIF v.11 is not yet supported. After the next release PCUIF
+ # v.11 will be supported in osmo-bts-latest as well and this function, including the
+ # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed.
+ image_suffix_is_master
+ if [ "$?" -eq 0 ]
+ then
+ echo $1
+ sed -i 's/PCUIF_Types.mp_pcuif_version := 10/PCUIF_Types.mp_pcuif_version := 11/g' $1
+ fi
+}
+
network_create
mkdir $VOL_BASE_DIR/bts-tester-generic
cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/
write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"
+set_pcuif_version "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"
mkdir $VOL_BASE_DIR/bts-tester-virtphy
cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/
write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-virtphy/BTS_Tests.cfg"
+set_pcuif_version "$VOL_BASE_DIR/bts-tester-virtphy/BTS_Tests.cfg"
mkdir $VOL_BASE_DIR/bts-tester-oml
cp oml/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-oml/
write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-oml/BTS_Tests.cfg"
+set_pcuif_version "$VOL_BASE_DIR/bts-tester-oml/BTS_Tests.cfg"
mkdir $VOL_BASE_DIR/bts-tester-hopping
cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/
write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg"
diff --git a/ttcn3-bts-test/oml/BTS_Tests.cfg b/ttcn3-bts-test/oml/BTS_Tests.cfg
index ee2b4e0..bcecf28 100644
--- a/ttcn3-bts-test/oml/BTS_Tests.cfg
+++ b/ttcn3-bts-test/oml/BTS_Tests.cfg
@@ -19,6 +19,7 @@
BTS_Tests_OML.mp_oml_ip := "172.18.9.10"
BTS_Tests_OML.mp_oml_port := 3002
BTS_Tests_OML.mp_pcu_socket := "/data/unix/pcu_sock"
+PCUIF_Types.mp_pcuif_version := 10;
[MAIN_CONTROLLER]
diff --git a/ttcn3-bts-test/virtphy/BTS_Tests.cfg b/ttcn3-bts-test/virtphy/BTS_Tests.cfg
index ee3455d..74d6f53 100644
--- a/ttcn3-bts-test/virtphy/BTS_Tests.cfg
+++ b/ttcn3-bts-test/virtphy/BTS_Tests.cfg
@@ -17,6 +17,7 @@
BTS_Tests.mp_ctrl_ip := "172.18.9.20"
BTS_Tests.mp_l1_supports_gprs := true
BTS_Tests.mp_bts_trxc_port := -1;
+PCUIF_Types.mp_pcuif_version := 10;
[MAIN_CONTROLLER]
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33521
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia28bc0d6d3cbfe63be19443db86631fb67bb80fb
Gerrit-Change-Number: 33521
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418 )
Change subject: BTS_Tests: Add support for PCUIF protocol version 11
......................................................................
Patch Set 2:
(1 comment)
File library/PCUIF_Types.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418/comment/9e198a43_af2f…
PS1, Line 376: enc_PCUIF_pch_dt
> We usually declare enc/dec functions close to the record they operate on. […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418
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: I08de02e951e10bc8b4381cc2ad32e63f2747e3c4
Gerrit-Change-Number: 33418
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 27 Jun 2023 12:57:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33457 )
Change subject: osmo-bts-sysmo: mute PHY until OML is ready
......................................................................
Patch Set 9: Code-Review-1
(3 comments)
File src/osmo-bts-sysmo/l1_if.c:
https://gerrit.osmocom.org/c/osmo-bts/+/33457/comment/8abd503b_3dab697a
PS7, Line 1271: oml_mo_rf_lock_chg(&trx->mo, fl1h->last_rf_mute, 0);
> I've verified that it sends a Change Administrative State Ack/Nack. […]
FYI you can also see what's done in osmo-bts-trx, something similar:
"""
static void st_open_poweroff_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
{
struct trx_l1h *l1h = (struct trx_l1h *)fi->priv;
struct phy_instance *pinst = l1h->phy_inst;
trx_provision_reset(l1h);
if (pinst->trx == NULL) {
trx_if_cmd_rfmute(l1h, true);
return;
}
/* Apply initial RFMUTE state */
trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED);
osmo_fsm_inst_dispatch(pinst->trx->mo.fi, NM_EV_SW_ACT, NULL);
osmo_fsm_inst_dispatch(pinst->trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);
}
"""
File src/osmo-bts-sysmo/l1_if.c:
https://gerrit.osmocom.org/c/osmo-bts/+/33457/comment/f9034480_1d0ce523
PS9, Line 1271: if (trx->mo.opstart_success)
Better use this below, the opstart_success field is a flag used internally by the FSM. Idealyl we should send an event to the FSM and the FSM should take care of sending that message, but that's not implemented yet.
if (trx->mo.fi->state != NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED)
https://gerrit.osmocom.org/c/osmo-bts/+/33457/comment/f68d8cff_28d67261
PS9, Line 1279: if (trx->mo.opstart_success)
if (trx->mo.fi->state != NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33457
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ia1769f952fa787202a442a33db5ed4a1f7cbe9c3
Gerrit-Change-Number: 33457
Gerrit-PatchSet: 9
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 27 Jun 2023 12:56:49 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418 )
Change subject: BTS_Tests: Add support for PCUIF protocol version 11
......................................................................
Patch Set 2:
(1 comment)
File library/PCUIF_CodecPort.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418/comment/6f4ad5d0_8746…
PS1, Line 173:
> cosmetic: no need for another tab-level here
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418
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: I08de02e951e10bc8b4381cc2ad32e63f2747e3c4
Gerrit-Change-Number: 33418
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 27 Jun 2023 12:54:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418
to look at the new patch set (#2).
Change subject: BTS_Tests: Add support for PCUIF protocol version 11
......................................................................
BTS_Tests: Add support for PCUIF protocol version 11
The PCUIF protocol version 11 uses a more distinct (direct TLLI) way
to signal PAGING COMMAND and IMMEDIATE ASSIGNMENT messages towards the PCU.
Since OsmoBTS will soon fully support v.11 of the PCUIF protocol we need
to add compatibility in the OsmoBTS TTCN3 testsuite early. We also have
to stay compatible with older versions of OsmoBTS. The BTS_Tests.default
config still sets up mp_pcuif_version to version 10, so this will be the
default until we have full version 11 support in current master and
latest.
Related: OS#5927
Change-Id: I08de02e951e10bc8b4381cc2ad32e63f2747e3c4
---
M bts/BTS_Tests.ttcn
M library/PCUIF_CodecPort.ttcn
M library/PCUIF_Types.ttcn
3 files changed, 72 insertions(+), 18 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/33418/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418
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: I08de02e951e10bc8b4381cc2ad32e63f2747e3c4
Gerrit-Change-Number: 33418
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33519
to look at the new patch set (#2).
Change subject: SGSN_Tests: turn f_gmm_gsup_lu_isd() into an altstep
......................................................................
SGSN_Tests: turn f_gmm_gsup_lu_isd() into an altstep
This way it can be used in the alt statements.
Change-Id: I1baaf6ed66cfaa75237b0abdce82ffdc7e672b96
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 24 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/33519/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33519
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: I1baaf6ed66cfaa75237b0abdce82ffdc7e672b96
Gerrit-Change-Number: 33519
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset