September 2024 - gerrit-log - lists.osmocom.org

[XS] Change in pysim[master]: pySim-prog: fix commandline parameter check for CSV mode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38165?usp=email ) Change subject: pySim-prog: fix commandline parameter check for CSV mode ...................................................................... pySim-prog: fix commandline parameter check for CSV mode The CSV mode needs one of the four additional parameters: --imsi --iccid, --read-iccid or --read-imsi. Also this check is unrelated to the batch mode. The CSV file parameter reading works independently from the batch mode. Related: SYS#4120 Change-Id: I1292afb85122ed2b7944d02ede69c928a453866f --- M pySim-prog.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-prog.py b/pySim-prog.py index cd7ac74..b6c86af 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -197,9 +197,8 @@ return options if options.source == 'csv': - if (options.imsi is None) and (options.batch_mode is False) and (options.read_imsi is False) and (options.read_iccid is False): - parser.error( - "CSV mode needs either an IMSI, --read-imsi, --read-iccid or batch mode") + if (options.imsi is None) and (options.iccid is None) and (options.read_imsi is False) and (options.read_iccid is False): + parser.error("CSV mode requires one additional parameter: --read-iccid, --read-imsi, --iccid or --imsi") if options.read_csv is None: parser.error("CSV mode requires a CSV input file") elif options.source == 'cmdline': -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38165?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1292afb85122ed2b7944d02ede69c928a453866f Gerrit-Change-Number: 38165 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: pySim-prog: add FIXME note to tell that writing hlr.db files is broken

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38162?usp=email ) Change subject: pySim-prog: add FIXME note to tell that writing hlr.db files is broken ...................................................................... pySim-prog: add FIXME note to tell that writing hlr.db files is broken The writing to osmo-hlr SQLITE files is broken since the SQLITE format has evolved over time. Let's add a FIXME note to tell that this needs fixing. Related: SYS#4120 Change-Id: I2b23f8bb9f3c2adeb48b010834057f5b4fb1e626 --- M pySim-prog.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-prog.py b/pySim-prog.py index 8d330cb..e238b66 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -623,6 +623,9 @@ def write_params_hlr(opts, params): # SQLite3 OpenBSC HLR + # FIXME: The format of the osmo-hlr database has evolved, so that the code below will no longer work. + print("Warning: the database format of recent OsmoHLR versions is not compatible with pySim-prog!") + if opts.write_hlr: import sqlite3 conn = sqlite3.connect(opts.write_hlr) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2b23f8bb9f3c2adeb48b010834057f5b4fb1e626 Gerrit-Change-Number: 38162 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 1 week

1
0
0 0

[M] Change in pysim[master]: pySim-prog: rework documentation

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38166?usp=email ) Change subject: pySim-prog: rework documentation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38166?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1d1a65154cea7fa77428b412fcf8c7b4cba629b1 Gerrit-Change-Number: 38166 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Sep 2024 15:47:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: pySim-prog: fix commandline parameter check for CSV mode

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38165?usp=email ) Change subject: pySim-prog: fix commandline parameter check for CSV mode ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38165?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1292afb85122ed2b7944d02ede69c928a453866f Gerrit-Change-Number: 38165 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Sep 2024 15:46:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: pySim-prog: treat --imsi and --iccid equally

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38163?usp=email ) Change subject: pySim-prog: treat --imsi and --iccid equally ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id3083c7794a7bd59501997f22afdc23bad3069e6 Gerrit-Change-Number: 38163 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Sep 2024 15:46:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: pySim-prog: add FIXME note to tell that writing hlr.db files is broken

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38162?usp=email ) Change subject: pySim-prog: add FIXME note to tell that writing hlr.db files is broken ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2b23f8bb9f3c2adeb48b010834057f5b4fb1e626 Gerrit-Change-Number: 38162 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Sep 2024 15:46:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: update pyosmocom dependency to 0.0.3

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38192?usp=email ) Change subject: update pyosmocom dependency to 0.0.3 ...................................................................... update pyosmocom dependency to 0.0.3 0.0.3 fixes an important problem related to enabling callers of build_construct() to pass in a total_len value in order to specify the target output size. Change-Id: I01687bb54e65bf5cc318745df588c3d6ea14eb83 --- M requirements.txt M setup.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/requirements.txt b/requirements.txt index 99fd5f9..25e3654 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ jsonpath-ng construct>=2.9.51 bidict -pyosmocom>=0.0.2 +pyosmocom>=0.0.3 pyyaml>=5.1 termcolor colorlog diff --git a/setup.py b/setup.py index d48b806..10500d3 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ "jsonpath-ng", "construct >= 2.9.51", "bidict", - "pyosmocom >= 0.0.2", + "pyosmocom >= 0.0.3", "pyyaml >= 5.1", "termcolor", "colorlog", -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I01687bb54e65bf5cc318745df588c3d6ea14eb83 Gerrit-Change-Number: 38192 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: update pyosmocom dependency to 0.0.3

by laforge

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38192?usp=email ) Change subject: update pyosmocom dependency to 0.0.3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I01687bb54e65bf5cc318745df588c3d6ea14eb83 Gerrit-Change-Number: 38192 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 Sep 2024 15:46:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: update pyosmocom dependency to 0.0.3

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38192?usp=email ) Change subject: update pyosmocom dependency to 0.0.3 ...................................................................... update pyosmocom dependency to 0.0.3 0.0.3 fixes an important problem related to enabling callers of build_construct() to pass in a total_len value in order to specify the target output size. Change-Id: I01687bb54e65bf5cc318745df588c3d6ea14eb83 --- M requirements.txt M setup.py 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/92/38192/1 diff --git a/requirements.txt b/requirements.txt index 99fd5f9..25e3654 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ jsonpath-ng construct>=2.9.51 bidict -pyosmocom>=0.0.2 +pyosmocom>=0.0.3 pyyaml>=5.1 termcolor colorlog diff --git a/setup.py b/setup.py index d48b806..10500d3 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ "jsonpath-ng", "construct >= 2.9.51", "bidict", - "pyosmocom >= 0.0.2", + "pyosmocom >= 0.0.3", "pyyaml >= 5.1", "termcolor", "colorlog", -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38192?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: I01687bb54e65bf5cc318745df588c3d6ea14eb83 Gerrit-Change-Number: 38192 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

9 months, 1 week

1
0
0 0

[S] Change in pysim[master]: pySim/profile: Change match_with_profile from static to class method

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38174?usp=email ) Change subject: pySim/profile: Change match_with_profile from static to class method ...................................................................... pySim/profile: Change match_with_profile from static to class method This was suggested by vyanitskiy during gerrit patch review in https://gerrit.osmocom.org/c/pysim/+/38049 in order to make the upcoming eUICC CardProfiles simpler. Change-Id: Ia7c049b31cb1c5c5bb682406d9dd7a73bcd43185 --- M pySim/cdma_ruim.py M pySim/profile.py M pySim/ts_102_221.py M pySim/ts_51_011.py 4 files changed, 8 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/pySim/cdma_ruim.py b/pySim/cdma_ruim.py index 96ff1a4..747a0d2 100644 --- a/pySim/cdma_ruim.py +++ b/pySim/cdma_ruim.py @@ -190,8 +190,8 @@ # TODO: Response parameters/data in case of DF_CDMA (section 2.6) return CardProfileSIM.decode_select_response(data_hex) - @staticmethod - def match_with_card(scc: SimCardCommands) -> bool: + @classmethod + def match_with_card(cls, scc: SimCardCommands) -> bool: return match_ruim(scc) class AddonRUIM(CardProfileAddon): diff --git a/pySim/profile.py b/pySim/profile.py index 74946ba..ae9e19f 100644 --- a/pySim/profile.py +++ b/pySim/profile.py @@ -137,9 +137,9 @@ """ return data_hex - @staticmethod + @classmethod @abc.abstractmethod - def match_with_card(scc: SimCardCommands) -> bool: + def match_with_card(cls, scc: SimCardCommands) -> bool: """Check if the specific profile matches the card. This method is a placeholder that is overloaded by specific dirived classes. The method actively probes the card to make sure the profile class matches the diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index aba28cd..c1c1388 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -884,8 +884,8 @@ d = t.to_dict() return flatten_dict_lists(d['fcp_template']) - @staticmethod - def match_with_card(scc: SimCardCommands) -> bool: + @classmethod + def match_with_card(cls, scc: SimCardCommands) -> bool: return match_uicc(scc) @with_default_category('TS 102 221 Specific Commands') diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index c6720fe..69c8c79 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -1192,8 +1192,8 @@ ret['life_cycle_status_int'] = 'terminated' return ret - @staticmethod - def match_with_card(scc: SimCardCommands) -> bool: + @classmethod + def match_with_card(cls, scc: SimCardCommands) -> bool: return match_sim(scc) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38174?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia7c049b31cb1c5c5bb682406d9dd7a73bcd43185 Gerrit-Change-Number: 38174 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

9 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024