This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. Change subject: fix cell identifier generation in ttcn3 paging tests ...................................................................... fix cell identifier generation in ttcn3 paging tests The cell identifier used by the paging tests is 001-01, i.e. uses a 2-digit MNC. With the introduction of 3-digit MNC support in osmo-bsc, the paging tests became incompatible with a osmo-bsc config with: network country code 1 mobile network code 1 Explicitly declare a Cell_Identity with 2-digit MNC (includes an 'f'). Also, fix f_enc_mcc_mnc to properly encode 2-digit MNC values. Related: OS#2847 Change-Id: Ide5228b403e43de8649b6eda18749ea2a9f592a9 --- M bsc/BSC_Tests.ttcn M library/BSSMAP_Templates.ttcn 2 files changed, 6 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 972d912..2a05d26 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -949,7 +949,7 @@ GsmLac lac, GsmCellId ci }; -private const Cell_Identity cid := { '001'H, '001'H, 1, 0 }; +private const Cell_Identity cid := { '001'H, 'f01'H, 1, 0 }; type set of integer BtsIdList; diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 77ff7e4..5d2bff2 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -665,7 +665,11 @@ } private function f_enc_mcc_mnc(GsmMcc mcc, GsmMnc mnc) return OCT3 { - return hex2oct(mcc[1] & mcc[0] & mnc[2] & mcc[2] & mnc[1] & mnc[0]); + if (mnc[0] == 'f'H) { + return hex2oct(mcc[1] & mcc[0] & mnc[0] & mcc[2] & mnc[2] & mnc[1]); + } else { + return hex2oct(mcc[1] & mcc[0] & mnc[2] & mcc[2] & mnc[1] & mnc[0]); + } } template BSSMAP_FIELD_CellIdentification_CGI ts_BSSMAP_CI_CGI(GsmMcc mcc, GsmMnc mnc, GsmLac lac, GsmCellId ci) := { -- To view, visit https://gerrit.osmocom.org/7287 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ide5228b403e43de8649b6eda18749ea2a9f592a9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Stefan Sperling <ssperling at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder