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

Change in pysim[master]: contrib/jenkins.sh: split test/pylint/docs

by laforge

Attention is currently required from: osmith, pespin, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/30004 ) Change subject: contrib/jenkins.sh: split test/pylint/docs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5245c529db729e209d78a02ab9c917a90d0e0206 Gerrit-Change-Number: 30004 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Nov 2022 15:08:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: obs: check_builders: at least 10, fail on error

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29897 ) Change subject: obs: check_builders: at least 10, fail on error ...................................................................... obs: check_builders: at least 10, fail on error The number of builders connected to the OBS server seems to fluctuate a bit (used to be 14, then 17 now 16). Make sure that we have at least 10 builders connected. Fix that the test didn't exit with 1 on error. Related: https://obs.osmocom.org/monitor Change-Id: Iedd506601a5450550e21bf701309b4ea79a3d897 --- M scripts/obs/check_builders.sh 1 file changed, 16 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/obs/check_builders.sh b/scripts/obs/check_builders.sh index 609c467..65a0d76 100755 --- a/scripts/obs/check_builders.sh +++ b/scripts/obs/check_builders.sh @@ -1,11 +1,19 @@ #!/bin/sh -ex -count=14 +min=10 +max=500 wget -q https://obs.osmocom.org -O index.html -if ! grep -q " of $count build hosts" index.html; then - grep "build hosts" index.html - set +x - echo - echo "ERROR: expected $count builders to be connected to OBS!" - echo -fi +set +x +for i in $(seq $min $max); do + if grep -q " of $i build hosts" index.html; then + echo + echo "Check successful, $i builders are connected to OBS" + echo + exit 0 + fi +done + +echo +echo "ERROR: expected at least $min builders to be connected to OBS!" +echo +exit 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iedd506601a5450550e21bf701309b4ea79a3d897 Gerrit-Change-Number: 29897 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: obs: check_builders: at least 10, fail on error

by laforge

Attention is currently required from: osmith, fixeria, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29897 ) Change subject: obs: check_builders: at least 10, fail on error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iedd506601a5450550e21bf701309b4ea79a3d897 Gerrit-Change-Number: 29897 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Nov 2022 15:07:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: ggsn-kernel-gtp: Use my current SSH public key

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30002 ) Change subject: ggsn-kernel-gtp: Use my current SSH public key ...................................................................... ggsn-kernel-gtp: Use my current SSH public key Change-Id: I64b8c853fd34de4210da43165bebc6f8514b2e1a --- M qemu-kvm/ggsn-kernel-gtp/postinst/authorized_keys 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/qemu-kvm/ggsn-kernel-gtp/postinst/authorized_keys b/qemu-kvm/ggsn-kernel-gtp/postinst/authorized_keys index 817a537..6a7cc8a 100644 --- a/qemu-kvm/ggsn-kernel-gtp/postinst/authorized_keys +++ b/qemu-kvm/ggsn-kernel-gtp/postinst/authorized_keys @@ -1,2 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmaAZWIdZZjFZHq7Xm5OCUz/Cm46haad+pm2iZ2uSQCIXubjN8HGz1XujBMH1DHhSDK+L0JOBEtxHaY4JR7F177V5R8o50VNwmtTrTaNBPS8WPyVBDuHjjDVSZA+d6QT3Y+3X/FhfoFKmGc2a8MZRmE8yDGW484y7MTZ4XBHqy5vWnnywxWCZm7kVqNccM4oQ4tPWlMTxk6+tgWC4wvk3axsUVUm0ak/WKuZLoX+jBWlsWXR4uwaOEqblpNMv98CxjLgpjEBTvZxgrgY35eAm11S9lmvxFSjLIZA1V/2huAA/9MSNvI4dX4ZQPHfLCsMqFjhkIY0hvFK2uX8hlxHhOR6GkOq3n3MdcKCMI+JAISCP6g++DdQO5wzfOLeSdpTETNpIxeFkjQLS+HnuAcgjRK6O7czI+xYfCiBcaoslsTIYi33Pg7gPuDjwAyVdKqQPVdYPluR8W5+FT1lFtf1jwIB3jgt+v9q+r6d4LfkOCAU17yxG6b40P+FqK9O7X+iUkva/lbghdAw7DimczDIuEMpVVVL3/WhmCIMrfJPG/RtMdoczcAw4q4FxBretZR1Ke4AomUvUklFwfMtLqijxBJN2Owpy7jtqggs+v6cUX54fKh7/SeVrgyIgeUtgJp6lqaxlMao8SoR59YoqLqZueYOp9QxYujA70AGoMMwxsEw== laforge@nataraja -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAX61B6rs76JfKmtqqFoR6o9KAP1/WVz9/COtjNrBDc6IfqDy46ZTlKwud4Nm3O3QF5cbdxx/hnOvep4SsLTArYuD8EcBtMoKhh8+c6Y30wR9l3kUWen4JEUJjFOCX/jr2SG4tikF/0S2zUJmILyFMw53pc1KSOmEewiWI8Z6U15ntLWEljWg+BWPs25kgQ5qeA3TO9ygNPFUrEQDGJlzLVubENwZOweTMll89bFaD+6jbjBG4ViPsSlzSvan9CThrTCrVCSmTObfOz3cEci0Wvgh1mBuOyfo5GyXQ7V8tHTF9AU5lGLybeyiXOki3f+bf9da8rnHuswR6ap8VsXrra2QFr40ro7ACCc7TC5Sa62c2Y8pC2Buuv3WcZ1x5PG7gRbU3iZqR0r7HeQGP/lVD0Z9uSV+9dSvg4uhsSS59XzRoI4gElHBiSGdxm0EKB+WI/0y+G9z10qyZggDPHqD67BY1Qpi5uQxQrFiOc5eadC0ucjjA2o4KqEid2cHI4qu8YLBns5X+GE1BB9o/ix5eSYFTBju0FlgzLaYEmo6zIURpKKvKfPEgpU/ZYWRX1SaUlohXaJxB60k87eyHNDCFwyIFDklZ8LB0WBvTJGqJaDmRcR9Idz4dP8UWCHD0hiShSLKW5sOFzkJflFRmaTWmBV8W/mwc9lVJrYuaSd7S4w== laforge(a)sunbeam.rsa +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF+89UJw1295JWouFrLnIVbxsX0i5X46J16olfb5gqyL laforge@nataraja -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I64b8c853fd34de4210da43165bebc6f8514b2e1a Gerrit-Change-Number: 30002 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: ggsn-kernel-gtp: Use new OBS package feed, not old obs.opensuse.org

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30001 ) Change subject: ggsn-kernel-gtp: Use new OBS package feed, not old obs.opensuse.org ...................................................................... ggsn-kernel-gtp: Use new OBS package feed, not old obs.opensuse.org Change-Id: I1566daa23425973bb4155a40f1cdd6040b494420 --- M qemu-kvm/ggsn-kernel-gtp/postinst.sh M qemu-kvm/ggsn-kernel-gtp/postinst/Release.key 2 files changed, 23 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/qemu-kvm/ggsn-kernel-gtp/postinst.sh b/qemu-kvm/ggsn-kernel-gtp/postinst.sh index cbee562..27df200 100755 --- a/qemu-kvm/ggsn-kernel-gtp/postinst.sh +++ b/qemu-kvm/ggsn-kernel-gtp/postinst.sh @@ -48,7 +48,7 @@ # add osmocom:nightly feed + install libosmocore-dev apt-key add /tmp/postinst/Release.key -echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_… ./" > /etc/apt/sources.list.d/osmocom-nightly.list +echo "deb http://downloads.osmocom.org/packages/osmocom:/nightly/Debian_9.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list apt-get update apt-get install -y --no-install-recommends \ libosmocore-dev diff --git a/qemu-kvm/ggsn-kernel-gtp/postinst/Release.key b/qemu-kvm/ggsn-kernel-gtp/postinst/Release.key index a737316..ecca084 100644 --- a/qemu-kvm/ggsn-kernel-gtp/postinst/Release.key +++ b/qemu-kvm/ggsn-kernel-gtp/postinst/Release.key @@ -1,20 +1,26 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.5 (GNU/Linux) -mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc -a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl -CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 -5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee -S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y -CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy -b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 -pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH -/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY -VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi -K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa -X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW -XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig -7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v -d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= -=/Tek +mQENBGKzE1QBCADFcM3ZzggvgxNRNNqDGWf5xIDAiK5qzFLdGes7L6F9VCHdaPy0 +RAOB5bFb/Q1tSDFNEBLtaauXKz+4iGL6qMVjZcyjzpB5w4jKN+kkrFRhjDNUv/SH +BX6d+P7v5WBGSNArNgA8D1BGzckp5a99EZ0okMJFEqIcN40PD6OGugpq5XnVV5Nk +e93fLa2Cu8vhFBcVn6CuHeEhsmuMf6NLbQRNfNNCEEUYaZn7beMYtpZ7t1djsKx5 +1xGm50OzI22FLu8lELQ9d7qMVGRG3WHYawX9BDteRybiyqxfwUHm1haWazRJtlGt +UWyzvwAb80BK1J2Nu5fbAa3w5CoEPAbUuCyrABEBAAG0JW9zbW9jb20gT0JTIFBy +b2plY3QgPG9zbW9jb21Ab3Ntb2NvbT6JAVQEEwEIAD4WIQRrKp83ktFetw1Oao+G +pzC2U3JZcwUCYrMV4wIbAwUJBB6yjwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK +CRCGpzC2U3JZc4FRCACQQkKIrnvQ7n2u7GSmyVZa3I+oLoFXSGqaGyey5TW/nrMm +vFDKU3qliHiuNSmUY35SnAhXUsvqOYppxVRoO1MLrqUvzMOnIWqkJpf8mtjGUnsW +jyVeto7Rsjs75y2i1Hk+e7ljb/V65J3NlfrfEYWbqR9AKd53ReNXTdrQ0J05A38N +GdI4Ld/2lNISAwaBmGhqdeKsLHpQw/JERU1TApVJR1whFiIwDF1rOCg9GPnNKIk7 +yRZdK267XzztrainX/cbPILyzUZEDhYs6wQuyACyQ1YUxZIxrwVfk7PMNay8CrLH +z42B73Ne5IAj8+op/3iJafFONLm7YXiDUFN+QDYAiQEzBBMBCAAdFiEExoiYhHND +S7aVYlnqa51NyAUyjdsFAmKzE1UACgkQa51NyAUyjdvuZgf+OXmr//i7u7Gg7eWB +7e0qUsyCId9lXS8J437x3K6ciJfD7/6RSy8TFW5Nglm/uSkbyq582I8t+SoOirMD +E6cg9U/5+h5s46bAf+Kd2XS/6tLGeNLM18i4el8CP06NpFzDrsKu76uYFpyRiiHD +otBdtgxeLJ83LugGfZslF+/5cigJkAJMhAdVvGO8h85R6fba8ZSOKtMKkaQRfi76 +nhyOrJPlLuS+DLEnHwdkOFgtKnxHdjM97K+Tx0gisb6uwaWroXfSLnhP8RTLLZZy +Z+noU1Hw3c+mn4c/NYbcC/uwHYHKRzuf9gHnQ3dGgv0Z5sbeLRVo92hjGj7Ftlyd +4hmKBg== +=HxK4 -----END PGP PUBLIC KEY BLOCK----- -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1566daa23425973bb4155a40f1cdd6040b494420 Gerrit-Change-Number: 30001 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: ggsn-kernel-gtp: Use new OBS package feed, not old obs.opensuse.org

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30001 ) Change subject: ggsn-kernel-gtp: Use new OBS package feed, not old obs.opensuse.org ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1566daa23425973bb4155a40f1cdd6040b494420 Gerrit-Change-Number: 30001 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-Comment-Date: Fri, 04 Nov 2022 15:07:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jenkins-gerrit: display JOB_TYPE infront of url

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30006 ) Change subject: jenkins-gerrit: display JOB_TYPE infront of url ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51f49e4799961776dbddaedd76c14ed37a0e6c84 Gerrit-Change-Number: 30006 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Nov 2022 14:43:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs: pysim: split into job types

