- gerrit-log - lists.osmocom.org

[S] Change in upf-benchmark[master]: Remove unused file
by pespin 07 Feb '25

07 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39469?usp=email ) Change subject: Remove unused file ...................................................................... Remove unused file osmo-pfcp-tool is no longer used since a while ago. Change-Id: I8efe3f78f6585ca4c5506e04b8e5a770ad331cf7 --- D testsuites/gtplab-sysmo2017/tunend/osmo-pfcp-tool.cfg 1 file changed, 0 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/testsuites/gtplab-sysmo2017/tunend/osmo-pfcp-tool.cfg b/testsuites/gtplab-sysmo2017/tunend/osmo-pfcp-tool.cfg deleted file mode 100644 index 6e80e6e..0000000 --- a/testsuites/gtplab-sysmo2017/tunend/osmo-pfcp-tool.cfg +++ /dev/null @@ -1,12 +0,0 @@ -log stderr - logging color 1 - logging print category-hex 0 - logging print category 1 - logging timestamp 0 - logging print file basename last - logging print level 1 - logging level set-all info - logging level lpfcp error - -local-addr 0.0.0.0 -listen -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39469?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I8efe3f78f6585ca4c5506e04b8e5a770ad331cf7 Gerrit-Change-Number: 39469 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in upf-benchmark[master]: Remove unused envnvar calling osmo-upf
by pespin 07 Feb '25

07 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39472?usp=email ) Change subject: Remove unused envnvar calling osmo-upf ...................................................................... Remove unused envnvar calling osmo-upf This is a copy-paste typo from eupf. Change-Id: I81de16bfe28b800e04bdaaf9e27d51ecbec33dd5 --- M testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh b/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh index 9dda226..a4951e9 100755 --- a/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh +++ b/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/run.sh @@ -2,7 +2,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -sudo GIN_MODE=release osmo-upf -c "$SCRIPT_DIR/osmo-upf.cfg" +sudo osmo-upf -c "$SCRIPT_DIR/osmo-upf.cfg" # TODO: Route needs to be set up manually on the tun iface once it becomes created, since osmo-upf is not yet doing it (OS#6585). # For now, run this manually after starting osmo-upf with the current run.sh script: -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39472?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I81de16bfe28b800e04bdaaf9e27d51ecbec33dd5 Gerrit-Change-Number: 39472 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in upf-benchmark[master]: gtplab-sysmo2025/tunmap: Small fixes in configure scripts
by pespin 07 Feb '25

07 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39473?usp=email ) Change subject: gtplab-sysmo2025/tunmap: Small fixes in configure scripts ...................................................................... gtplab-sysmo2025/tunmap: Small fixes in configure scripts Fixes from copy-paste from older gtpal-sysmo2017/tunmap setup, which doesn't appply to new TREx setuo anymore. Those CPF IP addresses are actually not used. Change-Id: I8b8ce66c8642ebaa59bdf9e238cdba7e40071726 --- M testsuites/gtplab-sysmo2025/tunmap/cpf/configure.sh M testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh 2 files changed, 5 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/testsuites/gtplab-sysmo2025/tunmap/cpf/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/cpf/configure.sh index 7f3c8af..2b24a65 100755 --- a/testsuites/gtplab-sysmo2025/tunmap/cpf/configure.sh +++ b/testsuites/gtplab-sysmo2025/tunmap/cpf/configure.sh @@ -1,10 +1 @@ #!/bin/bash -xe - -# Interface towards UPF: -IFACE_UPF="enp2s0f0np0" -NUM_ENB=50 - -# Set up IP addresses: -for i in $(seq "0" "$((NUM_ENB - 1))"); do - sudo ip addr add "$(printf "172.16.31.1%02u/24" $i)" dev $IFACE_UPF || true; -done diff --git a/testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh index 58792fe..825e59f 100755 --- a/testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh +++ b/testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh @@ -1,8 +1,8 @@ #!/bin/bash -xe # Interface towards UPF: -IFACE_RAN="enp2s0f0np0" -IFACE_CN="enp2s0f1np1" +IFACE_RAN="enp2s0f1np1" +IFACE_CN="enp2s0f0np0" # Disable ethernet flow control: sudo ethtool -A $IFACE_RAN autoneg off rx off tx off @@ -25,8 +25,8 @@ sudo sysctl -w net.core.netdev_budget=600 # Set up UPF address: -sudo ip addr add 172.16.31.2/24 dev $IFACE_RAN || true; -sudo ip addr add 172.16.32.1/24 dev $IFACE_CN || true; +sudo ip addr add 172.16.32.1/24 dev $IFACE_RAN || true; +sudo ip addr add 172.16.31.2/24 dev $IFACE_CN || true; # TRex doesn't answer ARPs, so we need to set up the CN-side peer: -sudo ip neigh add 172.16.31.200 lladdr ec:0d:9a:8a:27:53 nud permanent dev $IFACE_RAN || true; +sudo ip neigh add 172.16.31.200 lladdr ec:0d:9a:8a:27:53 nud permanent dev $IFACE_CN || true; -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39473?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I8b8ce66c8642ebaa59bdf9e238cdba7e40071726 Gerrit-Change-Number: 39473 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in upf-benchmark[master]: trex-tunmap: smf: Fix missing ENB addresses
by pespin 07 Feb '25

