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

[S] Change in pysim[master]: pySim-shell: do not fail when EF.ICCID does not exist
by dexter 16 Oct '23

16 Oct '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34768?usp=email ) Change subject: pySim-shell: do not fail when EF.ICCID does not exist ...................................................................... pySim-shell: do not fail when EF.ICCID does not exist An eUICC that has no active eSIM profile does not have an ICCID. (The reason for this is that EF.ICCID is part of the eSIM profile). Unfortunately pySim-shell insists on reading the ICCID from EF.ICCID on startup in order to use it as a lookup key for verify_adm later. To solve the problem, let's add a try/except block around the section where EF.ICCID is read. In case of failure we set the ICCID to None, Related: OS#5636 Change-Id: I8d18c5073946c5a6bb1f93be0ce692a599f46f8c --- M pySim-shell.py 1 file changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/68/34768/1 diff --git a/pySim-shell.py b/pySim-shell.py index afc7653..a79949c 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -244,8 +244,11 @@ self.register_command_set(Ts102222Commands()) self.register_command_set(PySimCommands()) - self.lchan.select('MF/EF.ICCID', self) - self.iccid = dec_iccid(self.lchan.read_binary()[0]) + try: + self.lchan.select('MF/EF.ICCID', self) + self.iccid = dec_iccid(self.lchan.read_binary()[0]) + except: + self.iccid = None self.lchan.select('MF', self) rc = True -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34768?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8d18c5073946c5a6bb1f93be0ce692a599f46f8c Gerrit-Change-Number: 34768 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: ansible: hosts: remove gtp0-deb(10,11)build
by osmith 16 Oct '23

16 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34766?usp=email ) Change subject: ansible: hosts: remove gtp0-deb(10,11)build ...................................................................... ansible: hosts: remove gtp0-deb(10,11)build Remove nodes that don't exist anymore according to: https://jenkins.osmocom.org/jenkins/computer/ Change-Id: I8e8ae59d4e4c8be85bba527ac89cce04b15fcaea --- M ansible/hosts 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ansible/hosts b/ansible/hosts index 538b10f..e027a31 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -11,8 +11,6 @@ build2-deb11build-ansible ansible_host=2a01:4f8:10b:2ad9::1:13 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" build3-deb11build-ansible ansible_host=2a01:4f8:212:3762::1:3 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" host2-deb11build-ansible ansible_host=2a01:4f8:120:8470::1:4 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" -gtp0-deb10build ansible_host=10.34.2.101 osmocom_jenkins_slave_fstrim=True -gtp0-deb11build ansible_host=10.34.2.106 osmocom_jenkins_slave_fstrim=True rpi4-raspbian11build-ansible-1 ansible_host=10.9.25.50 docker_max_image_space="20 GB" rpi4-raspbian11build-ansible-2 ansible_host=10.9.25.60 docker_max_image_space="20 GB" rpi4-raspbian11build-ansible-3 ansible_host=10.9.25.70 docker_max_image_space="20 GB" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34766?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8e8ae59d4e4c8be85bba527ac89cce04b15fcaea Gerrit-Change-Number: 34766 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in pysim[master]: transport: do not catch exceptions in init_reader
by dexter 16 Oct '23

16 Oct '23

Attention is currently required from: fixeria, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34697?usp=email ) Change subject: transport: do not catch exceptions in init_reader ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > You also need to revisit all the callers of this function and remove checking the returned value aga […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 Gerrit-Change-Number: 34697 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Oct 2023 12:36:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: transport: do not catch exceptions in init_reader
by dexter 16 Oct '23

16 Oct '23

Attention is currently required from: fixeria, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34697?usp=email ) Change subject: transport: do not catch exceptions in init_reader ...................................................................... Patch Set 2: (2 comments) File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/34697/comment/ed984e04_e4e4be6d PS1, Line 295: Optional > no more `Optional` Done https://gerrit.osmocom.org/c/pysim/+/34697/comment/87242e54_9bd5a36a PS1, Line 299: sl = None # type : :Optional[LinkBase] > not needed anymore Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 Gerrit-Change-Number: 34697 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Oct 2023 12:36:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: transport: do not catch exceptions in init_reader
by dexter 16 Oct '23

