June 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix a race condition in TC_imm_ass_pre_[ts,chan]_ack

by pespin

Attention is currently required from: neels, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28220 ) Change subject: BSC_Tests: fix a race condition in TC_imm_ass_pre_[ts,chan]_ack ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28220 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: I38cd31041741b69eb15098a089b4d4b6b918ffd4 Gerrit-Change-Number: 28220 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Jun 2022 10:08:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: configure 3 additional TRX instances for BTS2

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28213 ) Change subject: BSC_Tests: configure 3 additional TRX instances for BTS2 ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28213 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: Ie1241c54abac9a56906c525155cbf7482bca738e Gerrit-Change-Number: 28213 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Jun 2022 10:07:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: DIAMETER: Introduce and rework some AVP templates

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28221 ) Change subject: DIAMETER: Introduce and rework some AVP templates ...................................................................... DIAMETER: Introduce and rework some AVP templates All the AVP ecosystem in DIAMETER is quite a mess. There's AVPs defined in several different specs, sometimes even with the same name and different AVP code and vendor. Hence, as we add more templates it becomes important to start using the prefix in order to differentiate where they come from. Change-Id: Iec7c51dae136629d6b754de4dd798e988ac51f6b --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn M pgw/PGW_Tests.ttcn 3 files changed, 48 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/28221/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index ddc651c..be1953e 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -531,7 +531,7 @@ tr_AVP_Multiple_Services_Credit_Control(content := superset( tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, - tr_AVP_3GPP_QoS_Information, + tr_AVP_PCC_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), tr_AVP_3GPP_ServiceInformation(content := superset( @@ -578,7 +578,7 @@ tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ - tr_AVP_3GPP_QoS_Information, + tr_AVP_PCC_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), tr_AVP_3GPP_ServiceInformation(content := superset( @@ -626,7 +626,7 @@ /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ tr_AVP_Used_Service_Unit, tr_AVP_3GPP_Reporting_Reason(FINAL), - tr_AVP_3GPP_QoS_Information, + tr_AVP_PCC_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), tr_AVP_3GPP_ServiceInformation(content := superset( diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 2bc9e77..be3d8a2 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -860,7 +860,7 @@ } } -template (present) GenericAVP tr_AVP_3GPP_QoS_Information(template (present) AVP_list list := ?) := { +template (present) GenericAVP tr_AVP_PCC_3GPP_QoS_Information(template (present) AVP_list list := ?) := { avp := { avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_QoS_Information), avp_data := { @@ -869,11 +869,47 @@ } } -template (value) GenericAVP ts_AVP_3GPP_QosClassId(uint32_t id) := { +template (value) GenericAVP ts_AVP_PCC_3GPP_QoS_Information(template (value) AVP_list list) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_QoS_Information), + avp_data := { + avp_PCC_3GPP_QoS_Information := list + } + } +} + +template (value) GenericAVP ts_AVP_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL(uint32_t val) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL), + avp_data := { + avp_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL := int2oct(val, 4) + } + } +} + +template (value) GenericAVP ts_AVP_PCC_3GPP_APN_Aggregate_Max_Bitrate_UL(uint32_t val) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_APN_Aggregate_Max_Bitrate_UL), + avp_data := { + avp_PCC_3GPP_APN_Aggregate_Max_Bitrate_UL := int2oct(val, 4) + } + } +} + +template (value) GenericAVP ts_AVP_PCC_3GPP_Default_EPS_Bearer_QoS(template (value) AVP_list list) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_Default_EPS_Bearer_QoS), + avp_data := { + avp_PCC_3GPP_Default_EPS_Bearer_QoS := list + } + } +} + +template (value) GenericAVP ts_AVP_PCC_3GPP_QoS_Class_Identifier(uint32_t val) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_QoS_Class_Identifier), avp_data := { - avp_PCC_3GPP_QoS_Class_Identifier := int2oct(id, 4) + avp_PCC_3GPP_QoS_Class_Identifier := int2oct(val, 4) } } } @@ -887,8 +923,7 @@ } } - -template (value) GenericAVP ts_AVP_3GPP_AllocRetenPrio(uint32_t prio) := { +template (value) GenericAVP ts_AVP_PCC_3GPP_AllocRetenPrio(uint32_t prio) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_Allocation_Retention_Priority), avp_data := { @@ -906,8 +941,8 @@ avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_EPS_Subscribed_QoS_Profile), avp_data := { avp_AAA_3GPP_EPS_Subscribed_QoS_Profile := { - ts_AVP_3GPP_QosClassId(qos_class), - ts_AVP_3GPP_AllocRetenPrio(prio) + ts_AVP_PCC_3GPP_QoS_Class_Identifier(qos_class), + ts_AVP_PCC_3GPP_AllocRetenPrio(prio) } } } diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index e1f49ab..1041898 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -361,7 +361,7 @@ tr_AVP_Multiple_Services_Credit_Control(content := superset( tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, - tr_AVP_3GPP_QoS_Information, + tr_AVP_PCC_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), tr_AVP_3GPP_ServiceInformation(content := superset( @@ -410,7 +410,7 @@ tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ - tr_AVP_3GPP_QoS_Information, + tr_AVP_PCC_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), tr_AVP_3GPP_ServiceInformation(content := superset( @@ -460,7 +460,7 @@ /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ tr_AVP_Used_Service_Unit, tr_AVP_3GPP_Reporting_Reason(FINAL), - tr_AVP_3GPP_QoS_Information, + tr_AVP_PCC_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), tr_AVP_3GPP_ServiceInformation(content := superset( -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28221 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: Iec7c51dae136629d6b754de4dd798e988ac51f6b Gerrit-Change-Number: 28221 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: DIAMETER: Send QoS AVPs in Gx CCA

