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

[L] Change in pysim[master]: pySim.esim.saip: maintain a parsed fileystem hierarchy
by laforge 19 Aug '24

19 Aug '24

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37848?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pySim.esim.saip: maintain a parsed fileystem hierarchy ...................................................................... pySim.esim.saip: maintain a parsed fileystem hierarchy With this change, the ProfileElementSequence object will maintain a representation of the filesystem hierarchy of the eSIM profile. Every file that is added by a ProfileElement will add a FsNode into that tree, and each FsNode will point to the File object for the respective file. This allows us to find files by their path, as well as add files by path. Change-Id: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 --- M pySim/esim/saip/__init__.py 1 file changed, 627 insertions(+), 74 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/37848/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37848?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 Gerrit-Change-Number: 37848 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySim.esim.saip: Add missing entry for 'rfm' to class4petype
by laforge 19 Aug '24

19 Aug '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37859?usp=email ) Change subject: pySim.esim.saip: Add missing entry for 'rfm' to class4petype ...................................................................... pySim.esim.saip: Add missing entry for 'rfm' to class4petype Change-Id: I5fec2b026fc6a1197fc1e18d880ea6d10fd4a611 --- M pySim/esim/saip/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/59/37859/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 2fe9025..de631e2 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -450,7 +450,7 @@ 'akaParameter': ProfileElementAKA, # TODO: cdmaParameter 'securityDomain': ProfileElementSD, - # TODO: rfm + 'rfm': ProfileElementRFM, # TODO: application # TODO: nonStandard 'end': ProfileElementEnd, -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37859?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: I5fec2b026fc6a1197fc1e18d880ea6d10fd4a611 Gerrit-Change-Number: 37859 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[L] Change in pysim[master]: pySim.esim.saip: maintain a parsed fileystem hierarchy
by laforge 18 Aug '24

18 Aug '24

Attention is currently required from: fixeria. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/37848?usp=email ) Change subject: pySim.esim.saip: maintain a parsed fileystem hierarchy ...................................................................... Patch Set 5: (1 comment) File pySim/esim/saip/__init__.py: https://gerrit.osmocom.org/c/pysim/+/37848/comment/33b8c84e_90ae4c0f?usp=em… : PS1, Line 100: def __init__(self, pename: str, l: Optional[List[Tuple]] = None, template: : > I meant making the constructor accept `**kw` rather than adding even more `Optional` parameters: […] I prefer to keept it as-is, we're only talking about four arguments at this point. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37848?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: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 Gerrit-Change-Number: 37848 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 18 Aug 2024 17:41:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in pysim[master]: pySim.esim.saip: Refactor file size encoding into a method
by laforge 18 Aug '24

18 Aug '24

Attention is currently required from: dexter, laforge. Hello Jenkins Builder, dexter, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37836?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: pySim.esim.saip: Refactor file size encoding into a method ...................................................................... pySim.esim.saip: Refactor file size encoding into a method Change-Id: I46b8cb81ef8cc1794c11b61e0adfb575f937b349 --- M pySim/esim/saip/__init__.py 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/37836/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37836?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46b8cb81ef8cc1794c11b61e0adfb575f937b349 Gerrit-Change-Number: 37836 Gerrit-PatchSet: 5 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySim.esim.saip: Fix key used in FsProfileElement.files2pe
by laforge 18 Aug '24

18 Aug '24

Attention is currently required from: dexter, laforge. Hello Jenkins Builder, dexter, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37846?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: pySim.esim.saip: Fix key used in FsProfileElement.files2pe ...................................................................... pySim.esim.saip: Fix key used in FsProfileElement.files2pe The self.files member is a dict. Hence we should use those dict keys when [re]building the decoded dict. The previous code ignored it and re-constructed the key from File.pe_name - but that's not always identical. Change-Id: I0e6c97721fb1cfc6b5c21595d85bd374d485b573 --- M pySim/esim/saip/__init__.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/37846/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37846?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0e6c97721fb1cfc6b5c21595d85bd374d485b573 Gerrit-Change-Number: 37846 Gerrit-PatchSet: 4 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySim.esim.saip: Fix typo in ProfileElementAKA.set_mapping() method
by laforge 18 Aug '24

18 Aug '24

Attention is currently required from: dexter, laforge. Hello Jenkins Builder, dexter, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37845?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: pySim.esim.saip: Fix typo in ProfileElementAKA.set_mapping() method ...................................................................... pySim.esim.saip: Fix typo in ProfileElementAKA.set_mapping() method Change-Id: Icd1594c6c2a8536a4ab8d1fc698307f05f539bdb --- M pySim/esim/saip/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/45/37845/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icd1594c6c2a8536a4ab8d1fc698307f05f539bdb Gerrit-Change-Number: 37845 Gerrit-PatchSet: 4 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

