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

[S] Change in pysim[master]: Fix run-editor bug with cmd2 >= 2.0.0 compatibility
by laforge 26 Jun '23

26 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33420 ) Change subject: Fix run-editor bug with cmd2 >= 2.0.0 compatibility ...................................................................... Fix run-editor bug with cmd2 >= 2.0.0 compatibility In cmd2, the upstream authors decided to rename a method in 2.0.0 without providing a backwards compatibility wrapper. Let's add that locally. Change-Id: Iaa17b93db13ba330551799cce5f0388c78217224 Closes: OS#6071 --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 29 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index f6cd75d..9897d29 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from typing import List +from typing import List, Optional import json import traceback @@ -144,7 +144,18 @@ return rs, card -class PysimApp(cmd2.Cmd): +class Cmd2Compat(cmd2.Cmd): + """Backwards-compatibility wrapper around cmd2.Cmd to support older and newer + releases. See https://github.com/python-cmd2/cmd2/blob/master/CHANGELOG.md""" + def run_editor(self, file_path: Optional[str] = None) -> None: + if version.parse(cmd2.__version__) < version.parse("2.0.0"): + # pylint: disable=no-member + return self._run_editor(file_path) + else: + # pylint: disable=no-member + return super().run_editor(file_path) + +class PysimApp(Cmd2Compat): CUSTOM_CATEGORY = 'pySim Commands' def __init__(self, card, rs, sl, ch, script=None): diff --git a/pySim/filesystem.py b/pySim/filesystem.py index b5d0ccd..04e849b 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -649,7 +649,7 @@ with open(filename, 'w') as text_file: json.dump(orig_json, text_file, indent=4) # run a text editor - self._cmd._run_editor(filename) + self._cmd.run_editor(filename) with open(filename, 'r') as text_file: edited_json = json.load(text_file) if edited_json == orig_json: @@ -917,7 +917,7 @@ with open(filename, 'w') as text_file: json.dump(orig_json, text_file, indent=4) # run a text editor - self._cmd._run_editor(filename) + self._cmd.run_editor(filename) with open(filename, 'r') as text_file: edited_json = json.load(text_file) if edited_json == orig_json: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa17b93db13ba330551799cce5f0388c78217224 Gerrit-Change-Number: 33420 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bts[master]: gitignore: add arm-poky-linux-gnueabi-libtool
by osmith 26 Jun '23

26 Jun '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33412 ) Change subject: gitignore: add arm-poky-linux-gnueabi-libtool ...................................................................... gitignore: add arm-poky-linux-gnueabi-libtool This file gets copied into the tree when building with the SDK. Change-Id: I0fe4f96175ee94eb0a131c425bbeb110f1d55402 --- M .gitignore 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index a18b040..bf0f844 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,5 @@ contrib/osmo-bts.spec contrib/ber/rtp_ber contrib/ber/rtp_gen_map + +arm-poky-linux-gnueabi-libtool -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0fe4f96175ee94eb0a131c425bbeb110f1d55402 Gerrit-Change-Number: 33412 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in pysim[master]: cosmetic: Implement cmd2.Settable backwards-compat via wrapper class
by fixeria 25 Jun '23

25 Jun '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33421 ) Change subject: cosmetic: Implement cmd2.Settable backwards-compat via wrapper class ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Patchset: PS2: Nice idea! File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/33421/comment/19ec3472_31494643 PS2, Line 196: pylint: disable=too-many-function-args I guess all these attributes and `\` symbols are no more needed? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id234f3fa56fe7eff8e1153d71b9be8a2e88dd112 Gerrit-Change-Number: 33421 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 25 Jun 2023 18:41:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: Fix run-editor bug with cmd2 >= 2.0.0 compatibility
by fixeria 25 Jun '23

25 Jun '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33420 ) Change subject: Fix run-editor bug with cmd2 >= 2.0.0 compatibility ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa17b93db13ba330551799cce5f0388c78217224 Gerrit-Change-Number: 33420 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 25 Jun 2023 18:38:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPAC
by arehbein 25 Jun '23

25 Jun '23