by pespin

Attention is currently required from: neels. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219 to look at the new patch set (#2). Change subject: DIAMETER: Send QoS AVPs in Gx CCA ...................................................................... DIAMETER: Send QoS AVPs in Gx CCA This way we can trigger code paths in GGSN/PGW parsing those. Change-Id: Ib758d4e3acc331954aca6423372410cb1e341ebd --- M library/DIAMETER_Templates.ttcn 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/28219/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219 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: Ib758d4e3acc331954aca6423372410cb1e341ebd Gerrit-Change-Number: 28219 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: DIAMETER: Send QoS AVPs in Gx CCA

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219 ) Change subject: DIAMETER: Send QoS AVPs in Gx CCA ...................................................................... Patch Set 1: (2 comments) File library/DIAMETER_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219/comment/3e38719f_1a57… PS1, Line 863: P_ > should this also be called _PCC_? Ack https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219/comment/d87a9d78_01d3… PS1, Line 871: > ts_AVP_3GPP_QosClassId() dropped intentionally? It was renamed to ts_AVP_PCC_3GPP_QoS_Class_Identifier, all the Diameter AVP stuff is a nightmare, in specs and also in here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28219 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: Ib758d4e3acc331954aca6423372410cb1e341ebd Gerrit-Change-Number: 28219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Jun 2022 10:02:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in pysim[master]: pySim-shell: catch exceptions from walk() while exporting

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28162 ) Change subject: pySim-shell: catch exceptions from walk() while exporting ...................................................................... pySim-shell: catch exceptions from walk() while exporting When we run the exporter we also get an error summary at the end. However, if walk() throws an eception this stops the exporter immediately and we won't get the summpary. Lets catch exceptions from walk as well so that we are able to end gracefully. Change-Id: I3edc250ef2a84550c5b821a72e207e4d685790a5 --- M pySim-shell.py 1 file changed, 12 insertions(+), 5 deletions(-) Approvals: dexter: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 0ed4b7c..f498dea 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -648,10 +648,17 @@ context = {'ERR': 0, 'COUNT': 0, 'BAD': [], 'DF_SKIP': 0, 'DF_SKIP_REASON': []} kwargs_export = {'as_json': opts.json} + exception_str_add = "" + if opts.filename: self.export_ef(opts.filename, context, **kwargs_export) else: - self.walk(0, self.export_ef, None, context, **kwargs_export) + try: + self.walk(0, self.export_ef, None, context, **kwargs_export) + except Exception as e: + print("# Stopping early here due to exception: " + str(e)) + print("#") + exception_str_add = ", also had to stop early due to exception:" + str(e) self._cmd.poutput(boxed_heading_str("Export summary")) @@ -666,14 +673,14 @@ self._cmd.poutput("# " + b) if context['ERR'] and context['DF_SKIP']: - raise RuntimeError("unable to export %i elementary file(s) and %i dedicated file(s)" % ( - context['ERR'], context['DF_SKIP'])) + raise RuntimeError("unable to export %i elementary file(s) and %i dedicated file(s)%s" % ( + context['ERR'], context['DF_SKIP'], exception_str_add)) elif context['ERR']: raise RuntimeError( - "unable to export %i elementary file(s)" % context['ERR']) + "unable to export %i elementary file(s)%s" % (context['ERR'], exception_str_add)) elif context['DF_SKIP']: raise RuntimeError( - "unable to export %i dedicated files(s)" % context['ERR']) + "unable to export %i dedicated files(s)%s" % (context['ERR'], exception_str_add)) def do_reset(self, opts): """Reset the Card.""" 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3edc250ef2a84550c5b821a72e207e4d685790a5 Gerrit-Change-Number: 28162 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> 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

3 years, 2 months

1
0
0 0

Change in pysim[master]: pySim-shell: catch exceptions from walk() while exporting

by dexter

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28162 ) Change subject: pySim-shell: catch exceptions from walk() while exporting ...................................................................... Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3edc250ef2a84550c5b821a72e207e4d685790a5 Gerrit-Change-Number: 28162 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> 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-Comment-Date: Fri, 03 Jun 2022 08:25:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in pysim[master]: pySim-shell: extend walk() so that we can also have an action of ADF ...

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28160 ) Change subject: pySim-shell: extend walk() so that we can also have an action of ADF or DF ...................................................................... pySim-shell: extend walk() so that we can also have an action of ADF or DF The walk() method that we use to traverse the whole file system tree is currently only able to execute action callbacks on EFs. Lets add a mechanism that allows us to have a second callback that is executed when we hit a DF or ADF. Change-Id: Iabcd78552a14a2d3f8f31273dda7731e1f640cdb --- M pySim-shell.py 1 file changed, 15 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-shell.py b/pySim-shell.py index 95dc707..0ed4b7c 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -483,12 +483,18 @@ self._cmd.poutput(directory_str) self._cmd.poutput("%d files" % len(selectables)) - def walk(self, indent=0, action=None, context=None, **kwargs): + def walk(self, indent=0, action_ef=None, action_df=None, context=None, **kwargs): """Recursively walk through the file system, starting at the currently selected DF""" + + if isinstance(self._cmd.rs.selected_file, CardDF): + if action_df: + action_df(context, opts) + files = self._cmd.rs.selected_file.get_selectables( flags=['FNAMES', 'ANAMES']) for f in files: - if not action: + # special case: When no action is performed, just output a directory + if not action_ef and not action_df: output_str = " " * indent + str(f) + (" " * 250) output_str = output_str[0:25] if isinstance(files[f], CardADF): @@ -515,12 +521,12 @@ # If the DF was skipped, we never have entered the directory # below, so we must not move up. if skip_df == False: - self.walk(indent + 1, action, context, **kwargs) + self.walk(indent + 1, action_ef, action_df, context, **kwargs) fcp_dec = self._cmd.rs.select("..", self._cmd) - elif action: + elif action_ef: df_before_action = self._cmd.rs.selected_file - action(f, context, **kwargs) + action_ef(f, context, **kwargs) # When walking through the file system tree the action must not # always restore the currently selected file to the file that # was selected before executing the action() callback. @@ -532,8 +538,8 @@ """Display a filesystem-tree with all selectable files""" self.walk() - def export(self, filename, context, as_json): - """ Select and export a single file """ + def export_ef(self, filename, context, as_json): + """ Select and export a single elementary file (EF) """ context['COUNT'] += 1 df = self._cmd.rs.selected_file @@ -643,9 +649,9 @@ 'DF_SKIP': 0, 'DF_SKIP_REASON': []} kwargs_export = {'as_json': opts.json} if opts.filename: - self.export(opts.filename, context, **kwargs_export) + self.export_ef(opts.filename, context, **kwargs_export) else: - self.walk(0, self.export, context, **kwargs_export) + self.walk(0, self.export_ef, None, context, **kwargs_export) self._cmd.poutput(boxed_heading_str("Export summary")) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iabcd78552a14a2d3f8f31273dda7731e1f640cdb Gerrit-Change-Number: 28160 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in pysim[master]: pySim-shell: match SW in apdu command

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28169 ) Change subject: pySim-shell: match SW in apdu command ...................................................................... pySim-shell: match SW in apdu command The apdu command has no option to match the resulting SW. Lets add a new option for this. Change-Id: Ic5a52d7cf533c51d111850eb6d8147011a48ae6c --- M pySim-shell.py 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 7fa9d81..95dc707 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -40,7 +40,7 @@ from pySim.commands import SimCardCommands from pySim.transport import init_reader, ApduTracer, argparse_add_reader_args from pySim.cards import card_detect, SimCard -from pySim.utils import h2b, swap_nibbles, rpad, b2h, h2s, JsonEncoder, bertlv_parse_one +from pySim.utils import h2b, swap_nibbles, rpad, b2h, h2s, JsonEncoder, bertlv_parse_one, sw_match from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str from pySim.card_handler import CardHandler, CardHandlerAuto @@ -246,6 +246,7 @@ apdu_cmd_parser = argparse.ArgumentParser() apdu_cmd_parser.add_argument('APDU', type=str, help='APDU as hex string') + apdu_cmd_parser.add_argument('--expect-sw', help='expect a specified status word', type=str, default=None) @cmd2.with_argparser(apdu_cmd_parser) def do_apdu(self, opts): @@ -258,6 +259,9 @@ self.poutput("SW: %s, RESP: %s" % (sw, data)) else: self.poutput("SW: %s" % sw) + if opts.expect_sw: + if not sw_match(sw, opts.expect_sw): + raise SwMatchError(sw, opts.expect_sw) class InterceptStderr(list): def __init__(self): 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5a52d7cf533c51d111850eb6d8147011a48ae6c Gerrit-Change-Number: 28169 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> 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

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix a race condition in TC_imm_ass_pre_[ts,chan]_ack

by fixeria

Attention is currently required from: neels, fixeria, pespin. Hello Jenkins Builder, neels, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28220 to look at the new patch set (#2). Change subject: BSC_Tests: fix a race condition in TC_imm_ass_pre_[ts,chan]_ack ...................................................................... BSC_Tests: fix a race condition in TC_imm_ass_pre_[ts,chan]_ack These test cases sporadically fail on Jenkins and 9/10 times on my machine. The problem appears to be that we are sending both the RSL CHANnel ReQuireD and the VTY command simultaneously, and the later may be handled earlier than the former by osmo-bsc. Ensure that the RSL message is handled first by sending the VTY command after we have received the RSL CHANnel ACTivation message. Change-Id: I38cd31041741b69eb15098a089b4d4b6b918ffd4 --- M bsc/BSC_Tests.ttcn 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/28220/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28220 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: I38cd31041741b69eb15098a089b4d4b6b918ffd4 Gerrit-Change-Number: 28220 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2022