- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: testenv: support using multiple titan versions

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40450?usp=email ) Change subject: testenv: support using multiple titan versions ...................................................................... testenv: support using multiple titan versions Install eclipse-titan versions 9.0.0 and 11.1.0 into /opt/eclipse-titan-$version inside the podman container by using the new optdir packages. Choose the appropriate version by setting related environment variables. Use the version in $PATH on the host, unless /opt/eclipse-titan-$version is also present on the host system. Add a new --titan-version argument to explicitly set a version to use when running a testsuite. Rewrite the version check code to take titan_min, --titan-version and the host version (if not using optdir) into account. Related: OS#6490 Change-Id: I48d711da57c874cf7cd557480a163eea1a4167bd --- M _testenv/README.md M _testenv/data/podman/Dockerfile M _testenv/testenv.py M _testenv/testenv/__init__.py M _testenv/testenv/podman.py M _testenv/testenv/requirements.py M _testenv/testenv/testenv_cfg.py M _testenv/testenv/testsuite.py 8 files changed, 119 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/40450/1 diff --git a/_testenv/README.md b/_testenv/README.md index a712dc8..ecc8701 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -66,7 +66,8 @@ #### Testsuite section * `titan_min=`: the minimum required eclipse-titan version for building and - running this testsuite. + running this testsuite. See the eclipse-titan versions section below for + details. * `program=`: the executable for starting the testsuite, without arguments. @@ -275,6 +276,17 @@ * `TERM`: Is set to the same `TERM` passed to testenv with fallback to `dumb`. +## Eclipse-titan versions + +It is possible to change the eclipse-titan version that is used to build and +run a testsuite if multiple versions are installed. This is the case when +running in podman (see `testenv/data/podman/Dockerfile`) or if multiple +versions are installed as `/opt/eclipse-titan-$VERSION` paths on the host +system. + +Switching between the versions is done either by setting a `titan_min` version +in the `[testsuite]` section, or by using `-T` / `--titan-version`. + ## Troubleshooting ### Timeout waiting for RESET-ACK after sending RESET diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index dca8a75..84aa0db 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -147,7 +147,8 @@ RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ - eclipse-titan \ + eclipse-titan-optdir-9.0.0 \ + eclipse-titan-optdir-11.1.0 \ && \ apt-get clean && \ rm /etc/apt/sources.list.d/osmocom-latest.list diff --git a/_testenv/testenv.py b/_testenv/testenv.py index f852c0c..2aac11e 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -43,6 +43,7 @@ if testenv.args.podman: testenv.podman.init() testenv.podman.start() + testenv.podman.check_titan_version() if not testenv.args.binary_repo: testenv.osmo_dev.init() diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index cb4a02c..511ec58 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -86,6 +86,7 @@ help="which testenv.cfg to use (supports * wildcards via fnmatch)", ) group.add_argument("-i", "--io-uring", action="store_true", help="set LIBOSMO_IO_BACKEND=IO_URING") + group.add_argument("-T", "--titan-version", help="which eclipse-titan version to use") group = sub_run.add_argument_group("source/binary options", "All components are built from source by default.") group.add_argument( diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index f8812e4..5099a95 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -12,6 +12,7 @@ import testenv.testdir import testenv.coredump import time +import sys image_name = None distro = None @@ -283,6 +284,20 @@ exec_cmd(["apt-get", "-q", "update"]) +def check_titan_version(): + version, _ = testenv.testenv_cfg.get_titan_version_first_cfg() + if not testenv.cmd.run(["test", "-d", f"/opt/eclipse-titan-{version}"], check=False).returncode: + return + + up_to_date = testenv.podman.image_up_to_date() + logging.error(f"/opt/eclipse-titan-{version} not found in the podman container!") + if up_to_date: + logging.error("Consider modifying _testenv/data/podman/Dockerfile.") + else: + logging.error("Try './testenv.py init podman' to update the container.") + sys.exit(1) + + def distro_to_repo_dir(distro): if distro == "debian:bookworm": return "Debian_12" diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 6e7c32c..540fe55 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -1,10 +1,8 @@ # Copyright 2024 sysmocom - s.f.m.c. GmbH # SPDX-License-Identifier: GPL-3.0-or-later -from packaging.version import Version import logging import os.path import shutil -import subprocess import sys import testenv import testenv.cmd @@ -71,30 +69,6 @@ sys.exit(1) -def check_ttcn3_compiler_version(): - if testenv.args.podman: - return - - ttcn3_min_version = "9.0.0" - - v = subprocess.run(["ttcn3_compiler", "-v"], capture_output=True, text=True) - current = None - for line in v.stderr.split("\n"): - if not line.startswith("Version: "): - continue - - current = line.split(":", 1)[1].strip() - if Version(current) >= Version(ttcn3_min_version): - return - - logging.error(f"Found ttcn3_compiler version {current}, but {ttcn3_min_version} or higher is required.") - - if not current: - logging.error("Could not parse ttcn3_compiler version.") - logging.error(f"Please install at least version {ttcn3_min_version} and try again.") - sys.exit(1) - - def check_fftranscode(): cmd = [ "grep", @@ -124,7 +98,6 @@ def check(): check_programs() - check_ttcn3_compiler_version() if not testenv.args.podman: check_fftranscode() diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index 5b1d32f..84176d7 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -1,5 +1,6 @@ # Copyright 2024 sysmocom - s.f.m.c. GmbH # SPDX-License-Identifier: GPL-3.0-or-later +from packaging.version import Version import configparser import fnmatch import glob @@ -10,6 +11,8 @@ cfgs = {} current = None +titan_version_in_path = None +titan_min_previous = None def set_current(cfg_name, loop_count=0): @@ -74,6 +77,76 @@ return host, port +def get_titan_version_in_path(): + global titan_version_in_path + + if titan_version_in_path: + return titan_version_in_path + + ret = None + v = testenv.cmd.run(["ttcn3_compiler", "-v"], capture_output=True, text=True) + for line in v.stderr.split("\n"): + if line.startswith("Version: "): + ret = line.split(":", 1)[1].strip() + logging.debug(f"eclipse-titan version: {ret}") + break + titan_version_in_path = ret + return ret + + +def get_titan_version(cfg, path=None): + global titan_min_previous + + ret_version = cfg["testsuite"]["titan_min"] + ret_reason = "from titan_min= in testenv.cfg" + + if titan_min_previous and titan_min_previous["version"] != ret_version: + logging.error("Found different titan_min= versions in testenv.cfg files of the same directory:") + logging.error(f" titan_min={ret_version} in {path}") + logging.error(f" titan_min={titan_min_previous['version']} in {titan_min_previous['path']}") + logging.error("This is not supported, please fix it.") + sys.exit(1) + titan_min_previous = {"version": ret_version, "path": path} + + if testenv.args.titan_version: + if Version(ret_version) > Version(testenv.args.titan_version): + logging.error( + f"--titan-version={testenv.args.titan_version} is lower than titan_min={ret_version} in {path}" + ) + sys.exit(1) + ret_version = testenv.args.titan_version + ret_reason = "from --titan-version" + + if not testenv.args.podman and not os.path.exists(f"/opt/eclipse-titan-{ret_version}"): + path_version = get_titan_version_in_path() + if not path_version: + logging.error("Failed to parse the ttcn3_compiler version.") + logging.error(f"Install eclipse-titan {ret_version} or higher or use --podman.") + sys.exit(1) + if testenv.args.titan_version and ret_version != path_version: + logging.error( + f"Installed eclipse-titan version {path_version} is not the same as --titan-version={ret_version}." + ) + sys.exit(1) + if Version(ret_version) > Version(path_version): + logging.error( + f"Installed eclipse-titan version {path_version} is lower than titan_min={ret_version} in {path}." + ) + logging.error(f"Install eclipse-titan {ret_version} or higher or use --podman.") + sys.exit(1) + ret_version = path_version + ret_reason = "installed on host system" + + return ret_version, ret_reason + + +def get_titan_version_first_cfg(): + """The titan version is the same for all testenv.cfg files in the same + testsuite directory, this is enforced in get_titan_version().""" + _, cfg = next(iter(cfgs.items())) + return get_titan_version(cfg) + + def verify_qemu_cfgs(): """Check if passed -C or -K args make sense with the testenv configs.""" testsuite = testenv.args.testsuite @@ -194,6 +267,7 @@ sys.exit(1) get_vty_host_port(cfg, path) + get_titan_version(cfg, path) def raise_error_config_arg(glob_result, config_arg): diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 753773f..b7ffb43 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -11,6 +11,7 @@ import subprocess import testenv import testenv.cmd +import testenv.testenv_cfg import time builddir_env = {} @@ -35,15 +36,21 @@ atexit.register(stop) update_deps() - if testenv.args.podman: - builddir = os.path.join(testenv.args.cache, "podman", "ttcn3") - builddir_env = {"BUILDDIR": builddir} + titan_version, _ = testenv.testenv_cfg.get_titan_version_first_cfg() + ttcn3_dir = f"/opt/eclipse-titan-{titan_version}" + + if testenv.args.podman or os.path.exists(ttcn3_dir): + cache_dir = "podman" if testenv.args.podman else "host" + builddir = os.path.join(testenv.args.cache, cache_dir, f"titan-{titan_version}") + path_old = testenv.cmd.generate_env(podman=testenv.args.podman)["PATH"] + builddir_env = {"BUILDDIR": builddir, "TTCN3_DIR": ttcn3_dir, "PATH": f"{ttcn3_dir}/bin:{path_old}"} prepare_testsuite_dir() def build(): - logging.info("Building testsuite") + titan_version, titan_reason = testenv.testenv_cfg.get_titan_version_first_cfg() + logging.info(f"Building testsuite (eclipse-titan {titan_version}, {titan_reason})") env = copy.copy(builddir_env) if testenv.args.jobs: @@ -151,7 +158,8 @@ else: cmd += [f"{section_data['program']}.{test_arg}"] - logging.info("Running testsuite") + titan_version, titan_reason = testenv.testenv_cfg.get_titan_version_first_cfg() + logging.info(f"Running testsuite (eclipse-titan {titan_version}, {titan_reason})") if testenv.podman.is_running(): testsuite_proc = testenv.podman.exec_cmd_background(cmd, cwd=cwd, env=env) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40450?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I48d711da57c874cf7cd557480a163eea1a4167bd Gerrit-Change-Number: 40450 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: move ttcn3_hacks_dir to __init__.py

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40449?usp=email ) Change subject: testenv: move ttcn3_hacks_dir to __init__.py ...................................................................... testenv: move ttcn3_hacks_dir to __init__.py Move testenv.testsuite.ttcn3_hacks_dir to testenv.ttcn3_hacks_dir. It makes more sense there as the path to osmo-ttcn3-hacks is used by many modules, not just the testenv.testsuite module, and it prevents a cyclic import with future patches when testenv.testsuite will import testenv.testenv_cfg. Change-Id: I4280009da419e6f5b533805732656ec4cc05d5ac --- M _testenv/testenv/__init__.py M _testenv/testenv/cmd.py M _testenv/testenv/requirements.py M _testenv/testenv/testdir.py M _testenv/testenv/testenv_cfg.py M _testenv/testenv/testsuite.py 6 files changed, 17 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/40449/1 diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 9b5e944..cb4a02c 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -11,6 +11,7 @@ args = None +ttcn3_hacks_dir = os.path.realpath(f"{__file__}/../../..") src_dir = os.environ.get("TESTENV_SRC_DIR", os.path.realpath(f"{__file__}/../../../..")) data_dir = os.path.join(os.path.realpath(f"{__file__}/../.."), "data") custom_kernel_path = os.path.join(os.path.realpath(f"{__file__}/../../.."), ".linux") @@ -214,8 +215,7 @@ ) raise NoTraceException(f"For --kernel-custom, put a symlink or copy of your kernel to: {custom_kernel_path}") - ttcn3_hacks_dir_src = os.path.realpath(f"{__file__}/../../..") - testsuite_dir = os.path.join(ttcn3_hacks_dir_src, args.testsuite) + testsuite_dir = os.path.join(ttcn3_hacks_dir, args.testsuite) if not os.path.exists(testsuite_dir): raise NoTraceException(f"testsuite dir not found: {testsuite_dir}") diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index e65f777..d4a1e9a 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -79,8 +79,8 @@ ret = dict(env_extra) path = os.path.join(testenv.data_dir, "scripts") path += f":{os.path.join(testenv.data_dir, 'scripts/qemu')}" - if testenv.args.action == "run" and testenv.testsuite.ttcn3_hacks_dir: - path += f":{os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite)}" + if testenv.args.action == "run" and testenv.ttcn3_hacks_dir: + path += f":{os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite)}" if install_dir and install_dir != "/": path += f":{os.path.join(install_dir, 'bin')}" diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 5ab61ad..6e7c32c 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -101,7 +101,7 @@ "-q", "fftranscode", os.path.join( - testenv.testsuite.ttcn3_hacks_dir, + testenv.ttcn3_hacks_dir, testenv.args.testsuite, "regen_makefile.sh", ), diff --git a/_testenv/testenv/testdir.py b/_testenv/testenv/testdir.py index 929d19c..927ce69 100644 --- a/_testenv/testenv/testdir.py +++ b/_testenv/testenv/testdir.py @@ -66,7 +66,7 @@ testdir = os.path.join(topdir, cfg_name.replace("testenv_", "").replace(".cfg", "")) logging.info(f"Preparing testdir: {testdir}") - testsuite_dir = os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite) + testsuite_dir = os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite) atexit.register(clean_run_scripts) @@ -96,13 +96,13 @@ # Referenced in testsuite cfgs: Common.cfg common_cfg = os.path.join(testdir, "testsuite", "Common.cfg") - path = os.path.join(testenv.testsuite.ttcn3_hacks_dir, "Common.cfg") + path = os.path.join(testenv.ttcn3_hacks_dir, "Common.cfg") testenv.cmd.run(["install", "-Dm644", path, common_cfg]) testenv.cmd.run( [ "sed", "-i", - f's#TTCN3_HACKS_PATH := .*#TTCN3_HACKS_PATH := "{testenv.testsuite.ttcn3_hacks_dir}"#', + f's#TTCN3_HACKS_PATH := .*#TTCN3_HACKS_PATH := "{testenv.ttcn3_hacks_dir}"#', common_cfg, ] ) diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index e224815..5b1d32f 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -7,7 +7,6 @@ import os.path import sys import testenv -import testenv.testsuite cfgs = {} current = None @@ -30,7 +29,7 @@ def exit_error_readme(): - readme = os.path.join(testenv.testsuite.ttcn3_hacks_dir, "_testenv/README.md") + readme = os.path.join(testenv.ttcn3_hacks_dir, "_testenv/README.md") logging.error(f"More information: {readme}") sys.exit(1) @@ -215,7 +214,7 @@ def find_configs(): - dir_testsuite = os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite) + dir_testsuite = os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite) pattern = os.path.join(dir_testsuite, "testenv*.cfg") ret = sorted(glob.glob(pattern)) diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 6d0335e..753773f 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -13,18 +13,17 @@ import testenv.cmd import time -ttcn3_hacks_dir = os.path.realpath(f"{__file__}/../../..") builddir_env = {} testsuite_proc = None def update_deps(): logging.info("Updating osmo-ttcn3-hacks/deps") - testenv.cmd.run(["make", "deps"], cwd=ttcn3_hacks_dir) + testenv.cmd.run(["make", "deps"], cwd=testenv.ttcn3_hacks_dir) def prepare_testsuite_dir(): - testsuite_dir = f"{ttcn3_hacks_dir}/{testenv.args.testsuite}" + testsuite_dir = f"{testenv.ttcn3_hacks_dir}/{testenv.args.testsuite}" logging.info(f"Generating links and Makefile for {testenv.args.testsuite}") testenv.cmd.run(["./gen_links.sh"], cwd=testsuite_dir, env=builddir_env) testenv.cmd.run("USE_CCACHE=1 ./regen_makefile.sh", cwd=testsuite_dir, env=builddir_env) @@ -50,7 +49,7 @@ if testenv.args.jobs: env["PARALLEL_MAKE"] = f"-j{testenv.args.jobs}" - testenv.cmd.run(["make", testenv.args.testsuite], cwd=ttcn3_hacks_dir, env=env) + testenv.cmd.run(["make", testenv.args.testsuite], cwd=testenv.ttcn3_hacks_dir, env=env) def is_running(pid): @@ -70,7 +69,7 @@ cwd = os.path.join(testenv.testdir.testdir, "testsuite") logging.info("Merging log files") - log_merge = os.path.join(ttcn3_hacks_dir, "log_merge.sh") + log_merge = os.path.join(testenv.ttcn3_hacks_dir, "log_merge.sh") # stdout of this script is very verbose, making it harder to see the output # that matters (tests failed or not), so redirect it to /dev/null cmd = f"{shlex.quote(log_merge)} {shlex.quote(section_data['program'])} --rm >/dev/null" @@ -128,9 +127,9 @@ section_data = cfg["testsuite"] cwd = os.path.join(testenv.testdir.testdir, "testsuite") - start_testsuite = os.path.join(ttcn3_hacks_dir, "start-testsuite.sh") - suite = os.path.join(ttcn3_hacks_dir, testenv.args.testsuite, section_data["program"]) - suite = os.path.relpath(suite, ttcn3_hacks_dir) + start_testsuite = os.path.join(testenv.ttcn3_hacks_dir, "start-testsuite.sh") + suite = os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite, section_data["program"]) + suite = os.path.relpath(suite, testenv.ttcn3_hacks_dir) env = copy.copy(builddir_env) env["TTCN3_PCAP_PATH"] = os.path.join(testenv.testdir.testdir, "testsuite") -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4280009da419e6f5b533805732656ec4cc05d5ac Gerrit-Change-Number: 40449 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: enft_kpi: keep NFT counters intact

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40446?usp=email ) Change subject: enft_kpi: keep NFT counters intact ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40446?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: Id6db327b445b8597d39a1d838077e7002d538db5 Gerrit-Change-Number: 40446 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: Tue, 10 Jun 2025 20:56:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: enft_kpi: use command/expression templates from enftables

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40439?usp=email ) Change subject: enft_kpi: use command/expression templates from enftables ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40439?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: I421ba5ccc8956586136466d5eb50d6ace69eeb67 Gerrit-Change-Number: 40439 Gerrit-PatchSet: 4 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Jun 2025 20:55:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks

1
0
0 0

[L] Change in ...osmo-s1gw[master]: enft_kpi: support different UL/DL GTP-U addresses

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40437?usp=email ) Change subject: enft_kpi: support different UL/DL GTP-U addresses ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40437?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: Icd4a17790062bfcaf2bccb01fa94dcdb65c0872c Gerrit-Change-Number: 40437 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Jun 2025 20:55:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks

1
0
0 0

[L] Change in ...osmo-s1gw[master]: enft_kpi: support different UL/DL GTP-U addresses

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40437?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: enft_kpi: support different UL/DL GTP-U addresses ...................................................................... enft_kpi: support different UL/DL GTP-U addresses Change-Id: Icd4a17790062bfcaf2bccb01fa94dcdb65c0872c Related: SYS#7307 --- M src/enft_kpi.erl M src/s1ap_proxy.erl 2 files changed, 156 insertions(+), 113 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/37/40437/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Icd4a17790062bfcaf2bccb01fa94dcdb65c0872c Gerrit-Change-Number: 40437 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: enft_kpi: keep NFT counters intact

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40446?usp=email ) Change subject: enft_kpi: keep NFT counters intact ...................................................................... enft_kpi: keep NFT counters intact We don't want to reset counters if an eNB reconnects. This is also what osmo-hnbgw does. Change-Id: Id6db327b445b8597d39a1d838077e7002d538db5 Related: SYS#7307 --- M src/enft_kpi.erl 1 file changed, 16 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/46/40446/1 diff --git a/src/enft_kpi.erl b/src/enft_kpi.erl index e251a3b..9086298 100644 --- a/src/enft_kpi.erl +++ b/src/enft_kpi.erl @@ -210,7 +210,7 @@ {ok, #{genb_id := GlobalENBId, mon_ref := MonRef} = ES} -> erlang:demonitor(MonRef, [flush]), - enb_del_nft_counters(ES, Cfg), + enb_del_nft_rules(ES, Cfg), R1 = dict:erase(Pid, R0), ?LOG_INFO("eNB (pid ~p, ~p) has been unregistered", [Pid, GlobalENBId]), @@ -295,7 +295,7 @@ ?LOG_INFO("eNB process ~p terminated with reason ~p", [Pid, Reason]), case dict:find(Pid, R0) of {ok, ES} -> - enb_del_nft_counters(ES, Cfg), + enb_del_nft_rules(ES, Cfg), R1 = dict:erase(Pid, R0), ?LOG_INFO("eNB (pid ~p) has been unregistered", [Pid]), {noreply, S#state{registry = R1}}; @@ -395,37 +395,31 @@ end. --spec enb_del_nft_counters(ES0, Cfg) -> ES1 +-spec enb_del_nft_rules(ES0, Cfg) -> ES1 when Cfg :: cfg(), ES0 :: enb_state(), ES1 :: enb_state(). -enb_del_nft_counters(#{ul := ULS} = ES, Cfg) -> - enb_del_nft_counter(ULS, ES, Cfg), - enb_del_nft_counters(maps:remove(ul, ES), Cfg); +enb_del_nft_rules(#{ul := ULS} = ES, Cfg) -> + enb_del_nft_rule(ULS, Cfg), + enb_del_nft_rules(maps:remove(ul, ES), Cfg); -enb_del_nft_counters(#{dl := DLS} = ES, Cfg) -> - enb_del_nft_counter(DLS, ES, Cfg), - enb_del_nft_counters(maps:remove(dl, ES), Cfg); +enb_del_nft_rules(#{dl := DLS} = ES, Cfg) -> + enb_del_nft_rule(DLS, Cfg), + enb_del_nft_rules(maps:remove(dl, ES), Cfg); %% no UL/DL state => nothing to delete -enb_del_nft_counters(ES, _Cfg) -> ES. +enb_del_nft_rules(ES, _Cfg) -> ES. --spec enb_del_nft_counter(S, ES, Cfg) -> ok | {error, term()} +-spec enb_del_nft_rule(S, Cfg) -> ok | {error, term()} when S :: enb_uldl_state(), - ES :: enb_state(), Cfg :: cfg(). -enb_del_nft_counter(#{uldl := ULDL, handle := Handle}, - #{genb_id := GlobalENBId, pid := Pid}, - #{table_name := TName}) -> - ?LOG_DEBUG("eNB (pid ~p, ~p): deleting NFT counter for ~p", - [Pid, GlobalENBId, ULDL]), - CtrName = enb_nft_counter_name(ULDL, GlobalENBId), +enb_del_nft_rule(#{uldl := ULDL, handle := Handle}, + #{table_name := TName}) -> + %% keep the counter intact, remove the rule only + %% we don't want to reset counters if eNB reconnects CName = enb_nft_chain_name(ULDL), - Counter = enftables:nft_counter(TName, CtrName), - Cmds = [enftables:nft_cmd_del_rule(TName, CName, Handle), - enftables:nft_cmd_del_counter(Counter) - ], + Cmds = [enftables:nft_cmd_del_rule(TName, CName, Handle)], case nft_exec(Cmds) of ok -> ok; {error, Error} -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Id6db327b445b8597d39a1d838077e7002d538db5 Gerrit-Change-Number: 40446 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks

1
0
0 0

[M] Change in ...osmo-s1gw[master]: enft_kpi: use command/expression templates from enftables

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40439?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: enft_kpi: use command/expression templates from enftables ...................................................................... enft_kpi: use command/expression templates from enftables Change-Id: I421ba5ccc8956586136466d5eb50d6ace69eeb67 Related: SYS#7307 --- M src/enft_kpi.erl 1 file changed, 22 insertions(+), 116 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/39/40439/4 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I421ba5ccc8956586136466d5eb50d6ace69eeb67 Gerrit-Change-Number: 40439 Gerrit-PatchSet: 4 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NGAP_Emulation: Fix match on DownlinkNASTransport with different list...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40443?usp=email ) Change subject: NGAP_Emulation: Fix match on DownlinkNASTransport with different list of IEs ...................................................................... NGAP_Emulation: Fix match on DownlinkNASTransport with different list of IEs The existing receive templates match only a given set of parameters. Some of them are optional, so they wouldn't match the template if added. Match based on procedureCode instead. Change-Id: Iaec861f8c0d55a2897896d695b9f70bca64af339 --- M library/NGAP_Emulation.ttcn M library/NGAP_Functions.ttcn 2 files changed, 21 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved jolly: Looks good to me, but someone else must approve diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index 1dcae70..178d6cd 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -426,6 +426,11 @@ mw_ngap_unsuccMsg({procedureCode := tr_NGAP_ProcedureCode_non_UErelated, criticality := ?, value_ := ?})); +template (present) NGAP_PDU +tr_NGAP_DownlinkNASTransport := mw_ngap_initMsg({procedureCode := id_DownlinkNASTransport, + criticality := ?, + value_ := { DownlinkNASTransport := ? } + }); function main(NGAPOps ops, NGAP_conn_parameters p, charstring id) runs on NGAP_Emulation_CT { var Result res; @@ -557,7 +562,7 @@ dl_nas := f_NG_NAS_try_decaps_dl(NGapAssociationTable[assoc_id].nus, dl_nas); } /* DL/UlNasTransport are not interesting, don't send them */ - if (not match(mrf.msg, mw_ngap_initMsg(mw_n2_DownlinkNASTransport))) { + if (not match(mrf.msg, tr_NGAP_DownlinkNASTransport)) { /* send raw NGAP */ NGAP_CLIENT.send(mrf.msg) to vc_conn; } diff --git a/library/NGAP_Functions.ttcn b/library/NGAP_Functions.ttcn index 70d8941..523754e 100644 --- a/library/NGAP_Functions.ttcn +++ b/library/NGAP_Functions.ttcn @@ -21,18 +21,18 @@ { if (ischosen(ngap.initiatingMessage)) { var InitiatingMessage im := ngap.initiatingMessage; - select (im) { - case (mw_n2_DownlinkNASTransport) { + select (im.procedureCode) { + case (id_DownlinkNASTransport) { return im.value_.downlinkNASTransport.protocolIEs[0].value_.aMF_UE_NGAP_ID; } - case (mw_n2_UEContextReleaseCommand) { + case (id_UEContextRelease) { return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.aMF_UE_NGAP_ID; } /* TODO */ } } else if (ischosen(ngap.successfulOutcome)) { var SuccessfulOutcome so := ngap.successfulOutcome; - select (so) { + select (so.procedureCode) { case (?) { return omit; /* TODO */ @@ -42,7 +42,7 @@ } } else if (ischosen(ngap.unsuccessfulOutcome)) { var UnsuccessfulOutcome uo := ngap.unsuccessfulOutcome; - select (uo) { + select (uo.procedureCode) { case (?) { return omit; /* TODO */ @@ -58,21 +58,21 @@ { if (ischosen(ngap.initiatingMessage)) { var InitiatingMessage im := ngap.initiatingMessage; - select (im) { - case (mw_n2_initialUeMessage) { + select (im.procedureCode) { + case (id_InitialUEMessage) { return im.value_.InitialUEMessage.protocolIEs[0].value_.RAN_UE_NGAP_ID; } - case (mw_n2_DownlinkNASTransport) { + case (id_DownlinkNASTransport) { return im.value_.downlinkNASTransport.protocolIEs[1].value_.RAN_UE_NGAP_ID; } - case (mw_n2_UEContextReleaseCommand) { + case (id_UEContextRelease) { return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.rAN_UE_NGAP_ID; } /* TODO */ } } else if (ischosen(ngap.successfulOutcome)) { var SuccessfulOutcome so := ngap.successfulOutcome; - select (so) { + select (so.procedureCode) { case (?) { return omit; /* TODO */ @@ -82,7 +82,7 @@ } } else if (ischosen(ngap.unsuccessfulOutcome)) { var UnsuccessfulOutcome uo := ngap.unsuccessfulOutcome; - select (uo) { + select (uo.procedureCode) { case (?) { return omit; /* TODO */ @@ -100,8 +100,8 @@ if (ischosen(ngap.initiatingMessage)) { var InitiatingMessage im := ngap.initiatingMessage; - select (im) { - case (mw_n2_DownlinkNASTransport) { + select (im.procedureCode) { + case (id_DownlinkNASTransport) { var DownlinkNASTransport msg := im.value_.DownlinkNASTransport; for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { if (msg.protocolIEs[i].id == id_NAS_PDU) { @@ -109,7 +109,7 @@ } } } - case (mw_n2_UplinkNASTransport) { + case (id_UplinkNASTransport) { var UplinkNASTransport msg := im.value_.UplinkNASTransport; for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { if (msg.protocolIEs[i].id == id_NAS_PDU) { @@ -117,7 +117,7 @@ } } } - case (mw_n2_initialUeMessage) { + case (id_InitialUEMessage) { var InitialUEMessage msg := im.value_.InitialUEMessage; for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { if (msg.protocolIEs[i].id == id_NAS_PDU) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40443?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: Iaec861f8c0d55a2897896d695b9f70bca64af339 Gerrit-Change-Number: 40443 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 1 day

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: library: Improve some f_rnd_*() functions

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40442?usp=email ) Change subject: library: Improve some f_rnd_*() functions ...................................................................... library: Improve some f_rnd_*() functions Change-Id: I82535caf08aa628738c0cbc29b8b27d525ec78ce --- M library/General_Types.ttcn M library/Osmocom_Types.ttcn 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/library/General_Types.ttcn b/library/General_Types.ttcn index 163ec47..dca4ea2 100644 --- a/library/General_Types.ttcn +++ b/library/General_Types.ttcn @@ -172,6 +172,7 @@ type hexstring HEX4n length(4) with { variant "" }; type hexstring HEX6n length(6) with { variant "" }; type hexstring HEX8n length(8) with { variant "" }; + type hexstring HEX14n length(14) with { variant "" }; type hexstring HEX15n length(15) with { variant "" }; type hexstring HEX16n length(16) with { variant "" }; type hexstring HEX24n length(24) with { variant "" }; diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 21d7abf..f966ccc 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -101,11 +101,11 @@ return substr(oct2bit(oct), 0, len); } -function f_rnd_imsi(in hexstring prefix) return hexstring { +function f_rnd_imsi(in hexstring prefix := ''H) return HEX15n { return prefix & f_rnd_hexstring(15 - lengthof(prefix), 10); } -function f_rnd_imei(in hexstring prefix) return hexstring { +function f_rnd_imei(in hexstring prefix := ''H) return HEX14n { return prefix & f_rnd_hexstring(14 - lengthof(prefix), 10); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40442?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: I82535caf08aa628738c0cbc29b8b27d525ec78ce Gerrit-Change-Number: 40442 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 1 day

1
0
0 0

2025

2024

2023

2022

gerrit-log