Attention is currently required from: laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPAC ...................................................................... Patch Set 2: (4 comments) File include/osmocom/netif/stream.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/3053efbe_8f19eccb PS1, Line 25: osmo_stream_proto > The naming is unfortunately not good, IMHO. […] I have for now put `osmo_stream_trx_mode` instead; the name should be more general than just referring to segmentation, because in later commits, setting these kinds of values also sets the read/write callbacks for IPA which automatically pull/push IPA headers. Hope that's better, if not, please make another suggestion. https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/44671da8_2f4d7c1e PS1, Line 28: /* TODO: Add protocols for > I don't think there are any others, so it's not a TODO. […] Done. What functionality did you have in mind as missing? Please note that this commit is for adding segmentation only. File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/bcbe07ce_2b71f314 PS1, Line 1777: conn->iofd = osmo_iofd_setup(conn, fd, name, OSMO_IO_FD_MODE_READ_WRITE, > unrelated whitespace change? Done File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/f35c379b_dc8a2fab PS1, Line 2: * (C) 2019 by sysmocom - s.f.m.c. GmbH. > in case of significant changes, it makes sense to update the copyright year and also to add yourself […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 25 Jun 2023 17:01:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: ipa: Add helper osmo_ipa_ext_msg_alloc()
by Jenkins Builder 25 Jun '23

25 Jun '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33423 ) Change subject: ipa: Add helper osmo_ipa_ext_msg_alloc() ...................................................................... Patch Set 1: (1 comment) File src/ipa.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8531): https://gerrit.osmocom.org/c/libosmo-netif/+/33423/comment/6d89a664_46978bf9 PS1, Line 102: return osmo_ipa_msg_alloc(sizeof (struct ipa_head_ext) + headroom); space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I231026442503e6d7f720fd100f38c01916235d63 Gerrit-Change-Number: 33423 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 25 Jun 2023 16:59:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPAC
by Jenkins Builder 25 Jun '23

25 Jun '23

Attention is currently required from: arehbein. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPAC ...................................................................... Patch Set 2: (2 comments) File tests/stream/stream_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8530): https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/2f45435c_ffa07646 PS2, Line 518: osmo_hexdump((const unsigned char *)h, sizeof (*h) + h->len)); space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8530): https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/2f8a3366_d1ede7fc PS2, Line 638: printf("==================================Test %s complete========================================\n\n",testname); space required after that ',' (ctx:VxV) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Jun 2023 16:59:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in libosmo-netif[master]: stream: Add IPA send function/IPA-mode read to srv
by Jenkins Builder 25 Jun '23

25 Jun '23

Attention is currently required from: arehbein. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201 ) Change subject: stream: Add IPA send function/IPA-mode read to srv ...................................................................... Patch Set 2: (2 comments) File include/osmocom/netif/stream.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8528): https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/2debe203_47e4f45c PS2, Line 76: enum ipaccess_proto_ext pe, struct msgb *msg); code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8528): https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/54621b5d_f4032f9f PS2, Line 76: enum ipaccess_proto_ext pe, struct msgb *msg); please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Jun 2023 16:59:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPAC
by Jenkins Builder 25 Jun '23

25 Jun '23

Attention is currently required from: laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198 ) Change subject: stream: Add client-side (segmentation) support for IPAC ...................................................................... Patch Set 4: (3 comments) File tests/stream/stream_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8523): https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/efb9b6e4_38a471b1 PS4, Line 711: osmo_hexdump((const unsigned char *)h, sizeof (*h) + h->len)); space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8523): https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/b2e1c604_f9521ac6 PS4, Line 721: int (* test_segm_ipa_stream_cli_srv_close_cb)(struct osmo_stream_srv *conn) = Unnecessary space before function pointer name Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8523): https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/9ad7ea7b_9b0af9cd PS4, Line 721: int (* test_segm_ipa_stream_cli_srv_close_cb)(struct osmo_stream_srv *conn) = space prohibited after that '*' (ctx:BxW) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 25 Jun 2023 16:59:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPAC
by arehbein 25 Jun '23

25 Jun '23

Attention is currently required from: laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198 ) Change subject: stream: Add client-side (segmentation) support for IPAC ...................................................................... Patch Set 4: (1 comment) File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/18f33a41_38ee8a59 PS1, Line 811: LOGSCLI(cli, LOGL_ERROR, "Unexpected value (%d) for variable of type " > looks like the function should have a return value and you want to return -EINVAL here. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 25 Jun 2023 16:58:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0