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

[S] Change in pysim[master]: pySim.global_platform.ota: Support KVN 0x70 for SCP02

by laforge

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/+/37542?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pySim.global_platform.ota: Support KVN 0x70 for SCP02 ...................................................................... pySim.global_platform.ota: Support KVN 0x70 for SCP02 This is a non-standard extension of sysmocom products. Change-Id: I00d52f7629aae190ee487ea3453f42b5f94cf42f --- M pySim/global_platform/scp.py 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/37542/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37542?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: I00d52f7629aae190ee487ea3453f42b5f94cf42f Gerrit-Change-Number: 37542 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

11 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip-tool: Fix TAR display for implicit TAR

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37541?usp=email ) Change subject: saip-tool: Fix TAR display for implicit TAR ...................................................................... saip-tool: Fix TAR display for implicit TAR Until Change-Id Ifba1048e3000829d54769b0420f5134e2f9b04e1 the TAR output was working for implicit tar. With said commit we fixed it for explicit tar but broke implicit tar. With this commit it works for both implicit and explicit TAR. Change-Id: I76133b0e02996a138257f3fba5ceb0d2fc6fad80 --- M contrib/saip-tool.py 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/37541/1 diff --git a/contrib/saip-tool.py b/contrib/saip-tool.py index 8208602..d9d33c0 100755 --- a/contrib/saip-tool.py +++ b/contrib/saip-tool.py @@ -202,7 +202,8 @@ adf = rfm.decoded.get('adfRFMAccess', None) if adf: print("\tADF AID: %s" % b2h(adf['adfAID'])) - for tar in rfm.decoded['tarList']: + tar_list = rfm.decoded.get('tarList', [inst_aid[-3:]]) + for tar in tar_list: print("\tTAR: %s" % b2h(tar)) def do_extract_apps(pes:ProfileElementSequence, opts): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37541?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: I76133b0e02996a138257f3fba5ceb0d2fc6fad80 Gerrit-Change-Number: 37541 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in pysim[master]: pySim.global_platform.ota: Support KVN 0x70 for SCP02

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37542?usp=email ) Change subject: pySim.global_platform.ota: Support KVN 0x70 for SCP02 ...................................................................... pySim.global_platform.ota: Support KVN 0x70 for SCP02 This is a non-standard extension of sysmocom products. Change-Id: I00d52f7629aae190ee487ea3453f42b5f94cf42f --- M pySim/global_platform/scp.py 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/37542/1 diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index 967a582..0d52f04 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -115,6 +115,11 @@ if not card_keys.kvn in range(self.kvn_range[0], self.kvn_range[1]+1): raise ValueError('%s cannot be used with KVN outside range 0x%02x..0x%02x' % (self.__class__.__name__, self.kvn_range[0], self.kvn_range[1])) + elif hasattr(self, 'kvn_ranges'): + if all([not card_keys.kvn in range(x[0], x[1]+1) for x in self.kvn_ranges]): + raise ValueError('%s cannot be used with KVN outside permitted ranges %s' % + (self.__class__.__name__, self.kvn_ranges)) + self.lchan_nr = lchan_nr self.card_keys = card_keys self.sk = None @@ -216,7 +221,8 @@ constr_iur = Struct('key_div_data'/Bytes(10), 'key_ver'/Int8ub, Const(b'\x02'), 'seq_counter'/Int16ub, 'card_challenge'/Bytes(6), 'card_cryptogram'/Bytes(8)) - kvn_range = [0x20, 0x2f] + # The 0x70 is a non-spec special-case of sysmoISIM-SJA2/SJA5 and possibly more sysmocom products + kvn_ranges = [[0x20, 0x2f], [0x70, 0x70]] def __init__(self, *args, **kwargs): self.overhead = 8 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37542?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: I00d52f7629aae190ee487ea3453f42b5f94cf42f Gerrit-Change-Number: 37542 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in ...osmo-python-tests[master]: contrib/jenkins.sh: use virtualenv and pip

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37540?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: contrib/jenkins.sh: use virtualenv and pip ...................................................................... contrib/jenkins.sh: use virtualenv and pip setup.py install is deprecated: https://packaging.python.org/en/latest/discussions/setup-py-deprecated/ Change-Id: I42ba71e2fd0ceb8466758ea46e9ae33e3d4fcb91 --- M contrib/jenkins.sh 1 file changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/40/37540/2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I42ba71e2fd0ceb8466758ea46e9ae33e3d4fcb91 Gerrit-Change-Number: 37540 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

11 months, 1 week

1
0
0 0

