- gerrit-log - lists.osmocom.org

[L] Change in ...osmo-s1gw[master]: enft_kpi: retrieve per-eNB traffic counters

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40281?usp=email ) Change subject: enft_kpi: retrieve per-eNB traffic counters ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40281?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: I498d2854447a2d53d2abddd38652f3e2bbb1fbdd Gerrit-Change-Number: 40281 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 27 May 2025 13:24:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 month

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: debian: drop unneeded libpcap-dev

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email ) Change subject: debian: drop unneeded libpcap-dev ...................................................................... debian: drop unneeded libpcap-dev Change-Id: I4c152b6f5f517acccfe4aa856447c59eb1212707 --- M debian/control 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/control b/debian/control index 4062ee8..a4279b7 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: net Priority: optional Build-Depends: erlang-nox, - libpcap-dev, rebar3, debhelper (>= 10) Standards-Version: 4.5.0 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4c152b6f5f517acccfe4aa856447c59eb1212707 Gerrit-Change-Number: 40348 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: parse and store Global-ENB-ID IE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40368?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: s1ap_proxy: parse and store Global-ENB-ID IE ...................................................................... s1ap_proxy: parse and store Global-ENB-ID IE This commit prepares for a follow-up change implementing the NFT-based KPI (GTP-U packets/bytes stats) reporting, which will need the Global-ENB-ID. Change-Id: Icc24d4daf06d161d7b5b386456e8e92ac07d5eba Related: SYS#7307 --- M src/s1ap_proxy.erl 1 file changed, 56 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 774fc66..bf5f849 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -67,8 +67,12 @@ -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. -type erab_uid() :: {mme_ue_id(), enb_ue_id(), erab_id()}. +-type plmn_id() :: {MCC :: nonempty_string(), + MNC :: nonempty_string()}. -record(proxy_state, {erabs :: dict:dict(), + enb_id :: undefined | non_neg_integer(), + plmn_id :: undefined | plmn_id(), mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), erab_id :: undefined | erab_id(), @@ -195,6 +199,35 @@ ok. +%% Parse PLMN-ID as per 3GPP TS 24.008, Figure 10.5.13 +%% | MCC digit 2 | MCC digit 1 | octet 1 +%% | MNC digit 3 | MCC digit 3 | octet 2 +%% | MNC digit 2 | MNC digit 1 | octet 3 +-spec parse_plmn_id(<< _:24 >>) -> plmn_id(). +parse_plmn_id(<< MCC2:4, MCC1:4, + MNC3:4, MCC3:4, + MNC2:4, MNC1:4 >>) -> + MCC = parse_mcc_mnc(MCC1, MCC2, MCC3), + MNC = parse_mcc_mnc(MNC1, MNC2, MNC3), + {MCC, MNC}. + + +-define(UNHEX(H), H + 48). + +parse_mcc_mnc(D1, D2, 16#f) -> + [?UNHEX(D1), ?UNHEX(D2)]; + +parse_mcc_mnc(D1, D2, D3) -> + [?UNHEX(D1), ?UNHEX(D2), ?UNHEX(D3)]. + + +-spec parse_enb_id(tuple()) -> non_neg_integer(). +parse_enb_id({'macroENB-ID', << ID:20 >>}) -> ID; +parse_enb_id({'homeENB-ID', << ID:28 >>}) -> ID; +parse_enb_id({'short-macroENB-ID', << ID:18 >>}) -> ID; +parse_enb_id({'long-macroENB-ID', << ID:21 >>}) -> ID. + + %% Encode an S1AP PDU -spec encode_pdu(s1ap_pdu()) -> {ok, binary()} | {error, {asn1, tuple()}}. @@ -260,6 +293,17 @@ -spec handle_pdu(s1ap_pdu(), proxy_state()) -> {{proxy_action(), s1ap_pdu()}, proxy_state()} | {forward, proxy_state()}. +%% 9.1.8.4 S1 SETUP REQUEST +handle_pdu({initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-S1Setup', + value = C0}}, S0) -> + ?LOG_DEBUG("Processing S1 SETUP REQUEST"), + %% there's nothing to patch in this PDU, so we forward it as-is + %% TODO: check result of handle_ies(), inc. ?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR + {_, S1} = handle_ies(?'id-Global-ENB-ID', + C0#'S1SetupRequest'.protocolIEs, S0), + {forward, S1}; + %% 9.1.3.1 E-RAB SETUP REQUEST handle_pdu({Outcome = initiatingMessage, #'InitiatingMessage'{procedureCode = ?'id-E-RABSetup', @@ -538,6 +582,18 @@ Result :: {handle_ie_result(), proxy_state()}. +handle_ie([?'id-Global-ENB-ID'], + #'Global-ENB-ID'{'pLMNidentity' = PLMNId, + 'eNB-ID' = ENBId} = C, S0) -> + %% store PLMNId/ENBId + %% TODO: use that as a context for logging + S1 = S0#proxy_state{plmn_id = parse_plmn_id(PLMNId), + enb_id = parse_enb_id(ENBId)}, + ?LOG_INFO("Global-ENB-ID: PLMN-ID=~p, eNB-ID=~p", + [S1#proxy_state.plmn_id, + S1#proxy_state.enb_id]), + {{ok, C}, S1}; + %% E-RAB SETUP REQUEST related IEs handle_ie([?'id-E-RABToBeSetupListBearerSUReq'], C, S) -> %% This IE contains a list of BearerSUReq, so patch inner IEs -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40368?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Icc24d4daf06d161d7b5b386456e8e92ac07d5eba Gerrit-Change-Number: 40368 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: clarify type spec for teid_addr()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40377?usp=email ) Change subject: erab_fsm: clarify type spec for teid_addr() ...................................................................... erab_fsm: clarify type spec for teid_addr() Change-Id: If649c3436ce60d3b9ceefdcfb695bb2236ebe7ef --- M src/erab_fsm.erl 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index a941152..cd4fa27 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -73,8 +73,8 @@ -type teid() :: 0..16#ffffffff. -type addr() :: << _:32 >> | << _:128 >>. --type teid_addr() :: {teid(), %% GTP-U TEID - addr() %% GTP-U Transport Layer Address +-type teid_addr() :: {TEID :: teid(), %% GTP-U TEID + Addr :: addr() %% GTP-U Transport Layer Address }. -type mod_kind() :: setup_rsp | -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40377?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If649c3436ce60d3b9ceefdcfb695bb2236ebe7ef Gerrit-Change-Number: 40377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: clarify type spec for teid_addr()

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40377?usp=email ) Change subject: erab_fsm: clarify type spec for teid_addr() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40377?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: If649c3436ce60d3b9ceefdcfb695bb2236ebe7ef Gerrit-Change-Number: 40377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 13:13:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: deduplicate make_dir

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40378?usp=email ) Change subject: testenv: deduplicate make_dir ...................................................................... testenv: deduplicate make_dir Generate the osmo-dev make dir path in one location, in testenv.cmd which gets imported by testenv.osmo_dev instead of doing it in both. This makes it easier to bump make_dir_version when necessary. Change-Id: Id3cb30e1ea126daf04dac227a2bf39b746549ec9 --- M _testenv/testenv/cmd.py M _testenv/testenv/osmo_dev.py 2 files changed, 12 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 9a81e30..5da27fe 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -9,6 +9,9 @@ env_extra = {} install_dir = None +make_dir = None +# osmo-dev make dir version, bump when making incompatible changes +make_dir_version = 2 def init_env(): @@ -16,6 +19,7 @@ changes here.""" global env_extra global install_dir + global make_dir if testenv.args.podman: if testenv.args.binary_repo: @@ -48,9 +52,11 @@ if not testenv.args.binary_repo: if testenv.args.podman: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "podman", "make2") + make_dir = os.path.join(testenv.args.cache, "podman", "make") else: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "host", "make2") + make_dir = os.path.join(testenv.args.cache, "host", "make") + make_dir += str(make_dir_version) + env_extra["OSMO_DEV_MAKE_DIR"] = make_dir if testenv.args.kernel == "debian": env_extra["TESTENV_QEMU_KERNEL"] = "debian" diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 02fe2e8..8b83367 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -7,7 +7,6 @@ import testenv import testenv.cmd -make_dir = None init_done = False @@ -54,20 +53,17 @@ def init(): global init_done - global make_dir if init_done: return extra_opts = [] if testenv.args.podman: - make_dir = os.path.join(testenv.args.cache, "podman", "make") extra_opts = [ "--install-prefix", os.path.join(testenv.args.cache, "podman/usr"), ] else: - make_dir = os.path.join(testenv.args.cache, "host", "make") extra_opts = [ "--install-prefix", os.path.join(testenv.args.cache, "host/usr"), @@ -76,17 +72,13 @@ if testenv.args.jobs: extra_opts += [f"-j{testenv.args.jobs}"] - # Make dirs created without passing --autoreconf-in-src-copy to - # gen_makefile.py (as previous versions of testenv did) are incompatible. - # Add the "2" to avoid potential conflicts. - make_dir += "2" - + # Bump testenv.cmd.make_dir_version when making incompatible changes cmd = [ "./gen_makefile.py", "--build-debug", "--no-make-check", "--make-dir", - make_dir, + testenv.cmd.make_dir, "--no-ldconfig", "--src-dir", testenv.src_dir, @@ -135,7 +127,7 @@ logging.debug("No osmo-dev make targets found in testenv.cfg") return - makefile_path = os.path.join(make_dir, "Makefile") + makefile_path = os.path.join(testenv.cmd.make_dir, "Makefile") with open(makefile_path) as f: makefile = f.read() @@ -152,4 +144,4 @@ sys.exit(1) logging.info("Building test components") - testenv.cmd.run(["make"] + targets, cwd=make_dir) + testenv.cmd.run(["make"] + targets, cwd=testenv.cmd.make_dir) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40378?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: Id3cb30e1ea126daf04dac227a2bf39b746549ec9 Gerrit-Change-Number: 40378 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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>

1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: 5gc: testenv: use TESTENV_INSTALL_DIR

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?usp=email ) Change subject: 5gc: testenv: use TESTENV_INSTALL_DIR ...................................................................... 5gc: testenv: use TESTENV_INSTALL_DIR Change-Id: I412e53d132957a877a9a0478df3ac2fe31327a6c --- M 5gc/open5gs/open5gs_prepare.sh 1 file changed, 2 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/5gc/open5gs/open5gs_prepare.sh b/5gc/open5gs/open5gs_prepare.sh index 2946f21..7378980 100755 --- a/5gc/open5gs/open5gs_prepare.sh +++ b/5gc/open5gs/open5gs_prepare.sh @@ -1,20 +1,7 @@ #!/bin/sh -ex -set_ogs_sysconf_dir() { - if [ -z "$OSMO_DEV_MAKE_DIR" ]; then - # With --binary-repo - OGS_INSTALL_DIR="/" - OGS_SYSCONF_DIR="$OGS_INSTALL_DIR/etc/" - else - # Without --binary-repo - OGS_INSTALL_DIR="$OSMO_DEV_MAKE_DIR"/.. - OGS_SYSCONF_DIR="$OGS_INSTALL_DIR/usr/etc/" - fi -} - adjust_sysconfdir_config() { - sed -i "s~@sysconfdir@~$1~g" $2 + sed -i "s~@sysconfdir@~$TESTENV_INSTALL_DIR/etc/~g" $1 } -set_ogs_sysconf_dir -adjust_sysconfdir_config "$OGS_SYSCONF_DIR" ./*.yaml +adjust_sysconfdir_config ./*.yaml -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?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: I412e53d132957a877a9a0478df3ac2fe31327a6c Gerrit-Change-Number: 40380 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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>

1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: fix TESTENV_INSTALL_DIR

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40379?usp=email ) Change subject: testenv: fix TESTENV_INSTALL_DIR ...................................................................... testenv: fix TESTENV_INSTALL_DIR When osmo-dev is used (no --binary-repo arg is set), then set TESTENV_INSTALL_DIR and --install-prefix for osmo-dev to: <cache dir>/osmo-ttcn3-testenv/{podman,host}/install Old --install-prefix: <cache dir>/osmo-ttcn3-testenv/{podman,host}/usr Old TESTENV_INSTALL_DIR: <cache dir>/osmo-ttcn3-testenv/{podman,host} The old behavior was misleading, because: * It resulted in configs getting installed into: <cache dir>/osmo-ttcn3-testenv/{podman,host}/usr/etc/... * TESTENV_INSTALL_DIR looked like it would point at the install dir (because there is usr inside that directory), but it was actually pointing at the top dir of the install dir. Fixes: 143b1000 ("testenv: add TESTENV_INSTALL_DIR") Change-Id: Id94936338a6eb74dee0b3f4668cbaca309b269e4 --- M _testenv/README.md M _testenv/testenv/cmd.py M _testenv/testenv/osmo_dev.py 3 files changed, 14 insertions(+), 23 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/_testenv/README.md b/_testenv/README.md index 53d3440..a1ba73d 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -232,8 +232,8 @@ * `TESTENV_INSTALL_DIR`: The directory into which the SUT binaries and other files are installed. It is set to `/` for `--podman --binary-repo`, - `~/.cache/osmo-ttcn3-testenv/podman` for `--podman` and - `~/.cache/osmo-ttcn3-testenv/host` otherwise. The + `~/.cache/osmo-ttcn3-testenv/podman/install` for `--podman` and + `~/.cache/osmo-ttcn3-testenv/host/install` otherwise. The `~/.cache/osmo-ttcn3-testenv` part can be changed with the `--cache` argument. Different cache directories for podman and for the host are used as it is very likely that the binary objects from both are incompatible. @@ -245,10 +245,10 @@ * `OSMO_DEV_MAKE_DIR`: This variable is unset if `--binary-repo` is used as argument. Otherwise it - is set to `~/.cache/osmo-ttcn3-testenv/host/make2` or - `~/.cache/osmo-ttcn3-testenv/podman/make2` (with `--podman`) by default. The - `~/.cache/osmo-ttcn3-testenv` part can be changed with the `--cache` - argument. + is set to `~/.cache/osmo-ttcn3-testenv/host/make<version>` or + `~/.cache/osmo-ttcn3-testenv/podman/make<version>` (with `--podman`) by + default. The `~/.cache/osmo-ttcn3-testenv` part can be changed with the + `--cache` argument. * `TESTENV_QEMU_KERNEL`: Is only set if `-C`/`--custom-kernel` or `-D`/`--debian-kernel` parameters diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 5da27fe..e65f777 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -11,7 +11,7 @@ install_dir = None make_dir = None # osmo-dev make dir version, bump when making incompatible changes -make_dir_version = 2 +make_dir_version = 3 def init_env(): @@ -25,17 +25,17 @@ if testenv.args.binary_repo: install_dir = "/" else: - install_dir = os.path.join(testenv.args.cache, "podman") + install_dir = os.path.join(testenv.args.cache, "podman/install") else: - install_dir = os.path.join(testenv.args.cache, "host") + install_dir = os.path.join(testenv.args.cache, "host/install") if not testenv.args.binary_repo: - pkg_config_path = os.path.join(install_dir, "usr/lib/pkgconfig") + pkg_config_path = os.path.join(install_dir, "lib/pkgconfig") if "PKG_CONFIG_PATH" in os.environ: pkg_config_path += f":{os.environ.get('PKG_CONFIG_PATH')}" pkg_config_path += ":/usr/lib/pkgconfig" - ld_library_path = os.path.join(install_dir, "usr/lib") + ld_library_path = os.path.join(install_dir, "lib") if "LD_LIBRARY_PATH" in os.environ: ld_library_path += f":{os.environ.get('LD_LIBRARY_PATH')}" ld_library_path += ":/usr/lib" @@ -83,7 +83,7 @@ path += f":{os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite)}" if install_dir and install_dir != "/": - path += f":{os.path.join(install_dir, 'usr/bin')}" + path += f":{os.path.join(install_dir, 'bin')}" if podman: path += ":/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 8b83367..45912ae 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -58,17 +58,6 @@ return extra_opts = [] - if testenv.args.podman: - extra_opts = [ - "--install-prefix", - os.path.join(testenv.args.cache, "podman/usr"), - ] - else: - extra_opts = [ - "--install-prefix", - os.path.join(testenv.args.cache, "host/usr"), - ] - if testenv.args.jobs: extra_opts += [f"-j{testenv.args.jobs}"] @@ -77,6 +66,8 @@ "./gen_makefile.py", "--build-debug", "--no-make-check", + "--install-prefix", + testenv.cmd.install_dir, "--make-dir", testenv.cmd.make_dir, "--no-ldconfig", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40379?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: Id94936338a6eb74dee0b3f4668cbaca309b269e4 Gerrit-Change-Number: 40379 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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>

1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce tests to validate incoming TCP conn with unkown A...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40333?usp=email ) Change subject: stp: ipa: Introduce tests to validate incoming TCP conn with unkown AS (ipa_unit_id) ...................................................................... stp: ipa: Introduce tests to validate incoming TCP conn with unkown AS (ipa_unit_id) Change-Id: If6a9f54a19f6a4d833bbf66aad5dafd7e9917f82 --- M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml 2 files changed, 46 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 537cac4..8a34054 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -177,18 +177,15 @@ } -/* "accept-asp-connections pre-configured" and client from unknown source */ +/* "accept-asp-connections pre-configured" and client from unknown ASP source + * (but known AS/ipa_unit_name) */ testcase TC_unknown_client_nodynamic() runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); /* Build an ASP unknown (port) from osmo-stp: */ - ipa_configs := { - { asp_name := "ipa-asp-unknown", - as_name := ipa_configs[0].as_name, - is_server := false, - remote_port := ipa_configs[0].remote_port, - local_port := 3000 } - }; + ipa_configs[0].asp_name := "ipa-asp-unknown"; + ipa_configs[0].local_port := 3000; + f_init_common(); f_vty_cs7_listen_ipa_cmd("accept-asp-connections pre-configured", ipa_configs[0].remote_port); f_init_ipa(ipa_configs := ipa_configs); @@ -199,7 +196,25 @@ setverdict(pass); } -/* "accept-asp-connections pre-configured" and client from known source */ +/* "accept-asp-connections pre-configured" and client from known ASP (TCP endpoint) + * but unknown AS (ipa_unit_name) */ +testcase TC_unknown_as_client_nodynamic() runs on IPA_CT { + var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + /* Build an AS unknown (ipa_unit_id) from osmo-stp: */ + ipa_configs[0].as_name := "ipa-as-unknown"; + + f_init_common(); + f_vty_cs7_listen_ipa_cmd("accept-asp-connections pre-configured", ipa_configs[0].remote_port); + f_init_ipa(ipa_configs := ipa_configs); + f_connect_ipa(0, false); + + /* switch back to default */ + f_vty_cs7_listen_ipa_cmd("accept-asp-connections dynamic-permitted", ipa_configs[0].remote_port); + setverdict(pass); +} + +/* "accept-asp-connections pre-configured" and client from known source (ASP & AS) */ testcase TC_known_client_nodynamic() runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); @@ -215,18 +230,14 @@ } -/* "accept-asp-connections dynamic-permitted" and client from unknown source */ +/* "accept-asp-connections dynamic-permitted" and client from unknown ASP source + * (but known AS/ipa_unit_name) */ testcase TC_unknown_client_dynamic() runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); /* Build an ASP unknown (port) from osmo-stp: */ - ipa_configs := { - { asp_name := "ipa-asp-unknown2", - as_name := ipa_configs[0].as_name, - is_server := false, - remote_port := ipa_configs[0].remote_port, - local_port := 3001 } - }; + ipa_configs[0].asp_name := "ipa-asp-unknown"; + ipa_configs[0].local_port := 3001; f_init_common(); f_init_ipa(ipa_configs := ipa_configs); @@ -234,6 +245,20 @@ setverdict(pass); } +/* "accept-asp-connections dynamic-permitted" and client from known ASP (TCP endpoint) + * but unknown AS (ipa_unit_name) */ +testcase TC_unknown_as_client_dynamic() runs on IPA_CT { + var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + /* Build an AS unknown (ipa_unit_id) from osmo-stp: */ + ipa_configs[0].as_name := "ipa-as-unknown"; + + f_init_common(); + f_init_ipa(ipa_configs := ipa_configs); + f_connect_ipa(0, false); + setverdict(pass); +} + private function f_tc_tmt_override(boolean unknwon_dynamic_asp) runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-override-sender", @@ -463,8 +488,10 @@ control { execute( TC_unknown_client_nodynamic() ); + execute( TC_unknown_as_client_nodynamic() ); execute( TC_known_client_nodynamic() ); execute( TC_unknown_client_dynamic() ); + execute( TC_unknown_as_client_dynamic() ); execute( TC_tmt_override() ); execute( TC_unknown_client_dynamic_tmt_override() ); execute( TC_tmt_loadshare_roundrobin() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 44088fc..88e8d17 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -45,8 +45,10 @@ <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv_cli' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_nodynamic' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_as_client_nodynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_known_client_nodynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_as_client_dynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_tmt_override' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_override' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_roundrobin' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40333?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: If6a9f54a19f6a4d833bbf66aad5dafd7e9917f82 Gerrit-Change-Number: 40333 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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>

1 month

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv.yml: Add ttcn3-5gc-test-ogs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40374?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv.yml: Add ttcn3-5gc-test-ogs ...................................................................... jobs/ttcn3-testsuites-testenv.yml: Add ttcn3-5gc-test-ogs Depends: osmo-ttcn3-hacks.git Change-Id I867433c87c6da2f0d1f299245aedf4830acbf539 Change-Id: I6ef174b64ab5f0561b62f315be28bb6710ac125c --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 076bbe3..709b109 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -128,6 +128,12 @@ timer: H 09 * * * email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com + - ttcn3-5gc-test-ogs: # ~1 min + testsuite: 5gc + args: -b osmocom:nightly + timer: H 09 * * * + email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com + - ttcn3-s1gw-test: # ~2 min testsuite: s1gw args: -b osmocom:nightly -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40374?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6ef174b64ab5f0561b62f315be28bb6710ac125c Gerrit-Change-Number: 40374 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log