- gerrit-log - lists.osmocom.org

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: laforge, fixeria. fixeria has uploaded a new patch set (#13) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... ttcn3-bts-test: use osmo-config-merge to generate config files This uses the config files from osmo-ttcn3-hacks.git instead of keeping local copies around here, which has shown many times will get out of sync. Extract the original files (*.src.cfg) from the testsuite image (ttcn3-bts-test) and merge them with the local *.confmerge files using osmo-config-merge. Use the resulting files (*.gen.cfg). Unfortunately, osmo-config-merge is not capable of removing text blocks or substituting specific parts, so we fall-back to using sed where it's needed. A good example is 'log gsmtap 127.0.0.1', as there is no command for removing a logging target of such type. Co-Authored-By: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Co-Authored-By: Oliver Smith <osmith(a)sysmocom.de> Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 --- M .gitignore M ttcn3-bts-test/Makefile D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bsc.cfg A ttcn3-bts-test/generic/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bts.cfg A ttcn3-bts-test/generic/osmo-bts.confmerge M ttcn3-bts-test/jenkins.sh D ttcn3-bts-test/oml/osmo-bts.cfg A ttcn3-bts-test/oml/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 13 files changed, 322 insertions(+), 853 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/20622/13 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 13 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory
by fixeria 10 Feb '22

10 Feb '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26681 ) Change subject: ttcn3-bts-test: move generic config files into a directory ...................................................................... ttcn3-bts-test: move generic config files into a directory Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 --- M ttcn3-bts-test/Dockerfile R ttcn3-bts-test/generic/BTS_Tests.cfg R ttcn3-bts-test/generic/osmo-bsc.cfg R ttcn3-bts-test/generic/osmo-bts.cfg M ttcn3-bts-test/jenkins.sh 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, approved fixeria: Verified diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index d676bf0..b115000 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -8,6 +8,6 @@ VOLUME /data -COPY BTS_Tests.cfg /data/BTS_Tests.cfg +COPY generic/BTS_Tests.cfg /data/BTS_Tests.cfg CMD ttcn3-docker-run bts BTS_Tests diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg similarity index 100% rename from ttcn3-bts-test/BTS_Tests.cfg rename to ttcn3-bts-test/generic/BTS_Tests.cfg diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/generic/osmo-bsc.cfg similarity index 100% rename from ttcn3-bts-test/osmo-bsc.cfg rename to ttcn3-bts-test/generic/osmo-bsc.cfg diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/generic/osmo-bts.cfg similarity index 100% rename from ttcn3-bts-test/osmo-bts.cfg rename to ttcn3-bts-test/generic/osmo-bts.cfg diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 395407b..35ce0d5 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -120,7 +120,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/bts-tester-generic -cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ +cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" mkdir $VOL_BASE_DIR/bts-tester-virtphy cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/ @@ -136,11 +136,11 @@ $VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc mkdir $VOL_BASE_DIR/bsc -cp osmo-bsc.cfg $VOL_BASE_DIR/bsc/ +cp generic/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ mkdir $VOL_BASE_DIR/bts mkdir $VOL_BASE_DIR/bts/unix -cp osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/ mkdir $VOL_BASE_DIR/unix @@ -182,7 +182,7 @@ # 4) Frequency hopping tests require different configuration files cp fh/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ -cp osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/ # restart the BSC/BTS and run the testsuite again docker container kill ${BUILD_TAG}-bts start_bsc -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 Gerrit-Change-Number: 26681 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> 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

Change in pysim[master]: filesystem: Fix TLV decode/encode
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27100 ) Change subject: filesystem: Fix TLV decode/encode ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 Gerrit-Change-Number: 27100 Gerrit-PatchSet: 5 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: Thu, 10 Feb 2022 16:41:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: utils.py: Fix some tuple type annotations
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27133 ) Change subject: utils.py: Fix some tuple type annotations ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I869b0268383f6babd9b51d0ddfce448a1d2dda1e Gerrit-Change-Number: 27133 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: Thu, 10 Feb 2022 16:40:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: utils.py: type annotations for DataObject related methods
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27132 ) Change subject: utils.py: type annotations for DataObject related methods ...................................................................... Patch Set 2: Code-Review+1 (3 comments) File pySim/utils.py: https://gerrit.osmocom.org/c/pysim/+/27132/comment/e7a96607_60e117bb PS1, Line 1173: desc:str = None, tag:int = None Optional[str], Optional[int] respectively. https://gerrit.osmocom.org/c/pysim/+/27132/comment/f1622905_d34979ec PS1, Line 1292: str Optional[str] https://gerrit.osmocom.org/c/pysim/+/27132/comment/2e054aa3_b0a7a05f PS1, Line 1403: str Optional[str] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 Gerrit-Change-Number: 27132 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: Thu, 10 Feb 2022 16:39:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: ts_102_221: Handle nested security condition data objects
by laforge 10 Feb '22