07 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39464?usp=email ) Change subject: trex-tunmap: smf: Fix missing ENB addresses ...................................................................... trex-tunmap: smf: Fix missing ENB addresses Change-Id: I069174d8c3209210b81a7cc148900453bcb204b7 --- M testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty 1 file changed, 11 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty b/testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty index c570fd2..41416ef 100644 --- a/testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty +++ b/testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty @@ -3,13 +3,13 @@ # # osmo-upf-load-gen UPF "core" # |GTP-ep -------GTP-----> GTP-ep|GTP-ep ----------IP------> GTP-ep -# |10.0.1.1 10.0.2.1|10.0.3.1 10.0.3.2 -# |10.0.1.2 +# |172.16.32.2 172.16.32.1|172.16.31.2 172.16.31.200 +# |172.16.32.3 # ^ ^ ^ # ^ | | | # | | / configure by # configure by from UPF 'gtp core' -# 'gtp ip' ("F-TEID=choose") +# 'gtp local' ("F-TEID=choose") # Configure one or more local GTP endpoints to emit GTP packets from. # Established sessions will use these round-robin. @@ -65,6 +65,14 @@ gtp local 172.16.32.49 gtp local 172.16.32.50 gtp local 172.16.32.51 +gtp local 172.16.32.52 +gtp local 172.16.32.53 +gtp local 172.16.32.54 +gtp local 172.16.32.55 +gtp local 172.16.32.56 +gtp local 172.16.32.57 +gtp local 172.16.32.58 +gtp local 172.16.32.59 gtp local 172.16.32.60 gtp local 172.16.32.61 gtp local 172.16.32.62 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39464?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I069174d8c3209210b81a7cc148900453bcb204b7 Gerrit-Change-Number: 39464 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in upf-benchmark[master]: testsuite: Move topology graph to related directory
by pespin 07 Feb '25

07 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39466?usp=email ) Change subject: testsuite: Move topology graph to related directory ...................................................................... testsuite: Move topology graph to related directory The "tunend and tunmap" scenario is dropped since it's not really used anywhere, and it's simply and mix of the other 2 scenarios. Change-Id: I5db21fad6fbc4556f16a16ed8cafcbcc3d212929 --- D testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot R testsuites/gtplab-sysmo2017/tunend/topology.dot R testsuites/gtplab-sysmo2017/tunmap/topology.dot 3 files changed, 0 insertions(+), 43 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot b/testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot deleted file mode 100644 index f7f4224..0000000 --- a/testsuites/gtplab-sysmo2017/overview_tunmap_and_tunend.dot +++ /dev/null @@ -1,43 +0,0 @@ -digraph G { - rankdir=TB; - labelloc=t; - label="gtplab @ sysmocom"; - - subgraph cluster_gtplab0 { - label="gtplab0"; - rankdir=TB; - gtplab0_10 [label="10.9.25.20/24"]; - gtplab0_172_31 [label="172.16.31.1/24"]; - tool [label="osmo-upf-load-gen",shape=box3d]; - } - subgraph cluster_gtplab1 { - label="gtplab1"; - gtplab1_10 [label="10.9.25.21/24"]; - gtplab1_172_31 [label="172.16.31.2/24"]; - gtplab1_172_32 [label="172.16.32.1/24"]; - - upf1 [label="UPF\ntunmap",shape=box3d]; - } - subgraph cluster_gtplab2 { - label="gtplab2"; - gtplab2_10 [label="10.9.25.22/24"]; - gtplab2_172_32 [label="172.16.32.2/24"]; - - upf2 [label="UPF\ntunend",shape=box3d]; - - responder [label="osmo-udp-responder",shape=box3d]; - } - - - tool -> gtplab0_10 -> gtplab1_10 -> upf1 [label="PFCP", dir=both]; - gtplab0_10 -> gtplab2_10 -> upf2 [label="PFCP", dir=both]; - - tool -> gtplab0_172_31 -> gtplab1_172_31 -> upf1 [label="GTP tun",style=bold]; - upf1 -> gtplab1_172_32 -> gtplab2_172_32 -> upf2 [label="GTP tun",style=bold]; - upf2 -> responder [label="UDP/IP",style=bold]; - - upf2 -> responder [style=dotted,dir=back]; - upf1 -> gtplab1_172_32 -> gtplab2_172_32 -> upf2 [style=dotted,dir=back]; - tool -> gtplab0_172_31 -> gtplab1_172_31 -> upf1 [style=dotted,dir=back]; - -} diff --git a/testsuites/gtplab-sysmo2017/overview_only_tunend.dot b/testsuites/gtplab-sysmo2017/tunend/topology.dot similarity index 100% rename from testsuites/gtplab-sysmo2017/overview_only_tunend.dot rename to testsuites/gtplab-sysmo2017/tunend/topology.dot diff --git a/testsuites/gtplab-sysmo2017/overview_only_tunmap.dot b/testsuites/gtplab-sysmo2017/tunmap/topology.dot similarity index 100% rename from testsuites/gtplab-sysmo2017/overview_only_tunmap.dot rename to testsuites/gtplab-sysmo2017/tunmap/topology.dot -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39466?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I5db21fad6fbc4556f16a16ed8cafcbcc3d212929 Gerrit-Change-Number: 39466 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in upf-benchmark[master]: trex-tunmap: Initial working eupf setup
by pespin 07 Feb '25

07 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39465?usp=email ) Change subject: trex-tunmap: Initial working eupf setup ...................................................................... trex-tunmap: Initial working eupf setup Change-Id: I077623f679d8ca74ca81a1f6fd5fe58e0a019d8f --- M testsuites/gtplab-sysmo2017/trex-tunmap/upf/eupf/eupf.yaml 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2017/trex-tunmap/upf/eupf/eupf.yaml index 7b77a4a..2483a72 100644 --- a/testsuites/gtplab-sysmo2017/trex-tunmap/upf/eupf/eupf.yaml +++ b/testsuites/gtplab-sysmo2017/trex-tunmap/upf/eupf/eupf.yaml @@ -4,11 +4,12 @@ pfcp_address: 172.16.31.2:8805 pfcp_node_id: 172.16.31.2 metrics_address: :9090 -n3_address: 172.16.31.2 -n9_address: 172.16.32.1 -qer_map_size: 1000000 -far_map_size: 1000000 -pdr_map_size: 1000000 +n3_address: 172.16.32.1 +n9_address: 172.16.31.2 +qer_map_size: 4000000 +far_map_size: 4000000 +pdr_map_size: 4000000 feature_ueip: false feature_ftup: true -teid_pool: 1000000 +teid_pool: 4000000 +logging_level: 2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39465?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I077623f679d8ca74ca81a1f6fd5fe58e0a019d8f Gerrit-Change-Number: 39465 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in upf-benchmark[master]: Move new TRex based setup to its own gtplan-sysmo2025 dir
by pespin 07 Feb '25

