laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34038 )
Change subject: runtime: make sure applications are always listed in the same order
......................................................................
runtime: make sure applications are always listed in the same order
When we print the profile applications. which are not registered in
EF.DIR, we use python sets to subtract the applications which were part
of EF.DIR and hence already listed. Since we use sets the order may be
arbitrary. This is so far not a problem, since the output is meant to be
read by humans, but as soon as we try to use the output for unit-test
verifications we need a consistent order (sorted)
Related: OS#6094
Change-Id: Ie75613910aaba14c27420c52b6596ab080588273
---
M pySim/runtime.py
1 file changed, 18 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/pySim/runtime.py b/pySim/runtime.py
index 642e9c1..422e916 100644
--- a/pySim/runtime.py
+++ b/pySim/runtime.py
@@ -108,7 +108,7 @@
# Some card applications may not be registered in EF.DIR, we will actively
# probe for those applications
- for f in set(apps_profile) - set(apps_taken):
+ for f in sorted(set(apps_profile) - set(apps_taken), key=str):
try:
data, sw = self.card.select_adf_by_aid(f.aid)
if sw == "9000":
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/34038
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ie75613910aaba14c27420c52b6596ab080588273
Gerrit-Change-Number: 34038
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34041 )
Change subject: pySim-prog_test: fix typo
......................................................................
pySim-prog_test: fix typo
Related: OS#6094
Change-Id: I6432ee3ee948fea697067fb3857cb9b83b1f8422
---
M tests/pySim-prog_test.sh
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/tests/pySim-prog_test.sh b/tests/pySim-prog_test.sh
index f248768..f518618 100755
--- a/tests/pySim-prog_test.sh
+++ b/tests/pySim-prog_test.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Utility to verify the functionality of pysim-prog.py
+# Utility to verify the functionality of pySim-prog.py
#
# (C) 2018 by Sysmocom s.f.m.c. GmbH
# All Rights Reserved
@@ -27,7 +27,7 @@
set -e
-echo "pySim-prog_test - a test program to test pysim-prog.py"
+echo "pySim-prog_test - a test program to test pySim-prog.py"
echo "======================================================"
# Generate a list of the cards we expect to see by checking which .ok files
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/34041
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I6432ee3ee948fea697067fb3857cb9b83b1f8422
Gerrit-Change-Number: 34041
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: dexter.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34038 )
Change subject: runtime: make sure applications are always listed in the same order
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/34038
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ie75613910aaba14c27420c52b6596ab080588273
Gerrit-Change-Number: 34038
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 02 Aug 2023 19:54:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-gprs/+/34045
to look at the new patch set (#3).
Change subject: rlcmac: ul_tbf: Factor out function configuring TBF to lower layers
......................................................................
rlcmac: ul_tbf: Factor out function configuring TBF to lower layers
This code part will also be used by tbf_ul_ass_fsm.c to temporarily
configure lower layers with ctx->phase1_alloc in order to receive RTS
indications which the RLC/MAC uses to tick the FSM in state
GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_TBF_STARTING_TIME1.
Change-Id: I174327b25b726662a6b5902008e205ddb3de2fe0
---
M include/osmocom/gprs/rlcmac/tbf_ul.h
M src/rlcmac/tbf_ul.c
M src/rlcmac/tbf_ul_fsm.c
M tests/rlcmac/rlcmac_prim_test.err
4 files changed, 65 insertions(+), 36 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/45/34045/3
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34045
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I174327b25b726662a6b5902008e205ddb3de2fe0
Gerrit-Change-Number: 34045
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34045 )
Change subject: rlcmac: ul_tbf: Factor out function configuring TBF to lower layers
......................................................................
rlcmac: ul_tbf: Factor out function configuring TBF to lower layers
This code part will also be used by tbf_ul_ass_fsm.c to temporarily
configure lower layers with ctx->phase1_alloc in order to receive RTS
indications which the RLC/MAC uses to tick the FSM in state
GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_TBF_STARTING_TIME1.
Change-Id: I174327b25b726662a6b5902008e205ddb3de2fe0
---
M include/osmocom/gprs/rlcmac/tbf_ul.h
M src/rlcmac/tbf_ul.c
M src/rlcmac/tbf_ul_fsm.c
3 files changed, 49 insertions(+), 20 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/45/34045/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34045
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I174327b25b726662a6b5902008e205ddb3de2fe0
Gerrit-Change-Number: 34045
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34046 )
Change subject: rlcmac: ul_tbf: Implement TBF_Starting time (phase1)
......................................................................
rlcmac: ul_tbf: Implement TBF_Starting time (phase1)
This is unfortunately not yet working since lower layers are always
sending hardcoded fn=0 and hence ctx->tbf_starting_time calculated in
handle_imm_ass()->TBF_StartingTime_to_fn() is wrong.
Related: OS#6130
Change-Id: If6b7766ee1ba6667db4e54e897f376f5b27ad73d
---
M src/rlcmac/tbf_ul_ass_fsm.c
1 file changed, 39 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/46/34046/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34046
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: If6b7766ee1ba6667db4e54e897f376f5b27ad73d
Gerrit-Change-Number: 34046
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset