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

[XS] Change in pysim[master]: esim.saip.FsProfileElement: Add create_file() method

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38909?usp=email ) Change subject: esim.saip.FsProfileElement: Add create_file() method ...................................................................... esim.saip.FsProfileElement: Add create_file() method So far we mainly created File() instances when parsing existing profiles. However, sometimes we want to programmatically create Files and we should offer a convenience helper to do so, rather than asking API users to worry about low-level details. Change-Id: I0817819af40f3d0dc0c3d2b91039c5748dd31ee2 --- M pySim/esim/saip/__init__.py 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 94df453..2552c8e 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -643,6 +643,14 @@ file = File(k, v, template.files_by_pename.get(k, None)) self.add_file(file) + def create_file(self, pename: str) -> File: + """Programatically create a file by its PE-Name.""" + template = templates.ProfileTemplateRegistry.get_by_oid(self.templateID) + file = File(pename, None, template.files_by_pename.get(pename, None)) + self.add_file(file) + self.decoded[pename] = [] + return file + def _post_decode(self): # not entirely sure about doing this this automatism self.pe2files() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38909?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: I0817819af40f3d0dc0c3d2b91039c5748dd31ee2 Gerrit-Change-Number: 38909 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

[XS] Change in pysim[master]: esim.saip: Compute number of records from efFileSize and record_len

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38897?usp=email ) Change subject: esim.saip: Compute number of records from efFileSize and record_len ...................................................................... esim.saip: Compute number of records from efFileSize and record_len If we know the efFileSize and record_len, but Fcp doesn't contain the number of records, we can simply compute it. Change-Id: I0cc8e7241e37ee23df00c2622422904e7ccdca77 --- M pySim/esim/saip/__init__.py 1 file changed, 5 insertions(+), 2 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/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 6707802..3490f64 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -276,12 +276,15 @@ self.shareable = fdb_dec['shareable'] if fdb_dec['file_type'] == 'working_ef': efFileSize = fileDescriptor.get('efFileSize', None) - if efFileSize: - self._file_size = self._decode_file_size(efFileSize) if fd_dec['num_of_rec']: self.nb_rec = fd_dec['num_of_rec'] if fd_dec['record_len']: self.rec_len = fd_dec['record_len'] + if efFileSize: + self._file_size = self._decode_file_size(efFileSize) + if self.rec_len and self.nb_rec == None: + # compute the number of records from file size and record length + self.nb_rec = self._file_size // self.rec_len if fdb_dec['structure'] == 'linear_fixed': self.file_type = 'LF' elif fdb_dec['structure'] == 'cyclic': -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38897?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: I0cc8e7241e37ee23df00c2622422904e7ccdca77 Gerrit-Change-Number: 38897 Gerrit-PatchSet: 1 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>

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip: Fix parsing/generating fillPattern + repeatPattern

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38895?usp=email ) Change subject: esim.saip: Fix parsing/generating fillPattern + repeatPattern ...................................................................... esim.saip: Fix parsing/generating fillPattern + repeatPattern So far we only thought of default filling coming from a template. However, filling can happen from the Fcp, and we need to properly parse and [re-]encode that information. Change-Id: Iff339cbe841112a01c9c617f43b0e69df2521b51 Related: OS#6643 --- M pySim/esim/saip/__init__.py 1 file changed, 13 insertions(+), 14 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/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 658810a..3c46ef8 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -116,6 +116,8 @@ self.high_update: bool = False self.shareable: bool = True self.df_name = None + self.fill_pattern = None + self.fill_pattern_repeat = False # apply some defaults from profile if self.template: self.from_template(self.template) @@ -174,8 +176,6 @@ self.fid = template.fid self.sfi = template.sfi self.arr = template.arr - #self.default_val = template.default_val - #self.default_val_repeat = template.default_val_repeat if hasattr(template, 'rec_len'): self.rec_len = template.rec_len else: @@ -234,14 +234,11 @@ fileDescriptor['fileDescriptor'] = build_construct(FileDescriptor._construct, fd_dict) if self.high_update: pefi['specialFileInformation'] = b'\x80' # TS 102 222 Table 5 - try: - if self.template and self.template.default_val_repeat: - pefi['repeatPattern'] = self.template.expand_default_value_pattern() - elif self.template and self.template.default_val: - pefi['fillPattern'] = self.template.expand_default_value_pattern() - except ValueError: - # ignore this here as without a file or record length we cannot do this - pass + if self.fill_pattern: + if not self.fill_pattern_repeat: + pefi['fillPattern'] = self.fill_pattern + else: + pefi['repeatPattern'] = self.fill_pattern if len(pefi.keys()): # TODO: When overwriting the default "proprietaryEFInfo" for a template EF for which a # default fill or repeat pattern is defined; it is hence recommended to provide the @@ -292,11 +289,13 @@ specialFileInformation = pefi.get('specialFileInformation', None) if specialFileInformation: if specialFileInformation[0] & 0x80: - self.hihgi_update = True + self.high_update = True if 'repeatPattern' in pefi: - self.repeat_pattern = pefi['repeatPattern'] - if 'defaultPattern' in pefi: - self.repeat_pattern = pefi['defaultPattern'] + self.fill_pattern = pefi['repeatPattern'] + self.fill_pattern_repeat = True + if 'fillPattern' in pefi: + self.fill_pattern = pefi['fillPattern'] + self.fill_pattern_repeat = False elif fdb_dec['file_type'] == 'df': # only set it, if an earlier call to from_template() didn't alrady set it, as # the template can differentiate between MF, DF and ADF (unlike FDB) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38895?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: Iff339cbe841112a01c9c617f43b0e69df2521b51 Gerrit-Change-Number: 38895 Gerrit-PatchSet: 1 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>

7 months

1
0
0 0

[S] Change in pysim[master]: pySim.esim.saip: Treat "Readable and Updateable when deactivated" flag

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38896?usp=email ) Change subject: pySim.esim.saip: Treat "Readable and Updateable when deactivated" flag ...................................................................... pySim.esim.saip: Treat "Readable and Updateable when deactivated" flag There's a second flag hidden in the TS 102 222 "Special File Information"; let's parse + re-encode it properly. Change-Id: I7644d265f746c662b64f7156b3be08a01e3a97aa Related: OS#6643 --- M pySim/esim/saip/__init__.py 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 3c46ef8..6707802 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -114,6 +114,7 @@ self.nb_rec: Optional[int] = None self._file_size = 0 self.high_update: bool = False + self.read_and_update_when_deact: bool = False self.shareable: bool = True self.df_name = None self.fill_pattern = None @@ -194,6 +195,7 @@ fileDescriptor = {} fdb_dec = {} pefi = {} + spfi = 0 if self.fid: fileDescriptor['fileID'] = self.fid.to_bytes(2, 'big') if self.sfi: @@ -233,7 +235,11 @@ if len(fd_dict): fileDescriptor['fileDescriptor'] = build_construct(FileDescriptor._construct, fd_dict) if self.high_update: - pefi['specialFileInformation'] = b'\x80' # TS 102 222 Table 5 + spfi |= 0x80 # TS 102 222 Table 5 + if self.read_and_update_when_deact: + spfi |= 0x40 # TS 102 222 Table 5 + if spfi != 0x00: + pefi['specialFileInformation'] = spfi.to_bytes(1) if self.fill_pattern: if not self.fill_pattern_repeat: pefi['fillPattern'] = self.fill_pattern @@ -288,8 +294,11 @@ self._file_size = self._decode_file_size(pefi['maximumFileSize']) specialFileInformation = pefi.get('specialFileInformation', None) if specialFileInformation: + # TS 102 222 Table 5 if specialFileInformation[0] & 0x80: self.high_update = True + if specialFileInformation[0] & 0x40: + self.read_and_update_when_deact = True if 'repeatPattern' in pefi: self.fill_pattern = pefi['repeatPattern'] self.fill_pattern_repeat = True -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38896?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: I7644d265f746c662b64f7156b3be08a01e3a97aa Gerrit-Change-Number: 38896 Gerrit-PatchSet: 1 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>

7 months

1
0
0 0

[XS] Change in pysim[master]: esim.saip.File: Suppress encoding attributes that are like template

by laforge

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38908?usp=email ) Change subject: esim.saip.File: Suppress encoding attributes that are like template ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38908?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: I337ee6c7e882ec711bece17b7a0def9da36b0ad7 Gerrit-Change-Number: 38908 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:48:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in pysim[master]: esim.saip.File: Proper ARR conversion of template (into) to file (bytes)

by laforge

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38907?usp=email ) Change subject: esim.saip.File: Proper ARR conversion of template (into) to file (bytes) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38907?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: Ibb8afb85cc0006bc5c59230ebf28b2c0c1a8a8ed Gerrit-Change-Number: 38907 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:48:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip.File: Re-compute file_size when changing body

by laforge

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38906?usp=email ) Change subject: esim.saip.File: Re-compute file_size when changing body ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38906?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: I1a908504b845b7c90f31294faf2a6e988bdd8049 Gerrit-Change-Number: 38906 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:48:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip: New methods for inserting ProfileElement into sequence

by laforge

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38905?usp=email ) Change subject: esim.saip: New methods for inserting ProfileElement into sequence ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38905?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: I4424926127b4867931c2157e9340bacd2682ff0c Gerrit-Change-Number: 38905 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:48:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in pysim[master]: [cosmetic] esim: Fix various typos in comments/messages/docs

by laforge

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38900?usp=email ) Change subject: [cosmetic] esim: Fix various typos in comments/messages/docs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38900?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: I806c7a37951e72027ab9346169a3f8fe241f2c46 Gerrit-Change-Number: 38900 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:48:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip: Fix computation of file content

by laforge

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38898?usp=email ) Change subject: esim.saip: Fix computation of file content ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38898?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: I822bb5fbec11a3be35910a496af7168458fd949c Gerrit-Change-Number: 38898 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> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:47:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024