07 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39467?usp=email ) Change subject: Move new TRex based setup to its own gtplan-sysmo2025 dir ...................................................................... Move new TRex based setup to its own gtplan-sysmo2025 dir Some documentation regardins the setups is added/improved. Change-Id: Ia5adb2826c30a0a4c02b091e9907e48c309ebf05 --- A testsuites/gtplab-sysmo2017/README.md A testsuites/gtplab-sysmo2017/setup.dot D testsuites/gtplab-sysmo2017/trex-tunmap/README.md A testsuites/gtplab-sysmo2025/README.md A testsuites/gtplab-sysmo2025/setup.dot A testsuites/gtplab-sysmo2025/tunmap/README.md R testsuites/gtplab-sysmo2025/tunmap/cpf/0.gtp_flood.vty R testsuites/gtplab-sysmo2025/tunmap/cpf/configure.sh R testsuites/gtplab-sysmo2025/tunmap/cpf/osmo-upf-load-gen.cfg R testsuites/gtplab-sysmo2025/tunmap/cpf/run.sh A testsuites/gtplab-sysmo2025/tunmap/topology.dot R testsuites/gtplab-sysmo2025/tunmap/trex/configure.sh R testsuites/gtplab-sysmo2025/tunmap/trex/gtp_1pkt_simple.py R testsuites/gtplab-sysmo2025/tunmap/trex/run.sh R testsuites/gtplab-sysmo2025/tunmap/trex/trex_cfg.yaml R testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh R testsuites/gtplab-sysmo2025/tunmap/upf/eupf/eupf.yaml R testsuites/gtplab-sysmo2025/tunmap/upf/eupf/run.sh R testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/osmo-upf.cfg R testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/run.sh 20 files changed, 169 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/testsuites/gtplab-sysmo2017/README.md b/testsuites/gtplab-sysmo2017/README.md new file mode 100644 index 0000000..49bb4f2 --- /dev/null +++ b/testsuites/gtplab-sysmo2017/README.md @@ -0,0 +1,3 @@ +This directory contains test scenarios (tunmap, tunend) run on a setup which consists out of 3 identical machines, each with a dualport mellanox network card and 100ge cables to the next machine. + +See setup.dot in this same directory to understand better the general topology. \ No newline at end of file diff --git a/testsuites/gtplab-sysmo2017/setup.dot b/testsuites/gtplab-sysmo2017/setup.dot new file mode 100644 index 0000000..4a67ef3 --- /dev/null +++ b/testsuites/gtplab-sysmo2017/setup.dot @@ -0,0 +1,40 @@ +digraph G { + rankdir=TB; + labelloc=t; + label="gtplab @ sysmocom"; + + subgraph cluster_gtplab0 { + label="gtplab0"; + rankdir=TB; + gtplab0_ipmi [label="ipmi\n10.9.23.50/24\nac:1f:6b:4a:78:d2\nBMC/ipmi\ndhcpc"]; + gtplab0_eno1 [label="eno1\n10.9.25.20/24\nac:1f:6b:45:1b:04\nOOB access\ndhcpc"]; + gtplab0_eno2 [label="eno2\nac:1f:6b:45:1b:05\nunused"]; + gtplab0_enp2s0f0np0 [label="enp2s0f0np0\n172.16.31.1/24\nec:0d:9a:8a:28:12\nstatic "]; + gtplab0_enp2s0f1np1 [label="enp2s0f1np1\nec:0d:9a:8a:28:13\nunused "]; + } + subgraph cluster_gtplab1 { + label="gtplab1"; + gtplab1_ipmi [label="ipmi\n10.9.23.51/24\nac:1f:6b:4a:79:84\nBMC/ipmi\ndhcpc"]; + gtplab1_eno1 [label="eno1\n10.9.25.21/24\nac:1f:6b:45:1c:68\nOOB access\ndhcpc"]; + gtplab1_eno2 [label="eno2\nac:1f:6b:45:1c:69\nunused"]; + gtplab1_enp2s0f0np0 [label="enp2s0f0np0\n172.16.31.2/24\nec:0d:9a:8a:28:1a\n100gb link\nstatic "]; + gtplab1_enp2s0f1np1 [label="enp2s0f1np1\n172.16.32.1/24\nec:0d:9a:8a:28:1b\n100gb link\nstatic "]; + } + subgraph cluster_gtplab2 { + label="gtplab2"; + gtplab2_ipmi [label="ipmi\n10.9.23.52/24\nac:1f:6b:4a:77:cd\nBMC/ipmi\ndhcpc"]; + gtplab2_eno1 [label="eno1\n10.9.25.22/24\nac:1f:6b:45:18:fe\nOOB access\ndhcpc"]; + gtplab2_eno2 [label="eno2\nac:1f:6b:45:18:ff\nunused"]; + gtplab2_enp2s0f0np0 [label="enp2s0f0np0\n172.16.32.2/24\nec:0d:9a:8a:27:52\nstatic "]; + gtplab2_enp2s0f1np1 [label="enp2s0f1np1\nec:0d:9a:8a:27:53\nunused"]; + } + + switch -> gtplab0_ipmi [constraint=false,dir=both]; + switch -> gtplab0_eno1 [constraint=false,dir=both]; + switch -> gtplab1_ipmi [constraint=false,dir=both]; + switch -> gtplab1_eno1 [constraint=false,dir=both]; + switch -> gtplab2_ipmi [constraint=false,dir=both]; + switch -> gtplab2_eno1 [constraint=false,dir=both]; + gtplab0_enp2s0f0np0 -> gtplab1_enp2s0f0np0 [label="100gb",dir=both,style=bold]; + gtplab1_enp2s0f1np1 -> gtplab2_enp2s0f0np0 [label="100gb",dir=both,style=bold]; +} diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/README.md b/testsuites/gtplab-sysmo2017/trex-tunmap/README.md deleted file mode 100644 index 17102e4..0000000 --- a/testsuites/gtplab-sysmo2017/trex-tunmap/README.md +++ /dev/null @@ -1,5 +0,0 @@ ----- -[ran](172.16.31.1) ----GTPU--> ()[upf] - | -[cn](172.16.31.100) <--GTPU--- ()[upf] ----- \ No newline at end of file diff --git a/testsuites/gtplab-sysmo2025/README.md b/testsuites/gtplab-sysmo2025/README.md new file mode 100644 index 0000000..f6c6221 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/README.md @@ -0,0 +1,17 @@ +This directory contains test scenarios (tunmap, tunend) run on a setup which consists out of 3 machines, all of them are inter-connected via a Mellanox SN2700 32x 100GE switch. + +Machines: +* TRex: This machine runs TRex to generate/consume traffic emulating both RAN + and CN around the UPF. +* UPF: This machine runs the UPF under test, be it osmo-upf, eupf, etc. +* CPF: This machine runs the userspace program in charge of setting up the UPF + sessions over PFCP, hence acting as a CPF. It runs osmo-upf-load-gen tool from + this same repository. + +The CPF could actually also be run eg. at TRex machine and route PFCP traffic +over the external network towards UPF. Note it cannot easily use the network +interfaces (internal network) used to transmit GTPU, since those are controlled +by TRex and not by the linux kernel, hence why CPF is simply placed in another +machine. + +See setup.dot in this same directory to understand better the general topology. \ No newline at end of file diff --git a/testsuites/gtplab-sysmo2025/setup.dot b/testsuites/gtplab-sysmo2025/setup.dot new file mode 100644 index 0000000..d3a7a14 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/setup.dot @@ -0,0 +1,49 @@ +digraph G { + rankdir=TB; + labelloc=t; + label="gtplab @ sysmocom"; + + subgraph cluster_trex { + label="TRex (gtplab2)"; + rankdir=TB; + trex_ipmi [label="ipmi\n10.9.23.52/24\nac:1f:6b:4a:77:cd\nBMC/ipmi\ndhcpc"]; + trex_eno1 [label="eno1\n10.9.25.22/24\nac:1f:6b:45:18:fe\nOOB access\ndhcpc"]; + trex_eno2 [label="eno2\nac:1f:6b:45:18:ff\nunused"]; + trex_enp2s0f0np0 [label="enp2s0f0np0\n172.16.32.2/24\nec:0d:9a:8a:27:52\nstatic (TRex)"]; + trex_enp2s0f1np1 [label="enp2s0f1np1\n172.16.31.200\nec:0d:9a:8a:27:53\nstatic (TRex)"]; + } + subgraph cluster_upf { + label="UPF (gtplab1)"; + upf_ipmi [label="ipmi\n10.9.23.51/24\nac:1f:6b:4a:79:84\nBMC/ipmi\ndhcpc"]; + upf_eno1 [label="eno1\n10.9.25.21/24\nac:1f:6b:45:1c:68\nOOB access\ndhcpc"]; + upf_eno2 [label="eno2\nac:1f:6b:45:1c:69\nunused"]; + upf_enp2s0f0np0 [label="enp2s0f0np0\n172.16.31.2/24\nec:0d:9a:8a:28:1a\n100gb link\nstatic "]; + upf_enp2s0f1np1 [label="enp2s0f1np1\n172.16.32.1/24\nec:0d:9a:8a:28:1b\n100gb link\nstatic "]; + } + subgraph cluster_test_switch { + label="Test Switch (100gb)"; + test_switch_vlan1 [label="vlan1 (RAN)"]; + test_switch_vlan2 [label="vlan2 (CN)"]; + } + subgraph cluster_cpf { + label="CPF (gtplab0)"; + cpf_ipmi [label="ipmi\n10.9.23.50/24\nac:1f:6b:4a:78:d2\nBMC/ipmi\ndhcpc"]; + cpf_eno1 [label="eno1\n10.9.25.20/24\nac:1f:6b:45:1b:04\nOOB access\ndhcpc"]; + cpf_eno2 [label="eno2\nac:1f:6b:45:1b:05\nunused"]; + cpf_enp2s0f0np0 [label="enp2s0f0np0\n172.16.31.1/24\nec:0d:9a:8a:28:12\nstatic "]; + cpf_enp2s0f1np1 [label="enp2s0f1np1\nec:0d:9a:8a:28:13\nunused "]; + } + + trex_enp2s0f0np0 -> test_switch_vlan1 [label="RAN 100gb",dir=both,style=bold]; + trex_enp2s0f1np1 -> test_switch_vlan2 [label="CN 100gb",dir=both,style=bold]; + upf_enp2s0f0np0 -> test_switch_vlan2 [label="CN 100gb",dir=both,style=bold]; + upf_enp2s0f1np1 -> test_switch_vlan1 [label="RAN 100gb",dir=both,style=bold]; + cpf_enp2s0f0np0 -> test_switch_vlan1 [label="PFCP (100gb)",dir=both,style=bold]; + + switch -> cpf_ipmi [constraint=false,dir=both]; + switch -> cpf_eno1 [constraint=false,dir=both]; + switch -> upf_ipmi [constraint=false,dir=both]; + switch -> upf_eno1 [constraint=false,dir=both]; + switch -> trex_ipmi [constraint=false,dir=both]; + switch -> trex_eno1 [constraint=false,dir=both]; +} diff --git a/testsuites/gtplab-sysmo2025/tunmap/README.md b/testsuites/gtplab-sysmo2025/tunmap/README.md new file mode 100644 index 0000000..24b0f61 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunmap/README.md @@ -0,0 +1,18 @@ + +In this testsuite, TRex is used to generate Uplink GTPU traffic on the RAN side +towards UPF on its 1st iface and which which should be sent back patched +(tunmap) towards CN and received at TRex 2nd interface. + +The GTPU traffic is generated by gtp_1pkt_simply.py profile passed to TRex, +which emulates <enb-ip-addr,TEID> sessions based on parameters passed through +trex-console when launching the test, and which should match those configured in +cpf/0.gtp_flood.vty used by osmo-upf-load-gen to allocated the sessions at the +UPF. + +---- +[trex-ran](172.16.32.{2-101}) ----GTPU--> ()[upf] + | +[trex-cn](172.16.31.200) <---GTPU---- ()[upf] +---- + +See topoology.dot for a more detailed graph. \ No newline at end of file diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty b/testsuites/gtplab-sysmo2025/tunmap/cpf/0.gtp_flood.vty similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty rename to testsuites/gtplab-sysmo2025/tunmap/cpf/0.gtp_flood.vty diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/smf/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/cpf/configure.sh similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/smf/configure.sh rename to testsuites/gtplab-sysmo2025/tunmap/cpf/configure.sh diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/smf/osmo-upf-load-gen.cfg b/testsuites/gtplab-sysmo2025/tunmap/cpf/osmo-upf-load-gen.cfg similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/smf/osmo-upf-load-gen.cfg rename to testsuites/gtplab-sysmo2025/tunmap/cpf/osmo-upf-load-gen.cfg diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/smf/run.sh b/testsuites/gtplab-sysmo2025/tunmap/cpf/run.sh similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/smf/run.sh rename to testsuites/gtplab-sysmo2025/tunmap/cpf/run.sh diff --git a/testsuites/gtplab-sysmo2025/tunmap/topology.dot b/testsuites/gtplab-sysmo2025/tunmap/topology.dot new file mode 100644 index 0000000..b1ca646 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunmap/topology.dot @@ -0,0 +1,42 @@ +digraph G { + rankdir=TB; + labelloc=t; + label="gtplab @ sysmocom"; + + subgraph cluster_gtplab2 { + label="TRex (gtplab2)"; + trex [label="TRex",shape=box3d]; + gtplab2_172_32 [label="172.16.32.{2-101}/24"]; + gtplab2_172_31 [label="172.16.31.200/24"]; + } + subgraph cluster_switch { + label="Switch (100gb)"; + switch_vlan1 [label="vlan1"]; + switch_vlan2 [label="vlan2"]; + } + subgraph cluster_gtplab1 { + label="UPF (gtplab1)"; + gtplab1_172_31 [label="172.16.31.2/24"]; + gtplab1_172_32 [label="172.16.32.1/24"]; + + upf_tunmap [label="UPF\ntunmap",shape=box3d]; + } + subgraph cluster_gtplab0 { + label="CPF (gtplab0)"; + rankdir=TB; + gtplab0_172_31 [label="172.16.31.1/24"]; + pfcp_tool [label="osmo-udp-load-gen",shape=box3d]; + } + + # PFCP: + pfcp_tool -> gtplab0_172_31 -> switch_vlan1 -> gtplab1_172_31 -> upf_tunmap [label="PFCP",dir=both,style=dashed,color=black]; + + # UL: + trex -> gtplab2_172_32 -> switch_vlan2 -> gtplab1_172_32 -> upf_tunmap [label="GTPU UL (RAN)",style=bold, color=red]; + upf_tunmap -> gtplab1_172_31 -> switch_vlan1 -> gtplab2_172_31 -> trex [label="GTPU UL (CN)",style=bold, color=purple]; + + # DL: + trex -> gtplab2_172_31 -> switch_vlan1 -> gtplab1_172_31 -> upf_tunmap [label="GTPU DL (CN)",style=bold,color=blue]; + upf_tunmap -> gtplab1_172_32 -> switch_vlan2 -> gtplab2_172_32 -> trex [label="GTPU DL (RAN)",style=bold,color=darkgreen]; +} + diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/trex/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/trex/configure.sh similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/trex/configure.sh rename to testsuites/gtplab-sysmo2025/tunmap/trex/configure.sh diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/trex/gtp_1pkt_simple.py b/testsuites/gtplab-sysmo2025/tunmap/trex/gtp_1pkt_simple.py similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/trex/gtp_1pkt_simple.py rename to testsuites/gtplab-sysmo2025/tunmap/trex/gtp_1pkt_simple.py diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/trex/run.sh b/testsuites/gtplab-sysmo2025/tunmap/trex/run.sh similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/trex/run.sh rename to testsuites/gtplab-sysmo2025/tunmap/trex/run.sh diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/trex/trex_cfg.yaml b/testsuites/gtplab-sysmo2025/tunmap/trex/trex_cfg.yaml similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/trex/trex_cfg.yaml rename to testsuites/gtplab-sysmo2025/tunmap/trex/trex_cfg.yaml diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/upf/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/upf/configure.sh rename to testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/eupf.yaml similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/upf/eupf/eupf.yaml rename to testsuites/gtplab-sysmo2025/tunmap/upf/eupf/eupf.yaml diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/upf/eupf/run.sh b/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/run.sh similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/upf/eupf/run.sh rename to testsuites/gtplab-sysmo2025/tunmap/upf/eupf/run.sh diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/upf/osmo-upf/osmo-upf.cfg b/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/osmo-upf.cfg similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/upf/osmo-upf/osmo-upf.cfg rename to testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/osmo-upf.cfg diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/upf/osmo-upf/run.sh b/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/run.sh similarity index 100% rename from testsuites/gtplab-sysmo2017/trex-tunmap/upf/osmo-upf/run.sh rename to testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/run.sh -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39467?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Ia5adb2826c30a0a4c02b091e9907e48c309ebf05 Gerrit-Change-Number: 39467 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Use Misc_Helpers.f_shutdown upon rx of unexpected msg
by pespin 07 Feb '25

07 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39483?usp=email ) Change subject: hnbgw: Use Misc_Helpers.f_shutdown upon rx of unexpected msg ...................................................................... hnbgw: Use Misc_Helpers.f_shutdown upon rx of unexpected msg Otherwise the test continues for a while and ends up with a DTE which makes it harder to figure out the original test failure. Change-Id: I7f07cff2ce93e8b11338ba4e39e1d49662323f58 --- M hnbgw/ConnHdlr.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index dec5463..47c25a7 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -335,13 +335,13 @@ [] BSSAP.receive(exp_rx) -> value rx { setverdict(pass); } - [] BSSAP.receive(RANAP_PDU:?) { - setverdict(fail, "Got an unexpected RANAP message on BSSAP port, was waiting for ", exp_rx); - mtc.stop; + [] BSSAP.receive(RANAP_PDU:?) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got an unexpected RANAP message on BSSAP port: ", rx, " vs exp ", exp_rx)); } [] T.timeout { - setverdict(fail, "Timeout waiting for RANAP on BSSAP port: ", exp_rx); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for RANAP on BSSAP port: ", exp_rx)); } } T.stop; @@ -385,13 +385,13 @@ [] RUA.receive(exp_rx) -> value rx { setverdict(pass); } - [] RUA.receive(RANAP_PDU:?) { - setverdict(fail, "Got an unexpected RUA message, was waiting for ", exp_rx); - mtc.stop; + [] RUA.receive(RANAP_PDU:?) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got an unexpected RUA message: ", rx, " vs exp ", exp_rx)); } [] T.timeout { - setverdict(fail, "Timeout waiting for Iuh ", exp_rx); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for Iuh ", exp_rx)); } } T.stop; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39483?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: I7f07cff2ce93e8b11338ba4e39e1d49662323f58 Gerrit-Change-Number: 39483 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: MGCP_Emulation: Make sure peer is running before Tx
by pespin 07 Feb '25

