Attention is currently required from: neels, laforge, fixeria, pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27923 )
Change subject: Check VTY config against features reported by BTS
......................................................................
Patch Set 4:
(11 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/6b4b834c_da50f11a
PS4, Line 9: * Drop hardcoded features for osmo-bts and nanobts
> Be careful here, nanobts may support some features it doesn't report, since there may be feature enu […]
Done
File include/osmocom/bsc/bts.h:
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/6d0833b0_772d5790
PS4, Line 302: /* BTS reports features on start up. When false, BTS model features get
> "on start up" -> "during OML bring up".
Done
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/8d44a12a_40c45b06
PS4, Line 303: * copied to BTS features. */
> "features during object initialization". […]
I've shortened it to "BTS reports features on start up", the details about copying features is described in doc/bts-features.txt which is referenced above.
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/8325d15d_859e99b9
PS4, Line 347: bool features_set;
> I'd rather call it "features_present" or "feature_available" or "features_known", features_set may d […]
Done
File src/osmo-bsc/bts.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/66b467b2_16b1424c
PS4, Line 507: if (bts->features_set) {
> Let's move bts global checks before the trx/ts specific checks in the llist_for_each_entry above.
Done
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/5383cb4b_82a89a6a
PS4, Line 630: memset(bts->_features_data, 0, sizeof(bts->_features_data));
> You still may want to copy them in case of nanobts.
Not copying them here, because:
* once features are reported, they overwrite bts->_features_data
* it makes sense to overwrite them, in case the BTS software was downgraded / osmo-bts uses another backend and suddenly has less features
I've added a patch that extends the reported features with the bts->model features instead: https://gerrit.osmocom.org/c/osmo-bsc/+/27972
File src/osmo-bsc/bts_ipaccess_nanobts.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/bb47f212_7b1f95ba
PS4, Line 498: bts_model_nanobts.features_get_reported = true;
> I'm pretty sure this can be set when defining bts_model_nanobts directly in global scope, not here.
Done
File src/osmo-bsc/bts_osmobts.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/88f6ab86_8e6b9575
PS4, Line 204: model_osmobts.features_get_reported = true;
> same, can be set in bts_model_nanobts directly.
Done
File src/osmo-bsc/bts_trx.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/0f1c4b25_bcc336c2
PS4, Line 343: struct bitvec *ft
> const
Done
File src/osmo-bsc/bts_trx_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/55f63da1_55396fec
PS4, Line 319: struct gsm_bts *bts
> const
Done
https://gerrit.osmocom.org/c/osmo-bsc/+/27923/comment/b68f1c4f_4a3174cd
PS4, Line 342: struct gsm_bts *bts
> const
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27923
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I7fca42a39a4bc98a6ea8b9cfab28c4bad3a6a0aa
Gerrit-Change-Number: 27923
Gerrit-PatchSet: 4
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 28 Apr 2022 13:20:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27972 )
Change subject: abis_nm: add bts model features to reported ones
......................................................................
abis_nm: add bts model features to reported ones
As pointed out in code review, for nanobts we need to be able to combine
the reported features with a list of features we assume that the bts
model supports. This is because the enum of features is based on what
nanobts is able to report, but was extended for osmo-bts.
Related: SYS#5922, OS#5538
Change-Id: I7bdbf28c148877275048e070dce7f503ca5e6226
---
M contrib/jenkins.sh
M src/osmo-bsc/abis_nm.c
2 files changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/27972/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 53b30bf..4380f16 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -28,7 +28,9 @@
verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
# Check for wrong use of osmo_bts_has_feature (OS#5538)
-bts_features_wrong_use="$(grep -r -n 'osmo_bts_has_feature.*->model->features' | grep -v 'jenkins.sh')" || true
+bts_features_wrong_use="$(grep -r -n 'osmo_bts_has_feature.*->model->features' \
+ | grep -v 'jenkins.sh' \
+ | grep -v 'intentional check against bts model')" || true
if [ -n "$bts_features_wrong_use" ]; then
set +x
echo
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index 62f62b6..8c8b19d 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -613,6 +613,19 @@
LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: feature '%s' is"
" supported\n", osmo_bts_features_name(i));
}
+
+ /* Add features from the BTS model: nanobts may support more
+ * features than it reports, since we extend the enum of
+ * features for osmo-bts. */
+ for (i = 0; i < _NUM_BTS_FEAT; i++) {
+ if (!osmo_bts_has_feature(&bts->model->features, i) || /* intentional check against bts model */
+ osmo_bts_has_feature(&bts->features, i))
+ continue;
+
+ LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: feature '%s' is assumed to be"
+ " supported\n", osmo_bts_features_name(i));
+ osmo_bts_set_feature(&bts->features, i);
+ }
}
/* Parse Attribute Response Info content for 3GPP TS 52.021 §9.4.28 Manufacturer Dependent State */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27972
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I7bdbf28c148877275048e070dce7f503ca5e6226
Gerrit-Change-Number: 27972
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith, neels, laforge.
Hello Jenkins Builder, neels, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/27923
to look at the new patch set (#5).
Change subject: Check VTY config against features reported by BTS
......................................................................
Check VTY config against features reported by BTS
* Don't copy features for osmo-bts and nanobts initially, wait until
BTS reported its features
* Checks for BTS features in VTY cmds: pass if features are not known
(not yet reported by the BTS), fail if the feature is missing
* Once BTS reports its features, check relevant VTY config parts again
Related: SYS#5922, OS#5538
Change-Id: I7fca42a39a4bc98a6ea8b9cfab28c4bad3a6a0aa
---
A doc/bts-features.txt
M include/osmocom/bsc/bts.h
M src/osmo-bsc/abis_nm.c
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bts.c
M src/osmo-bsc/bts_ipaccess_nanobts.c
M src/osmo-bsc/bts_osmobts.c
M src/osmo-bsc/bts_trx.c
M src/osmo-bsc/bts_trx_vty.c
M src/osmo-bsc/bts_vty.c
M tests/Makefile.am
A tests/bts_features.vty
12 files changed, 136 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/27923/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27923
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I7fca42a39a4bc98a6ea8b9cfab28c4bad3a6a0aa
Gerrit-Change-Number: 27923
Gerrit-PatchSet: 5
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: Hoernchen.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341 )
Change subject: octsim: initial commit
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341/comment/c7fbc2f7_c9e9…
PS1, Line 7: octsim: initial commit
> there could be some more commitlog explaining what this is about. […]
ping? It has been 2 months...
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341
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: Iada6422d694eb5fc862477c8b43b8642c8d96692
Gerrit-Change-Number: 27341
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 28 Apr 2022 13:00:49 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27935 )
Change subject: paging: Estimate available_slots based on BTS config when no CCCH Load Ind received
......................................................................
Patch Set 3:
(1 comment)
File src/osmo-bsc/abis_rsl.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27935/comment/6ecc51e3_5aa06c76
PS3, Line 2344: sd.bts->ccch_load_ind_period
> In paging.c you multiply it by 2, but here you don't. Is it intentional? […]
Because in this path we know it's an ipaccess BTS which will keep sending CCCH Load Indication all the time despite being under Load Threshold (value UINT16_MAX), so we know we'll receive another CCCH Load Ind after sd.bts->ccch_load_ind_period seconds. Hence, there's no sense in calculating double the time.
sd.bts->ccch_load_ind_period * 2 is used to provide enough time for CCCH Load Ind to arrive if they are delayed. If that bts->ccch_load_ind_period * 2 timeframe is reached, in general we consider the BTS is not sending load indications because it's under threshold.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27935
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2df68e10eb549d62765ad3b25429f7fe2d5bb0b9
Gerrit-Change-Number: 27935
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 28 Apr 2022 11:51:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment