July 2023 - gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: pySim/cards: Split legacy classes away from core SIM + UICC
by fixeria 12 Jul '23

12 Jul '23

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33690 ) Change subject: pySim/cards: Split legacy classes away from core SIM + UICC ...................................................................... Patch Set 4: Code-Review-1 (3 comments) File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/33690/comment/daa21400_e2006d2a PS4, Line 31: base class Do we want to make it an abstract base class (`(a)abc.ABC`)? https://gerrit.osmocom.org/c/pysim/+/33690/comment/f2757feb_e0555905 PS4, Line 41: self._aids = [] unreachable code https://gerrit.osmocom.org/c/pysim/+/33690/comment/9b50a616_fc80f1be PS4, Line 319: SimCard `UiccCardBase` is a [grand]child of `SimCard`, do we really need `SimCard` here? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id36140675def5fc44eedce81fc7b09e0adc527e1 Gerrit-Change-Number: 33690 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> Gerrit-Comment-Date: Wed, 12 Jul 2023 16:27:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ASCI: Add support for Group/Broadcast channel activation
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33599 ) Change subject: ASCI: Add support for Group/Broadcast channel activation ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic0c0597d149d0758d6766937d99660fa02e0e139 Gerrit-Change-Number: 33599 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 12 Jul 2023 16:22:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: BSC_Tests_ASCI: UPLINK FREE / UPLINK BUSY uses unit data
by laforge 12 Jul '23

12 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33717 ) Change subject: BSC_Tests_ASCI: UPLINK FREE / UPLINK BUSY uses unit data ...................................................................... BSC_Tests_ASCI: UPLINK FREE / UPLINK BUSY uses unit data RSL_UNITDATA_REQ is used instead of RSL_DATA_REQ. Change-Id: I224a520ed49ea79b95172bbc38c567a7c861abf4 --- M bsc/BSC_Tests_ASCI.ttcn 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_ASCI.ttcn b/bsc/BSC_Tests_ASCI.ttcn index c7e64f9..e72c065 100644 --- a/bsc/BSC_Tests_ASCI.ttcn +++ b/bsc/BSC_Tests_ASCI.ttcn @@ -254,6 +254,10 @@ */ private altstep as_eat_rsl_data() runs on MSC_ConnHdlr { + [] RSL.receive(tr_RSL_UNITDATA_REQ(g_chan_nr, ?, ?)) { + log("VGCS: Got RSL UNITDATA REQ on channel"); + repeat; + } [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, ?)) { log("VGCS: Got RSL DATA REQ on channel"); repeat; @@ -338,12 +342,12 @@ deactivate(eat_rsl_data); return; } - [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, '082B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O)) { + [] RSL.receive(tr_RSL_UNITDATA_REQ(g_chan_nr, ?, '082B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O)) { log("VGCS: Got UPLINK FREE on channel"); COORD.send(COORD_VGCS_UPLINK_FREE); repeat; } - [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, '062A'O)) { + [] RSL.receive(tr_RSL_UNITDATA_REQ(g_chan_nr, ?, '062A'O)) { log("VGCS: Got UPLINK BUSY on channel"); COORD.send(COORD_VGCS_UPLINK_BUSY); repeat; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I224a520ed49ea79b95172bbc38c567a7c861abf4 Gerrit-Change-Number: 33717 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: BSC_Tests_ASCI: Add test to seize or release uplink by MSC
by laforge 12 Jul '23

12 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33719 ) Change subject: BSC_Tests_ASCI: Add test to seize or release uplink by MSC ...................................................................... BSC_Tests_ASCI: Add test to seize or release uplink by MSC The MSC will block (seize) or unblock (release) the uplink on one BSC, if a talker requests or releases uplink on a different BSC. An UPLINK BUSY or UPLINK FREE message es expected to be sent to the BTS. Change-Id: I7ebf03662e81f59d76ca8d8fa29f581043053564 --- M bsc/BSC_Tests_ASCI.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 99 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved dexter: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_ASCI.ttcn b/bsc/BSC_Tests_ASCI.ttcn index bfc66a9..70fcb4d 100644 --- a/bsc/BSC_Tests_ASCI.ttcn +++ b/bsc/BSC_Tests_ASCI.ttcn @@ -95,8 +95,9 @@ var boolean assign_res := false; var boolean assign_fail := false; /* Note: This timer is used to receive messages after the expected event. - * After timeout, the outcome of the test is checked. */ - timer T := 0.2; + * After timeout, the outcome of the test is checked. + * The timeout must be large enough, so all the messages pass before checking the outcome. */ + timer T := 1.0; /* Wait for the COORD ports to be connected. */ f_sleep(1.0); @@ -155,6 +156,19 @@ if (g_pars.asci_test.vgcs_assign_ok) { T.start; } + if (g_pars.asci_test.vgcs_uplink_seized or + g_pars.asci_test.vgcs_uplink_release) { + log("VGCS: sending Uplink Seized Cmd"); + BSSAP.send(ts_BSSMAP_UplinkSeizedCmd(9, omit, omit, omit)); + } + if (g_pars.asci_test.vgcs_uplink_release) { + log("VGCS: sending Uplink Release Cmd"); + BSSAP.send(ts_BSSMAP_UplinkRelCmd(9)); + } + if (g_pars.asci_test.vgcs_uplink_seized or + g_pars.asci_test.vgcs_uplink_release) { + T.start; + } repeat; } [] COORD.receive(COORD_VGCS_ASSIGN_FAIL) { @@ -249,6 +263,24 @@ setverdict(pass); return; } + if (g_pars.asci_test.vgcs_uplink_seized) { + if (not uplink_busy) { + setverdict(fail, "VGCS: Uplink not busy as expected!"); + return; + } + log("VGCS: Uplink established+released and uplink marked free as expected!"); + setverdict(pass); + return; + } + if (g_pars.asci_test.vgcs_uplink_release) { + if (not uplink_free) { + setverdict(fail, "VGCS: Uplink not free as expected!"); + return; + } + log("VGCS: Uplink established+released and uplink marked free as expected!"); + setverdict(pass); + return; + } } /* @@ -505,6 +537,50 @@ f_shutdown_helper(); } +testcase TC_vgcs_vbs_uplink_seized() runs on test_CT { + var MSC_ConnHdlr call_conn, chan_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + + pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + + pars.asci_test.vgcs_uplink_seized := true; + + call_conn := f_start_handler(refers(f_tc_vgcs_vbs_setup), pars); + chan_conn := f_start_handler(refers(f_tc_asci_assignment), pars); + /* Connect COORD ports of both functions. The functions will delay before using them. */ + connect(call_conn:COORD, chan_conn:COORD); + + call_conn.done; + chan_conn.done; + + f_shutdown_helper(); +} + +testcase TC_vgcs_vbs_uplink_release() runs on test_CT { + var MSC_ConnHdlr call_conn, chan_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + + pars.sccp_addr_msc := g_bssap[0].sccp_addr_own; + pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer; + + pars.asci_test.vgcs_uplink_release := true; + + call_conn := f_start_handler(refers(f_tc_vgcs_vbs_setup), pars); + chan_conn := f_start_handler(refers(f_tc_asci_assignment), pars); + /* Connect COORD ports of both functions. The functions will delay before using them. */ + connect(call_conn:COORD, chan_conn:COORD); + + call_conn.done; + chan_conn.done; + + f_shutdown_helper(); +} + control { execute( TC_vgcs_vbs_setup_only() ); execute( TC_vgcs_vbs_assignment() ); @@ -512,6 +588,8 @@ execute( TC_vgcs_vbs_talker_req() ); execute( TC_vgcs_vbs_talker_est() ); execute( TC_vgcs_vbs_talker_rel() ); + execute( TC_vgcs_vbs_uplink_seized() ); + execute( TC_vgcs_vbs_uplink_release() ); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 433dab5..f919fa6 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -758,7 +758,9 @@ boolean vgcs_assign_fail, boolean vgcs_talker_req, boolean vgcs_talker_est, - boolean vgcs_talker_rel + boolean vgcs_talker_rel, + boolean vgcs_uplink_seized, + boolean vgcs_uplink_release }; type record TestHdlrParams { @@ -851,7 +853,9 @@ vgcs_assign_fail := false, vgcs_talker_req := false, vgcs_talker_est := false, - vgcs_talker_rel := false + vgcs_talker_rel := false, + vgcs_uplink_seized := false, + vgcs_uplink_release := false } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7ebf03662e81f59d76ca8d8fa29f581043053564 Gerrit-Change-Number: 33719 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: BSC_Tests_ASCI: Do not expect UPLINK BUSY message
by laforge 12 Jul '23

