Attention is currently required from: laforge.
Hello laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-gprs/+/29016
to look at the new patch set (#2).
Change subject: update git URLs (git -> https; gitea)
......................................................................
update git URLs (git -> https; gitea)
Change-Id: Icb87ee511ceb9e65d7a801eeb8d4314b66e9f20a
---
M README.md
M debian/control
M debian/copyright
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/16/29016/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29016
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Icb87ee511ceb9e65d7a801eeb8d4314b66e9f20a
Gerrit-Change-Number: 29016
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29023 )
Change subject: BTS_Tests: fix TC_rsl_ms_pwr_dyn_{up,ass_down,max}: reply received SACCH L1H
......................................................................
BTS_Tests: fix TC_rsl_ms_pwr_dyn_{up,ass_down,max}: reply received SACCH L1H
As was explained in [1], until recently we relied on trxcon sendig
dummy RR Measurement Reports with patched L1 SACCH Header values.
Now trxcon does not patch it for us, so we need to send Uplink
SACCH blocks with the correct L1H ourselves.
Revision 2 of [1] was successfully tested and proved to fix the
above-mentioned testcases. However during code review I was asked
to make the statements sending Uplink SACCH blocks self-explanatory.
In revision 3 of [1] I modified the code to call f_send_meas_rep(),
which was introduced in [2], which as stated in the commit message
is using g_pars.l1_pars.{ms_power_level,ms_actual_ta} instead of
the values from received L1H. Of course this does not work.
Add and use f_send_meas_rep_l1h(), which allows to send the given L1H.
Take a chance to add a log() statement, so that we can see what we Tx.
Change-Id: Ia79a0a7b06394bd34d0f40226cf40e6e8bd2ba35
Fixes: [1] I31dd6b9026d04403092256176f67785a0a6486ad
Related: [2] Ia5d0315e053702df5fa8dad8c6c66c11c9f3edcb
Related: OS#5635
---
M bts/BTS_Tests.ttcn
1 file changed, 15 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 9f2e366..b2d6383 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -782,6 +782,15 @@
friend function f_send_meas_rep(template (value) MeasurementResults meas_res)
runs on ConnHdlr {
var template (value) SacchL1Header l1h;
+
+ l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta);
+ f_send_meas_rep_l1h(meas_res, l1h);
+}
+
+/* Send the given measurement results and L1H to the IUT over the Um interface */
+friend function f_send_meas_rep_l1h(template (value) MeasurementResults meas_res,
+ template (value) SacchL1Header l1h)
+runs on ConnHdlr {
var octetstring l2;
/* RR Measurement Report to be sent */
@@ -792,7 +801,8 @@
/* TITAN has weird (and often unusable) padding model, so we pad here manaully */
l2 := f_pad_oct(enc_LapdmFrameAB(valueof(ts_LAPDm_AB(0, meas_rep))), 21, '00'O);
- l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta);
+
+ log(%definitionId, "(): Tx SACCH L1 header: ", l1h);
/* Send RR Measurement Report over the Um interface */
L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2));
@@ -2979,7 +2989,7 @@
T2.start;
alt {
[] as_l1_sacch_l1h(l1h) {
- f_send_meas_rep(ts_MeasurementResults);
+ f_send_meas_rep_l1h(ts_MeasurementResults, l1h);
if (l1h.ms_power_lvl < (pwr_var + 6)) {
repeat;
@@ -3000,7 +3010,7 @@
T4.start;
alt {
[] as_l1_sacch_l1h(l1h) {
- f_send_meas_rep(ts_MeasurementResults);
+ f_send_meas_rep_l1h(ts_MeasurementResults, l1h);
if (l1h.ms_power_lvl > pwr_var) {
repeat;
@@ -3045,7 +3055,7 @@
T1.start;
alt {
[] as_l1_sacch_l1h(l1h) {
- f_send_meas_rep(ts_MeasurementResults);
+ f_send_meas_rep_l1h(ts_MeasurementResults, l1h);
repeat;
}
[] L1CTL.receive { repeat; }
@@ -3094,7 +3104,7 @@
T1.start;
alt {
[] as_l1_sacch_l1h(l1h) {
- f_send_meas_rep(ts_MeasurementResults);
+ f_send_meas_rep_l1h(ts_MeasurementResults, l1h);
repeat;
}
[] L1CTL.receive { repeat; }
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29023
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: Ia79a0a7b06394bd34d0f40226cf40e6e8bd2ba35
Gerrit-Change-Number: 29023
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29022 )
Change subject: BTS_Tests: use f_send_meas_rep() in f_TC_ms_pwr_ctrl_{constant,pf_ewma}
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29022
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: Id80317d1e9de3873ab2d26470a3552b4f2b539b1
Gerrit-Change-Number: 29022
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 10 Aug 2022 12:34:45 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith, fixeria.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005 )
Change subject: debian packaging of libosmo-gtlv and libosmo-pfcp
......................................................................
Patch Set 2:
(2 comments)
Patchset:
PS2:
BTW, I checked that the browsing URL
https://gitea.osmocom.org/osmocom/libosmo-pfcp
also serves as a clone URL without having to append ".git"
File debian/control:
https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005/comment/1ba077d4_69b6c40e
PS1, Line 13: python3-minimal
> Do we really need python, btw?
i thought the same, but figured for vty tests,
but now i notice that this library-only repos has no programs with vty tests.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53
Gerrit-Change-Number: 29005
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 10 Aug 2022 12:32:54 +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, neels.
Hello osmith, Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005
to look at the new patch set (#2).
Change subject: debian packaging of libosmo-gtlv and libosmo-pfcp
......................................................................
debian packaging of libosmo-gtlv and libosmo-pfcp
Fix debian packaging, so far a copy-paste from osmo-upf.git crept in
here by accident.
Related: SYS#5895
Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53
---
M debian/changelog
M debian/compat
M debian/control
M debian/copyright
A debian/libosmo-gtlv0.install
R debian/libosmo-pfcp0.install
M debian/rules
M tests/libosmo-pfcp/Makefile.am
8 files changed, 96 insertions(+), 33 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/05/29005/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53
Gerrit-Change-Number: 29005
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newpatchset
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29020 )
Change subject: vty doc tweaks
......................................................................
vty doc tweaks
Clarify "Add" and "Delete" of GTP devices.
Clarify GTP device in config vs. real GTP device.
Clarify s/kernel/Linux kernel
Related: SYS#5599
Change-Id: I918e0a9a332e4dd4b71965614c19481eb41004d6
---
M src/osmo-upf/upf_vty.c
M tests/upf.vty
2 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
diff --git a/src/osmo-upf/upf_vty.c b/src/osmo-upf/upf_vty.c
index 386aa2f..5227dba 100644
--- a/src/osmo-upf/upf_vty.c
+++ b/src/osmo-upf/upf_vty.c
@@ -86,7 +86,7 @@
DEFUN(cfg_gtp, cfg_gtp_cmd,
"gtp",
- "Enter the 'gtp' node to configure GTP kernel module usage\n")
+ "Enter the 'gtp' node to configure Linux GTP kernel module usage\n")
{
vty->node = GTP_NODE;
return CMD_SUCCESS;
@@ -135,7 +135,8 @@
DEFUN(cfg_gtp_dev_create, cfg_gtp_dev_create_cmd,
"dev create DEVNAME [LISTEN_ADDR]",
DEV_STR
- "create a new GTP device. Will listen on GTPv1 port " OSMO_STRINGIFY_VAL(PORT_GTP1_U)
+ "Add GTP device, creating a new Linux kernel GTP device. Will listen on GTPv1 port "
+ OSMO_STRINGIFY_VAL(PORT_GTP1_U)
" and GTPv0 port " OSMO_STRINGIFY_VAL(PORT_GTP0_U) " on the specified interface, or on ANY if LISTEN_ADDR is"
" omitted.\n"
"device name, e.g. 'apn0'\n"
@@ -154,7 +155,7 @@
DEFUN(cfg_gtp_dev_use, cfg_gtp_dev_use_cmd,
"dev use DEVNAME",
DEV_STR
- "use an existing GTP device, e.g. created by 'gtp-link'\n"
+ "Add GTP device, using an existing Linux kernel GTP device, e.g. created by 'gtp-link'\n"
"device name, e.g. 'apn0'\n")
{
struct gtp_vty_cfg_dev *d = talloc_zero(g_upf, struct gtp_vty_cfg_dev);
@@ -168,7 +169,7 @@
DEFUN(cfg_gtp_dev_del, cfg_gtp_dev_del_cmd,
"dev delete DEVNAME",
DEV_STR
- "Remove a GTP device from the configuration, and delete the device if it was created here.\n"
+ "Remove a GTP device from the configuration, and delete the Linux kernel GTP device if it was created here.\n"
"device name, e.g. 'apn0'\n")
{
const char *dev_name = argv[0];
diff --git a/tests/upf.vty b/tests/upf.vty
index 107909b..d1cebe5 100644
--- a/tests/upf.vty
+++ b/tests/upf.vty
@@ -23,9 +23,9 @@
OsmoUPF(config-gtp)# dev?
dev Configure the GTP device to use for encaps/decaps.
OsmoUPF(config-gtp)# dev ?
- create create a new GTP device. Will listen on GTPv1 port 2152 and GTPv0 port 3386 on the specified interface, or on ANY if LISTEN_ADDR is omitted.
- use use an existing GTP device, e.g. created by 'gtp-link'
- delete Remove a GTP device from the configuration, and delete the device if it was created here.
+ create Add GTP device, creating a new Linux kernel GTP device. Will listen on GTPv1 port 2152 and GTPv0 port 3386 on the specified interface, or on ANY if LISTEN_ADDR is omitted.
+ use Add GTP device, using an existing Linux kernel GTP device, e.g. created by 'gtp-link'
+ delete Remove a GTP device from the configuration, and delete the Linux kernel GTP device if it was created here.
OsmoUPF(config-gtp)# dev create ?
DEVNAME device name, e.g. 'apn0'
OsmoUPF(config-gtp)# dev create foo ?
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29020
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I918e0a9a332e4dd4b71965614c19481eb41004d6
Gerrit-Change-Number: 29020
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: merged