07 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39484?usp=email ) Change subject: MGCP_Emulation: Make sure peer is running before Tx ...................................................................... MGCP_Emulation: Make sure peer is running before Tx This avoid DTE with "Broken pipe" if messages are being transmitted while tear down process has already started, even if components are created as "alive". Change-Id: I8724870b9b967ffa49c3da03e1cdb2941f81653a --- M library/MGCP_Emulation.ttcn 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn index 3167579..7106f63 100644 --- a/library/MGCP_Emulation.ttcn +++ b/library/MGCP_Emulation.ttcn @@ -252,9 +252,17 @@ private function f_forward_to_client(MGCP_RecvFrom mrf, MGCP_ConnHdlr vc_conn) runs on MGCP_Emulation_CT { if (g_pars.multi_conn_mode) { - MGCP_CLIENT_MULTI.send(mrf) to vc_conn; + if (MGCP_CLIENT_MULTI.checkstate("Connected") and vc_conn.running) { + MGCP_CLIENT_MULTI.send(mrf) to vc_conn; + } else { + log("MGCP_CLIENT_MULTI: Discarding msg due to peer unavailable: ", mrf); + } } else { - MGCP_CLIENT.send(mrf.msg.command) to vc_conn; + if (MGCP_CLIENT.checkstate("Connected") and vc_conn.running) { + MGCP_CLIENT.send(mrf.msg.command) to vc_conn; + } else { + log("MGCP_CLIENT: Discarding msg due to peer unavailable: ", mrf); + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39484?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: I8724870b9b967ffa49c3da03e1cdb2941f81653a Gerrit-Change-Number: 39484 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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 0

[S] Change in osmo-ttcn3-hacks[master]: MGCP_Emulation: Make sure peer is running before Tx
by pespin 07 Feb '25

07 Feb '25

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39484?usp=email ) Change subject: MGCP_Emulation: Make sure peer is running before Tx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39484?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: I8724870b9b967ffa49c3da03e1cdb2941f81653a Gerrit-Change-Number: 39484 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 07 Feb 2025 12:21:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log