Attention is currently required from: arehbein, fixeria.
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31534 )
Change subject: common: Make socket queue max. length configurable
......................................................................
Patch Set 9:
(1 comment)
File src/common/vty.c:
https://gerrit.osmocom.org/c/osmo-bts/+/31534/comment/2944a0c0_afffb0aa
PS9, Line 473: vty_out(vty, " pcu-socket-wqueue-length %d%s", bts->pcu.sock_wqueue_len_max, VTY_NEWLINE);
Odd, that should give a warning during compilation: sock_wqueue_len_max is declared as unsigned int so it's %u
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31534
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id6ba6e4eadce9ce82ef2407f4e28346e7fe4abfa
Gerrit-Change-Number: 31534
Gerrit-PatchSet: 9
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 11 Apr 2023 15:55:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32272 )
Change subject: bts-sysmo: Delay marking phy_link as connected until L1 reset + got info
......................................................................
bts-sysmo: Delay marking phy_link as connected until L1 reset + got info
Better wait until the DSP is reset and all the information is retrieved
before telling upper layers that the phy is ready. Keep it in CONNECTING
state meanwhile.
Change-Id: Ifdc791336fb8efd42f4428893f687093085af129
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/72/32272/1
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 59a168f..9a0b19f 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1515,6 +1515,8 @@
msgb_free(resp);
+ phy_link_state_set(trx->pinst->phy_link, PHY_LINK_CONNECTED);
+
/* FIXME: clock related */
return 0;
}
@@ -1917,7 +1919,5 @@
hdl = pinst->u.sysmobts.hdl;
osmo_strlcpy(bts->sub_model, sysmobts_model(hdl->hw_info.model_nr, hdl->hw_info.trx_nr), sizeof(bts->sub_model));
- phy_link_state_set(plink, PHY_LINK_CONNECTED);
-
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32272
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ifdc791336fb8efd42f4428893f687093085af129
Gerrit-Change-Number: 32272
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/32271 )
Change subject: doc/manuals/chapters/configuration: fix typo
......................................................................
doc/manuals/chapters/configuration: fix typo
Change-Id: I0e9d2c77200c7c8b49aec669bc39ca91d5d4cf1f
---
M doc/manuals/chapters/configuration.adoc
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/71/32271/1
diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc
index c5d4283..e87e5b0 100644
--- a/doc/manuals/chapters/configuration.adoc
+++ b/doc/manuals/chapters/configuration.adoc
@@ -302,7 +302,7 @@
Address=192.168.7.1/24 <2>
IPMasquerade=yes <3>
----
-<1> The netowrk device name, which must match the one in the apn0.netdev unit file above
+<1> The network device name, which must match the one in the apn0.netdev unit file above
<2> The local IP address configured on the device
<3> Requesting systemd to configure IP masquerading for this interface. Depending on your needs,
You may not want this if you have proper end-to-end routing set up, and want to have transparent
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/32271
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I0e9d2c77200c7c8b49aec669bc39ca91d5d4cf1f
Gerrit-Change-Number: 32271
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32270 )
Change subject: bts-sysmo: Fix pinst->version filled too early
......................................................................
bts-sysmo: Fix pinst->version filled too early
The fields used to fill in pinst->version are set when info_compl_cb()
is called, which happens asynchronously and hence later than when in
bts_model_phy_link_open().
Hence, copying the values when in bts_model_phy_link_open()
(l1if_open()) makes no sense at all.
Fill in pinst->version in info_compl_cb(), just when the layer receives
the required information.
Related: OS#5978
Change-Id: Ica53a5d852214b24de7f75b08ad7e595ce5236ee
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 24 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/70/32270/1
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 786382c..59a168f 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1474,10 +1474,12 @@
fl1h->hw_info.ver_minor = sic->boardVersion.option;
#endif
- LOGP(DL1C, LOGL_INFO, "DSP v%u.%u.%u, FPGA v%u.%u.%u\nn",
- sic->dspVersion.major, sic->dspVersion.minor,
- sic->dspVersion.build, sic->fpgaVersion.major,
- sic->fpgaVersion.minor, sic->fpgaVersion.build);
+ snprintf(trx->pinst->version, sizeof(trx->pinst->version), "%u.%u dsp %u.%u.%u fpga %u.%u.%u",
+ fl1h->hw_info.ver_major, fl1h->hw_info.ver_minor,
+ fl1h->hw_info.dsp_version[0], fl1h->hw_info.dsp_version[1], fl1h->hw_info.dsp_version[2],
+ fl1h->hw_info.fpga_version[0], fl1h->hw_info.fpga_version[1], fl1h->hw_info.fpga_version[2]);
+
+ LOGP(DL1C, LOGL_INFO, "%s\n", trx->pinst->version);
#ifdef HW_SYSMOBTS_V1
if (sic->rfBand.gsm850)
@@ -1914,10 +1916,6 @@
hdl = pinst->u.sysmobts.hdl;
osmo_strlcpy(bts->sub_model, sysmobts_model(hdl->hw_info.model_nr, hdl->hw_info.trx_nr), sizeof(bts->sub_model));
- snprintf(pinst->version, sizeof(pinst->version), "%u.%u dsp %u.%u.%u fpga %u.%u.%u",
- hdl->hw_info.ver_major, hdl->hw_info.ver_minor,
- hdl->hw_info.dsp_version[0], hdl->hw_info.dsp_version[1], hdl->hw_info.dsp_version[2],
- hdl->hw_info.fpga_version[0], hdl->hw_info.fpga_version[1], hdl->hw_info.fpga_version[2]);
phy_link_state_set(plink, PHY_LINK_CONNECTED);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32270
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ica53a5d852214b24de7f75b08ad7e595ce5236ee
Gerrit-Change-Number: 32270
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
Hello Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266
to look at the new patch set (#3).
Change subject: bts: Proper tear down
......................................................................
bts: Proper tear down
This way we stop vc_IPA_OML before stopping the main component.
If we don't do this, the vc_IPA_OML is potentially receiving tons of OML
messages during BTS bringup which it tries to forward to the main
component. If the main component has stopped at that point, port
IPA_OML_PORT is no longer active and hence vc_IPA_OML fails with a
dynamic test error.
Change-Id: I761ae94aa698a74bb30b8a6b1860358545f222b5
---
M bts/BTS_Tests_OML.ttcn
1 file changed, 41 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/32266/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266
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: I761ae94aa698a74bb30b8a6b1860358545f222b5
Gerrit-Change-Number: 32266
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 )
Change subject: bts: Proper tear down
......................................................................
Patch Set 2:
(2 comments)
File bts/BTS_Tests_OML.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266/comment/a8daf341_6458…
PS1, Line 155: friend
> I think you want `private` instead of `friend` here, since this function is not used anywhere outsid […]
Not addressed.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266/comment/19810e34_8115…
PS1, Line 155: f_shutdown_helper
> I prefer using a local wrapper so that we don't need to change lots of tests afterwards if more stuf […]
Ok then.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266
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: I761ae94aa698a74bb30b8a6b1860358545f222b5
Gerrit-Change-Number: 32266
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 11 Apr 2023 14:09:53 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 )
Change subject: bts/oml: Repurpose test TC_ipa_rsl_connect_nack
......................................................................
bts/oml: Repurpose test TC_ipa_rsl_connect_nack
The old test was not really correct, since it is fine for the BTS to ACK
the RSL CONNECT despite later on failing to connect the RSL link.
RSL_CONNECT is really just setting the attributes (it could even be
replaced by SETATTR in the future), and connect happens later on.
This can still be found out by the BSC because the BBTRANSC will never
transition to a Enabled state until the RSL link becomes up.
This patch repurposes the existent test to do some more meaningful check
in a case the RSL CONNECT can be answered with a NACK. This scenario was
actually failing to be properly checked in osmo-bts until recently, so
it is expected that it will fail (and even crash) older versions of
osmo-bts.
Depends: osmo-bts.git Change-Id If27639ae1727fc5232e1a964a1b29f50c8805d80
Change-Id: I10df611f0086d34a5482f7c8a79703938313ab3d
---
M bts/BTS_Tests_OML.ttcn
M library/AbisOML_Types.ttcn
2 files changed, 35 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/32269/1
diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn
index fa76361..9a53582 100644
--- a/bts/BTS_Tests_OML.ttcn
+++ b/bts/BTS_Tests_OML.ttcn
@@ -675,14 +675,15 @@
f_shutdown_helper();
}
-/* Make sure that the IUT sends RSL Connect NACK when the remote is not reachable. */
+/* Make sure that the IUT sends RSL Connect NACK when configuring unexistent TRX NR */
testcase TC_ipa_rsl_connect_nack() runs on BSC_OML_CT {
timer T := 2.0;
+ /* Unconfigured TRX: */
+ template (value) OML_FOM_ObjectInstance obj_inst := ts_OML_ObjectInstance(0, 200, 255);
f_init_oml(testcasename());
- /* Most likely, nobody is listening to this port */
- OML.send(ts_OML_IPA_RslConnect(0, 65535));
+ OML.send(ts_OML_IPA_RslConnect(obj_inst, 0, 65535));
T.start;
alt {
diff --git a/library/AbisOML_Types.ttcn b/library/AbisOML_Types.ttcn
index ae39671..99ad252 100644
--- a/library/AbisOML_Types.ttcn
+++ b/library/AbisOML_Types.ttcn
@@ -1249,13 +1249,17 @@
-template (value) OML_PDU ts_OML_IPA_RslConnect(uint8_t stream_id, uint16_t port_nr) :=
- ts_OML_IPA_MsgType(NM_MT_IPACC_RSL_CONNECT, NM_OC_BASEB_TRANSC, ts_OML_ObjectInstance(0,0,255), {
+template (value) OML_PDU ts_OML_IPA_RslConnect(template (value) OML_FOM_ObjectInstance obj_inst,
+ template (value) uint8_t stream_id,
+ template (value) uint16_t port_nr) :=
+ ts_OML_IPA_MsgType(NM_MT_IPACC_RSL_CONNECT, NM_OC_BASEB_TRANSC, obj_inst, {
ts_OML_IE(NM_ATT_IPACC_STREAM_ID, OML_FOM_IE_Body:{stream_id := stream_id}),
ts_OML_IE(NM_ATT_IPACC_DST_IP_PORT, OML_FOM_IE_Body:{portnr := port_nr})
});
-template OML_PDU tr_OML_IPA_RslConnect(template uint8_t stream_id, template uint16_t port_nr) :=
- tr_OML_IPA_MsgType(NM_MT_IPACC_RSL_CONNECT, NM_OC_BASEB_TRANSC, tr_OML_ObjectInstance(0,0,255), {
+template OML_PDU tr_OML_IPA_RslConnect(template (present) OML_FOM_ObjectInstance obj_inst,
+ template (present) uint8_t stream_id,
+ template (present) uint16_t port_nr) :=
+ tr_OML_IPA_MsgType(NM_MT_IPACC_RSL_CONNECT, NM_OC_BASEB_TRANSC, obj_inst, {
tr_OML_IE(NM_ATT_IPACC_STREAM_ID, OML_FOM_IE_Body:{stream_id := stream_id}),
tr_OML_IE(NM_ATT_IPACC_DST_IP_PORT, OML_FOM_IE_Body:{portnr := port_nr})
});
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269
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: I10df611f0086d34a5482f7c8a79703938313ab3d
Gerrit-Change-Number: 32269
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 )
Change subject: bts: Proper tear down
......................................................................
Patch Set 2:
(1 comment)
File bts/BTS_Tests_OML.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266/comment/84a7c737_cba5…
PS1, Line 155: f_shutdown_helper
> My suggestion was to use `Misc_Helpers. f_shutdown()` directly. […]
I prefer using a local wrapper so that we don't need to change lots of tests afterwards if more stuff needs to be added. Lots of testsuites have local wrappers so it's not strange.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266
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: I761ae94aa698a74bb30b8a6b1860358545f222b5
Gerrit-Change-Number: 32266
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 11 Apr 2023 14:04:50 +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: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 )
Change subject: bts: Proper tear down
......................................................................
Patch Set 2: Code-Review-1
(1 comment)
File bts/BTS_Tests_OML.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266/comment/9e46df5b_15ea…
PS1, Line 155: f_shutdown_helper
> We already have `f_shutdown()` in `library/Misc_Helpers. […]
My suggestion was to use `Misc_Helpers. f_shutdown()` directly.
I see no real need for this local wrapper...
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266
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: I761ae94aa698a74bb30b8a6b1860358545f222b5
Gerrit-Change-Number: 32266
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 11 Apr 2023 13:57:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment