- gerrit-log - lists.osmocom.org

Change in pysim[master]: avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27104 ) Change subject: avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor' ...................................................................... avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor' At least on Debian 10 and unstable, I'm getting this error for pylint: ************* Module pySim.utils pySim/utils.py:570:1: E0611: No name 'strxor' in module 'Crypto.Util.strxor' (no-name-in-module) despite it clearly existing: >>> import Crypto.Util.strxor >>> Crypto.Util.strxor.strxor <built-in function strxor> So let's suppress the related pylint error. Change-Id: Iea89e758782a569be953d19892028f083a92c2f1 --- M pySim/utils.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 1806d0d..0a9be86 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -567,6 +567,7 @@ Run the milenage algorithm to calculate OPC from Ki and OP """ from Crypto.Cipher import AES + # pylint: disable=no-name-in-module from Crypto.Util.strxor import strxor from pySim.utils import b2h -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea89e758782a569be953d19892028f083a92c2f1 Gerrit-Change-Number: 27104 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: update pyyaml dependency to >= 5.1

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27102 ) Change subject: update pyyaml dependency to >= 5.1 ...................................................................... update pyyaml dependency to >= 5.1 5.1 was the version introducing pyyaml.FullLoader which we're using, see https://pyyaml.org/wiki/PyYAML#history Change-Id: I0f2fa08ceeac2759218e85ad5bdce3ef951d0b74 --- M contrib/jenkins.sh M requirements.txt 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e2e04e7..a01c012 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -18,7 +18,7 @@ virtualenv -p python3 venv --system-site-packages . venv/bin/activate pip install pytlv -pip install pyyaml +pip install 'pyyaml>=5.1' pip install cmd2==1.5 pip install jsonpath-ng pip install construct diff --git a/requirements.txt b/requirements.txt index 7308cf8..0046a50 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ construct bidict gsm0338 -pyyaml +pyyaml>=5.1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0f2fa08ceeac2759218e85ad5bdce3ef951d0b74 Gerrit-Change-Number: 27102 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor'

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27104 ) Change subject: avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea89e758782a569be953d19892028f083a92c2f1 Gerrit-Change-Number: 27104 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Feb 2022 15:57:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: update pyyaml dependency to >= 5.1

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27102 ) Change subject: update pyyaml dependency to >= 5.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0f2fa08ceeac2759218e85ad5bdce3ef951d0b74 Gerrit-Change-Number: 27102 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Feb 2022 15:57:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Test GTP-U Echo Request/Response

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27105 ) Change subject: ggsn: Test GTP-U Echo Request/Response ...................................................................... ggsn: Test GTP-U Echo Request/Response Change-Id: Id92180be948ee3f5246c7befec666698a1b074f3 --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 28 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/27105/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index ae24eeb..5ec535c 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1213,6 +1213,18 @@ T_default.stop; } + testcase TC_echo_req_resp_gtpu() runs on GT_CT { + f_init(); + GTPU.send(ts_GTPU_PING(g_peer_u, g_d_seq_nr)); + T_default.start; + alt { + [] GTPU.receive(tr_GTPU_PONG(g_peer_u)) { setverdict(pass); }; + [] GTPU.receive { repeat; }; + [] T_default.timeout { setverdict(fail); } + } + T_default.stop; + } + /* Test if the parser can cope with PCO that only contain either a * single primary DNS or a secondary DNS. */ testcase TC_pdp4_act_deact_with_single_dns() runs on GT_CT { @@ -1600,6 +1612,7 @@ execute(TC_pdp46_act_deact_apn4()); execute(TC_echo_req_resp()); + execute(TC_echo_req_resp_gtpu()); execute(TC_pdp_act2_recovery()); execute(TC_act_deact_retrans_duplicate()); diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 8f6098a..0a9c5e9 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -1121,7 +1121,7 @@ } /* generalized GTP-U send template */ - template PDU_GTPU ts_GTP1U_PDU(OCT1 msg_type, template (omit) uint16_t seq, OCT4 teid, GTPU_IEs ies) := { + template (value) PDU_GTPU ts_GTP1U_PDU(OCT1 msg_type, template (omit) uint16_t seq, OCT4 teid, GTPU_IEs ies) := { /* N-PDU Number flag (PN): the GTP-U header contains a meaningful N-PDU Number field if the PN * flag is set to 1. */ pn_bit := '0'B, /* we assume the encoder overwrites this if an optional part is given */ @@ -1153,8 +1153,9 @@ } - /* template matching reception of GTP-U echo-request */ + /* template matching reception of GTP-U echo-request/response */ template Gtp1uUnitdata tr_GTPU_PING(template GtpPeer peer) := tr_GTPU_MsgType(peer, echoRequest, '00000000'O); + template Gtp1uUnitdata tr_GTPU_PONG(template GtpPeer peer) := tr_GTPU_MsgType(peer, echoResponse, '00000000'O); /* template matching reception of GTP-U GPDU */ template GTPU_IEs t_GPDU(template octetstring data) := { @@ -1167,6 +1168,18 @@ gtpu := tr_GTP1U_PDU('FF'O, teid, t_GPDU(data)) } + template GTPU_IEs ts_UEchoReqPDU := { + echoRequest_IEs := { + private_extension_gtpu := omit + } + } + + /* master template for sending a GTP-C echo request */ + template (value) Gtp1uUnitdata ts_GTPU_PING(GtpPeer peer, uint16_t seq) := { + peer := peer, + gtpu := ts_GTP1U_PDU(echoRequest, seq, '00000000'O, valueof(ts_UEchoReqPDU)) + } + template GTPU_IEs ts_UEchoRespPDU(OCT1 restart_counter) := { echoResponse_IEs := { recovery_gtpu := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27105 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: Id92180be948ee3f5246c7befec666698a1b074f3 Gerrit-Change-Number: 27105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor'

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27104 ) Change subject: avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor' ...................................................................... avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor' At least on Debian 10 and unstable, I'm getting this error for pylint: ************* Module pySim.utils pySim/utils.py:570:1: E0611: No name 'strxor' in module 'Crypto.Util.strxor' (no-name-in-module) despite it clearly existing: >>> import Crypto.Util.strxor >>> Crypto.Util.strxor.strxor <built-in function strxor> So let's suppress the related pylint error. Change-Id: Iea89e758782a569be953d19892028f083a92c2f1 --- M pySim/utils.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/27104/1 diff --git a/pySim/utils.py b/pySim/utils.py index 1806d0d..0a9be86 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -567,6 +567,7 @@ Run the milenage algorithm to calculate OPC from Ki and OP """ from Crypto.Cipher import AES + # pylint: disable=no-name-in-module from Crypto.Util.strxor import strxor from pySim.utils import b2h -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea89e758782a569be953d19892028f083a92c2f1 Gerrit-Change-Number: 27104 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 6: (1 comment) File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/20622/comment/4a64de75_fea… PS6, Line 139: cp osmo-bsc-generic.gen.cfg $VOL_BASE_DIR/bsc/ Needs to be: cp osmo-bsc-generic.gen.cfg $VOL_BASE_DIR/bsc/osmo-bsc.cfg Same below. -- 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: 6 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-Comment-Date: Wed, 09 Feb 2022 15:34:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

Attention is currently required from: fixeria. Hello fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/27103 to look at the new patch set (#2). 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. Copy the files from the git repository checked out in the ttcn3-bts-test docker image, so we don't need to take care of cloning the repository again and checking out the same commit as used inside that image. Original files are copied to *.src.cfg, and then merged with the local *.confmerge files using osmo-conf-merge (*.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: If2d1ba8a775dc6c396f50f9853e633df110329a9 --- M .gitignore M jenkins-common.sh D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.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/osmo-bsc.cfg A ttcn3-bts-test/osmo-bsc.confmerge D ttcn3-bts-test/osmo-bts.cfg A ttcn3-bts-test/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 13 files changed, 336 insertions(+), 851 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/27103/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9 Gerrit-Change-Number: 27103 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

Attention is currently required from: fixeria. osmith has removed laforge from this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27103 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Removed cc laforge. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9 Gerrit-Change-Number: 27103 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: deleteReviewer

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27103 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Alternative version of https://gerrit.osmocom.org/c/docker-playground/+/20622 that avoids downloading the files with wget, which solves the following problem: * developer runs the testsuite for the first time, files get downloaded * time passes * files get updated in osmo-ttcn3-hacks * developer runs the testsuite again, files are not updated * tests are failing * developer has to figure out why -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9 Gerrit-Change-Number: 27103 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Feb 2022 15:28:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 6: Code-Review-1 (1 comment) Patchset: PS6: > However, I am not sure if there is an easy & beautiful solution. The original config files are in osmo-ttcn3-hacks.git, so we need to take them from there somehow, apply the *.confmerge files (and some other sed quirks), and then feed the generated files to osmo-bsc and osmo-bts. How about this approach to avoid wget? https://gerrit.osmocom.org/c/docker-playground/+/27103 -- 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: 6 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-Comment-Date: Wed, 09 Feb 2022 15:26:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27103 ) 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. Copy the files from the git repository checked out in the ttcn3-bts-test docker image, so we don't need to take care of cloning the repository again and checking out the same commit as used inside that image. Original files are copied to *.src.cfg, and then merged with the local *.confmerge files using osmo-conf-merge (*.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: If2d1ba8a775dc6c396f50f9853e633df110329a9 --- M .gitignore M jenkins-common.sh D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.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/osmo-bsc.cfg A ttcn3-bts-test/osmo-bsc.confmerge D ttcn3-bts-test/osmo-bts.cfg A ttcn3-bts-test/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 13 files changed, 336 insertions(+), 851 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/27103/1 diff --git a/.gitignore b/.gitignore index 386d3f8..9eb94ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ .release .common +*.src.cfg +*.gen.cfg + /_cache diff --git a/jenkins-common.sh b/jenkins-common.sh index 3faf6a9..0b29c89 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -417,6 +417,38 @@ "$config" } +# Copy configs from osmo-ttcn3-hacks via testsuite container for use with +# osmo-config-merge. +# $1: testsuite name (e.g. "osmo-ttcn3-hacks") +# $2: directory name in osmo-ttcn3-hacks.git (e.g. "bts") +# $3-n: files to be copied from that directory +# The destination file name is the same as the source file name, except that +# ".cfg" at the end is replaced with ".src.cfg" to indicate that this file is +# the source from osmo-ttcn3-hacks. See for example: ttcn3-bts-test/jenkins.sh +copy_configs_from_testsuite() { + local docker_img="$1" + local hacks_dir="$2" + shift 2 + local files="$@" + local uid="$(id -u)" + local gid="$(id -g)" + + docker run \ + --rm \ + -v "$PWD:/build" \ + "$USER/$docker_img" \ + sh -e -x -c \ + "for cfg in $files; do + out=\$(echo \$cfg | sed 's/\\.cfg\$/.src.cfg/') + install \ + -m644 \ + -o$uid \ + -g$gid \ + \"/osmo-ttcn3-hacks/$hacks_dir/\$cfg\" \ + \"/build/\$out\"; + done" +} + set -x # non-jenkins execution: assume local user name diff --git a/ttcn3-bts-test/fh/osmo-bsc.cfg b/ttcn3-bts-test/fh/osmo-bsc.cfg deleted file mode 100644 index cbb3080..0000000 --- a/ttcn3-bts-test/fh/osmo-bsc.cfg +++ /dev/null @@ -1,398 +0,0 @@ -! -! OsmoBSC (1.1.2.236-5f22) configuration saved from vty -!! -password foo -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging print file 1 - logging level set-all notice - logging level rll info - logging level rsl debug - logging level msc debug - logging level filter debug - logging level pcu debug - logging level lctrl info - logging level lsccp info -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive - ipa bind 0.0.0.0 -cs7 instance 0 - point-code 0.23.3 - asp asp-clnt-msc-0 2905 0 m3ua - as as-clnt-msc-0 m3ua - asp asp-clnt-msc-0 - routing-key 2 0.23.3 -network - network country code 1 - mobile network code 1 - encryption a5 0 - neci 1 - paging any use tch 0 - handover 0 - handover1 window rxlev averaging 10 - handover1 window rxqual averaging 1 - handover1 window rxlev neighbor averaging 10 - handover1 power budget interval 6 - handover1 power budget hysteresis 3 - handover1 maximum distance 9999 - timer t3212 30 - bts 0 - type sysmobts - band DCS1800 - cell_identity 0 - location_area_code 1 - dtx uplink force - dtx downlink - base_station_id_code 63 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - early-classmark-sending forbidden - early-classmark-sending-3g allowed - ip.access unit_id 1234 0 - ip.access rsl-ip 172.18.9.10 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - codec-support fr - gprs mode gprs - gprs routing area 0 - gprs network-control-order nc0 - gprs cell bvci 1234 - gprs cell timer blocking-timer 3 - gprs cell timer blocking-retries 3 - gprs cell timer unblocking-retries 3 - gprs cell timer reset-timer 3 - gprs cell timer reset-retries 3 - gprs cell timer suspend-timer 10 - gprs cell timer suspend-retries 3 - gprs cell timer resume-timer 10 - gprs cell timer resume-retries 3 - gprs cell timer capability-update-timer 10 - gprs cell timer capability-update-retries 3 - gprs nsei 1234 - gprs ns timer tns-block 3 - gprs ns timer tns-block-retries 3 - gprs ns timer tns-reset 3 - gprs ns timer tns-reset-retries 3 - gprs ns timer tns-test 30 - gprs ns timer tns-alive 3 - gprs ns timer tns-alive-retries 10 - gprs nsvc 0 nsvci 1234 - gprs nsvc 0 local udp port 23000 - gprs nsvc 0 remote udp port 23000 - gprs nsvc 0 remote ip 0.0.0.0 - no force-combined-si - trx 0 - rf_locked 0 - arfcn 871 - nominal power 50 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - ! Shall not be hopping - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - ! Intentionally non-hopping - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - ! (c) HSN=2, MAIO=0,1 - hopping enabled 1 - hopping sequence-number 2 - hopping maio 0 - hopping arfcn add 871 - hopping arfcn add 873 - timeslot 3 - phys_chan_config TCH/F_PDCH - ! (e) HSN=3, MAIO=3,2,1,0 - hopping enabled 1 - hopping sequence-number 3 - hopping maio 3 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 4 - ! Intentionally non-hopping - phys_chan_config TCH/F_TCH/H_PDCH - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - ! (f) HSN=5, MAIO=0,1,2,3 - hopping enabled 1 - hopping sequence-number 5 - hopping maio 0 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 6 - phys_chan_config SDCCH8 - ! (g) HSN=6, MAIO=1,0 - hopping enabled 1 - hopping sequence-number 6 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 877 - timeslot 7 - phys_chan_config PDCH - ! (i) HSN=0, MAIO=1,3 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 875 - trx 1 - rf_locked 0 - arfcn 873 - nominal power 50 - max_power_red 20 - rsl e1 tei 1 - timeslot 0 - phys_chan_config TCH/F - ! (a) HSN=0, MAIO=0,1,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 1 - phys_chan_config SDCCH8 - ! Intentionally non-hopping - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/H - ! (c) HSN=2, MAIO=0,1 - hopping enabled 1 - hopping sequence-number 2 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 873 - timeslot 3 - phys_chan_config TCH/F_PDCH - ! (e) HSN=3, MAIO=3,2,1,0 - hopping enabled 1 - hopping sequence-number 3 - hopping maio 2 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - ! Intentionally non-hopping - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - ! (f) HSN=5, MAIO=0,1,2,3 - hopping enabled 1 - hopping sequence-number 5 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 6 - phys_chan_config PDCH - ! (h) HSN=6, MAIO=1,0 - hopping enabled 1 - hopping sequence-number 6 - hopping maio 1 - hopping arfcn add 873 - hopping arfcn add 875 - timeslot 7 - phys_chan_config PDCH - ! (j) HSN=0, MAIO=0,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 0 - hopping arfcn add 873 - hopping arfcn add 877 - trx 2 - rf_locked 0 - arfcn 875 - nominal power 50 - max_power_red 20 - rsl e1 tei 2 - timeslot 0 - phys_chan_config TCH/F - ! (a) HSN=0, MAIO=0,1,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 1 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 1 - phys_chan_config SDCCH8 - ! (b) HSN=1, MAIO=3,5 - hopping enabled 1 - hopping sequence-number 1 - hopping maio 3 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 2 - phys_chan_config TCH/F - ! (d) HSN=2, MAIO=2,3 - hopping enabled 1 - hopping sequence-number 2 - hopping maio 2 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 3 - phys_chan_config TCH/F_PDCH - ! (e) HSN=3, MAIO=3,2,1,0 - hopping enabled 1 - hopping sequence-number 3 - hopping maio 1 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - ! Intentionally non-hopping - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - ! (f) HSN=5, MAIO=0,1,2,3 - hopping enabled 1 - hopping sequence-number 5 - hopping maio 2 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 6 - phys_chan_config PDCH - ! (h) HSN=6, MAIO=1,0 - hopping enabled 1 - hopping sequence-number 6 - hopping maio 0 - hopping arfcn add 873 - hopping arfcn add 875 - timeslot 7 - phys_chan_config PDCH - ! (i) HSN=0, MAIO=1,3 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 3 - hopping arfcn add 871 - hopping arfcn add 875 - trx 3 - rf_locked 0 - arfcn 877 - nominal power 50 - max_power_red 20 - rsl e1 tei 3 - timeslot 0 - phys_chan_config TCH/F - ! (a) HSN=0, MAIO=0,1,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 2 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 1 - phys_chan_config SDCCH8 - ! (b) HSN=1, MAIO=3,5 - hopping enabled 1 - hopping sequence-number 1 - hopping maio 5 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 2 - phys_chan_config TCH/H - ! (d) HSN=2, MAIO=2,3 - hopping enabled 1 - hopping sequence-number 2 - hopping maio 3 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 3 - phys_chan_config TCH/F_PDCH - ! (e) HSN=3, MAIO=3,2,1,0 - hopping enabled 1 - hopping sequence-number 3 - hopping maio 0 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - ! Intentionally non-hopping - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - ! (f) HSN=5, MAIO=0,1,2,3 - hopping enabled 1 - hopping sequence-number 5 - hopping maio 3 - hopping arfcn add 871 - hopping arfcn add 873 - hopping arfcn add 875 - hopping arfcn add 877 - timeslot 6 - phys_chan_config SDCCH8 - ! (g) HSN=6, MAIO=1,0 - hopping enabled 1 - hopping sequence-number 6 - hopping maio 0 - hopping arfcn add 871 - hopping arfcn add 877 - timeslot 7 - phys_chan_config PDCH - ! (j) HSN=0, MAIO=0,2 - hopping enabled 1 - hopping sequence-number 0 - hopping maio 2 - hopping arfcn add 873 - hopping arfcn add 877 -msc 0 - codec-list fr1 fr2 fr3 - allow-emergency allow - amr-config 12_2k forbidden - amr-config 10_2k forbidden - amr-config 7_95k forbidden - amr-config 7_40k forbidden - amr-config 6_70k forbidden - amr-config 5_90k allowed - amr-config 5_15k forbidden - amr-config 4_75k forbidden -bsc - mid-call-timeout 0 - no missing-msc-text diff --git a/ttcn3-bts-test/fh/osmo-bsc.confmerge b/ttcn3-bts-test/fh/osmo-bsc.confmerge new file mode 100644 index 0000000..91a4710 --- /dev/null +++ b/ttcn3-bts-test/fh/osmo-bsc.confmerge @@ -0,0 +1,231 @@ +network + bts 0 + trx 0 + timeslot 0 + ! Shall not be hopping + timeslot 1 + ! Intentionally non-hopping + timeslot 2 + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + ! Intentionally non-hopping + timeslot 5 + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 875 + trx 1 + timeslot 0 + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + ! Intentionally non-hopping + timeslot 2 + phys_chan_config TCH/H + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 877 + trx 2 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8 + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + phys_chan_config TCH/F + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 2 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 875 + trx 3 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8 + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 5 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config SDCCH8 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + phys_chan_config PDCH + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 877 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 395407b..bc31cda 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -116,8 +116,38 @@ $REPO_USER/ttcn3-bts-test } +merge_configs() { + copy_configs_from_testsuite \ + ttcn3-bts-test \ + bts \ + osmo-bts.cfg \ + osmo-bsc.cfg + + for program in osmo-bsc osmo-bts; do + osmo-config-merge \ + "$program".src.cfg \ + "$program".confmerge \ + > "$program"-generic.gen.cfg + sed -i "s/log gsmtap 127.0.0.1/log gsmtap 172.18.9.10/" "$program"-generic.gen.cfg + done + + for bts_variant in virtphy oml; do + osmo-config-merge \ + osmo-bts-generic.gen.cfg \ + "$bts_variant"/osmo-bts.confmerge \ + > "$bts_variant"/osmo-bts.gen.cfg + done + + osmo-config-merge \ + osmo-bsc-generic.gen.cfg \ + fh/osmo-bsc.confmerge \ + > fh/osmo-bsc.gen.cfg +} + + SUBNET=9 network_create $SUBNET +merge_configs mkdir $VOL_BASE_DIR/bts-tester-generic cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ @@ -136,11 +166,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 osmo-bsc-generic.gen.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 osmo-bts-generic.gen.cfg $VOL_BASE_DIR/bts/ mkdir $VOL_BASE_DIR/unix @@ -161,7 +191,7 @@ docker container kill ${BUILD_TAG}-trxcon docker container kill ${BUILD_TAG}-fake_trx docker container kill ${BUILD_TAG}-bts -cp virtphy/osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ start_bts virtual 0 start_virtphy # ... and execute the testsuite again with different cfg @@ -173,7 +203,7 @@ docker container kill ${BUILD_TAG}-virtphy docker container kill ${BUILD_TAG}-bts -cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/ +cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ start_bts trx 1 start_fake_trx start_trxcon @@ -181,8 +211,8 @@ start_testsuite oml # 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 fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/ +cp osmo-bts-generic.gen.cfg $VOL_BASE_DIR/bts/ # restart the BSC/BTS and run the testsuite again docker container kill ${BUILD_TAG}-bts start_bsc diff --git a/ttcn3-bts-test/oml/osmo-bts.cfg b/ttcn3-bts-test/oml/osmo-bts.cfg deleted file mode 100644 index 52a2ace..0000000 --- a/ttcn3-bts-test/oml/osmo-bts.cfg +++ /dev/null @@ -1,59 +0,0 @@ -! -! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty -!! -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all notice - logging level rsl info - logging level oml info - logging level meas info - logging level pag info - logging level l1c info - logging level dsp info - logging level pcu debug - logging level trx info - logging level lmib debug -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -phy 0 - osmotrx ip local 172.18.9.20 - osmotrx ip remote 172.18.9.21 - osmotrx fn-advance 20 - osmotrx rts-advance 5 - instance 0 - osmotrx rx-gain 10 - osmotrx tx-attenuation 0 -bts 0 - band DCS1800 - ipa unit-id 1234 0 - oml remote-ip 172.18.9.10 - rtp jitter-buffer 100 - paging queue-size 200 - paging lifetime 0 - min-qual-rach 50 - min-qual-norm -5 - !settsc - pcu-socket /data/unix/pcu_sock - trx 0 - power-ramp max-initial 0 mdBm - power-ramp step-size 2000 mdB - power-ramp step-interval 1 - phy 0 instance 0 -ctrl - bind 0.0.0.0 diff --git a/ttcn3-bts-test/oml/osmo-bts.confmerge b/ttcn3-bts-test/oml/osmo-bts.confmerge new file mode 100644 index 0000000..a9293b9 --- /dev/null +++ b/ttcn3-bts-test/oml/osmo-bts.confmerge @@ -0,0 +1,10 @@ +bts 0 + oml remote-ip 172.18.9.10 + trx 0 + power-ramp step-size 2000 mdB + trx 1 + power-ramp step-size 2000 mdB + trx 2 + power-ramp step-size 2000 mdB + trx 3 + power-ramp step-size 2000 mdB diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg deleted file mode 100644 index 49ca9d6..0000000 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ /dev/null @@ -1,247 +0,0 @@ -! -! OsmoBSC (1.1.2.236-5f22) configuration saved from vty -!! -password foo -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging print file 1 - logging level set-all notice - logging level rll info - logging level rsl debug - logging level msc debug - logging level filter debug - logging level pcu debug - logging level lctrl info - logging level lsccp info -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive - ipa bind 0.0.0.0 -cs7 instance 0 - point-code 0.23.3 - asp asp-clnt-msc-0 2905 0 m3ua - as as-clnt-msc-0 m3ua - asp asp-clnt-msc-0 - routing-key 2 0.23.3 -network - network country code 1 - mobile network code 1 - encryption a5 0 - neci 1 - paging any use tch 0 - handover 0 - handover1 window rxlev averaging 10 - handover1 window rxqual averaging 1 - handover1 window rxlev neighbor averaging 10 - handover1 power budget interval 6 - handover1 power budget hysteresis 3 - handover1 maximum distance 9999 - timer t3212 30 - bts 0 - type sysmobts - band DCS1800 - cell_identity 0 - location_area_code 1 - dtx uplink force - dtx downlink - base_station_id_code 63 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - early-classmark-sending forbidden - early-classmark-sending-3g allowed - ip.access unit_id 1234 0 - ip.access rsl-ip 172.18.9.10 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - codec-support fr - gprs mode gprs - gprs routing area 0 - gprs network-control-order nc0 - gprs cell bvci 1234 - gprs cell timer blocking-timer 3 - gprs cell timer blocking-retries 3 - gprs cell timer unblocking-retries 3 - gprs cell timer reset-timer 3 - gprs cell timer reset-retries 3 - gprs cell timer suspend-timer 10 - gprs cell timer suspend-retries 3 - gprs cell timer resume-timer 10 - gprs cell timer resume-retries 3 - gprs cell timer capability-update-timer 10 - gprs cell timer capability-update-retries 3 - gprs nsei 1234 - gprs ns timer tns-block 3 - gprs ns timer tns-block-retries 3 - gprs ns timer tns-reset 3 - gprs ns timer tns-reset-retries 3 - gprs ns timer tns-test 30 - gprs ns timer tns-alive 3 - gprs ns timer tns-alive-retries 10 - gprs nsvc 0 nsvci 1234 - gprs nsvc 0 local udp port 23000 - gprs nsvc 0 remote udp port 23000 - gprs nsvc 0 remote ip 0.0.0.0 - no force-combined-si - trx 0 - rf_locked 0 - arfcn 871 - nominal power 50 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F_PDCH - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 6 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 7 - phys_chan_config PDCH - hopping enabled 0 - trx 1 - rf_locked 0 - arfcn 873 - nominal power 50 - max_power_red 20 - rsl e1 tei 1 - timeslot 0 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 1 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 2 - phys_chan_config PDCH - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F_TCH/H_PDCH - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F_PDCH - hopping enabled 0 - timeslot 5 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 6 - phys_chan_config PDCH - hopping enabled 0 - timeslot 7 - phys_chan_config PDCH - hopping enabled 0 - trx 2 - rf_locked 0 - arfcn 875 - nominal power 50 - max_power_red 20 - rsl e1 tei 2 - timeslot 0 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 1 - phys_chan_config PDCH - hopping enabled 0 - timeslot 2 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 3 - phys_chan_config PDCH - hopping enabled 0 - timeslot 4 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 6 - phys_chan_config PDCH - hopping enabled 0 - timeslot 7 - phys_chan_config PDCH - hopping enabled 0 - trx 3 - rf_locked 0 - arfcn 877 - nominal power 50 - max_power_red 20 - rsl e1 tei 3 - timeslot 0 - phys_chan_config PDCH - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 3 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 4 - phys_chan_config PDCH - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 6 - phys_chan_config PDCH - hopping enabled 0 - timeslot 7 - phys_chan_config SDCCH8 - hopping enabled 0 -msc 0 - codec-list fr1 fr2 fr3 - allow-emergency allow - amr-config 12_2k forbidden - amr-config 10_2k forbidden - amr-config 7_95k forbidden - amr-config 7_40k forbidden - amr-config 6_70k forbidden - amr-config 5_90k allowed - amr-config 5_15k forbidden - amr-config 4_75k forbidden -bsc - mid-call-timeout 0 - no missing-msc-text diff --git a/ttcn3-bts-test/osmo-bsc.confmerge b/ttcn3-bts-test/osmo-bsc.confmerge new file mode 100644 index 0000000..eb1324d --- /dev/null +++ b/ttcn3-bts-test/osmo-bsc.confmerge @@ -0,0 +1,7 @@ +line vty + bind 0.0.0.0 +e1_input + ipa bind 0.0.0.0 +network + bts 0 + ip.access rsl-ip 172.18.9.10 diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg deleted file mode 100644 index bbe8a1d..0000000 --- a/ttcn3-bts-test/osmo-bts.cfg +++ /dev/null @@ -1,81 +0,0 @@ -! -! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty -!! -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all notice - logging level rsl info - logging level oml info - logging level meas info - logging level pag info - logging level l1c info - logging level dsp info - logging level pcu debug - logging level trx info - logging level lmib debug -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -phy 0 - osmotrx ip local 172.18.9.20 - osmotrx ip remote 172.18.9.21 - instance 0 - osmotrx rx-gain 10 - instance 1 - osmotrx rx-gain 10 - instance 2 - osmotrx rx-gain 10 - instance 3 - osmotrx rx-gain 10 -bts 0 - band DCS1800 - ipa unit-id 1234 0 - oml remote-ip 172.18.9.11 - rtp jitter-buffer 100 - paging queue-size 200 - paging lifetime 0 - gsmtap-remote-host 172.18.9.10 - gsmtap-sapi enable-all - no gsmtap-sapi pdtch - no gsmtap-sapi ptcch - min-qual-rach 50 - min-qual-norm -5 - !settsc - pcu-socket /data/unix/pcu_sock - trx 0 - power-ramp max-initial 0 mdBm - power-ramp step-size 8000 mdB - power-ramp step-interval 1 - phy 0 instance 0 - trx 1 - power-ramp max-initial 0 mdBm - power-ramp step-size 8000 mdB - power-ramp step-interval 1 - phy 0 instance 1 - trx 2 - power-ramp max-initial 0 mdBm - power-ramp step-size 8000 mdB - power-ramp step-interval 1 - phy 0 instance 2 - trx 3 - power-ramp max-initial 0 mdBm - power-ramp step-size 8000 mdB - power-ramp step-interval 1 - phy 0 instance 3 -ctrl - bind 0.0.0.0 diff --git a/ttcn3-bts-test/osmo-bts.confmerge b/ttcn3-bts-test/osmo-bts.confmerge new file mode 100644 index 0000000..7837748 --- /dev/null +++ b/ttcn3-bts-test/osmo-bts.confmerge @@ -0,0 +1,11 @@ +line vty + bind 0.0.0.0 +phy 0 + osmotrx ip local 172.18.9.20 + osmotrx ip remote 172.18.9.21 +bts 0 + oml remote-ip 172.18.9.11 + gsmtap-remote-host 172.18.9.10 + pcu-socket /data/unix/pcu_sock +ctrl + bind 0.0.0.0 diff --git a/ttcn3-bts-test/virtphy/osmo-bts.cfg b/ttcn3-bts-test/virtphy/osmo-bts.cfg deleted file mode 100644 index 2dab646..0000000 --- a/ttcn3-bts-test/virtphy/osmo-bts.cfg +++ /dev/null @@ -1,60 +0,0 @@ -! -! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty -!! -! -log gsmtap 172.18.9.10 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all notice - logging level rsl info - logging level oml info - logging level meas info - logging level pag info - logging level l1c info - logging level dsp info - logging level pcu debug - logging level trx info - logging level lmib debug -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -phy 0 - !virtual-um ms-multicast-group 239.193.23.1 - !virtual-um bts-multicast-group 239.193.23.2 - instance 0 -bts 0 - band DCS1800 - ipa unit-id 1234 0 - oml remote-ip 172.18.9.11 - rtp jitter-buffer 100 - paging queue-size 200 - paging lifetime 0 - gsmtap-sapi rach - gsmtap-sapi agch - gsmtap-sapi bcch - gsmtap-sapi pch - gsmtap-sapi sdcch - gsmtap-sapi sacch - min-qual-rach 50 - min-qual-norm -5 - pcu-socket /data/unix/pcu_sock - trx 0 - power-ramp max-initial 0 mdBm - power-ramp step-size 2000 mdB - power-ramp step-interval 1 - phy 0 instance 0 -ctrl - bind 0.0.0.0 diff --git a/ttcn3-bts-test/virtphy/osmo-bts.confmerge b/ttcn3-bts-test/virtphy/osmo-bts.confmerge new file mode 100644 index 0000000..d4f95d1 --- /dev/null +++ b/ttcn3-bts-test/virtphy/osmo-bts.confmerge @@ -0,0 +1,6 @@ +phy 0 + !virtual-um ms-multicast-group 239.193.23.1 + !virtual-um bts-multicast-group 239.193.23.2 +bts 0 + trx 0 + power-ramp step-size 2000 mdB -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9 Gerrit-Change-Number: 27103 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 ) Change subject: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct() ...................................................................... GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct() This patch fixes the following DTE happening sporadically: 04:09:29.373271 mtc GGSN_Tests.ttcn:1478 Dynamic test case error: The first argument of function int2oct(), which is 256, does not fit in 1 octet. Change-Id: I517b8e5d5872c36f7c759433a1cde338c90f16da --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 3b34c7f..ae24eeb 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1475,7 +1475,7 @@ var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); f_pdp_ctx_act(ctxA); - g_restart_ctr := int2oct(oct2int(g_restart_ctr) + 1, 1); + g_restart_ctr := int2oct((oct2int(g_restart_ctr) + 1) mod 256, 1); log("sending 2nd CreatePDP (recovery increased)"); f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctxB.imsi, g_restart_ctr, @@ -1564,7 +1564,7 @@ /* Wait to receive second echo request and send incremented Restart counter. This will fake a restarted SGSN, and pdp ctx allocated should be released by GGSN */ - g_restart_ctr := int2oct(oct2int(g_restart_ctr) + 1, 1); + g_restart_ctr := int2oct((oct2int(g_restart_ctr) + 1) mod 256, 1); GTPC.receive(tr_GTPC_PING(?)) -> value ud { var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber); GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 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: I517b8e5d5872c36f7c759433a1cde338c90f16da Gerrit-Change-Number: 27101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libgtpnl[master]: fix some cases of rc == 0 on error

by pablo

Attention is currently required from: neels, laforge, pespin. pablo has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/26990 ) Change subject: fix some cases of rc == 0 on error ...................................................................... Patch Set 1: (1 comment) File src/gtp-genl.c: https://gerrit.osmocom.org/c/libgtpnl/+/26990/comment/1fb34816_5c5793a9 PS1, Line 82: return -2; > just above this bit of code, the code returns -1. […] return -1 is fine, libmnl accordingly sets on errno. -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/26990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I22fd69709e023572c6c616a4184340a554456faf Gerrit-Change-Number: 26990 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pablo <pablo(a)gnumonks.org> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 14:34:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: update pyyaml dependency to >= 5.1

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27102 ) Change subject: update pyyaml dependency to >= 5.1 ...................................................................... update pyyaml dependency to >= 5.1 5.1 was the version introducing pyyaml.FullLoader which we're using, see https://pyyaml.org/wiki/PyYAML#history Change-Id: I0f2fa08ceeac2759218e85ad5bdce3ef951d0b74 --- M contrib/jenkins.sh M requirements.txt 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/27102/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e2e04e7..a01c012 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -18,7 +18,7 @@ virtualenv -p python3 venv --system-site-packages . venv/bin/activate pip install pytlv -pip install pyyaml +pip install 'pyyaml>=5.1' pip install cmd2==1.5 pip install jsonpath-ng pip install construct diff --git a/requirements.txt b/requirements.txt index 7308cf8..0046a50 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ construct bidict gsm0338 -pyyaml +pyyaml>=5.1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0f2fa08ceeac2759218e85ad5bdce3ef951d0b74 Gerrit-Change-Number: 27102 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct()

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 ) Change subject: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 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: I517b8e5d5872c36f7c759433a1cde338c90f16da Gerrit-Change-Number: 27101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 13:36:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct()

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 ) Change subject: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > You restarted the environment a lot of times it seems ;) Not really ;) This happens because we initialize g_restart_ctr with a random value in f_init(): https://git.osmocom.org/osmo-ttcn3-hacks/tree/ggsn_tests/GGSN_Tests.ttcn#n2… -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 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: I517b8e5d5872c36f7c759433a1cde338c90f16da Gerrit-Change-Number: 27101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 12:46:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct()

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 ) Change subject: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: You restarted the environment a lot of times it seems ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 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: I517b8e5d5872c36f7c759433a1cde338c90f16da Gerrit-Change-Number: 27101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 12:43:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 6: (1 comment) Patchset: PS6: > Regarding the patch, I would try to avoid downloading the files with wget, and rather run the config merge inside docker, where the config files are available in the checked out osmo-ttcn3-hacks.git. Then we would avoid the problem of having stale configs downloaded. I understand the problem, thanks for pointing it out! However, I am not sure if there is an easy & beautiful solution. The original config files are in osmo-ttcn3-hacks.git, so we need to take them from there somehow, apply the *.confmerge files (and some other sed quirks), and then feed the generated files to osmo-bsc and osmo-bts. -- 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: 6 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-Comment-Date: Wed, 09 Feb 2022 12:42:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 6: (1 comment) Patchset: PS6: > Should this be marked as WIP? In OS#5377 fixeria wrote: "the configuration file is still not understood correctly" I fixed various config parsing issues in the most recent patchset, so it's ready for review. -- 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: 6 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-Comment-Date: Wed, 09 Feb 2022 12:33:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 ) Change subject: GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct() ...................................................................... GGSN_Tests: fix DTE due to passing out-of-bound values to int2oct() This patch fixes the following DTE happening sporadically: 04:09:29.373271 mtc GGSN_Tests.ttcn:1478 Dynamic test case error: The first argument of function int2oct(), which is 256, does not fit in 1 octet. Change-Id: I517b8e5d5872c36f7c759433a1cde338c90f16da --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/27101/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 3b34c7f..ae24eeb 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1475,7 +1475,7 @@ var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); f_pdp_ctx_act(ctxA); - g_restart_ctr := int2oct(oct2int(g_restart_ctr) + 1, 1); + g_restart_ctr := int2oct((oct2int(g_restart_ctr) + 1) mod 256, 1); log("sending 2nd CreatePDP (recovery increased)"); f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctxB.imsi, g_restart_ctr, @@ -1564,7 +1564,7 @@ /* Wait to receive second echo request and send incremented Restart counter. This will fake a restarted SGSN, and pdp ctx allocated should be released by GGSN */ - g_restart_ctr := int2oct(oct2int(g_restart_ctr) + 1, 1); + g_restart_ctr := int2oct((oct2int(g_restart_ctr) + 1) mod 256, 1); GTPC.receive(tr_GTPC_PING(?)) -> value ud { var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber); GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27101 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: I517b8e5d5872c36f7c759433a1cde338c90f16da Gerrit-Change-Number: 27101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: filesystem: Fix TLV decode/encode

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27100 ) Change subject: filesystem: Fix TLV decode/encode ...................................................................... filesystem: Fix TLV decode/encode We cannot call a method of a class without instantiating it Change-Id: I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 --- M pySim/filesystem.py 1 file changed, 36 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/00/27100/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 3e9d52e..d60068d 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -532,8 +532,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_bin_data.hex()} def decode_hex(self, raw_hex_data:str) -> dict: @@ -558,8 +559,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_bin_data.hex()} def encode_bin(self, abstract_data:dict) -> bytearray: @@ -583,8 +585,9 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - self._tlv.from_dict(abstract_data) - return self._tlv.to_tlv() + t = self._tlv() + t.from_dict(raw_bin_data) + return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_hex(self, abstract_data:dict) -> str: @@ -609,8 +612,9 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - self._tlv.from_dict(abstract_data) - return b2h(self._tlv.to_tlv()) + t = self._tlv() + t.from_dict(abstract_data) + return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -767,8 +771,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_bin_data.hex()} def decode_record_bin(self, raw_bin_data:bytearray) -> dict: @@ -793,8 +798,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_hex_data} def encode_record_hex(self, abstract_data:dict) -> str: @@ -819,8 +825,9 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - self._tlv.from_dict(abstract_data) - return b2h(self._tlv.to_tlv()) + t = self._tlv() + t.from_dict(abstract_data) + return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: @@ -844,8 +851,9 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - self._tlv.from_dict(abstract_data) - return self._tlv.to_tlv() + t = self._tlv() + t.from_dict(abstract_data) + return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) class CyclicEF(LinFixedEF): @@ -901,8 +909,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_hex_data} def decode_record_bin(self, raw_bin_data:bytearray) -> dict: @@ -927,8 +936,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_hex_data} def encode_record_hex(self, abstract_data:dict) -> str: @@ -952,8 +962,9 @@ if self._construct: return b2h(filter_dict(self._construct.build(abstract_data))) elif self._tlv: - self._tlv.from_dict(abstract_data) - return b2h(self._tlv.to_tlv()) + t = self._tlv() + t.from_dict(abstract_data) + return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: @@ -977,8 +988,9 @@ if self._construct: return filter_dict(self._construct.build(abstract_data)) elif self._tlv: - self._tlv.from_dict(abstract_data) - return self._tlv.to_tlv() + t = self._tlv() + t.from_dict(abstract_data) + return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def _decode_bin(self, raw_bin_data:bytearray): -- 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_31_102: EF.PNN encoding is identical to that of DF.GSM

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27098 ) Change subject: ts_31_102: EF.PNN encoding is identical to that of DF.GSM ...................................................................... ts_31_102: EF.PNN encoding is identical to that of DF.GSM so let's use the DF.GSM/EF.PNN decoder Change-Id: If2ce52fccfca3d8bb2c9801b9812912922600377 --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/98/27098/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index c96bf09..f6f6c00 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -292,7 +292,7 @@ from pySim.ts_51_011 import EF_CBMID, EF_CBMIR, EF_ADN, EF_SMS, EF_MSISDN, EF_SMSP, EF_SMSS from pySim.ts_51_011 import EF_SMSR, EF_DCK, EF_EXT, EF_CNL, EF_OPL, EF_MBI, EF_MWIS from pySim.ts_51_011 import EF_MMSN, EF_MMSICP, EF_MMSUP, EF_MMSUCP, EF_VGCS, EF_VGCSS, EF_NIA -from pySim.ts_51_011 import EF_ACMmax, EF_AAeM, EF_eMLPP, EF_CMI +from pySim.ts_51_011 import EF_ACMmax, EF_AAeM, EF_eMLPP, EF_CMI, EF_PNN import pySim.ts_102_221 @@ -1037,7 +1037,7 @@ 'User controlled PLMN Selector with Access Technology'), EF_ARR('6f06', 0x17), TransparentEF('6fc4', None, 'EF.NETPAR', 'Network Parameters'), - LinFixedEF('6fc5', 0x19, 'EF.PNN', 'PLMN Network Name'), + EF_PNN('6fc5', 0x19), EF_OPL(), EF_ADN('6fc7', None, 'EF.MBDN', 'Mailbox Dialling Numbers'), EF_MBI(), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If2ce52fccfca3d8bb2c9801b9812912922600377 Gerrit-Change-Number: 27098 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_51_011: Fix typo in EF_MMSUP

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27099 ) Change subject: ts_51_011: Fix typo in EF_MMSUP ...................................................................... ts_51_011: Fix typo in EF_MMSUP The TLV decoder class must be in self._tlv, not self.tlv Change-Id: Ide6f6c823d5a16e375c324ba9bfa92e02c3b3c89 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/99/27099/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index a4e3507..a7f9f97 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -887,7 +887,7 @@ def __init__(self, fid='6fd1', sfid=None, name='EF.MMSUP', rec_len={1,None}, desc='MMS User Preferences'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len) - self.tlv = EF_MMSUP.MMS_User_Preferences + self._tlv = EF_MMSUP.MMS_User_Preferences # TS 51.011 Section 10.3.55 class EF_MMSUCP(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ide6f6c823d5a16e375c324ba9bfa92e02c3b3c89 Gerrit-Change-Number: 27099 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT Theoretically, this should improve performance of the code where we frequently invoke OSMO_ASSERT(), like osmo-msc and osmo-bsc. Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe --- M include/osmocom/core/utils.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 182da08..ba2cafb 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -112,7 +112,7 @@ */ #define OSMO_ASSERT(exp) \ do { \ - if (!(exp)) { \ + if (OSMO_UNLIKELY(!(exp))) { \ osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \ } \ } while (0); /* some code invokes OSMO_ASSERT() without the semicolon */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 10:05:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by osmith