by pespin

Attention is currently required from: osmith, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30005 ) Change subject: jobs: pysim: split into job types ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iea4f15fd9c9f8f36cb8d638c48da000eafe746a4 Gerrit-Change-Number: 30005 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Nov 2022 14:43:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC: add TC_ho_meas_rep_multi_band

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 ) Change subject: BSC: add TC_ho_meas_rep_multi_band ...................................................................... BSC: add TC_ho_meas_rep_multi_band Related: OS#5717 Related: osmo-bsc Ic5e4f0531e08685460948b102367825588d839ba Change-Id: I4fe6bb9e4b5a69ea6204585ebdf1f157a68a8286 --- M bsc/BSC_Tests.ttcn M library/BSSMAP_Templates.ttcn 2 files changed, 97 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 98cdb45..118d707 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5871,16 +5871,19 @@ } } -private function f_ho_out_of_this_bsc(template (omit) BSSMAP_oldToNewBSSIEs exp_oldToNewBSSIEs := omit) runs on MSC_ConnHdlr { +private function f_ho_out_of_this_bsc(template (omit) BSSMAP_oldToNewBSSIEs exp_oldToNewBSSIEs := omit, + boolean skip_meas_rep := false) runs on MSC_ConnHdlr { - var NcellReports neighbor_rep := { - { rxlev := 20, bcch_freq := 0, bsic := 11 } - }; - var octetstring l3_mr := enc_GsmRrL3Message(valueof(ts_MEAS_REP(true, 8, 8, reps := neighbor_rep))); - RSL.send(ts_RSL_MEAS_RES(g_chan_nr, 0, ts_RSL_IE_UplinkMeas, ts_RSL_IE_BS_Power(0), ts_RSL_IE_L1Info, - l3_mr, 0)); + if (not skip_meas_rep) { + var NcellReports neighbor_rep := { + { rxlev := 20, bcch_freq := 0, bsic := 11 } + }; + var octetstring l3_mr := enc_GsmRrL3Message(valueof(ts_MEAS_REP(true, 8, 8, reps := neighbor_rep))); + RSL.send(ts_RSL_MEAS_RES(g_chan_nr, 0, ts_RSL_IE_UplinkMeas, ts_RSL_IE_BS_Power(0), ts_RSL_IE_L1Info, + l3_mr, 0)); - BSSAP.receive(tr_BSSMAP_HandoverRequired(exp_oldToNewBSSIEs)); + BSSAP.receive(tr_BSSMAP_HandoverRequired(exp_oldToNewBSSIEs)); + } f_sleep(0.5); /* The MSC negotiates Handover Request and Handover Request Ack with @@ -11971,6 +11974,84 @@ f_shutdown_helper(); } +private function f_tc_ho_meas_rep_multi_band(charstring id) runs on MSC_ConnHdlr { + g_pars := f_gen_test_hdlr_pars(); + var PDU_BSSAP ass_req := f_gen_ass_req(); + ass_req.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_req.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + f_establish_fully(ass_req, exp_compl); + + /* Send a measurement report with bad rxlev except on 3rd entry. The + * measurement report is divided into two sub lists, as described in + * 3GPP TS 04.08 § 10.5.2.20. */ + var NcellReports neighbor_rep := { + /* Sub list 1: same band */ + { rxlev := 0, bcch_freq := 0, bsic := 11 }, /* ARFCN 700, band 1800, LAC 96 */ + { rxlev := 0, bcch_freq := 1, bsic := 12 }, /* ARFCN 800, band 1800, LAC 98 */ + /* Sub list 2: different band */ + { rxlev := 40, bcch_freq := 2, bsic := 13 }, /* ARFCN 200, band 850, LAC 97 */ + { rxlev := 0, bcch_freq := 3, bsic := 14 } /* ARFCN 1000, band 900, LAC 99 */ + }; + var octetstring l3_mr := enc_GsmRrL3Message(valueof(ts_MEAS_REP(true, 8, 8, reps := neighbor_rep))); + RSL.send(ts_RSL_MEAS_RES(g_chan_nr, 0, ts_RSL_IE_UplinkMeas, ts_RSL_IE_BS_Power(0), ts_RSL_IE_L1Info, + l3_mr, 0)); + + /* Expect a handover to the third entry. If the BSC parsed the report + * correctly, the third entry has LAC 97. */ + var template BSSMAP_FIELD_CellIdentificationList cid_list := { + cIl_LAC := { ts_BSSMAP_CI_LAC(97) } + }; + alt { + [] BSSAP.receive(tr_BSSMAP_HandoverRequired(cid_list := cid_list)) { + setverdict(pass); + } + [] BSSAP.receive(tr_BSSMAP_HandoverRequired()) { + setverdict(fail, "Handover has unexpected LAC in Cell Identification List. The BSC probably" + & " didn't parse the multi-band measurement report correctly."); + } + } + + f_ho_out_of_this_bsc(skip_meas_rep := true); +} +testcase TC_ho_meas_rep_multi_band() runs on test_CT { + /* Verify that the BSC parses the measurement report correctly when + * neighbors in multiple bands are configured (OS#5717). See + * gsm_arfcn2band_rc() in libosmocore src/gsm/gsm_utils.c for the + * ARFCN -> band mapping. The MS is connected to band 1800. */ + var MSC_ConnHdlr vc_conn; + + f_init_vty(); + f_bts_0_cfg(BSCVTY, + {"neighbor-list mode automatic", + "handover 1", + "handover algorithm 2", + "handover2 window rxlev averaging 1", + "no neighbors", + "neighbor lac 99 arfcn 1000 bsic any", /* band 900 */ + "neighbor lac 98 arfcn 800 bsic any", /* band 1800 */ + "neighbor lac 97 arfcn 200 bsic any", /* band 850 */ + "neighbor lac 96 arfcn 700 bsic any"}); /* band 1800 */ + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(1, true); + f_sleep(1.0); + + f_ctrs_bsc_and_bts_handover_init(); + + vc_conn := f_start_handler(refers(f_tc_ho_meas_rep_multi_band)); + vc_conn.done; + + f_ctrs_bsc_and_bts_add(0, "assignment:attempted"); + f_ctrs_bsc_and_bts_add(0, "assignment:completed"); + f_ctrs_bsc_and_bts_add(0, "handover:attempted"); + f_ctrs_bsc_and_bts_add(0, "handover:completed"); + f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); + f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:completed"); + f_ctrs_bsc_and_bts_verify(); + f_shutdown_helper(ho := true); +} + control { /* CTRL interface testing */ execute( TC_ctrl_msc_connection_status() ); @@ -12313,6 +12394,8 @@ execute( TC_mgwpool_pin_bts() ); } + execute( TC_ho_meas_rep_multi_band() ); + /* Run TC_ho_out_of_this_bsc last, because it may trigger a segfault before osmo-bsc's patch * with change-id I5a3345ab0005a73597f5c27207480912a2f5aae6 */ execute( TC_ho_out_of_this_bsc() ); diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 26f7ed9..1eebb02 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -894,11 +894,16 @@ } -template PDU_BSSAP tr_BSSMAP_HandoverRequired(template BSSMAP_oldToNewBSSIEs oldToNewBSSIEs := *) modifies tr_BSSAP_BSSMAP := { +template PDU_BSSAP tr_BSSMAP_HandoverRequired(template BSSMAP_oldToNewBSSIEs oldToNewBSSIEs := *, + template (present) BSSMAP_FIELD_CellIdentificationList cid_list := ?) +modifies tr_BSSAP_BSSMAP := { pdu := { bssmap := { handoverRequired := { messageType := '11'O, + cellIdentifierList := { + cellIdentificationList := cid_list + }, oldToNewBSSInfo := f_tr_BSSMAP_IE_OldToNewBSSInfo(oldToNewBSSIEs) } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 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: I4fe6bb9e4b5a69ea6204585ebdf1f157a68a8286 Gerrit-Change-Number: 29837 Gerrit-PatchSet: 8 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC: extend TC_ho_meas_rep_multi_band for ARFCN=0

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29858 ) Change subject: BSC: extend TC_ho_meas_rep_multi_band for ARFCN=0 ...................................................................... BSC: extend TC_ho_meas_rep_multi_band for ARFCN=0 Adjust the test to also check the special case ARFCN=0, which is at the end of each sub list. Related: OS#5717 Related: osmo-bsc Ic5e4f0531e08685460948b102367825588d839ba Change-Id: Ia8f94d72651061427afc9e34f678544f89d0149b --- M bsc/BSC_Tests.ttcn 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 118d707..4753ae9 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -11987,20 +11987,20 @@ * 3GPP TS 04.08 § 10.5.2.20. */ var NcellReports neighbor_rep := { /* Sub list 1: same band */ - { rxlev := 0, bcch_freq := 0, bsic := 11 }, /* ARFCN 700, band 1800, LAC 96 */ - { rxlev := 0, bcch_freq := 1, bsic := 12 }, /* ARFCN 800, band 1800, LAC 98 */ + { rxlev := 0, bcch_freq := 0, bsic := 12 }, /* ARFCN 800, band 1800, LAC 98 */ /* Sub list 2: different band */ - { rxlev := 40, bcch_freq := 2, bsic := 13 }, /* ARFCN 200, band 850, LAC 97 */ - { rxlev := 0, bcch_freq := 3, bsic := 14 } /* ARFCN 1000, band 900, LAC 99 */ + { rxlev := 0, bcch_freq := 1, bsic := 13 }, /* ARFCN 200, band 850, LAC 97 */ + { rxlev := 40, bcch_freq := 2, bsic := 14 }, /* ARFCN 1000, band 900, LAC 99 */ + { rxlev := 0, bcch_freq := 3, bsic := 11 } /* ARFCN 0, band 900, LAC 96 */ }; var octetstring l3_mr := enc_GsmRrL3Message(valueof(ts_MEAS_REP(true, 8, 8, reps := neighbor_rep))); RSL.send(ts_RSL_MEAS_RES(g_chan_nr, 0, ts_RSL_IE_UplinkMeas, ts_RSL_IE_BS_Power(0), ts_RSL_IE_L1Info, l3_mr, 0)); /* Expect a handover to the third entry. If the BSC parsed the report - * correctly, the third entry has LAC 97. */ + * correctly, the third entry has LAC 99. */ var template BSSMAP_FIELD_CellIdentificationList cid_list := { - cIl_LAC := { ts_BSSMAP_CI_LAC(97) } + cIl_LAC := { ts_BSSMAP_CI_LAC(99) } }; alt { [] BSSAP.receive(tr_BSSMAP_HandoverRequired(cid_list := cid_list)) { @@ -12031,7 +12031,7 @@ "neighbor lac 99 arfcn 1000 bsic any", /* band 900 */ "neighbor lac 98 arfcn 800 bsic any", /* band 1800 */ "neighbor lac 97 arfcn 200 bsic any", /* band 850 */ - "neighbor lac 96 arfcn 700 bsic any"}); /* band 1800 */ + "neighbor lac 96 arfcn 0 bsic any"}); /* band 900 */ f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); f_init(1, true); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29858 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: Ia8f94d72651061427afc9e34f678544f89d0149b Gerrit-Change-Number: 29858 Gerrit-PatchSet: 5 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-MessageType: merged

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022