16 Oct '23

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34697?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by fixeria, Verified+1 by Jenkins Builder Change subject: transport: do not catch exceptions in init_reader ...................................................................... transport: do not catch exceptions in init_reader We currently catch any exceptions that may occur when the card reader is initialized. Then we print the exception string or the exception type when no string is available. However, a failure during the reader initialization is usually a severe problem, so a traceback would provde a lot of helpful information to debug the issue. So lets not catch any exceptions at this level so that we get the full backtrace. Related: OS#6210 Change-Id: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 --- M pySim-prog.py M pySim-read.py M pySim-shell.py M pySim/transport/__init__.py 4 files changed, 37 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/97/34697/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 Gerrit-Change-Number: 34697 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ci[master]: ansible: hosts: remove gtp0-deb(10,11)build
by fixeria 16 Oct '23

16 Oct '23

Attention is currently required from: laforge, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34766?usp=email ) Change subject: ansible: hosts: remove gtp0-deb(10,11)build ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34766?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8e8ae59d4e4c8be85bba527ac89cce04b15fcaea Gerrit-Change-Number: 34766 Gerrit-PatchSet: 1 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-Comment-Date: Mon, 16 Oct 2023 12:24:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: hss: Add missing test in expected-results.xml
by fixeria 16 Oct '23

16 Oct '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34764?usp=email ) Change subject: hss: Add missing test in expected-results.xml ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34764?usp=email 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: I890bcd2f8ffa74e43b5a593dbf8547af5fccd40d Gerrit-Change-Number: 34764 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Oct 2023 12:24:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: transport: add return type annotation to method __str__
by dexter 16 Oct '23

16 Oct '23

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34696?usp=email ) Change subject: transport: add return type annotation to method __str__ ...................................................................... transport: add return type annotation to method __str__ The abstract class LinkBase has no return type annotation on its __str__ method. Related: OS#6210 Change-Id: I26d3d2714708dbe957704b60d17ba2afa325b2c4 --- M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py 5 files changed, 18 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 1dd8d18..0b50a4f 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -68,7 +68,7 @@ self.proactive_handler = proactive_handler @abc.abstractmethod - def __str__(self): + def __str__(self) -> str: """Implementation specific method for printing an information to identify the device.""" @abc.abstractmethod diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py index b827d88..d7d9649 100644 --- a/pySim/transport/calypso.py +++ b/pySim/transport/calypso.py @@ -160,5 +160,5 @@ return b2h(data), b2h(sw) - def __str__(self): + def __str__(self) -> str: return "osmocon:%s" % (self._sock_path) diff --git a/pySim/transport/modem_atcmd.py b/pySim/transport/modem_atcmd.py index 58d6f9d..5e5a3dd 100644 --- a/pySim/transport/modem_atcmd.py +++ b/pySim/transport/modem_atcmd.py @@ -170,5 +170,5 @@ log.debug('Command response: %s, %s', data, sw) return data, sw - def __str__(self): + def __str__(self) -> str: return "modem:%s" % self._device diff --git a/pySim/transport/pcsc.py b/pySim/transport/pcsc.py index 41c4c19..c7b5878 100644 --- a/pySim/transport/pcsc.py +++ b/pySim/transport/pcsc.py @@ -93,5 +93,5 @@ # Return value return i2h(data), i2h(sw) - def __str__(self): + def __str__(self) -> str: return "PCSC:%u[%s]" % (self._reader_number, self._reader) diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py index f4b1621..e5f7bdb 100644 --- a/pySim/transport/serial.py +++ b/pySim/transport/serial.py @@ -237,5 +237,5 @@ # Return value return b2h(data), b2h(sw) - def __str__(self): + def __str__(self) -> str: return "serial:%s" % (self._sl.name) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34696?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I26d3d2714708dbe957704b60d17ba2afa325b2c4 Gerrit-Change-Number: 34696 Gerrit-PatchSet: 1 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

1 0

[S] Change in osmo-ci[master]: ansible: known_hosts: update
by pespin 16 Oct '23

16 Oct '23

Attention is currently required from: laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34767?usp=email ) Change subject: ansible: known_hosts: update ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3e3841d9f1f5581067b7dd90cdfcaf8337700e6f Gerrit-Change-Number: 34767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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-Comment-Date: Mon, 16 Oct 2023 11:23:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ansible: known_hosts: update
by osmith 16 Oct '23

16 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34767?usp=email ) Change subject: ansible: known_hosts: update ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/34767/comment/5c28213e_215c4276 PS1, Line 9: After deploying with ansible to the jenkins nodes, these entries were > These are the VPN IPs of the raspberry pis from the hosts file. […] alternatively we could also add that known_hosts to gitignore. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3e3841d9f1f5581067b7dd90cdfcaf8337700e6f Gerrit-Change-Number: 34767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Oct 2023 11:22:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0