dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42086?usp=email )
Change subject: pySim/euicc: fix encoding/decoding of Iccid
......................................................................
pySim/euicc: fix encoding/decoding of Iccid
The class Iccid uses a BcdAdapter to encoded/decode the ICCID. This
works fine for ICCIDs that have an even (20) number of digits. In case
the digit count is odd (19), the ICCID the last digit requires padding.
Let's switch to PaddedBcdAdapter for encoding/decoding, to ensure that
odd-length ICCIDs are padded automatically.
Change-Id: I527a44ba454656a0d682ceb590eec6d9d0ac883a
Related: OS#6868
---
M pySim/euicc.py
M tests/pySim-shell_test/euicc/get_profiles_info.ok
M tests/pySim-shell_test/euicc/test.py
M tests/pySim-shell_test/euicc/test_gen_notif.script
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/42086/1
diff --git a/pySim/euicc.py b/pySim/euicc.py
index ccb65be..36e2d2a 100644
--- a/pySim/euicc.py
+++ b/pySim/euicc.py
@@ -181,7 +181,7 @@
class NotificationAddress(BER_TLV_IE, tag=0x0c):
_construct = Utf8Adapter(GreedyBytes)
class Iccid(BER_TLV_IE, tag=0x5a):
- _construct = BcdAdapter(GreedyBytes)
+ _construct = PaddedBcdAdapter(GreedyBytes)
class NotificationMetadata(BER_TLV_IE, tag=0xbf2f, nested=[SeqNumber, ProfileMgmtOperation,
NotificationAddress, Iccid]):
pass
diff --git a/tests/pySim-shell_test/euicc/get_profiles_info.ok b/tests/pySim-shell_test/euicc/get_profiles_info.ok
index 8450cb2..28eeff4 100644
--- a/tests/pySim-shell_test/euicc/get_profiles_info.ok
+++ b/tests/pySim-shell_test/euicc/get_profiles_info.ok
@@ -15,7 +15,7 @@
},
{
"profile_info": {
- "iccid": "8949449999999990031f",
+ "iccid": "8949449999999990031",
"isdp_aid": "a0000005591010ffffffff8900001200",
"profile_state": "disabled",
"service_provider_name": "OsmocomSPN",
diff --git a/tests/pySim-shell_test/euicc/test.py b/tests/pySim-shell_test/euicc/test.py
index 3cad859..654d575 100644
--- a/tests/pySim-shell_test/euicc/test.py
+++ b/tests/pySim-shell_test/euicc/test.py
@@ -23,7 +23,7 @@
import json
from utils import *
-# This testcase requires a sysmoEUICC1-C2T with the test prfile TS48V1-B-UNIQUE (ICCID 8949449999999990031f)
+# This testcase requires a sysmoEUICC1-C2T with the test prfile TS48V1-B-UNIQUE (ICCID 8949449999999990031)
# installed, and in disabled state. Also the profile must be installed in such a way that notifications are
# generated when the profile is disabled or enabled (ProfileMetadata)
diff --git a/tests/pySim-shell_test/euicc/test_gen_notif.script b/tests/pySim-shell_test/euicc/test_gen_notif.script
index d97dc2b..feb7ef2 100644
--- a/tests/pySim-shell_test/euicc/test_gen_notif.script
+++ b/tests/pySim-shell_test/euicc/test_gen_notif.script
@@ -4,5 +4,5 @@
select ADF.ISD-R
# Generate two (additional) notifications by quickly enabeling the test profile
-enable_profile --iccid 8949449999999990031f
+enable_profile --iccid 8949449999999990031
enable_profile --iccid 89000123456789012341
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/42086?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I527a44ba454656a0d682ceb590eec6d9d0ac883a
Gerrit-Change-Number: 42086
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42070?usp=email )
Change subject: bts: as_rsl_meas_res(): tolerate bad RxQual in early reports
......................................................................
bts: as_rsl_meas_res(): tolerate bad RxQual in early reports
Bit errors are expected during early stage of channel establishment.
Ignore bad RxQual in the very first reports (4 * 0.480s = 1.92s).
This reduces probability of sporadic failures.
Change-Id: Ie8acb15b66cd92092ec49bc8caeaf0ad4d471f1d
Related: OS#6933
---
M bts/BTS_Tests.ttcn
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 5ec0f1e..c3b8f35 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -2310,6 +2310,12 @@
rxq_s_u := f_tolerance(l1p.meas_ul.sub.rxqual, 0, 7, mp_tolerance_rxqual),
supp_meas_info := omit
};
+ /* Bit errors are expected during early stage of channel establishment.
+ * Ignore bad RxQual in the very first reports (4 * 0.480s = 1.92s). */
+ if (g_rsl_meas_res_nr < 4) {
+ ul_meas.rxq_f_u := ?;
+ ul_meas.rxq_s_u := ?;
+ }
if (l1p.toa256_enabled) {
ul_meas.len := (3+8);
ul_meas.supp_meas_info := {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42070?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie8acb15b66cd92092ec49bc8caeaf0ad4d471f1d
Gerrit-Change-Number: 42070
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41938?usp=email )
Change subject: bts: as_rsl_meas_res(): do not expect dummy UL SACCH
......................................................................
bts: as_rsl_meas_res(): do not expect dummy UL SACCH
We're now populating the UL SACCH cache before establishing a
decicated channel in f_est_dchan(), so this special case is
no longer needed and can be safely removed.
Change-Id: I6eeee2876a76d41ab453af4c7724173fea773b83
Related: I4781fe7539e64e77d594e84f905646c127f46b64
Related: OS#6933
---
M bts/BTS_Tests.ttcn
1 file changed, 1 insertion(+), 20 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index c3b8f35..fb186b7 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -221,7 +221,6 @@
/* RSL MEASurement RESult params for as_rsl_meas_res() */
var uint8_t g_rsl_meas_res_nr := 0;
- var boolean g_rsl_meas_res_first := true;
var boolean g_rsl_meas_res_chan_est := false;
/* PCU Interface of BTS */
@@ -2397,8 +2396,7 @@
/* The following two cases may only happen in the beginning
* of the channel establishment phase. Once we have received
* the "our" measurement report the first time, the channel
- * is established and empty or hardcoded TRXCON reports must
- * not occur anymore. */
+ * is established and empty reports must not occur anymore. */
g_rsl_meas_res_chan_est := true;
repeat;
@@ -2416,22 +2414,6 @@
repeat;
}
- /* Due to the TDMA nature of GSM, TRXCON implements a way to emit dummy
- * measurements if the TTCN3 side does not supply measurement input in
- * time. In those cases TRXCON will either use a cached measurement
- * report or a hardcoded one. If TRXCON picks the hardcoded measurement
- * report the templates above will not match. We tolerate this
- * behavior, but only once. */
- [not g_rsl_meas_res_chan_est] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr, g_rsl_meas_res_nr)) -> value rsl {
- /* increment counter of next to-be-expected meas rep */
- g_rsl_meas_res_nr := (g_rsl_meas_res_nr + 1) mod 256;
- if (g_rsl_meas_res_first) {
- g_rsl_meas_res_first := false;
- repeat;
- } else {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unspecific MEAS RES ", rsl));
- }
- }
[] RSL.receive(tr_RSL_MEAS_RES(?)) -> value rsl {
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected MEAS RES ", rsl));
}
@@ -2586,7 +2568,6 @@
}
g_rsl_meas_res_nr := 0;
- g_rsl_meas_res_first := true;
g_rsl_meas_res_chan_est := false;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41938?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6eeee2876a76d41ab453af4c7724173fea773b83
Gerrit-Change-Number: 41938
Gerrit-PatchSet: 6
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: jolly, laforge, pespin.
osmith has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41140?usp=email )
Change subject: Add CAS channel support
......................................................................
Patch Set 4:
(1 comment)
Patchset:
PS4:
> hm, somehow there's no build (neither the expected failure nor a success) for the latest version of […]
yes, via https://jenkins.osmocom.org/jenkins/gerrit_manual_trigger/. I'll trigger a build.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41140?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I81cc89e01bb4207dc899ab28f24a131f24b61c9c
Gerrit-Change-Number: 41140
Gerrit-PatchSet: 4
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 09 Feb 2026 12:35:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Attention is currently required from: fixeria.
laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41938?usp=email )
Change subject: bts: as_rsl_meas_res(): do not expect dummy UL SACCH
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41938?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6eeee2876a76d41ab453af4c7724173fea773b83
Gerrit-Change-Number: 41938
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 09 Feb 2026 12:35:43 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria.
laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42070?usp=email )
Change subject: bts: as_rsl_meas_res(): tolerate bad RxQual in early reports
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42070?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie8acb15b66cd92092ec49bc8caeaf0ad4d471f1d
Gerrit-Change-Number: 42070
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 09 Feb 2026 12:35:25 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria, laforge.
osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/42046?usp=email )
Change subject: osmo-bts-trx: trx_provision_fsm: do not send *_CNF events on failure
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bts/+/42046/comment/d9ec6d12_5dae2073?usp… :
PS1, Line 12: ensuring that only successful operations generate confirmation events.
> I guess we could change the FSM to shutdown immediately if some command fails. […]
makes sense, thanks for explaining!
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42046?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id85fb19c6621f55a9c46882df24bec534864a9dc
Gerrit-Change-Number: 42046
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 09 Feb 2026 12:33:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: pespin.
laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074?usp=email )
Change subject: xua_default_fsm: Support IPSP role
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42074?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Id9ad8bbfce5cf15fedcba83034ae383e61d3b3a3
Gerrit-Change-Number: 42074
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 09 Feb 2026 12:33:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes