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

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Support testenv
by osmith 25 Oct '24

25 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email ) Change subject: hnbgw: Support testenv ...................................................................... hnbgw: Support testenv Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 --- M _testenv/testenv/osmo_dev.py A hnbgw/HNBGW_Tests-with-pfcp.cfg M hnbgw/osmo-hnbgw-with-pfcp.cfg M hnbgw/osmo-hnbgw.cfg A hnbgw/testenv_generic.cfg A hnbgw/testenv_with-pfcp.cfg 6 files changed, 87 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 9a10462..51d07a7 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -85,9 +85,12 @@ "default.opts", "ccache.opts", "gtp_linux.opts", + "hnbgw_with_nftables.opts", + "hnbgw_with_pfcp.opts", "iu.opts", "no_dahdi.opts", "no_doxygen.opts", + "no_man_pages.opts", "no_systemd.opts", "werror.opts", os.path.join(testenv.data_dir, "osmo-dev/osmo-bts-trx.opts"), diff --git a/hnbgw/HNBGW_Tests-with-pfcp.cfg b/hnbgw/HNBGW_Tests-with-pfcp.cfg new file mode 100644 index 0000000..7024bb9 --- /dev/null +++ b/hnbgw/HNBGW_Tests-with-pfcp.cfg @@ -0,0 +1,20 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./HNBGW_Tests.default" + +# Local configuration below + + [LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-with-pfcp" + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +HNBGW_Tests.mp_enable_pfcp_tests := true; + +[MAIN_CONTROLLER] + +[EXECUTE] +HNBGW_Tests.control diff --git a/hnbgw/osmo-hnbgw-with-pfcp.cfg b/hnbgw/osmo-hnbgw-with-pfcp.cfg index ffe5e09..c4e1c08 100644 --- a/hnbgw/osmo-hnbgw-with-pfcp.cfg +++ b/hnbgw/osmo-hnbgw-with-pfcp.cfg @@ -2,28 +2,38 @@ ! OsmoHNBGW (1.1.0) configuration saved from vty !! ! +log gsmtap 172.0.0.1 + logging level set-all debug + logging filter all 1 +! log stderr logging filter all 1 logging color 1 logging print category-hex 0 logging print category 1 + logging print level 1 logging print thread-id 0 logging print extended-timestamp 1 - logging print level 1 logging print file basename last logging level set-all debug - logging level ranap info - logging level rua info - logging level lss7 error - logging level lm3ua error - logging level linp error - logging level lpfcp info - logging level lsua notice - logging level lsccp notice ! line vty no login + bind 127.0.0.1 +ctrl + bind 127.0.0.1 ! + +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 127.0.0.1 + remote-port 8125 + flush-period 1 + mtu 1024 + enable + cs7 instance 0 point-code 0.23.5 @@ -65,6 +75,8 @@ local-ip 127.0.0.1 local-port 29169 hnbap-allow-tmsi 1 + # don't spam RANAP RESET messages for up to eight CN links across all tests + timer hnbgw T4 60 pfcp remote-addr 127.0.0.1 local-addr 127.0.0.2 diff --git a/hnbgw/osmo-hnbgw.cfg b/hnbgw/osmo-hnbgw.cfg index 8a9774b..854e4cc 100644 --- a/hnbgw/osmo-hnbgw.cfg +++ b/hnbgw/osmo-hnbgw.cfg @@ -2,18 +2,26 @@ ! OsmoHNBGW (1.1.0) configuration saved from vty !! ! +log gsmtap 172.0.0.1 + logging level set-all debug + logging filter all 1 +! log stderr logging filter all 1 logging color 1 - logging print category-hex 1 + logging print category-hex 0 logging print category 1 + logging print level 1 logging print thread-id 0 logging print extended-timestamp 1 - logging print file 1 + logging print file basename last logging level set-all debug ! line vty no login + bind 127.0.0.1 +ctrl + bind 127.0.0.1 ! stats interval 0 diff --git a/hnbgw/testenv_generic.cfg b/hnbgw/testenv_generic.cfg new file mode 100644 index 0000000..d1daeab --- /dev/null +++ b/hnbgw/testenv_generic.cfg @@ -0,0 +1,16 @@ +[testsuite] +program=HNBGW_Tests +config=HNBGW_Tests.cfg + +[stp] +program=osmo-stp +make=libosmo-sigtran +package=osmo-stp +copy=osmo-stp.cfg + +[hnbgw] +program=osmo-hnbgw +make=osmo-hnbgw +package=osmo-hnbgw +copy=osmo-hnbgw.cfg +vty_port=4261 diff --git a/hnbgw/testenv_with-pfcp.cfg b/hnbgw/testenv_with-pfcp.cfg new file mode 100644 index 0000000..4f19a31 --- /dev/null +++ b/hnbgw/testenv_with-pfcp.cfg @@ -0,0 +1,17 @@ +[testsuite] +program=HNBGW_Tests +config=HNBGW_Tests-with-pfcp.cfg +clean=rename_junit_xml_classname.sh :with-pfcp + +[stp] +program=osmo-stp +make=libosmo-sigtran +package=osmo-stp +copy=osmo-stp.cfg + +[hnbgw] +program=osmo-hnbgw -c osmo-hnbgw-with-pfcp.cfg +make=osmo-hnbgw +package=osmo-hnbgw +copy=osmo-hnbgw-with-pfcp.cfg +vty_port=4261 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 Gerrit-Change-Number: 38527 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Support testenv
by osmith 25 Oct '24