1 0

[L] Change in pysim[master]: pySim.esim.saip: maintain a parsed fileystem hierarchy
by laforge 18 Aug '24

18 Aug '24

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37848?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pySim.esim.saip: maintain a parsed fileystem hierarchy ...................................................................... pySim.esim.saip: maintain a parsed fileystem hierarchy With this change, the ProfileElementSequence object will maintain a representation of the filesystem hierarchy of the eSIM profile. Every file that is added by a ProfileElement will add a FsNode into that tree, and each FsNode will point to the File object for the respective file. This allows us to find files by their path, as well as add files by path. Change-Id: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 --- M pySim/esim/saip/__init__.py 1 file changed, 601 insertions(+), 70 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/37848/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37848?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 Gerrit-Change-Number: 37848 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[S] Change in pysim[master]: contrib/saip-tool: Add command-line arguments to configure log level
by laforge 18 Aug '24

18 Aug '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37858?usp=email ) Change subject: contrib/saip-tool: Add command-line arguments to configure log level ...................................................................... contrib/saip-tool: Add command-line arguments to configure log level Change-Id: I4257d7b76193cdaad8c8571ff49f29067e8ab8c8 --- M contrib/saip-tool.py 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/58/37858/1 diff --git a/contrib/saip-tool.py b/contrib/saip-tool.py index 22b913e..7b57488 100755 --- a/contrib/saip-tool.py +++ b/contrib/saip-tool.py @@ -31,11 +31,12 @@ pp = HexBytesPrettyPrinter(indent=4,width=500) -logging.basicConfig(level=logging.INFO) - parser = argparse.ArgumentParser(description=""" Utility program to work with eSIM SAIP (SimAlliance Interoperable Profile) files.""") parser.add_argument('INPUT_UPP', help='Unprotected Profile Package Input file') +parser.add_argument("--loglevel", dest="loglevel", choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], + default='INFO', help="Set the logging level") +parser.add_argument('--debug', action='store_true', help='Enable DEBUG logging') subparsers = parser.add_subparsers(dest='command', help="The command to perform", required=True) parser_split = subparsers.add_parser('split', help='Split PE-Sequence into individual PEs') @@ -225,6 +226,11 @@ if __name__ == '__main__': opts = parser.parse_args() + if opts.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.getLevelName(opts.loglevel)) + with open(opts.INPUT_UPP, 'rb') as f: pes = ProfileElementSequence.from_der(f.read()) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37858?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: I4257d7b76193cdaad8c8571ff49f29067e8ab8c8 Gerrit-Change-Number: 37858 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: properly omit Network Instance IE
by fixeria 18 Aug '24

18 Aug '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37857?usp=email ) Change subject: erab_fsm: properly omit Network Instance IE ...................................................................... erab_fsm: properly omit Network Instance IE If the access/core Network Instance IE value is not configured, the 'network_instance' field shall not be added to PDRs and FARs. Otherwise we hit a function_clause exception in pfcplib. Change-Id: I643a23eeb1cfb699cda44f973cb8098edb0a9a83 Fixes: 3d8119c "erab_fsm: include Network Instance IE in PDRs and FARs" --- M src/erab_fsm.erl 1 file changed, 42 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/57/37857/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 931b47f..544f5ab 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -81,6 +81,10 @@ -type erab_state() :: #erab_state{}. +-type iface() :: 'Core' | 'Access'. +-type pfcp_ie() :: map(). + + %% ------------------------------------------------------------------ %% public API %% ------------------------------------------------------------------ @@ -375,68 +379,78 @@ logger:set_process_metadata(#{prefix => Prefix}). --spec net_inst(atom()) -> undefined | binary(). -net_inst(Param) -> - case application:get_env(osmo_s1gw, Param) of - {ok, Val} -> Val; - undefined -> undefined - end. - - -spec session_establish_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). session_establish_req(#erab_state{seid_loc = F_SEID, %% used as F-SEID u2c = U2C}) -> - %% Network Instance IE values for core/access - NI_Core = net_inst(pfcp_net_inst_core), - NI_Access = net_inst(pfcp_net_inst_access), %% Packet Detection Rules OHR = #outer_header_removal{header = 'GTP-U/UDP/IPv4'}, PDRs = [#{pdr_id => {pdr_id, 1}, %% -- for Core -> Access far_id => {far_id, 1}, %% see FARs below precedence => {precedence, 255}, outer_header_removal => OHR, - pdi => #{f_teid => #f_teid{teid = choose, - ipv4 = choose}, - network_instance => NI_Core, - source_interface => {source_interface, 'Core'}}}, + pdi => pdi('Core')}, #{pdr_id => {pdr_id, 2}, %% -- for Access -> Core far_id => {far_id, 2}, %% see FARs below precedence => {precedence, 255}, outer_header_removal => OHR, - pdi => #{f_teid => #f_teid{teid = choose, - ipv4 = choose}, - network_instance => NI_Access, - source_interface => {source_interface, 'Access'}}}], + pdi => pdi('Access')}], %% Forwarding Action Rules + FPars = #{outer_header_creation => ohc(U2C), + destination_interface => {destination_interface, 'Core'}}, + FParsNI = add_net_inst(FPars, 'Core'), %% optional Network Instance IE FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access %% We don't know the Access side TEID / GTP-U address yet, so we set %% this FAR to DROP and modify it when we get E-RAB SETUP RESPONSE. apply_action => #{'DROP' => []}}, #{far_id => {far_id, 2}, %% -- for Access -> Core apply_action => #{'FORW' => []}, - forwarding_parameters => - #{outer_header_creation => ohc(U2C), - network_instance => NI_Core, - destination_interface => {destination_interface, 'Core'}}}], + forwarding_parameters => FParsNI}], pfcp_peer:session_establish_req(F_SEID, PDRs, FARs). -spec session_modify_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). session_modify_req(#erab_state{seid_rem = SEID, %% SEID allocated to us u2a = U2A}) -> - %% Network Instance IE value for access - NI_Access = net_inst(pfcp_net_inst_access), %% Forwarding Action Rules + FPars = #{outer_header_creation => ohc(U2A)}, + FParsNI = add_net_inst(FPars, 'Access'), %% optional Network Instance IE FARs = [#{far_id => {far_id, 1}, %% -- for Core -> Access %% Now we know the Access side TEID / GTP-U address, so we modify %% this FAR (which was previously set to DROP) to FORW. apply_action => #{'FORW' => []}, - update_forwarding_parameters => - #{outer_header_creation => ohc(U2A), - network_instance => NI_Access}}], + update_forwarding_parameters => FParsNI}], pfcp_peer:session_modify_req(SEID, [], FARs). +%% Network Instance IE env parameter name +-spec net_inst_param(iface()) -> atom(). +net_inst_param('Core') -> pfcp_net_inst_core; +net_inst_param('Access') -> pfcp_net_inst_access. + + +%% if configured, add Network Instance IE (optional) +-spec add_net_inst(pfcp_ie(), iface()) -> pfcp_ie(). +add_net_inst(IE, Iface) -> + Param = net_inst_param(Iface), + case application:get_env(osmo_s1gw, Param) of + {ok, NI} -> + IE#{network_instance => NI}; + undefined -> + IE + end. + + +%% Packet Detection Information IE generator +-spec pdi(iface()) -> pfcp_ie(). +pdi(SrcIface) -> + IE = #{f_teid => #f_teid{teid = choose, + ipv4 = choose}, + source_interface => {source_interface, SrcIface}}, + %% if configured, add Network Instance IE (optional) + add_net_inst(IE, SrcIface). + + +%% Outer Header Creation IE generator ohc({TEID, Addr}) -> OHC = #outer_header_creation{n6 = false, n19 = false, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37857?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I643a23eeb1cfb699cda44f973cb8098edb0a9a83 Gerrit-Change-Number: 37857 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in pysim[master]: pySim.esim.saip: maintain a parsed fileystem hierarchy
by fixeria 18 Aug '24

18 Aug '24

Attention is currently required from: laforge. fixeria has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/37848?usp=email ) Change subject: pySim.esim.saip: maintain a parsed fileystem hierarchy ...................................................................... Patch Set 4: (1 comment) File pySim/esim/saip/__init__.py: https://gerrit.osmocom.org/c/pysim/+/37848/comment/31679e21_358f4fef?usp=em… : PS1, Line 100: def __init__(self, pename: str, l: Optional[List[Tuple]] = None, template: : > I don't get the **kwargs argument, but I've added the name docstring. I meant making the constructor accept `**kw` rather than adding even more `Optional` parameters: ``` def __init__(self, pename: str, **kw): self.foo: FooType = kw.get('foo') self.bar: BarType = kw.get('bar') if 'l' in kw: self.from_tuples(kw['l']) ``` This way the method declaration is more readable. This is a usual practice in Python. Not critical. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37848?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: I2caadc24b1087855f23f3c57cdf8dabbf81757c0 Gerrit-Change-Number: 37848 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 18 Aug 2024 13:37:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2024