- gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: lint: run 'ruff' on various repositories
by osmith 03 Apr '25

03 Apr '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/39912?usp=email ) Change subject: lint: run 'ruff' on various repositories ...................................................................... lint: run 'ruff' on various repositories Lint the python code with "ruff check" and "ruff format" where they are known to pass. Related: https://docs.astral.sh/ruff/ Change-Id: I5c2ede1a7b2a204ca3deb24c55008c7585c289a0 --- M lint/lint_diff.sh 1 file changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/12/39912/1 diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index 4b95b9f..408d79f 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -4,12 +4,21 @@ GIT_DIR="$(git rev-parse --show-toplevel 2>/dev/null || true)" SCRIPT_DIR="$(dirname "$(realpath "$0")")" ERROR=0 +PROJECT="${GERRIT_PROJECT}" if [ "$OSMO_LINT" = 0 ]; then echo "Skipping lint_diff.sh (OSMO_LINT=0)" exit 0 fi +get_project() { + if [ -n "$PROJECT" ] || ! [ -e .gitreview ]; then + return + fi + + PROJECT="$(grep project= .gitreview | cut -d = -f2)" +} + check_git_dir() { if [ -z "$GIT_DIR" ]; then echo "ERROR: path is not a git repository: $PWD" @@ -70,6 +79,40 @@ fi } +test_ruff() { + local i + local check_projects=" + osmo-ci + osmo-dev + osmo-ttcn3-hacks + " + local format_projects=" + osmo-ttcn3-hacks + " + + if ! command -v ruff >/dev/null; then + return + fi + + for i in $check_projects; do + if [ "$i" = "$PROJECT" ]; then + echo "Running 'ruff check'..." + echo + ruff check + break + fi + done + + for i in $format_projects; do + if [ "$i" = "$PROJECT" ]; then + echo "Running 'ruff format --diff'..." + echo + ruff format --diff + break + fi + done +} + show_error() { echo echo "Please fix the linting errors above. More information:" @@ -106,8 +149,10 @@ < gerrit_report.json } +get_project check_git_dir set_commit +test_ruff test_docker_run_rm test_checkpatch test_clang_format -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39912?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5c2ede1a7b2a204ca3deb24c55008c7585c289a0 Gerrit-Change-Number: 39912 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in docker-playground[master]: debian-bookworm-build: fix lcov-to-cobertura-xml
by fixeria 03 Apr '25

03 Apr '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/39897?usp=email ) Change subject: debian-bookworm-build: fix lcov-to-cobertura-xml ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2e248bf988be055a3a88cc414946e0377e266e1e Gerrit-Change-Number: 39897 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Apr 2025 07:34:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: osmo-release: improve check for REL argument
by fixeria 03 Apr '25

03 Apr '25

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmocore/+/39896?usp=email ) Change subject: osmo-release: improve check for REL argument ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39896?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibac10dbc983b6d65cce6de10371fb731505a7ce8 Gerrit-Change-Number: 39896 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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: Thu, 03 Apr 2025 07:33:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-hlr[master]: Bump version: 1.9.0.2-1a71e → 1.9.1
by fixeria 03 Apr '25

03 Apr '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39899?usp=email ) Change subject: Bump version: 1.9.0.2-1a71e → 1.9.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib8bdcee7a6fa4ae9821d9748a8a7ea4aecbea62e Gerrit-Change-Number: 39899 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Apr 2025 07:32:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: osmo-release: improve check for REL argument
by osmith 03 Apr '25

03 Apr '25

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmocore/+/39896?usp=email ) Change subject: osmo-release: improve check for REL argument ...................................................................... Patch Set 2: (1 comment) File osmo-release.sh: https://gerrit.osmocom.org/c/libosmocore/+/39896/comment/17270dbd_aaa3681e?… : PS1, Line 9: echo "usage: make REL=patch|minor|major release" > you may want to put this into a print_help() function, but fine anyway. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39896?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibac10dbc983b6d65cce6de10371fb731505a7ce8 Gerrit-Change-Number: 39896 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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: Thu, 03 Apr 2025 06:48:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: osmo-release: improve check for REL argument
by osmith 03 Apr '25

03 Apr '25

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/39896?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: osmo-release: improve check for REL argument ...................................................................... osmo-release: improve check for REL argument Verify that REL is actually "patch", "minor" or "major". If it is something else (e.g. because of a typo), the script would contiune otherwise and create an invalid release commit without bumping the version. Change-Id: Ibac10dbc983b6d65cce6de10371fb731505a7ce8 --- M osmo-release.sh 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/39896/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39896?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibac10dbc983b6d65cce6de10371fb731505a7ce8 Gerrit-Change-Number: 39896 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: fix passing swapped {MME,ENB}_UE_S1AP_ID
by fixeria 02 Apr '25

02 Apr '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39906?usp=email ) Change subject: s1gw: fix passing swapped {MME,ENB}_UE_S1AP_ID ...................................................................... s1gw: fix passing swapped {MME,ENB}_UE_S1AP_ID This commit fixes a regression introduced in 64db5053 and makes the following TCs green again: * TC_e_rab_modify_ind_cnf[_multi] * TC_e_rab_modify_req_rsp[_multi] Change-Id: I9b19a82234f547a9e44c9c034492ee4b21892818 Fixes: 64db5053 ("s1gw: ConnHdlr: allow passing {MME,ENB}-UE-S1AP-ID") --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/39906/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 5c9e108..8e01c1f 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -1104,7 +1104,7 @@ function f_ConnHdlr_erab_setup_req_() runs on ConnHdlr { - f_ConnHdlr_erab_setup_req(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_erab_setup_req(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_erab_setup_req(inout ERabList erabs, @@ -1139,7 +1139,7 @@ function f_ConnHdlr_erab_setup_rsp_() runs on ConnHdlr { - f_ConnHdlr_erab_setup_rsp(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_erab_setup_rsp(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_erab_setup_rsp(in ERabList erabs, @@ -1256,7 +1256,7 @@ function f_ConnHdlr_erab_release_cmd_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { - f_ConnHdlr_erab_release_cmd(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_erab_release_cmd(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_erab_release_cmd(inout ERabList erabs, @@ -1273,7 +1273,7 @@ function f_ConnHdlr_erab_release_rsp_() runs on ConnHdlr { - f_ConnHdlr_erab_release_rsp(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_erab_release_rsp(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_erab_release_rsp(inout ERabList erabs, @@ -1288,7 +1288,7 @@ function f_ConnHdlr_erab_release_ind_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { - f_ConnHdlr_erab_release_ind(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id, cause); + f_ConnHdlr_erab_release_ind(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx, cause); } function f_ConnHdlr_erab_release_ind(inout ERabList erabs, @@ -1305,7 +1305,7 @@ function f_ConnHdlr_initial_ctx_setup_req_() runs on ConnHdlr { - f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_initial_ctx_setup_req(inout ERabList erabs, @@ -1340,7 +1340,7 @@ function f_ConnHdlr_initial_ctx_setup_rsp_() runs on ConnHdlr { - f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_initial_ctx_setup_rsp(inout ERabList erabs, @@ -1356,7 +1356,7 @@ function f_ConnHdlr_ue_ctx_release_req_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { - f_ConnHdlr_ue_ctx_release_req(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id, cause); + f_ConnHdlr_ue_ctx_release_req(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx, cause); } function f_ConnHdlr_ue_ctx_release_req(inout ERabList erabs, @@ -1375,7 +1375,7 @@ function f_ConnHdlr_ue_ctx_release_cmd_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { - f_ConnHdlr_ue_ctx_release_cmd(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id, cause); + f_ConnHdlr_ue_ctx_release_cmd(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx, cause); } function f_ConnHdlr_ue_ctx_release_cmd(inout ERabList erabs, @@ -1401,7 +1401,7 @@ function f_ConnHdlr_ue_ctx_release_compl_() runs on ConnHdlr { - f_ConnHdlr_ue_ctx_release_compl(g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_ue_ctx_release_compl(g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_ue_ctx_release_compl(MME_UE_S1AP_ID mme_ue_id, diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index fef8279..e6ce2f4 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -442,7 +442,7 @@ f_PFCPEM_subscribe_seid(erab.pfcp_loc_seid); log("eNB <- [S1GW <- MME]: E-RAB SETUP REQUEST"); - f_ConnHdlr_tx_erab_setup_req({erab}, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_tx_erab_setup_req({erab}, g_pars.mme_ue_id, g_pars.idx); log("UPF <- S1GW: PFCP Session Establishment Request"); var PDU_PFCP req := f_ConnHdlr_rx_session_establish_req(erab); /* store peer's SEID, so that it can be used in outgoing PDUs later */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39906?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: I9b19a82234f547a9e44c9c034492ee4b21892818 Gerrit-Change-Number: 39906 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in upf-benchmark[master]: tunend: trex: Support differnet amount of pkt per UL/DL dir
by pespin 02 Apr '25

02 Apr '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39905?usp=email ) Change subject: tunend: trex: Support differnet amount of pkt per UL/DL dir ...................................................................... tunend: trex: Support differnet amount of pkt per UL/DL dir Change-Id: Id273fabc9cd09df352a12b6d8f3ba60b6a9ce39f --- M testsuites/gtplab-sysmo2025/tunend/trex/run.sh M testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py 2 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/05/39905/1 diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/run.sh b/testsuites/gtplab-sysmo2025/tunend/trex/run.sh index 18c2bbe..5798b6b 100755 --- a/testsuites/gtplab-sysmo2025/tunend/trex/run.sh +++ b/testsuites/gtplab-sysmo2025/tunend/trex/run.sh @@ -11,7 +11,7 @@ echo "To start the test, run: >" echo "tunnel --type gtpu;" echo "tunnels_topo load -f ${SCRIPT_DIR}/gtpu_topo.py -t num-streams=${NUM_STREAMS},num-addrs=${NUM_ADDRS};" -echo "start -f ${SCRIPT_DIR}/udp_simple.py -m 50000 -d 600 -t num-streams=${NUM_STREAMS},num-addrs=${NUM_ADDRS},num-pkts=1,dir=ul;" +echo "start -f ${SCRIPT_DIR}/udp_simple.py -m 50000 -d 600 -t num-streams=${NUM_STREAMS},num-addrs=${NUM_ADDRS},num-pkts-ul=1,num-pkts-dl=1,dir=ul;" echo "" printf "Once the test finished, run: >\ntunnel --type gtpu --off;\n stats\n" set -x diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py b/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py index 31d4370..8ff406b 100644 --- a/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py +++ b/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py @@ -56,10 +56,14 @@ type=int, default=1, help="The number of src IP addresses.") - parser.add_argument('--num-pkts', + parser.add_argument('--num-pkts-ul', type=int, default=1, - help="The number of Packets to transmit per flow.") + help="The number of UL Packets to transmit per flow.") + parser.add_argument('--num-pkts-dl', + type=int, + default=1, + help="The number of DL Packets to transmit per flow.") parser.add_argument('--dir', type=str, default='ul', @@ -68,25 +72,26 @@ args = parser.parse_args(tunables) self.num_streams = args.num_streams self.num_addrs = args.num_addrs - self.num_pkts = args.num_pkts + self.num_pkts_ul = args.num_pkts_ul + self.num_pkts_dl = args.num_pkts_dl do_ul = "ul" in args.dir.lower() do_dl = "dl" in args.dir.lower() # client commands prog_c = ASTFProgram(stream=False, udp_mtu=1400, addon='latency') if do_ul: - for _ in range(self.num_pkts): + for _ in range(self.num_pkts_ul): prog_c.send_msg(ul_pkt) if do_dl: prog_c.set_keepalive_msg(10000) - prog_c.recv_msg(self.num_pkts) + prog_c.recv_msg(self.num_pkts_dl) prog_s = ASTFProgram(stream=False, udp_mtu=1400, addon='latency') if do_ul: prog_s.set_keepalive_msg(10000) - prog_s.recv_msg(self.num_pkts) + prog_s.recv_msg(self.num_pkts_ul) if do_dl: - for _ in range(self.num_pkts): + for _ in range(self.num_pkts_dl): prog_s.send_msg(dl_pkt) # Not really used, but must be passed to ASTFProfile: -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39905?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Id273fabc9cd09df352a12b6d8f3ba60b6a9ce39f Gerrit-Change-Number: 39905 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in upf-benchmark[master]: tunend: trex: Increase udp flow keepalive waiting to rx from DL
by pespin 02 Apr '25

02 Apr '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39902?usp=email ) Change subject: tunend: trex: Increase udp flow keepalive waiting to rx from DL ...................................................................... tunend: trex: Increase udp flow keepalive waiting to rx from DL Change-Id: I6e0cce1cb5ec1658fa8ccf0fa90d57039196199c --- M testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/02/39902/1 diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py b/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py index 5d5d3c0..106edbc 100644 --- a/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py +++ b/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py @@ -72,10 +72,12 @@ if do_ul: prog_c.send_msg(ul_pkt) if do_dl: + prog_c.set_keepalive_msg(10000) prog_c.recv_msg(1) prog_s = ASTFProgram(stream=False, udp_mtu=1400, addon='latency') if do_ul: + prog_s.set_keepalive_msg(10000) prog_s.recv_msg(1) if do_dl: prog_s.send_msg(dl_pkt) -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39902?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I6e0cce1cb5ec1658fa8ccf0fa90d57039196199c Gerrit-Change-Number: 39902 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in upf-benchmark[master]: tunend: trex: Make amount of pkts per flow configurable
by pespin 02 Apr '25

02 Apr '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39903?usp=email ) Change subject: tunend: trex: Make amount of pkts per flow configurable ...................................................................... tunend: trex: Make amount of pkts per flow configurable Change-Id: I72ca5c7fd15949936b208b23259b79881325fc43 --- M testsuites/gtplab-sysmo2025/tunend/trex/run.sh M testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py 2 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/03/39903/1 diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/run.sh b/testsuites/gtplab-sysmo2025/tunend/trex/run.sh index 0bc0b73..18c2bbe 100755 --- a/testsuites/gtplab-sysmo2025/tunend/trex/run.sh +++ b/testsuites/gtplab-sysmo2025/tunend/trex/run.sh @@ -11,7 +11,7 @@ echo "To start the test, run: >" echo "tunnel --type gtpu;" echo "tunnels_topo load -f ${SCRIPT_DIR}/gtpu_topo.py -t num-streams=${NUM_STREAMS},num-addrs=${NUM_ADDRS};" -echo "start -f ${SCRIPT_DIR}/udp_simple.py -m 50000 -d 600 -t num-streams=${NUM_STREAMS},num-addrs=${NUM_ADDRS},dir=ul;" +echo "start -f ${SCRIPT_DIR}/udp_simple.py -m 50000 -d 600 -t num-streams=${NUM_STREAMS},num-addrs=${NUM_ADDRS},num-pkts=1,dir=ul;" echo "" printf "Once the test finished, run: >\ntunnel --type gtpu --off;\n stats\n" set -x diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py b/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py index 106edbc..31d4370 100644 --- a/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py +++ b/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py @@ -56,6 +56,10 @@ type=int, default=1, help="The number of src IP addresses.") + parser.add_argument('--num-pkts', + type=int, + default=1, + help="The number of Packets to transmit per flow.") parser.add_argument('--dir', type=str, default='ul', @@ -64,23 +68,26 @@ args = parser.parse_args(tunables) self.num_streams = args.num_streams self.num_addrs = args.num_addrs + self.num_pkts = args.num_pkts do_ul = "ul" in args.dir.lower() do_dl = "dl" in args.dir.lower() # client commands prog_c = ASTFProgram(stream=False, udp_mtu=1400, addon='latency') if do_ul: - prog_c.send_msg(ul_pkt) + for _ in range(self.num_pkts): + prog_c.send_msg(ul_pkt) if do_dl: prog_c.set_keepalive_msg(10000) - prog_c.recv_msg(1) + prog_c.recv_msg(self.num_pkts) prog_s = ASTFProgram(stream=False, udp_mtu=1400, addon='latency') if do_ul: prog_s.set_keepalive_msg(10000) - prog_s.recv_msg(1) + prog_s.recv_msg(self.num_pkts) if do_dl: - prog_s.send_msg(dl_pkt) + for _ in range(self.num_pkts): + prog_s.send_msg(dl_pkt) # Not really used, but must be passed to ASTFProfile: default_ip_gen = self.create_ip_gen(prog_c, prog_s, 0) -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39903?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I72ca5c7fd15949936b208b23259b79881325fc43 Gerrit-Change-Number: 39903 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log