25 Oct '24

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email ) Change subject: hnbgw: Support testenv ...................................................................... Patch Set 4: Code-Review+2 (2 comments) File _testenv/data/podman/Dockerfile: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527/comment/fa618b32_98aa… : PS2, Line 22: asciidoc-base \ > Fine with me, I'll wait till that patch is merged to rework and resubmit. Done File hnbgw/testenv_with-pfcp.cfg: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527/comment/be5d8dfe_e115… : PS2, Line 3: config=HNBGW_Tests-with-pfcp.cfg > To end up with the same test results format, as with docker-playground, we need to add to `[testsuit […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 Gerrit-Change-Number: 38527 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 11:47:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Support testenv
by osmith 25 Oct '24

25 Oct '24

Attention is currently required from: pespin. osmith has uploaded a new patch set (#4) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: hnbgw: Support testenv ...................................................................... hnbgw: Support testenv Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 --- M _testenv/testenv/osmo_dev.py A hnbgw/HNBGW_Tests-with-pfcp.cfg M hnbgw/osmo-hnbgw-with-pfcp.cfg M hnbgw/osmo-hnbgw.cfg A hnbgw/testenv_generic.cfg A hnbgw/testenv_with-pfcp.cfg 6 files changed, 87 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/38527/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 Gerrit-Change-Number: 38527 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Support testenv
by osmith 25 Oct '24

25 Oct '24

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email ) Change subject: hnbgw: Support testenv ...................................................................... Patch Set 2: (1 comment) File hnbgw/testenv_with-pfcp.cfg: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527/comment/e246731c_e92f… : PS2, Line 3: config=HNBGW_Tests-with-pfcp.cfg To end up with the same test results format, as with docker-playground, we need to add to `[testsuite]`: ``` clean=rename_junit_xml_classname.sh :with-pfcp ``` This is because the jenkins jobs run both without pfcp and with pfcp in the same job, and then add this ":with-pfcp" to the results of the pfcp run. https://gitea.osmocom.org/osmocom/docker-playground/src/commit/dd829a475dfd… -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 Gerrit-Change-Number: 38527 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 11:44:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Support testenv
by pespin 25 Oct '24