[S] Change in ...osmo-python-tests[master]: contrib/jenkins.sh: do not run test_py3.py twice

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37539?usp=email ) Change subject: contrib/jenkins.sh: do not run test_py3.py twice ...................................................................... contrib/jenkins.sh: do not run test_py3.py twice Change-Id: Ib7e8e358d38be37055d44c8ff284d1578a30f6ac --- M contrib/jenkins.sh 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/39/37539/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b129190..810cb7e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -8,7 +8,6 @@ PY3=python3 PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" $PY3 ./setup.py install --user -$PY3 tests/test_py3.py for f in $PY3_LIST do $PY3 $COM_FLAGS $f -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ib7e8e358d38be37055d44c8ff284d1578a30f6ac Gerrit-Change-Number: 37539 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in ...osmo-python-tests[master]: [pylint] osmopy/obscvty.py: fix E1130 (invalid-unary-operand-type)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37538?usp=email ) Change subject: [pylint] osmopy/obscvty.py: fix E1130 (invalid-unary-operand-type) ...................................................................... [pylint] osmopy/obscvty.py: fix E1130 (invalid-unary-operand-type) This is not really a problem. Just making pylint happy. Change-Id: I32b637fdc0941d051e80e677857321b861ae0c20 --- M osmopy/obscvty.py 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/38/37538/1 diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py index 5789f98..8228bda 100755 --- a/osmopy/obscvty.py +++ b/osmopy/obscvty.py @@ -191,7 +191,7 @@ if close: self._close_socket() - return res[len(request) + 2: -end] + return res[len(request) + 2: end * -1] """A generator function yielding lines separated by delim. Behaves similar to a file readlines() method. -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37538?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I32b637fdc0941d051e80e677857321b861ae0c20 Gerrit-Change-Number: 37538 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in ...osmo-python-tests[master]: contrib/jenkins.sh: use virtualenv and pip

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37540?usp=email ) Change subject: contrib/jenkins.sh: use virtualenv and pip ...................................................................... contrib/jenkins.sh: use virtualenv and pip setup.py install is deprecated: https://packaging.python.org/en/latest/discussions/setup-py-deprecated/ Change-Id: I42ba71e2fd0ceb8466758ea46e9ae33e3d4fcb91 --- M contrib/jenkins.sh 1 file changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/40/37540/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 810cb7e..978dc35 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -2,16 +2,12 @@ set -ex -COM_FLAGS='-m compileall' - -rm -rf ./build PY3=python3 -PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" -$PY3 ./setup.py install --user -for f in $PY3_LIST -do - $PY3 $COM_FLAGS $f -done + +rm -rf ./env +virtualenv --system-site-packages env +source env/bin/activate +pip install . # Run async server which tests scripts/osmo_ctrl.py interaction $PY3 tests/test_py3.py -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I42ba71e2fd0ceb8466758ea46e9ae33e3d4fcb91 Gerrit-Change-Number: 37540 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: doc/examples: drop no-op 'gsmtap-sapi' lines

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/37518?usp=email ) Change subject: doc/examples: drop no-op 'gsmtap-sapi' lines ...................................................................... doc/examples: drop no-op 'gsmtap-sapi' lines These lines yield nothing without the 'gsmtap-remote-host' parameter actually enabling GSMTAP Um logging. Remove them to avoid confusion. Change-Id: Icde668b5829a56663c258e54957e2f639a8e82a9 --- M doc/examples/trx/osmo-bts-trx-calypso.cfg M doc/examples/trx/osmo-bts-trx.cfg 2 files changed, 12 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/trx/osmo-bts-trx-calypso.cfg b/doc/examples/trx/osmo-bts-trx-calypso.cfg index 018744f..8eda4f3 100644 --- a/doc/examples/trx/osmo-bts-trx-calypso.cfg +++ b/doc/examples/trx/osmo-bts-trx-calypso.cfg @@ -34,8 +34,6 @@ bts 0 oml remote-ip 127.0.0.1 ipa unit-id 6969 0 - gsmtap-sapi pdtch - gsmtap-sapi ccch band 900 trx 0 phy 0 instance 0 diff --git a/doc/examples/trx/osmo-bts-trx.cfg b/doc/examples/trx/osmo-bts-trx.cfg index 6b23952..b8da7f7 100644 --- a/doc/examples/trx/osmo-bts-trx.cfg +++ b/doc/examples/trx/osmo-bts-trx.cfg @@ -31,7 +31,5 @@ band 1800 ipa unit-id 6969 0 oml remote-ip 192.168.122.1 - gsmtap-sapi ccch - gsmtap-sapi pdtch trx 0 phy 0 instance 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/37518?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icde668b5829a56663c258e54957e2f639a8e82a9 Gerrit-Change-Number: 37518 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: doc/examples: use common 'ipa unit-id' in all files

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/37517?usp=email ) Change subject: doc/examples: use common 'ipa unit-id' in all files ...................................................................... doc/examples: use common 'ipa unit-id' in all files Ensure that the 'ipa unit-id' in all config examples is set to value 6969, matching the value used in the osmo-bsc config examples. Change-Id: I2b5ed8eaa5c2cbfe20091dcfea0dd1a70f148f7c --- M doc/examples/litecell15/osmo-bts-lc15.cfg M doc/examples/oc2g/osmo-bts-oc2g.cfg M doc/examples/octphy/osmo-bts-octphy.cfg M doc/examples/octphy/osmo-bts-trx2dsp1.cfg M doc/examples/sysmo/osmo-bts-sysmo.cfg 5 files changed, 17 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/examples/litecell15/osmo-bts-lc15.cfg b/doc/examples/litecell15/osmo-bts-lc15.cfg index 16651eb..f61613b 100644 --- a/doc/examples/litecell15/osmo-bts-lc15.cfg +++ b/doc/examples/litecell15/osmo-bts-lc15.cfg @@ -39,7 +39,7 @@ trx-calibration-path /mnt/rom/factory/calib bts 0 band 900 - ipa unit-id 1500 0 + ipa unit-id 6969 0 oml remote-ip 192.168.234.185 trx 0 phy 0 instance 0 diff --git a/doc/examples/oc2g/osmo-bts-oc2g.cfg b/doc/examples/oc2g/osmo-bts-oc2g.cfg index ddf69f4..5a501fb 100644 --- a/doc/examples/oc2g/osmo-bts-oc2g.cfg +++ b/doc/examples/oc2g/osmo-bts-oc2g.cfg @@ -36,7 +36,7 @@ trx-calibration-path /mnt/rom/factory/calib bts 0 band 900 - ipa unit-id 1500 0 + ipa unit-id 6969 0 oml remote-ip 10.42.0.1 trx 0 phy 0 instance 0 diff --git a/doc/examples/octphy/osmo-bts-octphy.cfg b/doc/examples/octphy/osmo-bts-octphy.cfg index a3a0093..c7394d9 100644 --- a/doc/examples/octphy/osmo-bts-octphy.cfg +++ b/doc/examples/octphy/osmo-bts-octphy.cfg @@ -29,7 +29,7 @@ instance 0 bts 0 band 1800 - ipa unit-id 1234 0 + ipa unit-id 6969 0 oml remote-ip 127.0.0.1 trx 0 phy 0 instance 0 diff --git a/doc/examples/octphy/osmo-bts-trx2dsp1.cfg b/doc/examples/octphy/osmo-bts-trx2dsp1.cfg index 477bff8..79a670e 100644 --- a/doc/examples/octphy/osmo-bts-trx2dsp1.cfg +++ b/doc/examples/octphy/osmo-bts-trx2dsp1.cfg @@ -30,7 +30,7 @@ instance 1 bts 0 band 1800 - ipa unit-id 1234 0 + ipa unit-id 6969 0 oml remote-ip 127.0.0.1 trx 0 phy 0 instance 0 diff --git a/doc/examples/sysmo/osmo-bts-sysmo.cfg b/doc/examples/sysmo/osmo-bts-sysmo.cfg index f44c718..8375a7c 100644 --- a/doc/examples/sysmo/osmo-bts-sysmo.cfg +++ b/doc/examples/sysmo/osmo-bts-sysmo.cfg @@ -27,7 +27,7 @@ instance 0 bts 0 band 1800 - ipa unit-id 666 0 + ipa unit-id 6969 0 oml remote-ip 10.1.2.3 trx 0 phy 0 instance 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/37517?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2b5ed8eaa5c2cbfe20091dcfea0dd1a70f148f7c Gerrit-Change-Number: 37517 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: doc/examples: osmo-bts-trx.cfg: set 'oml remote-ip' to '127.0.0.1'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/37516?usp=email ) Change subject: doc/examples: osmo-bts-trx.cfg: set 'oml remote-ip' to '127.0.0.1' ...................................................................... doc/examples: osmo-bts-trx.cfg: set 'oml remote-ip' to '127.0.0.1' In a typical lab setup the BSC is co-located on the same host with the BTS process. Using the localhost address instead of random addresses makes life easier for those using example configs. Change-Id: I41b8de14c19088ef614ce751c738e4fc5969f0da --- M doc/examples/trx/osmo-bts-trx.cfg 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/doc/examples/trx/osmo-bts-trx.cfg b/doc/examples/trx/osmo-bts-trx.cfg index b8da7f7..4a8ee95 100644 --- a/doc/examples/trx/osmo-bts-trx.cfg +++ b/doc/examples/trx/osmo-bts-trx.cfg @@ -30,6 +30,6 @@ bts 0 band 1800 ipa unit-id 6969 0 - oml remote-ip 192.168.122.1 + oml remote-ip 127.0.0.1 trx 0 phy 0 instance 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/37516?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I41b8de14c19088ef614ce751c738e4fc5969f0da Gerrit-Change-Number: 37516 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024