10 Feb '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27129 ) Change subject: ts_102_221: Handle nested security condition data objects ...................................................................... ts_102_221: Handle nested security condition data objects ISO 7816-4 Section 5.4.3.2 "Expanded Format" permits for nesting of security conditions using boolean operators OR, AND, NOT. Let's implement decoding and encoding of these. An example decoded looks like: pySIM-shell (MF/EF.ARR)> read_record_decoded 1 [ [ { "access_mode": [ "activate_file_or_record", "deactivate_file_or_record", "update_erase" ] }, { "or": [ { "control_reference_template": "ADM1" }, { "control_reference_template": "ADM2" } ] } ], [ { "access_mode": [ "read_search_compare" ] }, { "always": null } ] ] Prior to this patch, pySim would raise "ValueError: Unknown Tag 0xa0 in bytearray" Change-Id: Icb09cf3a90303a86fc77406b8b0806b5c926f1be Closes: OS#5411 --- M pySim/ts_102_221.py 1 file changed, 28 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 7cc3025..71d5b82 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -470,8 +470,35 @@ Always_DO = TL0_DataObject('always', 'Always', 0x90) Never_DO = TL0_DataObject('never', 'Never', 0x97) + +class Nested_DO(DataObject): + """A DO that nests another DO/Choice/Sequence""" + def __init__(self, name, tag, choice): + super().__init__(name, tag=tag) + self.children = choice + def from_bytes(self, binary:bytes) -> list: + remainder = binary + self.decoded = [] + while remainder: + rc, remainder = self.children.decode(remainder) + self.decoded.append(rc) + return self.decoded + def to_bytes(self) -> bytes: + encoded = [self.children.encode(d) for d in self.decoded] + return b''.join(encoded) + +OR_Template = DataObjectChoice('or_template', 'OR-Template', + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) +OR_DO = Nested_DO('or', 0xa0, OR_Template) +AND_Template = DataObjectChoice('and_template', 'AND-Template', + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) +AND_DO = Nested_DO('and', 0xa7, AND_Template) +NOT_Template = DataObjectChoice('not_template', 'NOT-Template', + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) +NOT_DO = Nested_DO('not', 0xaf, NOT_Template) SC_DO = DataObjectChoice('security_condition', 'Security Condition', - members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO(), + OR_DO, AND_DO, NOT_DO]) # TS 102 221 Section 13.1 class EF_DIR(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09cf3a90303a86fc77406b8b0806b5c926f1be Gerrit-Change-Number: 27129 Gerrit-PatchSet: 3 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

Change in pysim[master]: ts_51_011: Fix type annotation for Tuple[int, int]
by laforge 10 Feb '22

10 Feb '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27131 ) Change subject: ts_51_011: Fix type annotation for Tuple[int, int] ...................................................................... ts_51_011: Fix type annotation for Tuple[int, int] Thanks to Vadim for pointing this out. Change-Id: I7ee1309331902bafab3c9fc6bc33ca713f8c7832 --- M pySim/ts_51_011.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index a7f9f97..dd7b788 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -325,6 +325,7 @@ from pySim.utils import * from pySim.tlv import * +from typing import Tuple from struct import pack, unpack from construct import * from construct import Optional as COptional @@ -528,7 +529,7 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self.table = table @staticmethod - def _bit_byte_offset_for_service(service:int) -> (int, int): + def _bit_byte_offset_for_service(service:int) -> Tuple[int, int]: i = service - 1 byte_offset = i//4 bit_offset = (i % 4) * 2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ee1309331902bafab3c9fc6bc33ca713f8c7832 Gerrit-Change-Number: 27131 Gerrit-PatchSet: 1 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

Change in pysim[master]: utils.py: type annotations for DataObject related methods
by laforge 10 Feb '22

10 Feb '22

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/+/27132 to look at the new patch set (#2). Change subject: utils.py: type annotations for DataObject related methods ...................................................................... utils.py: type annotations for DataObject related methods Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 --- M pySim/utils.py 1 file changed, 31 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/27132/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 Gerrit-Change-Number: 27132 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name
by pespin 10 Feb '22

10 Feb '22

Attention is currently required from: iedemam. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Thu, 10 Feb 2022 15:57:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name
by iedemam 10 Feb '22

10 Feb '22

Attention is currently required from: pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 2: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/27134/comment/b060351b_06211bb3 PS1, Line 346: snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%d", line->num); > num is unsigned, so %u. Same in the other block added below. true, true -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 15:33:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log