Attention is currently required from: laforge, fixeria, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 09:52:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by iedemam

Attention is currently required from: neels, laforge, pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 7: (3 comments) Patchset: PS7: Ooops, I missed these review items. File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/783258a7_3c001f69 PS4, Line 3830: vty_out(vty, " Channel Activations : %"PRIu64" TCH", activations_tch); > Uhm sounds like I missed that part, I was just focusing on the formatting. […] addressed File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/93ccaae5_04664224 PS5, Line 3831: vty_out(vty," TCH %"PRIu64"", activations_tch); > This tabulation looks really big, it probably needs to be " ". addressed -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 7 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 09:40:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by pespin

Attention is currently required from: neels, laforge, pespin. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 7: (1 comment) Patchset: PS7: LGTM, letting Neels comment on the time_cc potential use. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 7 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 09:37:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by iedemam

Attention is currently required from: neels, laforge, pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 7: (4 comments) Patchset: PS7: Hi all, More updates. I fixed type usage when pulling rate_crt and stat_items as well. This (unfortunately?) led me to think a rate_crt is indeed the better type for storing total ms. Simply because it is a much larger type and will only ever increase. We will never have fewer active ms from one period to another. Thoughts? How is wrapping handled in a stat_item? If I'm calculating correctly, we will wrap the ms value there after approximately 600 Erlangs. No problem if it's handled gracefully...I just want to point it out. Thanks, -Michael File src/osmo-bsc/bts_trx_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/9a580c6c_f6a17e38 PS4, Line 575: vty_out(vty, " Activated %llu ms ago%s", duration_ms, VTY_NEWLINE); > Feel free to print it as ms if value < 1000. Or print them as "X. […] Now I show "<1s" if sub 1000ms and "Xs" otherwise. File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/0eff2fad_081ffdcf PS6, Line 3831: vty_out(vty, " TCH %"PRIu64"", activations_tch); > I ment the left side tabulation ;) It's 2 spaces per indentation leel afaict Sorry, gotcha. I was right-aligning TCH and SDCCH. It should be correct now. File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/d3d793d6_b741daad PS5, Line 1815: case GSM_LCHAN_TCH_F: > we put "case" line in the same column as "switch" in osmocom syntax style. aligned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 7 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 09:37:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by iedemam

Attention is currently required from: iedemam, neels, laforge. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 to look at the new patch set (#7). Change subject: WIP: New stats for lchan life duration. ...................................................................... WIP: New stats for lchan life duration. This patch adds two stats which track cummulative lchan lifetime by type TCH and SDCCH. These new counters will accomplish two things: 1) Provide a glanceable way to see if lchan durations look healthy. When examining a site, short-lived (<5s) and long-lived (>30s) TCH lchans are difficult to tell apart. If we only see short-lived TCH lchans, there is most likely an RF or signaling problem to investigate. This new counter will expose channel ages in the VTY output 2) Provide a more accurate count for Erlangs per site. Currently, we are basing Erlangs on active TCH channel counts per stats period. This method skews high very quickly. Each active TCH in that period translates into the full 10s of activity. This counter should improve accuracy by two orders of magnitude. Approach: - For now: a time calculation between channel activation and release - Maybe cleaner: use osmo_time_cc Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 7 files changed, 84 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/27081/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 7 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: tests: in46a_test: Make coverity happy when calling in46a_from_eua

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 ) Change subject: tests: in46a_test: Make coverity happy when calling in46a_from_eua ...................................................................... tests: in46a_test: Make coverity happy when calling in46a_from_eua Coverity warns around that test code: "Overrunning struct type in46_addr of 20 bytes by passing it to a function which accesses it at byte offset 39." That's basically because in64a_from_eua expects to be passed a 2 element array to be filled. The second element, though, is only accessed in the case where an IPv4v6 EUA is passed, so in the cases where the test explicitly passes an IPv4 or IPv6 EUA it's not really an issue, hence coverity throwing a false positive here. Let's anyway rewrite the code to pass a 2 element array for completeness, since it doesn't hurt and makes coverity happy. Related: Coverity CID#249006 Change-Id: Idfc9104f48eeee6e7f11ebc5c17d4b0e4b2fe9e2 --- M tests/lib/in46a_test.c 1 file changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/97/27097/1 diff --git a/tests/lib/in46a_test.c b/tests/lib/in46a_test.c index d6c4f47..d576124 100644 --- a/tests/lib/in46a_test.c +++ b/tests/lib/in46a_test.c @@ -146,7 +146,7 @@ static void test_in46a_from_eua(void) { - struct in46_addr ia; + struct in46_addr ia[2]; struct ul66_t eua; const uint8_t v4_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4 }; const uint8_t v4_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4, 1,2,3,4 }; @@ -155,35 +155,35 @@ printf("Testing in46a_from_eua() with IPv4 addresses\n"); /* default: v4 unspec */ - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 4); - OSMO_ASSERT(ia.v4.s_addr == 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == 0); /* invalid */ eua.v[0] = 0x23; eua.v[1] = PDP_EUA_TYPE_v4; eua.l = 6; - OSMO_ASSERT(in46a_from_eua(&eua, &ia) < 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) < 0); /* invalid */ eua.v[0] = PDP_EUA_ORG_IETF; eua.v[1] = 0x23; eua.l = 6; - OSMO_ASSERT(in46a_from_eua(&eua, &ia) < 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) < 0); /* unspecified V4 */ memcpy(eua.v, v4_unspec, sizeof(v4_unspec)); eua.l = sizeof(v4_unspec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 4); - OSMO_ASSERT(ia.v4.s_addr == 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == 0); /* specified V4 */ memcpy(eua.v, v4_spec, sizeof(v4_spec)); eua.l = sizeof(v4_spec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 4); - OSMO_ASSERT(ia.v4.s_addr == htonl(0x01020304)); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == htonl(0x01020304)); } static void test_in46a_netmasklen(void) @@ -318,7 +318,7 @@ static void test_in46a_from_eua_v6(void) { - struct in46_addr ia; + struct in46_addr ia[2]; struct ul66_t eua; const uint8_t v6_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v6 }; const uint8_t v6_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v6, @@ -331,16 +331,16 @@ /* unspecified V6 */ memcpy(eua.v, v6_unspec, sizeof(v6_unspec)); eua.l = sizeof(v6_unspec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 16); - OSMO_ASSERT(IN6_IS_ADDR_UNSPECIFIED(&ia.v6)); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 16); + OSMO_ASSERT(IN6_IS_ADDR_UNSPECIFIED(&ia[0].v6)); /* specified V6 */ memcpy(eua.v, v6_spec, sizeof(v6_spec)); eua.l = sizeof(v6_spec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 16); - OSMO_ASSERT(!memcmp(&ia.v6, v6_spec+2, ia.len)); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 16); + OSMO_ASSERT(!memcmp(&ia[0].v6, v6_spec+2, ia[0].len)); } static void test_in46a_from_eua_v4v6(void) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idfc9104f48eeee6e7f11ebc5c17d4b0e4b2fe9e2 Gerrit-Change-Number: 27097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/msgb.h: make use of OSMO_LIKELY / OSMO_UNLIKELY

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27048 ) Change subject: core/msgb.h: make use of OSMO_LIKELY / OSMO_UNLIKELY ...................................................................... core/msgb.h: make use of OSMO_LIKELY / OSMO_UNLIKELY Change-Id: Iff666b5fa0b320ae47b6c8c5dfd39debd2d9b8b7 --- M include/osmocom/core/msgb.h 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index 38e51dd..117fcb0 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -234,7 +234,7 @@ static inline unsigned char *msgb_put(struct msgb *msgb, unsigned int len) { unsigned char *tmp = msgb->tail; - if (msgb_tailroom(msgb) < (int) len) + if (OSMO_UNLIKELY(msgb_tailroom(msgb) < (int) len)) MSGB_ABORT(msgb, "Not enough tailroom msgb_put" " (allocated %u, head at %u, len %u, tailroom %u < want tailroom %u)\n", msgb->data_len - sizeof(struct msgb), @@ -282,7 +282,7 @@ */ static inline unsigned char *msgb_get(struct msgb *msgb, unsigned int len) { - if (msgb_length(msgb) < len) + if (OSMO_UNLIKELY(msgb_length(msgb) < len)) MSGB_ABORT(msgb, "msgb too small to get %u (len %u)\n", len, msgb_length(msgb)); msgb->tail -= len; @@ -334,7 +334,7 @@ */ static inline unsigned char *msgb_push(struct msgb *msgb, unsigned int len) { - if (msgb_headroom(msgb) < (int) len) + if (OSMO_UNLIKELY(msgb_headroom(msgb) < (int) len)) MSGB_ABORT(msgb, "Not enough headroom msgb_push" " (allocated %u, head at %u < want headroom %u, len %u, tailroom %u)\n", msgb->data_len - sizeof(struct msgb), @@ -397,7 +397,7 @@ */ static inline unsigned char *msgb_pull(struct msgb *msgb, unsigned int len) { - if (msgb_length(msgb) < len) + if (OSMO_UNLIKELY(msgb_length(msgb) < len)) MSGB_ABORT(msgb, "msgb too small to pull %u (len %u)\n", len, msgb_length(msgb)); msgb->len -= len; @@ -488,9 +488,9 @@ */ static inline int msgb_trim(struct msgb *msg, int len) { - if (len < 0) + if (OSMO_UNLIKELY(len < 0)) MSGB_ABORT(msg, "Negative length is not allowed\n"); - if (len > msg->data_len) + if (OSMO_UNLIKELY(len > msg->data_len)) return -1; msg->len = len; @@ -526,7 +526,7 @@ osmo_static_assert(size >= headroom, headroom_bigger); struct msgb *msg = msgb_alloc_c(ctx, size, name); - if (msg) + if (OSMO_LIKELY(msg)) msgb_reserve(msg, headroom); return msg; } @@ -548,7 +548,7 @@ osmo_static_assert(size >= headroom, headroom_bigger); struct msgb *msg = msgb_alloc(size, name); - if (msg) + if (OSMO_LIKELY(msg)) msgb_reserve(msg, headroom); return msg; } 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iff666b5fa0b320ae47b6c8c5dfd39debd2d9b8b7 Gerrit-Change-Number: 27048 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

Attention is currently required from: osmith, laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... Patch Set 4: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/27047/comment/b00c291c_dd7b015f PS2, Line 7: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT > Maybe explain a bit more where the advantage is. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 19:47:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-tests-ogs: Configuration fixes for IPv6 tests

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27096 ) Change subject: ttcn3-ggsn-tests-ogs: Configuration fixes for IPv6 tests ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6fe98f6642bbd42376c9ed7353b58451c104eaca Gerrit-Change-Number: 27096 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 19:42:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27094 ) Change subject: ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a452ad871612d1c88b94579dadbe62b718b1475 Gerrit-Change-Number: 27094 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 19:41:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 19:16:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by pespin

Attention is currently required from: iedemam, neels, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 6: (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/4b823371_0f0e2166 PS6, Line 3831: vty_out(vty, " TCH %"PRIu64"", activations_tch); I ment the left side tabulation ;) It's 2 spaces per indentation leel afaict -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 6 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 08 Feb 2022 19:15:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... Patch Set 4: (1 comment) File include/osmocom/core/utils.h: https://gerrit.osmocom.org/c/libosmocore/+/27047/comment/340f4899_88510e40 PS3, Line 115: if (OSMO_LIKELY(exp)) ; \ > Ack Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 17:44:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

Attention is currently required from: osmith, pespin, fixeria. Hello osmith, Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27047 to look at the new patch set (#4). Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT Theoretically, this should improve performance of the code where we frequently invoke OSMO_ASSERT(), like osmo-msc and osmo-bsc. Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe --- M include/osmocom/core/utils.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/27047/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-bts[master]: logging: get rid of logging category DSUM

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16145 ) Change subject: logging: get rid of logging category DSUM ...................................................................... logging: get rid of logging category DSUM DSUM is somewhat similar to DMAIN, generic logging category used in other Osmocom projects. This category is rarely used in a few places, where the other categories could fit better. Remove it. Change-Id: Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce --- M include/osmo-bts/logging.h M src/common/bts.c M src/common/bts_trx.c M src/common/logging.c M src/common/main.c M src/osmo-bts-virtual/main.c 6 files changed, 9 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmo-bts/logging.h b/include/osmo-bts/logging.h index 852c383..e24fe74 100644 --- a/include/osmo-bts/logging.h +++ b/include/osmo-bts/logging.h @@ -20,7 +20,6 @@ DLOOP, DABIS, DRTP, - DSUM, }; extern const struct log_info bts_log_info; diff --git a/src/common/bts.c b/src/common/bts.c index 93fb400..4e49c45 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -429,7 +429,7 @@ { int i, j; - LOGP(DSUM, LOGL_INFO, "Main link established, sending NM Status.\n"); + LOGP(DOML, LOGL_INFO, "Main link established, sending NM Status.\n"); /* BTS SITE MGR becomes Offline (tx SW ACT Report), BTS is DEPENDENCY */ osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SW_ACT, NULL); @@ -652,7 +652,7 @@ struct gsm48_imm_ass_rej *imm_ass_cmd = msgb_l3(msg); if (bts->agch_queue.length > hard_limit) { - LOGP(DSUM, LOGL_ERROR, + LOGP(DRR, LOGL_ERROR, "AGCH: too many messages in queue, " "refusing message type %s, length = %d/%d\n", gsm48_rr_msg_name(((struct gsm48_imm_ass *)msgb_l3(msg))->msg_type), diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index ff5c618..fce1d02 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -222,7 +222,7 @@ { int rc; - LOGPTRX(trx, DSUM, LOGL_INFO, "RSL link up\n"); + LOGPTRX(trx, DRSL, LOGL_INFO, "RSL link up\n"); osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_RSL_UP, NULL); osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_RSL_UP, NULL); diff --git a/src/common/logging.c b/src/common/logging.c index 50a5a1a..04025fc 100644 --- a/src/common/logging.c +++ b/src/common/logging.c @@ -119,12 +119,6 @@ .color = "\033[0;34m", .enabled = 1, .loglevel = LOGL_NOTICE, }, - [DSUM] = { - .name = "DSUM", - .description = "DSUM", - .loglevel = LOGL_NOTICE, - .enabled = 1, - }, }; static int osmo_bts_filter_fn(const struct log_context *ctx, struct log_target *tgt) diff --git a/src/common/main.c b/src/common/main.c index b5ba21b..4ce00cc 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -303,6 +303,8 @@ bts_vty_init(tall_bts_ctx); e1inp_vty_init(); + logging_vty_add_deprecated_subsys(tall_bts_ctx, "sum"); + handle_options(argc, argv); fprintf(stderr, "((*))\n |\n / \\ OsmoBTS\n"); diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index e5e44ed..34020e1 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -80,7 +80,7 @@ void bts_model_print_help() { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DLGLOBAL, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int bts_model_handle_options(int argc, char **argv) @@ -126,18 +126,18 @@ void bts_model_phy_instance_set_defaults(struct phy_instance *pinst) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DLGLOBAL, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DLGLOBAL, LOGL_NOTICE, "Unimplemented %s\n", __func__); return -ENOTSUP; } void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); + LOGP(DLGLOBAL, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int main(int argc, char **argv) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce Gerrit-Change-Number: 16145 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm_network_T_defs: add T4, so it becomes configurable

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27084 ) Change subject: gsm_network_T_defs: add T4, so it becomes configurable ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c Gerrit-Change-Number: 27084 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: bssmap_reset: pass -1 to osmo_tdef_fsm_inst_state_chg()

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27089 ) Change subject: bssmap_reset: pass -1 to osmo_tdef_fsm_inst_state_chg() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2533dc73ddb9498f09824d59f5d189517f30abc0 Gerrit-Change-Number: 27089 Gerrit-PatchSet: 1 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: abandon

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by pespin

Attention is currently required from: iedemam, neels, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 6: (1 comment) File src/osmo-bsc/bts_trx_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/d6efa26d_8eedc4b1 PS4, Line 575: vty_out(vty, " Activated %llu ms ago%s", duration_ms, VTY_NEWLINE); > SDCCH channels might not ever reach a full second. […] Feel free to print it as ms if value < 1000. Or print them as "X.Y s" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 6 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 08 Feb 2022 17:28:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by iedemam

Attention is currently required from: iedemam, neels, laforge. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 to look at the new patch set (#6). Change subject: WIP: New stats for lchan life duration. ...................................................................... WIP: New stats for lchan life duration. This patch adds two stats which track cummulative lchan lifetime by type TCH and SDCCH. These new counters will accomplish two things: 1) Provide a glanceable way to see if lchan durations look healthy. When examining a site, short-lived (<5s) and long-lived (>30s) TCH lchans are difficult to tell apart. If we only see short-lived TCH lchans, there is most likely an RF or signaling problem to investigate. This new counter will expose channel ages in the VTY output 2) Provide a more accurate count for Erlangs per site. Currently, we are basing Erlangs on active TCH channel counts per stats period. This method skews high very quickly. Each active TCH in that period translates into the full 10s of activity. This counter should improve accuracy by two orders of magnitude. Approach: - For now: a time calculation between channel activation and release - Maybe cleaner: use osmo_time_cc Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 7 files changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/27081/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 6 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by pespin

Attention is currently required from: iedemam, neels, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 5: (2 comments) Patchset: PS5: > Hi all, […] I'm fine with tracking milliseconds, I'm not saying you should change that. I'm mentioning that I think showing milliseconds *in the VTY output* is not needed and makes stuff more difficult to read. Since VTY is to be read by a person, there's no need to see milliseconds there, and only makes it more difficult to quickly understand the duration. File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/f1f580c2_b626457c PS4, Line 3830: vty_out(vty, " Channel Activations : %"PRIu64" TCH", activations_tch); > You don't want to show total activations? Same comment as above about ms precision being needed to d […] Uhm sounds like I missed that part, I was just focusing on the formatting. It's probably something liek this then right? Channel Activations: TCH 43534 (avg lifespan 3s) SDCCH 3214123 (avg lifespan 5s) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 5 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 08 Feb 2022 17:25:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by pespin

Attention is currently required from: iedemam, neels, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 5: (3 comments) Patchset: PS5: Only minor linter stuff. Also indeed it may make sense to use the time_cc thing instead of printing stats, letting Neels look at that he'll know better. File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/c2d8e80a_7549dfe5 PS5, Line 3831: vty_out(vty," TCH %"PRIu64"", activations_tch); This tabulation looks really big, it probably needs to be " ". File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/607fd18d_d9c035ab PS5, Line 1815: case GSM_LCHAN_TCH_F: we put "case" line in the same column as "switch" in osmocom syntax style. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 5 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 08 Feb 2022 17:21:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by iedemam

Attention is currently required from: neels, laforge, pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: WIP: New stats for lchan life duration. ...................................................................... Patch Set 5: (7 comments) Patchset: PS5: Hi all, Thanks for the reviews so far. Latest patchset uploaded which addresses some concerns. I think our main disagreement is that of precision. The best of both worlds would be for me to store cumulative active time as seconds instead of milliseconds while still being able to show individual channel ages in milliseconds. This would require carrying remainders as state between activations which I think is ugly. Perhaps it is indeed enough to only track seconds. In the grand scheme of using this value to extrapolate Erlangs per site, it is still quite precise. Regards, -Michael File src/osmo-bsc/bts_trx_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/d981f7cc_ded2752b PS4, Line 575: vty_out(vty, " Activated %llu ms ago%s", duration_ms, VTY_NEWLINE); > Probably more interesting to print it in VTY as seconds? Doesn't look like we can glance millisecond […] SDCCH channels might not ever reach a full second. This was my thinking in using millisecond precision in the VTY. File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/88700fb3_6d23878f PS4, Line 3830: vty_out(vty, " Channel Activations : %"PRIu64" TCH", activations_tch); > I'd rather put it: […] You don't want to show total activations? Same comment as above about ms precision being needed to display SDCCH info in a meaningful way. I could add logic to simply show "<1s" for them. Sounds clean as well. File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/9ad59d86_98481bf2 PS4, Line 349: long long > wondering if a signed data type makes sense here, but this is not critical. true...everything is now unsigned long long File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/ad77c3bf_d66974a4 PS4, Line 1812: long long duration_ms = gsm_lchan_active_duration_ms(lchan); > Shouldn't this be an unsigned long long everywhere? Maybe simply use time_t? true...everything is now unsigned long long https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/d9f07147_63e75399 PS4, Line 1814: if (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H) { > I'd go for a switch statement here, but not critical. done https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/a10937cb_11d0cbc0 PS4, Line 1816: rate_ctr_add(rate_ctr_group_get_ctr(bts_ctrs, BTS_CTR_LCHAN_TCH_TOTAL_ACTIVE_MILLISECONDS), duration_ms); > my gut feeling also goes more towards a stat_item, but I didn't spend a lot of time contemplating it […] Agreed. Converted to stat_item. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 5 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 17:17:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: WIP: New stats for lchan life duration.

by iedemam

Attention is currently required from: iedemam, neels, pespin. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 to look at the new patch set (#5). Change subject: WIP: New stats for lchan life duration. ...................................................................... WIP: New stats for lchan life duration. This patch adds two stats which track cummulative lchan lifetime by type TCH and SDCCH. These new counters will accomplish two things: 1) Provide a glanceable way to see if lchan durations look healthy. When examining a site, short-lived (<5s) and long-lived (>30s) TCH lchans are difficult to tell apart. If we only see short-lived TCH lchans, there is most likely an RF or signaling problem to investigate. This new counter will expose channel ages in the VTY output 2) Provide a more accurate count for Erlangs per site. Currently, we are basing Erlangs on active TCH channel counts per stats period. This method skews high very quickly. Each active TCH in that period translates into the full 10s of activity. This counter should improve accuracy by two orders of magnitude. Approach: - For now: a time calculation between channel activation and release - Maybe cleaner: use osmo_time_cc Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 7 files changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/27081/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 5 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-tests-ogs: Configuration fixes for IPv6 tests

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27096 ) Change subject: ttcn3-ggsn-tests-ogs: Configuration fixes for IPv6 tests ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6fe98f6642bbd42376c9ed7353b58451c104eaca Gerrit-Change-Number: 27096 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 17:08:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log