12 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33718 ) Change subject: BSC_Tests_ASCI: Do not expect UPLINK BUSY message ...................................................................... BSC_Tests_ASCI: Do not expect UPLINK BUSY message There is no UPLINK BUSY message sent by BSC, if the talker requests/establishes the uplink. Due to timing reason, the message is sent by the BTS itself towards the MS. Change-Id: I2e3b866eca174ae212ea986980d508e48e31fa57 --- M bsc/BSC_Tests_ASCI.ttcn 1 file changed, 19 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_ASCI.ttcn b/bsc/BSC_Tests_ASCI.ttcn index e72c065..bfc66a9 100644 --- a/bsc/BSC_Tests_ASCI.ttcn +++ b/bsc/BSC_Tests_ASCI.ttcn @@ -213,8 +213,9 @@ setverdict(fail, "VGCS: No uplink request as expected!"); return; } - if (not uplink_busy) { - setverdict(fail, "VGCS: Uplink not busy as expected!"); + /* UPLINK BUSY is automatically sent by BTS, but not by BSC. */ + if (uplink_busy) { + setverdict(fail, "VGCS: Uplink set to busy, this is not expected!"); return; } log("VGCS: Uplink requested and uplink marked busy as expected!"); @@ -226,8 +227,9 @@ setverdict(fail, "VGCS: No uplink request confirm as expected!"); return; } - if (not uplink_busy) { - setverdict(fail, "VGCS: Uplink not busy as expected!"); + /* UPLINK BUSY is automatically sent by BTS, but not by BSC. */ + if (uplink_busy) { + setverdict(fail, "VGCS: Uplink set to busy, this is not expected!"); return; } log("VGCS: Uplink established and uplink marked busy as expected!"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2e3b866eca174ae212ea986980d508e48e31fa57 Gerrit-Change-Number: 33718 Gerrit-PatchSet: 3 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-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: BSC_Tests_ASCI: Add test to seize or release uplink by MSC
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33719 ) Change subject: BSC_Tests_ASCI: Add test to seize or release uplink by MSC ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7ebf03662e81f59d76ca8d8fa29f581043053564 Gerrit-Change-Number: 33719 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 12 Jul 2023 16:21:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: BSC_Tests_ASCI: Do not expect UPLINK BUSY message
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33718 ) Change subject: BSC_Tests_ASCI: Do not expect UPLINK BUSY message ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2e3b866eca174ae212ea986980d508e48e31fa57 Gerrit-Change-Number: 33718 Gerrit-PatchSet: 2 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 12 Jul 2023 16:21:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: filesystem: Support selecting MF from MF
by fixeria 12 Jul '23

12 Jul '23

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33689 ) Change subject: filesystem: Support selecting MF from MF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I41b9f047ee5dc6b91b487f370f011af994aaca04 Gerrit-Change-Number: 33689 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jul 2023 16:18:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: csd_bs_list_to_gsm0808_channel_type: add T 300
by fixeria 12 Jul '23

12 Jul '23

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33591 ) Change subject: csd_bs_list_to_gsm0808_channel_type: add T 300 ...................................................................... Patch Set 3: (1 comment) File src/libmsc/csd_bs.c: https://gerrit.osmocom.org/c/osmo-msc/+/33591/comment/95e87e88_e812cc0a PS1, Line 196: GSM0808_DATA_FULL_BM > technically it is true, one can carry those rates over TCH/H. I'm not sure how good a policy decision it is, given that TCH/F provides so much more redundancy and hence robustness... IIUC the idea behind `GSM0808_DATA_FULL_PREF` is that we allocate a TCH/F whenever possible, or a TCH/H if no TCH/F is available. If my understanding is correct, then giving a TCH/H is still better than rejecting a connection... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7297cc481fbe36355b5231ca800cf566a1ee93c0 Gerrit-Change-Number: 33591 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jul 2023 16:17:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: GlobalPlatform ADF.SD: Add command line reference + error message
by laforge 12 Jul '23

12 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33670 ) Change subject: GlobalPlatform ADF.SD: Add command line reference + error message ...................................................................... GlobalPlatform ADF.SD: Add command line reference + error message The get_data shell command didn't have any interactive help / syntax, and no meaningful error message in case an unknown data object name was specified by the user. Let's fix that. Change-Id: I09faaf5d45118635cf832c8c513033aede1427e5 --- M docs/shell.rst M pySim/global_platform.py 2 files changed, 30 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/docs/shell.rst b/docs/shell.rst index ef08fcf..73b988a 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -795,8 +795,9 @@ get_data ~~~~~~~~ -Performs the GET DATA command as specified by GlobalPlatform. - +.. argparse:: + :module: pySim.global_platform + :func: ADF_SD.AddlShellCommands.get_data_parser cmd2 settable parameters ------------------------ diff --git a/pySim/global_platform.py b/pySim/global_platform.py index baae234..ea8b70d 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -223,9 +223,21 @@ def __init__(self): super().__init__() + get_data_parser = argparse.ArgumentParser() + get_data_parser.add_argument('data_object_name', type=str, + help='Name of the data object to be retrieved from the card') + + @cmd2.with_argparser(get_data_parser) def do_get_data(self, opts): - tlv_cls_name = opts.arg_list[0] - tlv_cls = DataCollection().members_by_name[tlv_cls_name] + """Perform the GlobalPlatform GET DATA command in order to obtain some card-specific data.""" + tlv_cls_name = opts.data_object_name + try: + tlv_cls = DataCollection().members_by_name[tlv_cls_name] + except KeyError: + do_names = [camel_to_snake(str(x.__name__)) for x in DataCollection.possible_nested] + self._cmd.poutput('Unknown data object "%s", available options: %s' % (tlv_cls_name, + do_names)) + return (data, sw) = self._cmd.card._scc.get_data(cla=0x80, tag=tlv_cls.tag) ie = tlv_cls() ie.from_tlv(h2b(data)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I09faaf5d45118635cf832c8c513033aede1427e5 Gerrit-Change-Number: 33670 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> Gerrit-MessageType: merged

1 0