25 Oct '24

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: hnbgw: Support testenv ...................................................................... hnbgw: Support testenv Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 --- M _testenv/testenv/osmo_dev.py A hnbgw/HNBGW_Tests-with-pfcp.cfg M hnbgw/osmo-hnbgw-with-pfcp.cfg M hnbgw/osmo-hnbgw.cfg A hnbgw/testenv_generic.cfg A hnbgw/testenv_with-pfcp.cfg 6 files changed, 86 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/38527/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 Gerrit-Change-Number: 38527 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: s1gw_metrics: add a counter for unexpected PFCP PDUs
by pespin 25 Oct '24

25 Oct '24

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38535?usp=email ) Change subject: s1gw_metrics: add a counter for unexpected PFCP PDUs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38535?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I338662d0fe079f1c4222a70c5521eff2d237c793 Gerrit-Change-Number: 38535 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 11:37:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: s1gw_metrics: add counters for PFCP Heartbeat Req/Resp
by pespin 25 Oct '24

25 Oct '24

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38534?usp=email ) Change subject: s1gw_metrics: add counters for PFCP Heartbeat Req/Resp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38534?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I61b28c41be4fe051adff1a5315b70409dea9b9cd Gerrit-Change-Number: 38534 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 11:36:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in ...osmo-s1gw[master]: pfcp_peer: implement Heartbeat Request procedure
by pespin 25 Oct '24

25 Oct '24

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38533?usp=email ) Change subject: pfcp_peer: implement Heartbeat Request procedure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38533?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie52d58ffcc169abe8e72ea106ab957c12af2e8b9 Gerrit-Change-Number: 38533 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 11:35:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: osmo-dev: add hint for gen_makefile fail
by osmith 25 Oct '24

25 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38530?usp=email ) Change subject: testenv: osmo-dev: add hint for gen_makefile fail ...................................................................... testenv: osmo-dev: add hint for gen_makefile fail When gen_makefile.py from osmo-dev fails, it is likely that the osmo-dev git clone is outdated, for example if a new file with configure options was added to osmo-dev.git and is now being used by testenv. Display a hint for pulling this repository to the user. Change-Id: Ia9ed23fa910876252093054f5f389865632c7593 --- M _testenv/testenv/osmo_dev.py M _testenv/testenv/podman.py 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 4dd581a..9a10462 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later import logging import os +import shlex import sys import testenv import testenv.cmd @@ -92,7 +93,12 @@ os.path.join(testenv.data_dir, "osmo-dev/osmo-bts-trx.opts"), ] + extra_opts - testenv.cmd.run(cmd, cwd=get_osmo_dev_dir()) + cwd = get_osmo_dev_dir() + if testenv.cmd.run(cmd, cwd=cwd, check=False).returncode: + logging.critical("gen_makefile.py from osmo-dev failed!") + logging.critical("Your osmo-dev.git clone might be outdated, try:") + logging.critical(f"$ git -C {shlex.quote(cwd)} pull") + sys.exit(1) init_done = True diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 683f468..faa1837 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -146,7 +146,7 @@ if isinstance(cmd, str): cmd = ["sh", "-c", cmd] - testenv.cmd.run( + return testenv.cmd.run( ["podman", "exec"] + podman_opts + [container_name] + cmd, no_podman=True, *args, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38530?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia9ed23fa910876252093054f5f389865632c7593 Gerrit-Change-Number: 38530 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-dev[master]: no_man_pages.opts: new file
by osmith 25 Oct '24

25 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/38529?usp=email ) Change subject: no_man_pages.opts: new file ...................................................................... no_man_pages.opts: new file Disable building man pages for nftables, which requires asciidoc. Related: osmo-ttcn3-hacks Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 Change-Id: I53342830d75b879a28334090df9d5cb935c43637 --- A no_man_pages.opts 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/no_man_pages.opts b/no_man_pages.opts new file mode 100644 index 0000000..aee63e8 --- /dev/null +++ b/no_man_pages.opts @@ -0,0 +1 @@ +nftables --disable-man-doc -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/38529?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I53342830d75b879a28334090df9d5cb935c43637 Gerrit-Change-Number: 38529 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0