- gerrit-log - lists.osmocom.org

[L] Change in osmo-ttcn3-hacks[master]: stp: Split M3UA TCP tests into its own testenv config
by pespin 21 May '25

21 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40324?usp=email ) Change subject: stp: Split M3UA TCP tests into its own testenv config ...................................................................... stp: Split M3UA TCP tests into its own testenv config That group of tests explicitly tests operation of m3ua-tcp AS(P)s and interaction with m3ua(-sctp) ones. Hence, create a new config to test those, where we keep the TCP related configuration in osmo-stp. Change-Id: I8123887755aa3253830b43407b4cc6b21142233c --- M stp/STP_Tests_M3UA.cfg M stp/STP_Tests_M3UA.ttcn A stp/STP_Tests_M3UA_TCP.cfg A stp/STP_Tests_M3UA_TCP.ttcn M stp/expected-results.xml A stp/osmo-stp-m3ua-tcp.confmerge M stp/osmo-stp-m3ua.confmerge A stp/testenv_m3ua-tcp.cfg 8 files changed, 262 insertions(+), 131 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg index d5894a1..994314a 100644 --- a/stp/STP_Tests_M3UA.cfg +++ b/stp/STP_Tests_M3UA.cfg @@ -38,15 +38,6 @@ point_code := 42, routing_ctx := 1042 }, - /* as-sender-tcp: One ASP within AS */ - { - asp_name := "asp-sender-tcp", - use_tcp := true, - remote_port := 2905, - local_port := 9999, - point_code := 123, - routing_ctx := 1123 - }, /* as-client: One ASP within AS */ { asp_name := "asp-client0", @@ -73,21 +64,12 @@ local_port := 11061, point_code := 61, routing_ctx := - - }, - /* as-client-tcp: One ASP within AS */ - { - asp_name := "asp-client0-tcp", - use_tcp := true, - remote_port := 2906, - local_port := 10002, - point_code := 155, - routing_ctx := 1155 } }; /* number of M3UA clients in ATS */ -STP_Tests_M3UA.mp_m3ua_num_clients := 4; +STP_Tests_M3UA.mp_m3ua_num_clients := 3; /* number of M3UA servers in ATS */ -STP_Tests_M3UA.mp_m3ua_num_servers := 4; +STP_Tests_M3UA.mp_m3ua_num_servers := 3; [MAIN_CONTROLLER] diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index a78dec5..64153ab 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -12,6 +12,7 @@ */ friend module STP_Tests_IPA_M3UA; +friend module STP_Tests_M3UA_TCP; import from General_Types all; import from Osmocom_Types all; @@ -70,7 +71,7 @@ }; type record of M3uaConfig M3uaConfigs; -private function M3UA_SRV(integer idx) runs on RAW_M3UA_CT return integer { +friend function M3UA_SRV(integer idx) runs on RAW_M3UA_CT return integer { return g_m3ua_num_clients + idx; } @@ -515,7 +516,7 @@ } /* Test if traffic is routed from idx_tx/pc_tx to idx_rx/pc_rx */ -private function f_test_traffic(integer idx_tx, template (omit) OCT4 rctx_sender, OCT4 pc_tx, +friend function f_test_traffic(integer idx_tx, template (omit) OCT4 rctx_sender, OCT4 pc_tx, integer idx_rx, template (omit) OCT4 rctx_receiver, OCT4 pc_rx, OCT1 si := '23'O, OCT1 ni := '00'O, OCT1 mp := '00'O, OCT1 sls := '00'O) runs on RAW_M3UA_CT { @@ -1456,76 +1457,6 @@ f_clear_m3ua(); } -private function f_TC_m3ua_tcp(integer idx_a, integer idx_b) runs on RAW_M3UA_CT { - var M3uaConfig cfg_a := g_m3ua_configs[idx_a]; - var M3uaConfig cfg_b := g_m3ua_configs[idx_b]; - var OCT4 rctx_a := int2oct(cfg_a.routing_ctx, 4); - var OCT4 rctx_b := int2oct(cfg_b.routing_ctx, 4); - var OCT4 pc_a := int2oct(cfg_a.point_code, 4); - var OCT4 pc_b := int2oct(cfg_b.point_code, 4); - - /* establish connection with ASP 'A' */ - if (idx_a < g_m3ua_num_clients) { - f_M3UA_asp_up_act(idx_a, rctx := rctx_a); - } else { - f_M3UA_CLNT_asp_up_act(idx_a, rctx := rctx_a); - } - - /* establish connection with ASP 'B' */ - if (idx_b < g_m3ua_num_clients) { - f_M3UA_asp_up_act(idx_b, rctx := rctx_b); - } else { - f_M3UA_CLNT_asp_up_act(idx_b, rctx := rctx_b); - } - - /* In the case when ASP[idx_b] is configured as the client (i.e. osmo-stp connects to - * the testsuite; idx_b >= g_m3ua_num_clients), in f_M3UA_CLNT_asp_up_act() we're expecting - * to receive ASPACT and then sending ASPACT_ACK to it. Right after that, we're sending - * some random data via ASP[idx_a], which we then expect to receive via ASP[idx_b]. - * - * There is a chance that the random data sent via ASP[idx_a] would reach osmo-stp - * earlier than the ASPUP_ACK we sent for ASP[idx_b]. This is happening most of the - * times when running TC_m3ua_tcp_cli_srv. Using f_sleep() helps to avoid this. */ - f_sleep(1.0); - - /* M3UA/A -> M3UA/B */ - f_test_traffic(idx_a, rctx_a, pc_a, - idx_b, rctx_b, pc_b); - /* M3UA/B -> M3UA/A */ - f_test_traffic(idx_b, rctx_b, pc_b, - idx_a, rctx_a, pc_a); - - f_clear_m3ua(); -} - -/* test routing between M3UA/SCTP (client) and M3UA/TCP (client) */ -testcase TC_m3ua_tcp_cli() runs on RAW_M3UA_CT { - f_init_m3ua(); - f_TC_m3ua_tcp(0, 3); /* 'asp-sender' <-> 'asp-sender-tcp' */ -} - -/* test routing between M3UA/SCTP (client) and M3UA/TCP (server) */ -testcase TC_m3ua_tcp_cli_srv() runs on RAW_M3UA_CT { - f_init_m3ua(); - f_init_m3ua_srv(); - f_TC_m3ua_tcp(0, M3UA_SRV(3)); /* 'asp-sender' <-> 'asp-client-tcp' */ -} - -/* test routing between M3UA/SCTP (server) and M3UA/TCP (server) */ -testcase TC_m3ua_tcp_srv() runs on RAW_M3UA_CT { - f_init_m3ua(); - f_init_m3ua_srv(); - f_TC_m3ua_tcp(M3UA_SRV(0), M3UA_SRV(3)); /* 'asp-client' <-> 'asp-client-tcp' */ -} - -/* test routing between M3UA/SCTP (server) and M3UA/TCP (client) */ -testcase TC_m3ua_tcp_srv_cli() runs on RAW_M3UA_CT { - f_init_m3ua(); - f_init_m3ua_srv(); - f_TC_m3ua_tcp(M3UA_SRV(0), 3); /* 'asp-client' <-> 'asp-sender-tcp' */ -} - - control { /* M3UA Tests */ execute( TC_connect_asp_up() ); @@ -1542,11 +1473,6 @@ execute( TC_act_rctx_data_no_rctx() ); execute( TC_m3ua_sctp_srv_adm_shutdown() ); - execute( TC_m3ua_tcp_cli() ); - execute( TC_m3ua_tcp_cli_srv() ); - execute( TC_m3ua_tcp_srv() ); - execute( TC_m3ua_tcp_srv_cli() ); - /* M3UA RKM tests */ execute( TC_rkm_reg_static_notpermitted() ); execute( TC_rkm_reg_static_permitted() ); diff --git a/stp/STP_Tests_M3UA_TCP.cfg b/stp/STP_Tests_M3UA_TCP.cfg new file mode 100644 index 0000000..7113e97 --- /dev/null +++ b/stp/STP_Tests_M3UA_TCP.cfg @@ -0,0 +1,61 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./STP_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */ +STP_Tests_M3UA.mp_m3ua_configs := { + /* as-sender: One ASP within AS */ + { + asp_name := "asp-sender", + use_tcp := false, + remote_port := 2905, + local_port := 9999, + point_code := 23, + routing_ctx := 1023 + }, + /* as-sender-tcp: One ASP within AS */ + { + asp_name := "asp-sender-tcp", + use_tcp := true, + remote_port := 2905, + local_port := 9999, + point_code := 123, + routing_ctx := 1123 + }, + /* as-client: One ASP within AS */ + { + asp_name := "asp-client0", + use_tcp := false, + remote_port := 2906, + local_port := 10002, + point_code := 55, + routing_ctx := 1055 + }, + /* as-client-tcp: One ASP within AS */ + { + asp_name := "asp-client0-tcp", + use_tcp := true, + remote_port := 2906, + local_port := 10002, + point_code := 155, + routing_ctx := 1155 + } + }; +/* number of M3UA clients in ATS */ +STP_Tests_M3UA.mp_m3ua_num_clients := 2; +/* number of M3UA servers in ATS */ +STP_Tests_M3UA.mp_m3ua_num_servers := 2; + +[MAIN_CONTROLLER] + +[EXECUTE] +STP_Tests_M3UA_TCP.control diff --git a/stp/STP_Tests_M3UA_TCP.ttcn b/stp/STP_Tests_M3UA_TCP.ttcn new file mode 100644 index 0000000..15361ef --- /dev/null +++ b/stp/STP_Tests_M3UA_TCP.ttcn @@ -0,0 +1,114 @@ +module STP_Tests_M3UA_TCP { + +/* Osmocom STP test suite in in TTCN-3 + * (C) 2019 Harald Welte <laforge(a)gnumonks.org> + * (C) 2024-2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; +import from IPL4asp_Types all; + +import from Osmocom_VTY_Functions all; + +import from M3UA_Types all; +import from M3UA_Templates all; +import from M3UA_CodecPort all; +import from M3UA_CodecPort_CtrlFunct all; + +import from M3UA_Emulation all; +import from MTP3asp_Types all; +import from MTP3asp_PortType all; + +import from SCCP_Types all; +import from SCCP_Templates all; +import from SCCPasp_Types all; +import from SCCP_Emulation all; + +import from STP_Tests_Common all; +import from STP_Tests_M3UA all; + +private function f_TC_m3ua_tcp(integer idx_a, integer idx_b) runs on RAW_M3UA_CT { + var M3uaConfig cfg_a := g_m3ua_configs[idx_a]; + var M3uaConfig cfg_b := g_m3ua_configs[idx_b]; + var OCT4 rctx_a := int2oct(cfg_a.routing_ctx, 4); + var OCT4 rctx_b := int2oct(cfg_b.routing_ctx, 4); + var OCT4 pc_a := int2oct(cfg_a.point_code, 4); + var OCT4 pc_b := int2oct(cfg_b.point_code, 4); + + /* establish connection with ASP 'A' */ + if (idx_a < g_m3ua_num_clients) { + f_M3UA_asp_up_act(idx_a, rctx := rctx_a); + } else { + f_M3UA_CLNT_asp_up_act(idx_a, rctx := rctx_a); + } + + /* establish connection with ASP 'B' */ + if (idx_b < g_m3ua_num_clients) { + f_M3UA_asp_up_act(idx_b, rctx := rctx_b); + } else { + f_M3UA_CLNT_asp_up_act(idx_b, rctx := rctx_b); + } + + /* In the case when ASP[idx_b] is configured as the client (i.e. osmo-stp connects to + * the testsuite; idx_b >= g_m3ua_num_clients), in f_M3UA_CLNT_asp_up_act() we're expecting + * to receive ASPACT and then sending ASPACT_ACK to it. Right after that, we're sending + * some random data via ASP[idx_a], which we then expect to receive via ASP[idx_b]. + * + * There is a chance that the random data sent via ASP[idx_a] would reach osmo-stp + * earlier than the ASPUP_ACK we sent for ASP[idx_b]. This is happening most of the + * times when running TC_m3ua_tcp_cli_srv. Using f_sleep() helps to avoid this. */ + f_sleep(1.0); + + /* M3UA/A -> M3UA/B */ + f_test_traffic(idx_a, rctx_a, pc_a, + idx_b, rctx_b, pc_b); + /* M3UA/B -> M3UA/A */ + f_test_traffic(idx_b, rctx_b, pc_b, + idx_a, rctx_a, pc_a); + + f_clear_m3ua(); +} + +/* test routing between M3UA/SCTP (client) and M3UA/TCP (client) */ +testcase TC_m3ua_tcp_cli() runs on RAW_M3UA_CT { + f_init_m3ua(); + f_TC_m3ua_tcp(0, 1); /* 'asp-sender' <-> 'asp-sender-tcp' */ +} + +/* test routing between M3UA/SCTP (client) and M3UA/TCP (server) */ +testcase TC_m3ua_tcp_cli_srv() runs on RAW_M3UA_CT { + f_init_m3ua(); + f_init_m3ua_srv(); + f_TC_m3ua_tcp(0, M3UA_SRV(1)); /* 'asp-sender' <-> 'asp-client-tcp' */ +} + +/* test routing between M3UA/SCTP (server) and M3UA/TCP (server) */ +testcase TC_m3ua_tcp_srv() runs on RAW_M3UA_CT { + f_init_m3ua(); + f_init_m3ua_srv(); + f_TC_m3ua_tcp(M3UA_SRV(0), M3UA_SRV(1)); /* 'asp-client' <-> 'asp-client-tcp' */ +} + +/* test routing between M3UA/SCTP (server) and M3UA/TCP (client) */ +testcase TC_m3ua_tcp_srv_cli() runs on RAW_M3UA_CT { + f_init_m3ua(); + f_init_m3ua_srv(); + f_TC_m3ua_tcp(M3UA_SRV(0), 1); /* 'asp-client' <-> 'asp-sender-tcp' */ +} + +control { + /* M3UA TCP Tests */ + execute( TC_m3ua_tcp_cli() ); + execute( TC_m3ua_tcp_cli_srv() ); + execute( TC_m3ua_tcp_srv() ); + execute( TC_m3ua_tcp_srv_cli() ); +} + +} \ No newline at end of file diff --git a/stp/expected-results.xml b/stp/expected-results.xml index c0fb22f..44088fc 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -13,10 +13,6 @@ <testcase classname='STP_Tests_M3UA' name='TC_tmt_broadcast' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_act_rctx_data_no_rctx' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_m3ua_sctp_srv_adm_shutdown' time='MASKED'/> - <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_cli' time='MASKED'/> - <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_cli_srv' time='MASKED'/> - <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_srv' time='MASKED'/> - <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_srv_cli' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_rkm_reg_static_notpermitted' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_rkm_reg_static_permitted' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_rkm_reg_dynamic_permitted' time='MASKED'/> @@ -44,6 +40,10 @@ <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dupu' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_scon' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_act_tmt_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_cli' time='MASKED'/> + <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_cli_srv' time='MASKED'/> + <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_known_client_nodynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic' time='MASKED'/> diff --git a/stp/osmo-stp-m3ua-tcp.confmerge b/stp/osmo-stp-m3ua-tcp.confmerge new file mode 100644 index 0000000..7c77b05 --- /dev/null +++ b/stp/osmo-stp-m3ua-tcp.confmerge @@ -0,0 +1,67 @@ +cs7 instance 0 + ! + ! M3UA-TCP AS/ASP: + ! + asp asp-sender-tcp 9999 2905 m3ua tcp + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + transport-role server + asp asp-client0-tcp 10002 2906 m3ua tcp + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + transport-role client + as as-sender-tcp m3ua + asp asp-sender-tcp + routing-key 1123 123 + as as-client-tcp m3ua + routing-key 1155 155 + asp asp-client0-tcp + ! + !M3UA AS/ASP: + ! + asp asp-sender 9999 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-client0 10002 2906 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + as as-sender m3ua + asp asp-sender + routing-key 1023 23 + as as-client m3ua + routing-key 1055 55 + asp asp-client0 + ! + ! ROUTING TABLE: + ! + route-table system + update route 123 16777215 linkset as-sender-tcp + update route 155 16777215 linkset as-client-tcp + route-table system + update route 23 16777215 linkset as-sender + update route 55 16777215 linkset as-client + ! + !SERVERS: + ! + listen m3ua 2905 tcp + local-ip 127.0.0.1 + local-ip ::1 + accept-asp-connections dynamic-permitted + listen m3ua 2905 + local-ip 127.0.0.1 + local-ip ::1 + accept-asp-connections dynamic-permitted diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge index 2140553..65e2fa2 100644 --- a/stp/osmo-stp-m3ua.confmerge +++ b/stp/osmo-stp-m3ua.confmerge @@ -1,28 +1,5 @@ cs7 instance 0 ! - ! M3UA-TCP AS/ASP: - ! - asp asp-sender-tcp 9999 2905 m3ua tcp - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - transport-role server - asp asp-client0-tcp 10002 2906 m3ua tcp - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - transport-role client - as as-sender-tcp m3ua - asp asp-sender-tcp - routing-key 1123 123 - as as-client-tcp m3ua - routing-key 1155 155 - asp asp-client0-tcp - ! !M3UA AS/ASP: ! asp asp-sender 9999 2905 m3ua @@ -87,9 +64,6 @@ ! ROUTING TABLE: ! route-table system - update route 123 16777215 linkset as-sender-tcp - update route 155 16777215 linkset as-client-tcp - route-table system update route 23 16777215 linkset as-sender update route 42 16777215 linkset as-receiver update route 55 16777215 linkset as-client @@ -98,10 +72,6 @@ ! !SERVERS: ! - listen m3ua 2905 tcp - local-ip 127.0.0.1 - local-ip ::1 - accept-asp-connections dynamic-permitted listen m3ua 2905 local-ip 127.0.0.1 local-ip ::1 diff --git a/stp/testenv_m3ua-tcp.cfg b/stp/testenv_m3ua-tcp.cfg new file mode 100644 index 0000000..37b2338 --- /dev/null +++ b/stp/testenv_m3ua-tcp.cfg @@ -0,0 +1,11 @@ +[testsuite] +program=STP_Tests +config=STP_Tests_M3UA_TCP.cfg + +[stp] +prepare=osmo-config-merge osmo-stp.cfg osmo-stp-m3ua-tcp.confmerge > osmo-stp-m3ua-tcp.cfg +program=osmo-stp -c osmo-stp-m3ua-tcp.cfg +make=libosmo-sigtran +package=osmo-stp libosmocore-utils +copy=osmo-stp.cfg osmo-stp-m3ua-tcp.confmerge +vty_port=4239 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40324?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: I8123887755aa3253830b43407b4cc6b21142233c Gerrit-Change-Number: 40324 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: stp: m3ua: Specify ASP names to use per test
by pespin 21 May '25

21 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40325?usp=email ) Change subject: stp: m3ua: Specify ASP names to use per test ...................................................................... stp: m3ua: Specify ASP names to use per test Since we recently introduced an "asp_name" into each m3ua_config, use that to construct a list of m3ua_configs to set up for each test. This makes each test only set up the relevant ASPs for the test easily, plus the big win of port offsets becoming test-specific. That means changing the order or clients or servers in the testsuite config, or adding new ones won't break existing tests. Also add a new "is_server" field which allows specifying clients and servers in whichever order we like. Change-Id: I63ed043014ee8a9a593ed17797b621f39c746bcd --- M stp/STP_Tests_IPA_M3UA.cfg M stp/STP_Tests_IPA_M3UA.ttcn M stp/STP_Tests_M3UA.cfg M stp/STP_Tests_M3UA.ttcn M stp/STP_Tests_M3UA_TCP.cfg M stp/STP_Tests_M3UA_TCP.ttcn 6 files changed, 419 insertions(+), 313 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/stp/STP_Tests_IPA_M3UA.cfg b/stp/STP_Tests_IPA_M3UA.cfg index be16ccf..4ca349d 100644 --- a/stp/STP_Tests_IPA_M3UA.cfg +++ b/stp/STP_Tests_IPA_M3UA.cfg @@ -15,11 +15,10 @@ "ipa-as-dynamic-asp" }; -/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */ STP_Tests_M3UA.mp_m3ua_configs := { - /* as-sender: One ASP within AS */ { asp_name := "asp-sender", + is_server := false, use_tcp := false, remote_port := 2905, local_port := 9999, @@ -27,10 +26,6 @@ routing_ctx := 1023 } }; -/* number of M3UA clients in ATS */ -STP_Tests_M3UA.mp_m3ua_num_clients := 1; -/* number of M3UA servers in ATS */ -STP_Tests_M3UA.mp_m3ua_num_servers := 0; [MAIN_CONTROLLER] diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn index 4fcd506..f62fc7c 100644 --- a/stp/STP_Tests_IPA_M3UA.ttcn +++ b/stp/STP_Tests_IPA_M3UA.ttcn @@ -13,6 +13,7 @@ import from General_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from Osmocom_VTY_Functions all; @@ -62,18 +63,17 @@ /* Test routing of SCCP between an M3UA and an IPA ASP */ testcase TC_m3ua_to_ipa() runs on IPA_M3UA_CT { - f_init_m3ua(); - f_init_ipa(); - - const integer ipa_idx := 0; - const integer m3ua_idx := 0; - - var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); var OCT4 pc_receiver := int2oct(5, 4); - f_connect_ipa(ipa_idx); - f_M3UA_asp_up_act(m3ua_idx, omit, rctx_sender); + f_init_m3ua(m3ua_configs := m3ua_configs); + f_init_ipa(); + + f_connect_ipa(0); + f_M3UA_asp_up_act(0, omit, rctx_sender); /* send a well-formed, encoded SCCP message via M3UA */ var octetstring data := f_rnd_octstring_rnd_len(100); @@ -83,32 +83,31 @@ var octetstring sccp_enc := enc_PDU_SCCP(sccp); var template (value) M3UA_Protocol_Data tx_pd; tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, sccp_enc); - f_M3UA_send(m3ua_idx, ts_M3UA_DATA(rctx_sender, tx_pd), 1); + f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1); /* expect to receive it via IPA */ - f_IPA_exp(ipa_idx, sccp_enc); + f_IPA_exp(0, sccp_enc); f_clear_m3ua(); } /* test routing an SCCP message from IPA ASP to M3UA ASP */ testcase TC_ipa_to_m3ua() runs on IPA_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 pc_sender := int2oct(5, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); + f_init_common(); f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"}, "point-code override patch-sccp disabled"); - f_init_m3ua(); + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_ipa(); - const integer ipa_idx := 0; - const integer m3ua_idx := 0; - - var OCT4 pc_sender := int2oct(5, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4); - - f_connect_ipa(ipa_idx); - f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver); + f_connect_ipa(0); + f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ var octetstring data := f_rnd_octstring_rnd_len(100); @@ -116,35 +115,33 @@ var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); var octetstring sccp_enc := enc_PDU_SCCP(sccp); - f_IPA_send(ipa_idx, sccp_enc); + f_IPA_send(0, sccp_enc); /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, sccp_enc); - f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd)); + f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_clear_m3ua(); } /* test routing an SCCP message from IPA ASP to M3UA ASP using national network indicator */ testcase TC_ipa_to_m3ua_ni() runs on IPA_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 pc_sender := int2oct(5, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); f_init_common(); f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"}, "point-code override patch-sccp disabled"); - f_init_m3ua(); + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_ipa(); - const integer ipa_idx := 0; - const integer m3ua_idx := 0; - - var OCT4 pc_sender := int2oct(5, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4); - - f_connect_ipa(ipa_idx); - f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver); + f_connect_ipa(0); + f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ var octetstring data := f_rnd_octstring_rnd_len(100); @@ -153,13 +150,13 @@ var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); var octetstring sccp_enc := enc_PDU_SCCP(sccp); f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator national"); - f_IPA_send(ipa_idx, sccp_enc); + f_IPA_send(0, sccp_enc); /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, c_M3UA_NI_NATIONAL, '00'O, ?, sccp_enc); - f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd)); + f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator international"); f_clear_m3ua(); } @@ -167,29 +164,28 @@ /* test routing an SCCP message from IPA ASP to M3UA ASP while patching PC into SCCP addresses */ testcase TC_ipa_to_m3ua_patch_sccp() runs on IPA_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 pc_sender := int2oct(5, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); + f_init_common(); f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"}, "point-code override patch-sccp both"); - f_init_m3ua(); + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_ipa(); - const integer ipa_idx := 0; - const integer m3ua_idx := 0; - - var OCT4 pc_sender := int2oct(5, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4); - - f_connect_ipa(ipa_idx); - f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver); + f_connect_ipa(0); + f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - f_IPA_send(ipa_idx, enc_PDU_SCCP(sccp)); + f_IPA_send(0, enc_PDU_SCCP(sccp)); /* patch point codes into addresses */ called := valueof(ts_SccpAddr_PC_GT(oct2int(pc_receiver), '83'O, "mtp3_itu", '1234'H)); @@ -200,7 +196,7 @@ var template (present) M3UA_Protocol_Data rx_pd; rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, enc_PDU_SCCP(sccp_exp)); - f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd)); + f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_clear_m3ua(); } diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg index 994314a..dd0c97b 100644 --- a/stp/STP_Tests_M3UA.cfg +++ b/stp/STP_Tests_M3UA.cfg @@ -11,65 +11,62 @@ [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] -/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */ STP_Tests_M3UA.mp_m3ua_configs := { - /* as-sender: One ASP within AS */ { asp_name := "asp-sender", + is_server := false, use_tcp := false, remote_port := 2905, local_port := 9999, point_code := 23, routing_ctx := 1023 }, - /* as-receiver: Two ASP within AS */ { asp_name := "asp-receiver0", + is_server := false, use_tcp := false, remote_port := 2905, local_port := 10000, point_code := 42, routing_ctx := 1042 - }, { + }, + { asp_name := "asp-receiver1", + is_server := false, use_tcp := false, remote_port := 2905, local_port := 10001, point_code := 42, routing_ctx := 1042 }, - /* as-client: One ASP within AS */ { asp_name := "asp-client0", + is_server := true, use_tcp := false, remote_port := 2906, local_port := 10002, point_code := 55, routing_ctx := 1055 }, - /* as-client60-norctx */ { asp_name := "asp-client60-norctx0", + is_server := true, use_tcp := false, remote_port := 2907, local_port := 11060, point_code := 60, - routing_ctx := - + routing_ctx := omit }, - /* as-client61-norctx */ { asp_name := "asp-client61-norctx0", + is_server := true, use_tcp := false, remote_port := 2907, local_port := 11061, point_code := 61, - routing_ctx := - + routing_ctx := omit } }; -/* number of M3UA clients in ATS */ -STP_Tests_M3UA.mp_m3ua_num_clients := 3; -/* number of M3UA servers in ATS */ -STP_Tests_M3UA.mp_m3ua_num_servers := 3; [MAIN_CONTROLLER] diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 64153ab..2f452de 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -45,12 +45,8 @@ HostList mp_stp_m3ua_ip := { "127.0.0.1", "::1" }; /* local IP addresses */ HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" }; - /* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */ + /* local ASPs. Set in .cfg file: */ M3uaConfigs mp_m3ua_configs := {}; - /* number of M3UA clients in ATS */ - integer mp_m3ua_num_clients := 0; - /* number of M3UA servers in ATS */ - integer mp_m3ua_num_servers := 0; integer mp_recovery_timeout_msec := 2000; charstring mp_sccp_service_type := "mtp3_itu"; } @@ -58,6 +54,8 @@ type record M3uaConfig { /* Name of the ASP in the STP, (eg. to access it over VTY) */ charstring asp_name, + /* Whether local side is a TCP/SCTP server */ + boolean is_server, /* use TCP (true) or SCTP (false) */ boolean use_tcp, /* STP-side SCTP (or TCP) port for M3UA */ @@ -67,36 +65,63 @@ /* point code routed via this M3U */ integer point_code, /* associated routing context */ - integer routing_ctx + integer routing_ctx optional }; type record of M3uaConfig M3uaConfigs; -friend function M3UA_SRV(integer idx) runs on RAW_M3UA_CT return integer { - return g_m3ua_num_clients + idx; -} - -friend function f_m3ua_cli_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig { - if (idx < 0 or idx >= g_m3ua_num_clients) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_cli_config(): unexpected idx"); - } - return g_m3ua_configs[idx]; -} - -friend function f_m3ua_srv_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig { - if (idx < 0 or idx >= g_m3ua_num_servers) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_srv_config(): unexpected idx"); - } - return g_m3ua_configs[M3UA_SRV(idx)]; -} - type component RAW_M3UA_CT extends Test_CT { port M3UA_CODEC_PT M3UA[MAX_NR_M3UA]; var M3uaConfigs g_m3ua_configs; - var integer g_m3ua_num_clients; - var integer g_m3ua_num_servers; var integer g_m3ua_conn_id[MAX_NR_M3UA]; } +friend function f_m3ua_get_config_idx(charstring asp_name) runs on RAW_M3UA_CT return integer { + for (var integer i := 0; i < lengthof(g_m3ua_configs); i := i + 1) { + if (g_m3ua_configs[i].asp_name == asp_name) { + return i; + } + } + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("f_m3ua_get_config_idx(): unexpected asp_name not found: ", asp_name)); + return -1; +} + +friend function f_m3ua_get_config_by_idx(integer idx) runs on RAW_M3UA_CT return M3uaConfig { + if (idx < 0 or idx >= lengthof(g_m3ua_configs)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_get_config(): unexpected idx"); + } + return g_m3ua_configs[idx]; +} + +friend function f_m3ua_get_config_by_name(charstring asp_name) runs on RAW_M3UA_CT return M3uaConfig { + return f_m3ua_get_config_by_idx(f_m3ua_get_config_idx(asp_name)); +} + +friend function m3ua_build_configs(template (omit) Misc_Helpers.ro_charstring asps := omit) +runs on RAW_M3UA_CT return M3uaConfigs +{ + if (not isvalue(asps)) { + return mp_m3ua_configs; + } + + var M3uaConfigs m3ua_configs := {}; + for (var integer i := 0; i < lengthof(asps); i := i + 1) { + var boolean found := false; + for (var integer j := 0; j < lengthof(mp_m3ua_configs); j := j + 1) { + if (mp_m3ua_configs[j].asp_name == valueof(asps[i])) { + found := true; + m3ua_configs := m3ua_configs & {mp_m3ua_configs[j]}; + break; + } + } + if (not found) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Could not find ASP ", asps[i], ", check your configuration")); + } + } + return m3ua_configs; +} + private template PortEvent tr_ConnOpened := { connOpened := ? } @@ -279,27 +304,34 @@ } } +private function m3ua_configs_mapped() runs on RAW_M3UA_CT return integer +{ + for (var integer i := 0; i < lengthof(g_m3ua_configs); i := i + 1) { + if (not M3UA[i].checkstate("Mapped")) { + return i; + } + } + return lengthof(g_m3ua_configs); +} + friend function f_init_m3ua(boolean ignore_ssnm := true, - template (omit) M3uaConfigs m3ua_configs := omit, - integer m3ua_num_clients := 0, - integer m3ua_num_servers := 0) runs on RAW_M3UA_CT { + template (omit) M3uaConfigs m3ua_configs := omit) + +runs on RAW_M3UA_CT { var integer i; f_init_common(); - if (isvalue(m3ua_configs)) { + if (not istemplatekind(m3ua_configs, "omit")) { g_m3ua_configs := valueof(m3ua_configs); - g_m3ua_num_clients := m3ua_num_clients; - g_m3ua_num_servers := m3ua_num_servers } else { g_m3ua_configs := mp_m3ua_configs; - g_m3ua_num_clients := mp_m3ua_num_clients; - g_m3ua_num_servers := mp_m3ua_num_servers; } - - for (i := 0; i < g_m3ua_num_clients; i:=i+1) { - map(self:M3UA[i], system:M3UA_CODEC_PT); + for (i := 0; i < lengthof(g_m3ua_configs); i:= i + 1) { + if (not g_m3ua_configs[i].is_server) { + map(self:M3UA[i], system:M3UA_CODEC_PT); + } } activate(as_m3ua_sctp()); @@ -307,11 +339,13 @@ activate(as_m3ua_ssnm_ignore()); } - for (i := 0; i < g_m3ua_num_clients; i:=i+1) { - if (g_m3ua_configs[i].use_tcp) { - f_M3UA_connect_tcp(i); - } else { - f_M3UA_connect_sctp(i); + for (i := 0; i < lengthof(g_m3ua_configs); i:=i+1) { + if (not g_m3ua_configs[i].is_server) { + if (g_m3ua_configs[i].use_tcp) { + f_M3UA_connect_tcp(i); + } else { + f_M3UA_connect_sctp(i); + } } } } @@ -321,8 +355,10 @@ log("Clearing M3UA..."); - for (i := 0; i < g_m3ua_num_clients; i:=i+1) { - f_M3UA_close(i); + for (i := 0; i < lengthof(g_m3ua_configs); i:=i+1) { + if (not g_m3ua_configs[i].is_server) { + f_M3UA_close(i); + } } /* Wait for recovery timer to trigger and shutdown all AS: */ f_sleep(int2float(mp_recovery_timeout_msec)/1000.0 + 0.5); @@ -333,17 +369,25 @@ var integer i; var PortEvent port_evt; - for (i := g_m3ua_num_clients; i < lengthof(g_m3ua_configs); i:=i+1) { - map(self:M3UA[i], system:M3UA_CODEC_PT); + var integer start_idx := m3ua_configs_mapped(); + + for (i := start_idx; i < lengthof(g_m3ua_configs); i:=i+1) { + if (g_m3ua_configs[i].is_server) { + map(self:M3UA[i], system:M3UA_CODEC_PT); + } } - for (i := g_m3ua_num_clients; i < lengthof(g_m3ua_configs); i:=i+1) { - /* bind + listen */ - f_M3UA_listen(i); + for (i := start_idx; i < lengthof(g_m3ua_configs); i:=i+1) { + if (g_m3ua_configs[i].is_server) { + /* bind + listen */ + f_M3UA_listen(i); + } } - for (i := g_m3ua_num_clients; i < lengthof(g_m3ua_configs); i:=i+1) { - /* wait for accept() */ - M3UA[i].receive(tr_ConnOpened) -> value port_evt { - g_m3ua_conn_id[i] := port_evt.connOpened.connId; + for (i := start_idx; i < lengthof(g_m3ua_configs); i:=i+1) { + if (g_m3ua_configs[i].is_server) { + /* wait for accept() */ + M3UA[i].receive(tr_ConnOpened) -> value port_evt { + g_m3ua_conn_id[i] := port_evt.connOpened.connId; + } } } } @@ -467,11 +511,15 @@ /* test whether the STP accepts M3UA DATA without Routing Context IE */ testcase TC_act_rctx_data_no_rctx() runs on RAW_M3UA_CT { - f_init_m3ua(); - var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4); + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + + f_init_m3ua(m3ua_configs := m3ua_configs); + /* bring up the sender specifying a routing context */ f_M3UA_asp_up_act(0, rctx := rctx_sender); @@ -485,11 +533,13 @@ /* Test administrative state, VTY "[no] shutdown" */ testcase TC_m3ua_sctp_srv_adm_shutdown() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_asp_up_act(0, c_M3UA_TMT_override, omit); f_sleep(1.0); - f_vty_cs7_asp_cmd(f_m3ua_cli_config(0), "shutdown"); + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "shutdown"); log("ASP should now be DOWN") as_M3UA_wait_sctp_conn_closed(0); @@ -507,7 +557,7 @@ } /* Now let the ASP be active again, it should reconnect to us: */ - f_vty_cs7_asp_cmd(f_m3ua_cli_config(0), "no shutdown"); + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "no shutdown"); log("Connecting to ASP (expect success):"); f_M3UA_connect_sctp(0); f_M3UA_asp_up_act(0, c_M3UA_TMT_override, omit, ntfy_after_up := c_M3UA_ST_I_AS_PENDING); @@ -530,13 +580,14 @@ /* test "traffic-mode override" behavior */ testcase TC_tmt_override() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); - f_init_m3ua(); - - var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4); + f_init_m3ua(m3ua_configs := m3ua_configs); /* bring up the 'sender' side (single ASP in AS) */ f_M3UA_asp_up_act(0, omit, omit); @@ -571,16 +622,17 @@ /* Test "traffic-mode roundrobin" behavior (distributing within ASPs of a given AS in roundrobin fashion). */ testcase TC_tmt_loadshare_roundrobin() runs on RAW_M3UA_CT { var integer i; + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); - f_init_m3ua(); + f_init_m3ua(m3ua_configs := m3ua_configs); f_vty_config2(VTY, {"cs7 instance 0", "as as-receiver m3ua"}, "traffic-mode roundrobin"); - var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4); - /* bring up the 'sender' side (single ASP in AS) */ f_M3UA_asp_up_act(0, omit, rctx_sender); @@ -643,17 +695,18 @@ * within linksets/ASs of a combined linkset). */ testcase TC_tmt_loadshare_sls() runs on RAW_M3UA_CT { var integer i; + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); - f_init_m3ua(); + f_init_m3ua(m3ua_configs := m3ua_configs); f_vty_config3(VTY, {"cs7 instance 0", "as as-receiver m3ua"}, { "traffic-mode loadshare", "binding-table reset" }); - var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4); - /* bring up the 'sender' side (single ASP in AS) */ f_M3UA_asp_up_act(0, omit, rctx_sender); @@ -725,13 +778,14 @@ /* test "traffic-mode broadcast" behavior */ testcase TC_tmt_broadcast() runs on RAW_M3UA_CT { var integer i; + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); - f_init_m3ua(); - - var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4); + f_init_m3ua(m3ua_configs := m3ua_configs); /* FIXME: configure the STP via VTY to set traffic-mode */ @@ -781,7 +835,9 @@ /* Send RKM registration; expect -EPERM as RCTX doesn't match config and dynamic not permitted */ testcase TC_rkm_reg_static_notpermitted() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='00000099'O, dpc:='aabbcc'O)})); f_M3UA_exp(0, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:='00000099'O, status:=c_M3UA_REGSTS_ERR_EPERM, @@ -792,10 +848,12 @@ /* Send RKM registration; expect OK as RCTX does match config */ testcase TC_rkm_reg_static_permitted() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT3 dpc := int2oct(m3ua_configs[0].point_code, 3); // must match config + var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); // must match config - var OCT3 dpc := int2oct(f_m3ua_cli_config(0).point_code, 3); // must match config - var OCT4 rctx := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); // must match config + f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='10000099'O, dpc:=dpc, rctx:=rctx)})); f_M3UA_exp(0, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:='10000099'O, status:=c_M3UA_REGSTS_SUCCESS, @@ -806,9 +864,11 @@ /* Send RKM registration; expect OK as dynamic not permitted */ testcase TC_rkm_reg_dynamic_permitted() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); f_init_common(); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); - f_init_m3ua(); + f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='20000099'O, dpc:='aabbcc'O)})); f_M3UA_exp(0, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:='20000099'O, status:=c_M3UA_REGSTS_SUCCESS, @@ -821,8 +881,11 @@ /* try to de-register a routing key that was never registered -> error */ testcase TC_rkm_unreg_never_registered() runs on RAW_M3UA_CT { - f_init_m3ua(); - var octetstring rctx := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var octetstring rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + f_init_m3ua(m3ua_configs := m3ua_configs); + f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctx))); f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_ERR_NOT_REG)})); f_clear_m3ua(); @@ -830,7 +893,10 @@ /* try to de-register a routing key that is invalid (non-existant) -> error */ testcase TC_rkm_unreg_invalid() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + f_init_m3ua(m3ua_configs := m3ua_configs); + f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(1234,4)))); f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_ERR_INVAL_RCTX)})); f_clear_m3ua(); @@ -838,12 +904,14 @@ /* try to de-register a routing key that was registered -> OK */ testcase TC_rkm_unreg_registered() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); var OCT3 dpc := int2oct(123, 3); var OCT4 rctx := int2oct(1234, 4); f_init_common(); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); - f_init_m3ua(); + f_init_m3ua(m3ua_configs := m3ua_configs); /* first register the routing key */ f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctx, ntfy_after_reg := omit); @@ -858,13 +926,15 @@ /* try to de-register a routing key for an active ASP -> ERROR */ testcase TC_rkm_unreg_active() runs on RAW_M3UA_CT { - f_init_common(); - f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); - f_init_m3ua(); - + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); var OCT3 dpc := int2oct(123, 3); var OCT4 rctxA := int2oct(1234, 4); - var OCT4 rctxB := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); // must match config + var OCT4 rctxB := int2oct(m3ua_configs[0].routing_ctx, 4); // must match config + + f_init_common(); + f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); + f_init_m3ua(m3ua_configs := m3ua_configs); /* first register the routing key */ f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctxA, ntfy_after_reg := omit); @@ -901,6 +971,7 @@ var M3uaConfigs m3ua_configs := { { asp_name := "unknown", + is_server := false, use_tcp := false, remote_port := 2905, local_port := 2222, @@ -911,7 +982,7 @@ var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); f_init_common(); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); - f_init_m3ua(m3ua_configs := m3ua_configs, m3ua_num_clients := 1, m3ua_num_servers := 0); + f_init_m3ua(m3ua_configs := m3ua_configs); /* ASPUP + ACK */ f_M3UA_asp_up(0); @@ -939,6 +1010,7 @@ var M3uaConfigs m3ua_configs := { { asp_name := "unknown0", + is_server := false, use_tcp := false, remote_port := 2905, local_port := 2222, @@ -946,6 +1018,7 @@ routing_ctx := 220 }, { asp_name := "unknown1", + is_server := false, use_tcp := false, remote_port := 2905, local_port := 2223, @@ -957,7 +1030,7 @@ var OCT4 rctx1 := int2oct(m3ua_configs[0].routing_ctx, 4); f_init_common(); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted"); - f_init_m3ua(m3ua_configs := m3ua_configs, m3ua_num_clients := 2, m3ua_num_servers := 0); + f_init_m3ua(m3ua_configs := m3ua_configs); ///////// ASP 0 ///////////// /* ASPUP + ACK */ @@ -1040,34 +1113,41 @@ /* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP */ testcase TC_clnt_connect_asp_up() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up(M3UA_SRV(0)); + f_M3UA_CLNT_asp_up(0); f_clear_m3ua(); } /* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ testcase TC_clnt_asp_act() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); - var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); + f_M3UA_CLNT_asp_up_act(0, rctx := rctx); f_clear_m3ua(); } /* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ testcase TC_clnt_asp_act_tmt_loadshare() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + f_init_common(); f_vty_config2(VTY, {"cs7 instance 0", "as as-client m3ua"}, "traffic-mode loadshare"); - f_init_m3ua(); + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); - var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), tmt := c_M3UA_TMT_loadshare, rctx := rctx); + f_M3UA_CLNT_asp_up_act(0, tmt := c_M3UA_TMT_loadshare, rctx := rctx); f_clear_m3ua(); } @@ -1075,21 +1155,23 @@ /* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client" * side STP (M3UA ASP) */ testcase TC_clnt_sg_to_asp() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + + f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_asp_up_act(0); - var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_srv_config(0).point_code, 4); - f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx_receiver); + f_M3UA_CLNT_asp_up_act(1, rctx := rctx_receiver); f_sleep(1.0); /* verify traffic is routed from sender to [sole] receiver */ - f_test_traffic(0, rctx_sender, pc_sender, M3UA_SRV(0), rctx_receiver, pc_receiver); + f_test_traffic(0, rctx_sender, pc_sender, 1, rctx_receiver, pc_receiver); f_clear_m3ua(); } @@ -1097,47 +1179,51 @@ /* Test traffic being routed through "client" side STP (M3UA ASP), coming back in "server" * side STP (M3UA SG) */ testcase TC_clnt_asp_to_sg() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); + + f_init_m3ua(m3ua_configs := m3ua_configs); f_M3UA_asp_up_act(0); - var OCT4 rctx_sender := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - var OCT4 pc_sender := int2oct(f_m3ua_srv_config(0).point_code, 4); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4); - f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx_sender); + f_M3UA_CLNT_asp_up_act(1, rctx := rctx_sender); f_sleep(1.0); /* verify traffic is routed from sender to [sole] receiver */ - f_test_traffic(M3UA_SRV(0), rctx_sender, pc_sender, 0, rctx_receiver, pc_receiver); + f_test_traffic(1, rctx_sender, pc_sender, 0, rctx_receiver, pc_receiver); f_clear_m3ua(); } /* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client" * side STP (M3UA ASP) which has no routing context set */ testcase TC_clnt_sg_to_asp_norctx() runs on RAW_M3UA_CT { - /* activate the sender side (ATS is client to STP in SG role) */ - f_init_m3ua(); - f_M3UA_asp_up_act(0); + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client60-norctx0", "asp-client61-norctx0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 pc_receiver2 := int2oct(m3ua_configs[2].point_code, 4); - var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_srv_config(1).point_code, 4); - var OCT4 pc_receiver2 := int2oct(f_m3ua_srv_config(2).point_code, 4); + /* activate the sender side (ATS is client to STP in SG role) */ + f_init_m3ua(m3ua_configs := m3ua_configs); + f_M3UA_asp_up_act(0); /* activate the receiver side (ATS is server to STP in ASP role) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(1), rctx := omit); + f_M3UA_CLNT_asp_up_act(1, rctx := omit); /* activate another instance of STP in ASP role with no routing context */ - f_M3UA_CLNT_asp_up_act(M3UA_SRV(2), rctx := omit); + f_M3UA_CLNT_asp_up_act(2, rctx := omit); f_sleep(1.0); /* verify traffic is routed from sender to [sole] receiver for each PC */ - f_test_traffic(0, rctx_sender, pc_sender, M3UA_SRV(1), omit, pc_receiver); - f_test_traffic(0, rctx_sender, pc_sender, M3UA_SRV(2), omit, pc_receiver2); + f_test_traffic(0, rctx_sender, pc_sender, 1, omit, pc_receiver); + f_test_traffic(0, rctx_sender, pc_sender, 2, omit, pc_receiver2); f_clear_m3ua(); } @@ -1145,39 +1231,44 @@ /* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client" * side STP (M3UA ASP) which has no routing context set */ testcase TC_clnt_asp_to_sg_norctx() runs on RAW_M3UA_CT { - /* activate the sender side (ATS is client to STP in SG role) */ - f_init_m3ua(); - f_M3UA_asp_up_act(0); + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client60-norctx0", "asp-client61-norctx0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4); - var OCT4 pc_sender := int2oct(f_m3ua_srv_config(1).point_code, 4); - var OCT4 pc_sender2 := int2oct(f_m3ua_srv_config(2).point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[1].point_code, 4); + var OCT4 pc_sender2 := int2oct(m3ua_configs[2].point_code, 4); + + /* activate the sender side (ATS is client to STP in SG role) */ + f_init_m3ua(m3ua_configs := m3ua_configs); + f_M3UA_asp_up_act(0); /* activate the receiver side (ATS is server to STP in ASP role) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(1), rctx := omit); + f_M3UA_CLNT_asp_up_act(1, rctx := omit); /* activate another instance of STP in ASP role with no routing context */ - f_M3UA_CLNT_asp_up_act(M3UA_SRV(2), rctx := omit); + f_M3UA_CLNT_asp_up_act(2, rctx := omit); f_sleep(1.0); /* verify traffic is routed from sender to [sole] receiver for each PC */ - f_test_traffic(M3UA_SRV(1), omit, pc_sender, 0, rctx_receiver, pc_receiver); - f_test_traffic(M3UA_SRV(2), omit, pc_sender2, 0, rctx_receiver, pc_receiver); + f_test_traffic(1, omit, pc_sender, 0, rctx_receiver, pc_receiver); + f_test_traffic(2, omit, pc_sender2, 0, rctx_receiver, pc_receiver); f_clear_m3ua(); } /* Test if ASPAC / ASPIA of one ASP generates DAVA / DUNA on other ASP */ testcase TC_ssnm_aspac_dava_aspia_duna() runs on RAW_M3UA_CT { - f_init_m3ua(ignore_ssnm := false); + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); + var integer pc0 := m3ua_configs[1].point_code; + + f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs); /* activate the first ASP */ f_M3UA_asp_up_act(0); - var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var integer pc0 := f_m3ua_cli_config(1).point_code; - /* activate the second ASP */ f_M3UA_asp_up_act(1, c_M3UA_TMT_override, omit); /* expect DAVA for PC of second ASP on first ASP */ @@ -1195,102 +1286,106 @@ /* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP */ testcase TC_ssnm_distribution_dava_duna() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); - f_init_m3ua(ignore_ssnm := false); + f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs); /* activate the first ASP */ f_M3UA_asp_up_act(0); - var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - /* activate SG-role ASP (ASP on STP) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0); + f_M3UA_CLNT_asp_up_act(1, rctx := rctxS0); /* transmit a DAVA to the remote ASP */ - f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA({adv_pc}, rctxS0)); + f_M3UA_send(1, ts_M3UA_DAVA({adv_pc}, rctxS0)); /* expect that to show up on other ASP */ f_M3UA_exp(0, tr_M3UA_DAVA({adv_pc}, rctx0)); /* transmit a DUNA to the remote ASP */ - f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUNA({adv_pc}, rctxS0)); + f_M3UA_send(1, ts_M3UA_DUNA({adv_pc}, rctxS0)); /* expect that to show up on other ASP */ f_M3UA_exp(0, tr_M3UA_DUNA({adv_pc}, rctx0)); } /* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP */ testcase TC_ssnm_distribution_dava_duna_multipc() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Codes adv_pcs := { ts_M3UA_PC(1234, 0), ts_M3UA_PC(5678, 0) }; - f_init_m3ua(ignore_ssnm := false); + f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs); /* activate the first ASP */ f_M3UA_asp_up_act(0); - var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - /* activate SG-role ASP (ASP on STP) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0); + f_M3UA_CLNT_asp_up_act(1, rctx := rctxS0); /* transmit a DAVA to the remote ASP */ - f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA(adv_pcs, rctxS0)); + f_M3UA_send(1, ts_M3UA_DAVA(adv_pcs, rctxS0)); /* expect that to show up on other ASP */ f_M3UA_exp(0, tr_M3UA_DAVA(adv_pcs, rctx0)); /* transmit a DUNA to the remote ASP */ - f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUNA(adv_pcs, rctxS0)); + f_M3UA_send(1, ts_M3UA_DUNA(adv_pcs, rctxS0)); /* expect that to show up on other ASP */ f_M3UA_exp(0, tr_M3UA_DUNA(adv_pcs, rctx0)); } /* Test if DUPU sent from SG to ASP-role STP gets forwarded to other ASP */ testcase TC_ssnm_distribution_dupu() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); - f_init_m3ua(ignore_ssnm := false); + f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs); /* activate the first ASP */ f_M3UA_asp_up_act(0); - var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - /* activate SG-role ASP (ASP on STP) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0); + f_M3UA_CLNT_asp_up_act(1, rctx := rctxS0); /* transmit a DUPU to the remote ASP */ - f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctxS0)); + f_M3UA_send(1, ts_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctxS0)); /* expect that to show up on other ASP */ f_M3UA_exp(0, tr_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctx0)); } /* Test if SCON sent from SG to ASP-role STP gets forwarded to other ASP */ testcase TC_ssnm_distribution_scon() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); - f_init_m3ua(ignore_ssnm := false); + f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs); /* activate the first ASP */ f_M3UA_asp_up_act(0); - var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); - var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - /* activate SG-role ASP (ASP on STP) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0); + f_M3UA_CLNT_asp_up_act(1, rctx := rctxS0); /* transmit a SCON to the remote ASP */ - f_M3UA_send(M3UA_SRV(0), ts_M3UA_SCON({adv_pc}, rctxS0)); + f_M3UA_send(1, ts_M3UA_SCON({adv_pc}, rctxS0)); /* expect that to show up on other ASP */ f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0)); } @@ -1317,21 +1412,24 @@ f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, cmd); } -private function f_quirk(charstring quirk) runs on RAW_M3UA_CT { - f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "quirk " & quirk) +private function f_quirk(charstring quirk, integer m3ua_idx := 0) runs on RAW_M3UA_CT { + f_vty_cs7_asp_cmd(g_m3ua_configs[m3ua_idx], "quirk " & quirk) } -private function f_no_quirk(charstring quirk) runs on RAW_M3UA_CT { - f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "no quirk " & quirk) +private function f_no_quirk(charstring quirk, integer m3ua_idx := 0) runs on RAW_M3UA_CT { + f_vty_cs7_asp_cmd(g_m3ua_configs[m3ua_idx], "no quirk " & quirk) } /* quirk 'no_notify': Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ testcase TC_clnt_quirk_no_notify_asp_act() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + + f_init_m3ua(m3ua_configs := m3ua_configs); f_quirk("no_notify"); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4), + f_M3UA_CLNT_asp_up_act(0, rctx := int2oct(g_m3ua_configs[0].routing_ctx, 4), ntfy_after_up := omit, ntfy_after_act := omit); f_no_quirk("no_notify"); f_clear_m3ua(); @@ -1339,18 +1437,20 @@ /* ensure that DAUD is not supported in ASP role, as required by RFC */ testcase TC_clnt_no_daud_in_asp() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + var integer pc := m3ua_configs[0].point_code; + var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) }; + + f_init_m3ua(m3ua_configs := m3ua_configs); f_no_quirk("daud_in_asp"); f_init_m3ua_srv(); - var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - var integer pc := f_m3ua_srv_config(0).point_code; + f_M3UA_CLNT_asp_up_act(0, rctx := rctx); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); - - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) }; - f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAUD(aff_pcs)); - f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ERR('00000004'O, omit)); + f_M3UA_send(0, ts_M3UA_DAUD(aff_pcs)); + f_M3UA_exp(0, tr_M3UA_ERR('00000004'O, omit)); setverdict(pass); f_clear_m3ua(); @@ -1358,18 +1458,20 @@ /* quirk 'daud_in_asp': allowing inbound DAUD from SG in ASP role */ testcase TC_clnt_quirk_daud_in_asp() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + var integer pc := m3ua_configs[0].point_code; + var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) }; + + f_init_m3ua(m3ua_configs := m3ua_configs); f_quirk("daud_in_asp"); f_init_m3ua_srv(); - var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - var integer pc := f_m3ua_srv_config(0).point_code; + f_M3UA_CLNT_asp_up_act(0, rctx := rctx); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); - - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) }; - f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAUD(aff_pcs)); - f_M3UA_exp(M3UA_SRV(0), tr_M3UA_DAVA(aff_pcs)); + f_M3UA_send(0, ts_M3UA_DAUD(aff_pcs)); + f_M3UA_exp(0, tr_M3UA_DAVA(aff_pcs)); setverdict(pass); f_no_quirk("daud_in_asp"); @@ -1378,19 +1480,22 @@ /* Expect a normal ASP to reject any [S]SNM messages in ASP-INACTIVE state */ testcase TC_clnt_no_snm_inactive() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(m3ua_configs[0].point_code) }; + + f_init_m3ua(m3ua_configs := m3ua_configs); f_quirk("no_notify"); f_quirk("daud_in_asp"); f_no_quirk("snm_inactive"); f_init_m3ua_srv(); /* bring ASP only UP (into INACTIVE state), but not ACTIVE! */ - f_M3UA_CLNT_asp_up(M3UA_SRV(0)); - f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ASPAC(*, *)); + f_M3UA_CLNT_asp_up(0); + f_M3UA_exp(0, tr_M3UA_ASPAC(*, *)); - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(f_m3ua_srv_config(0).point_code) }; - f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAUD(aff_pcs)); - f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ERR('00000006'O, omit)); + f_M3UA_send(0, ts_M3UA_DAUD(aff_pcs)); + f_M3UA_exp(0, tr_M3UA_ERR('00000006'O, omit)); setverdict(pass); f_no_quirk("no_notify"); @@ -1400,19 +1505,22 @@ /* quirk 'snm_inactive': Process [S]SNM in ASP-INACTIVE state */ testcase TC_clnt_quirk_snm_inactive() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(m3ua_configs[0].point_code) }; + + f_init_m3ua(m3ua_configs := m3ua_configs); f_quirk("no_notify"); f_quirk("daud_in_asp"); f_quirk("snm_inactive"); f_init_m3ua_srv(); /* bring ASP only UP (into INACTIVE state), but not ACTIVE! */ - f_M3UA_CLNT_asp_up(M3UA_SRV(0)); - f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ASPAC(*, *)); + f_M3UA_CLNT_asp_up(0); + f_M3UA_exp(0, tr_M3UA_ASPAC(*, *)); - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(f_m3ua_srv_config(0).point_code) }; - f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAUD(aff_pcs)); - f_M3UA_exp(M3UA_SRV(0), tr_M3UA_DUNA(aff_pcs)); + f_M3UA_send(0, ts_M3UA_DAUD(aff_pcs)); + f_M3UA_exp(0, tr_M3UA_DUNA(aff_pcs)); setverdict(pass); f_no_quirk("no_notify"); @@ -1424,22 +1532,24 @@ /* Test administrative state, VTY "[no] shutdown" */ testcase TC_clnt_sctp_adm_shutdown() runs on RAW_M3UA_CT { var PortEvent pev; + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); - f_init_m3ua(); + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); - var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); + var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); + f_M3UA_CLNT_asp_up_act(0, rctx := rctx); f_sleep(1.0); - f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "shutdown"); + f_vty_cs7_asp_cmd(m3ua_configs[0], "shutdown"); log("ASP should now be DOWN") - as_M3UA_wait_sctp_conn_closed(M3UA_SRV(0)); + as_M3UA_wait_sctp_conn_closed(0); /* Wait for a while to make sure ASP doesn't reconnect to us: */ timer T := 10.0; T.start; alt { - [] M3UA[M3UA_SRV(0)].receive(tr_ConnOpened) { + [] M3UA[0].receive(tr_ConnOpened) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected reconnect from ASP client!"); } @@ -1447,12 +1557,12 @@ } /* Now let the ASP be active again, it should reconnect to us: */ - f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "no shutdown"); + f_vty_cs7_asp_cmd(m3ua_configs[0], "no shutdown"); log("Waiting for client ASP to reconnect to us"); - M3UA[M3UA_SRV(0)].receive(tr_ConnOpened) -> value pev { - g_m3ua_conn_id[M3UA_SRV(0)] := pev.connOpened.connId; + M3UA[0].receive(tr_ConnOpened) -> value pev { + g_m3ua_conn_id[0] := pev.connOpened.connId; } - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); + f_M3UA_CLNT_asp_up_act(0, rctx := rctx); f_clear_m3ua(); } diff --git a/stp/STP_Tests_M3UA_TCP.cfg b/stp/STP_Tests_M3UA_TCP.cfg index 7113e97..704de7a 100644 --- a/stp/STP_Tests_M3UA_TCP.cfg +++ b/stp/STP_Tests_M3UA_TCP.cfg @@ -11,38 +11,37 @@ [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] -/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */ STP_Tests_M3UA.mp_m3ua_configs := { - /* as-sender: One ASP within AS */ { asp_name := "asp-sender", + is_server := false, use_tcp := false, remote_port := 2905, local_port := 9999, point_code := 23, routing_ctx := 1023 }, - /* as-sender-tcp: One ASP within AS */ { asp_name := "asp-sender-tcp", + is_server := false, use_tcp := true, remote_port := 2905, local_port := 9999, point_code := 123, routing_ctx := 1123 }, - /* as-client: One ASP within AS */ { asp_name := "asp-client0", + is_server := true, use_tcp := false, remote_port := 2906, local_port := 10002, point_code := 55, routing_ctx := 1055 }, - /* as-client-tcp: One ASP within AS */ { asp_name := "asp-client0-tcp", + is_server := true, use_tcp := true, remote_port := 2906, local_port := 10002, @@ -50,10 +49,6 @@ routing_ctx := 1155 } }; -/* number of M3UA clients in ATS */ -STP_Tests_M3UA.mp_m3ua_num_clients := 2; -/* number of M3UA servers in ATS */ -STP_Tests_M3UA.mp_m3ua_num_servers := 2; [MAIN_CONTROLLER] diff --git a/stp/STP_Tests_M3UA_TCP.ttcn b/stp/STP_Tests_M3UA_TCP.ttcn index 15361ef..a5e4c2a 100644 --- a/stp/STP_Tests_M3UA_TCP.ttcn +++ b/stp/STP_Tests_M3UA_TCP.ttcn @@ -14,6 +14,7 @@ import from General_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from Osmocom_VTY_Functions all; @@ -43,22 +44,22 @@ var OCT4 pc_b := int2oct(cfg_b.point_code, 4); /* establish connection with ASP 'A' */ - if (idx_a < g_m3ua_num_clients) { - f_M3UA_asp_up_act(idx_a, rctx := rctx_a); - } else { + if (g_m3ua_configs[idx_a].is_server) { f_M3UA_CLNT_asp_up_act(idx_a, rctx := rctx_a); + } else { + f_M3UA_asp_up_act(idx_a, rctx := rctx_a); } /* establish connection with ASP 'B' */ - if (idx_b < g_m3ua_num_clients) { - f_M3UA_asp_up_act(idx_b, rctx := rctx_b); - } else { + if (g_m3ua_configs[idx_b].is_server) { f_M3UA_CLNT_asp_up_act(idx_b, rctx := rctx_b); + } else { + f_M3UA_asp_up_act(idx_b, rctx := rctx_b); } /* In the case when ASP[idx_b] is configured as the client (i.e. osmo-stp connects to - * the testsuite; idx_b >= g_m3ua_num_clients), in f_M3UA_CLNT_asp_up_act() we're expecting - * to receive ASPACT and then sending ASPACT_ACK to it. Right after that, we're sending + * the testsuite), in f_M3UA_CLNT_asp_up_act() we're expecting to receive ASPACT and + * then sending ASPACT_ACK to it. Right after that, we're sending * some random data via ASP[idx_a], which we then expect to receive via ASP[idx_b]. * * There is a chance that the random data sent via ASP[idx_a] would reach osmo-stp @@ -78,29 +79,41 @@ /* test routing between M3UA/SCTP (client) and M3UA/TCP (client) */ testcase TC_m3ua_tcp_cli() runs on RAW_M3UA_CT { - f_init_m3ua(); - f_TC_m3ua_tcp(0, 1); /* 'asp-sender' <-> 'asp-sender-tcp' */ + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-sender-tcp" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + + f_init_m3ua(m3ua_configs := m3ua_configs); + f_TC_m3ua_tcp(0, 1); } /* test routing between M3UA/SCTP (client) and M3UA/TCP (server) */ testcase TC_m3ua_tcp_cli_srv() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0-tcp" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); - f_TC_m3ua_tcp(0, M3UA_SRV(1)); /* 'asp-sender' <-> 'asp-client-tcp' */ + f_TC_m3ua_tcp(0, 1); } /* test routing between M3UA/SCTP (server) and M3UA/TCP (server) */ testcase TC_m3ua_tcp_srv() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-client0", "asp-client0-tcp" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); - f_TC_m3ua_tcp(M3UA_SRV(0), M3UA_SRV(1)); /* 'asp-client' <-> 'asp-client-tcp' */ + f_TC_m3ua_tcp(0, 1); } /* test routing between M3UA/SCTP (server) and M3UA/TCP (client) */ testcase TC_m3ua_tcp_srv_cli() runs on RAW_M3UA_CT { - f_init_m3ua(); + var Misc_Helpers.ro_charstring asps := { "asp-client0", "asp-sender-tcp" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + + f_init_m3ua(m3ua_configs := m3ua_configs); f_init_m3ua_srv(); - f_TC_m3ua_tcp(M3UA_SRV(0), 1); /* 'asp-client' <-> 'asp-sender-tcp' */ + f_TC_m3ua_tcp(0, 1); } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40325?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: I63ed043014ee8a9a593ed17797b621f39c746bcd Gerrit-Change-Number: 40325 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in upf-benchmark[master]: testsuites: tunmap: upf: Support upf running in epyc1
by pespin 21 May '25

21 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40337?usp=email ) Change subject: testsuites: tunmap: upf: Support upf running in epyc1 ...................................................................... testsuites: tunmap: upf: Support upf running in epyc1 Change-Id: I8c211147cc2c29ac87acd909041219bf668e8f8a --- M testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh M testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh 2 files changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh index bcd9ee7..cabb332 100755 --- a/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh +++ b/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh @@ -24,6 +24,12 @@ sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_RAN sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_CN ;; +epyc1) + IFACE_RAN="enp129s0f0np0" + IFACE_CN="enp129s0f1np1" + # TRex peer is c240-1 Mellanox NIC: + MAC_CN_PEER="88:e9:a4:3b:f0:49" + ;; *) echo "UNEXPECTED HOSTNAME: $(hostname)" exit 1 diff --git a/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh index 7c308ce..a64a376 100755 --- a/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh +++ b/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh @@ -24,6 +24,12 @@ sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_RAN sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_CN ;; +epyc1) + IFACE_RAN="enp129s0f0np0" + IFACE_CN="enp129s0f1np1" + # TRex peer is c240-1 Mellanox NIC: + MAC_CN_PEER="88:e9:a4:3b:f0:49" + ;; *) echo "UNEXPECTED HOSTNAME: $(hostname)" exit 1 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40337?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: I8c211147cc2c29ac87acd909041219bf668e8f8a Gerrit-Change-Number: 40337 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in upf-benchmark[master]: testsuites: tunend: upf: Support upf running in epyc1
by pespin 21 May '25

21 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40338?usp=email ) Change subject: testsuites: tunend: upf: Support upf running in epyc1 ...................................................................... testsuites: tunend: upf: Support upf running in epyc1 Change-Id: I18ab093167476f9075877207a49da95bd9fb9bd2 --- M testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh M testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh 2 files changed, 14 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh index fb76737..7fff94b 100755 --- a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh +++ b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh @@ -29,6 +29,13 @@ sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_RAN sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_CN ;; +epyc1) + IFACE_RAN="enp129s0f0np0" + IFACE_CN="enp129s0f1np1" + # TRex peer is c240-1 Mellanox NIC: + MAC_RAN_PEER="88:e9:a4:3b:f0:48" + MAC_CN_PEER="88:e9:a4:3b:f0:49" + ;; *) echo "UNEXPECTED HOSTNAME: $(hostname)" exit 1 diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh index 92f4fb3..e2c46cc 100755 --- a/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh +++ b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh @@ -30,6 +30,13 @@ sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_RAN sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_CN ;; +epyc1) + IFACE_RAN="enp129s0f0np0" + IFACE_CN="enp129s0f1np1" + # TRex peer is c240-1 Mellanox NIC: + MAC_RAN_PEER="88:e9:a4:3b:f0:48" + MAC_CN_PEER="88:e9:a4:3b:f0:49" + ;; *) echo "UNEXPECTED HOSTNAME: $(hostname)" exit 1 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40338?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: I18ab093167476f9075877207a49da95bd9fb9bd2 Gerrit-Change-Number: 40338 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in upf-benchmark[master]: testsuites: tunend: eupf: Run with GIN_MODE=release
by pespin 21 May '25

21 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40340?usp=email ) Change subject: testsuites: tunend: eupf: Run with GIN_MODE=release ...................................................................... testsuites: tunend: eupf: Run with GIN_MODE=release As already done in tunmap and also older testsuites. Change-Id: I50deef5730367812b5357fa49d5d9b3177660426 --- M testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh index 1532b76..26a1931 100755 --- a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh +++ b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh @@ -2,4 +2,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -sudo eupf --config "$SCRIPT_DIR/eupf.yaml" +sudo GIN_MODE=release eupf --config "$SCRIPT_DIR/eupf.yaml" -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40340?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: I50deef5730367812b5357fa49d5d9b3177660426 Gerrit-Change-Number: 40340 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in upf-benchmark[master]: testsuites: Add tunend-2trex test env
by pespin 21 May '25

21 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40339?usp=email ) Change subject: testsuites: Add tunend-2trex test env ...................................................................... testsuites: Add tunend-2trex test env In order to validate tunend scenario (encaps/decaps) against an UPF, we use TRex in stateful mode (ASTF) with its tunnels_topo infrastructure. This setup is less performant than the stateless mode used in the tunmap scenario, and as a result less throughput can be generated. This really poses a problem if the host running TRex (generating the GTPU traffic) is the same or less poerful hardware than the UIT running the UPF, as generating+handling traffic is at least as complex as the work UPF is doing. Hence, in order to be able to use less performant hardware to generate the traffic, a new test environment is added which expects 2 hosts instead of 1 running TRex. As a result, the tunnels configured their traffic are split into 2 segments/buckets of IP addresses/TEIDs, each configured on the UPF by its own osmo-upf-load-gen over PFCP, and also traffic for each of those two being generated/handled by one of the two TRex instances being run. In order to get the benchmark results, one must add the output from the console from both TRex instances running in parallel on separate hosts. With this it becomes possible to fill in the 100Gbps using C240-1 and c240-2 hosts. Change-Id: I6dcc3a27ef61857c05ab8d5cb67cceab5bb3dffa --- A testsuites/gtplab-sysmo2025/tunend-2trex/README.md A testsuites/gtplab-sysmo2025/tunend-2trex/cpf/0.gtp_flood.vty A testsuites/gtplab-sysmo2025/tunend-2trex/cpf/0.osmo-upf-load-gen.cfg A testsuites/gtplab-sysmo2025/tunend-2trex/cpf/1.gtp_flood.vty A testsuites/gtplab-sysmo2025/tunend-2trex/cpf/1.osmo-upf-load-gen.cfg A testsuites/gtplab-sysmo2025/tunend-2trex/cpf/configure.sh A testsuites/gtplab-sysmo2025/tunend-2trex/cpf/gen_gtpu_concurrent_ue_addr_range.py A testsuites/gtplab-sysmo2025/tunend-2trex/cpf/run.sh A testsuites/gtplab-sysmo2025/tunend-2trex/topology.dot A testsuites/gtplab-sysmo2025/tunend-2trex/trex/configure.sh A testsuites/gtplab-sysmo2025/tunend-2trex/trex/gtpu_topo.py A testsuites/gtplab-sysmo2025/tunend-2trex/trex/run.sh A testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_c240-1.yaml A testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_c240-2.yaml A testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_epyc1.yaml A testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_gtplab2.yaml A testsuites/gtplab-sysmo2025/tunend-2trex/trex/udp_simple.py A testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/configure.sh A testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/eupf.yaml A testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/run.sh A testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/configure.sh A testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/osmo-upf.cfg A testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/run.sh 23 files changed, 1,007 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/README.md b/testsuites/gtplab-sysmo2025/tunend-2trex/README.md new file mode 100644 index 0000000..7a20f3a --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/README.md @@ -0,0 +1,17 @@ +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 decapsulated +(tunend) 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.{100-200}) <----IP---- ()[upf] +``` + +See topoology.dot for a more detailed graph. \ No newline at end of file diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/0.gtp_flood.vty b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/0.gtp_flood.vty new file mode 100644 index 0000000..4142b5c --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/0.gtp_flood.vty @@ -0,0 +1,132 @@ +# Establish N PFCP sessions for tunend, and emit massive GTP traffic to the UPF +# to each established tunnel. +# +# osmo-upf-load-gen UPF "internet host" +# |GTP-ep -------GTP-----> GTP-ep|UE-IP-addr -------IP------> arbitrary-IP| +# |172.16.32.2 172.16.32.1|192.168.10.23 123.234.42.23| +# |172.16.32.3 +# ^ ^ ^ +# ^ | | | +# | | configure by configure by +# configure by from UPF 'ue ip' 'payload target ip', +# 'gtp local' ("F-TEID=choose") 'payload target port' + +# Configure one or more local GTP endpoints to emit GTP packets from. +# Established sessions will use these round-robin. +no gtp local bind +gtp local 172.16.32.2 2152 ue-ip-range 193.0.0.0 193.0.255.255 +gtp local 172.16.32.3 2152 ue-ip-range 193.1.0.0 193.1.255.255 +gtp local 172.16.32.4 2152 ue-ip-range 193.2.0.0 193.2.255.255 +gtp local 172.16.32.5 2152 ue-ip-range 193.3.0.0 193.3.255.255 +gtp local 172.16.32.6 2152 ue-ip-range 193.4.0.0 193.4.255.255 +gtp local 172.16.32.7 2152 ue-ip-range 193.5.0.0 193.5.255.255 +gtp local 172.16.32.8 2152 ue-ip-range 193.6.0.0 193.6.255.255 +gtp local 172.16.32.9 2152 ue-ip-range 193.7.0.0 193.7.255.255 +gtp local 172.16.32.10 2152 ue-ip-range 193.8.0.0 193.8.255.255 +gtp local 172.16.32.11 2152 ue-ip-range 193.9.0.0 193.9.255.255 +gtp local 172.16.32.12 2152 ue-ip-range 193.10.0.0 193.10.255.255 +gtp local 172.16.32.13 2152 ue-ip-range 193.11.0.0 193.11.255.255 +gtp local 172.16.32.14 2152 ue-ip-range 193.12.0.0 193.12.255.255 +gtp local 172.16.32.15 2152 ue-ip-range 193.13.0.0 193.13.255.255 +gtp local 172.16.32.16 2152 ue-ip-range 193.14.0.0 193.14.255.255 +gtp local 172.16.32.17 2152 ue-ip-range 193.15.0.0 193.15.255.255 +gtp local 172.16.32.18 2152 ue-ip-range 193.16.0.0 193.16.255.255 +gtp local 172.16.32.19 2152 ue-ip-range 193.17.0.0 193.17.255.255 +gtp local 172.16.32.20 2152 ue-ip-range 193.18.0.0 193.18.255.255 +gtp local 172.16.32.21 2152 ue-ip-range 193.19.0.0 193.19.255.255 +gtp local 172.16.32.22 2152 ue-ip-range 193.20.0.0 193.20.255.255 +gtp local 172.16.32.23 2152 ue-ip-range 193.21.0.0 193.21.255.255 +gtp local 172.16.32.24 2152 ue-ip-range 193.22.0.0 193.22.255.255 +gtp local 172.16.32.25 2152 ue-ip-range 193.23.0.0 193.23.255.255 +gtp local 172.16.32.26 2152 ue-ip-range 193.24.0.0 193.24.255.255 +gtp local 172.16.32.27 2152 ue-ip-range 193.25.0.0 193.25.255.255 +gtp local 172.16.32.28 2152 ue-ip-range 193.26.0.0 193.26.255.255 +gtp local 172.16.32.29 2152 ue-ip-range 193.27.0.0 193.27.255.255 +gtp local 172.16.32.30 2152 ue-ip-range 193.28.0.0 193.28.255.255 +gtp local 172.16.32.31 2152 ue-ip-range 193.29.0.0 193.29.255.255 +gtp local 172.16.32.32 2152 ue-ip-range 193.30.0.0 193.30.255.255 +gtp local 172.16.32.33 2152 ue-ip-range 193.31.0.0 193.31.255.255 +gtp local 172.16.32.34 2152 ue-ip-range 193.32.0.0 193.32.255.255 +gtp local 172.16.32.35 2152 ue-ip-range 193.33.0.0 193.33.255.255 +gtp local 172.16.32.36 2152 ue-ip-range 193.34.0.0 193.34.255.255 +gtp local 172.16.32.37 2152 ue-ip-range 193.35.0.0 193.35.255.255 +gtp local 172.16.32.38 2152 ue-ip-range 193.36.0.0 193.36.255.255 +gtp local 172.16.32.39 2152 ue-ip-range 193.37.0.0 193.37.255.255 +gtp local 172.16.32.40 2152 ue-ip-range 193.38.0.0 193.38.255.255 +gtp local 172.16.32.41 2152 ue-ip-range 193.39.0.0 193.39.255.255 +gtp local 172.16.32.42 2152 ue-ip-range 193.40.0.0 193.40.255.255 +gtp local 172.16.32.43 2152 ue-ip-range 193.41.0.0 193.41.255.255 +gtp local 172.16.32.44 2152 ue-ip-range 193.42.0.0 193.42.255.255 +gtp local 172.16.32.45 2152 ue-ip-range 193.43.0.0 193.43.255.255 +gtp local 172.16.32.46 2152 ue-ip-range 193.44.0.0 193.44.255.255 +gtp local 172.16.32.47 2152 ue-ip-range 193.45.0.0 193.45.255.255 +gtp local 172.16.32.48 2152 ue-ip-range 193.46.0.0 193.46.255.255 +gtp local 172.16.32.49 2152 ue-ip-range 193.47.0.0 193.47.255.255 +gtp local 172.16.32.50 2152 ue-ip-range 193.48.0.0 193.48.255.255 +gtp local 172.16.32.51 2152 ue-ip-range 193.49.0.0 193.49.255.255 +gtp local 172.16.32.52 2152 ue-ip-range 193.50.0.0 193.50.255.255 +gtp local 172.16.32.53 2152 ue-ip-range 193.51.0.0 193.51.255.255 +gtp local 172.16.32.54 2152 ue-ip-range 193.52.0.0 193.52.255.255 +gtp local 172.16.32.55 2152 ue-ip-range 193.53.0.0 193.53.255.255 +gtp local 172.16.32.56 2152 ue-ip-range 193.54.0.0 193.54.255.255 +gtp local 172.16.32.57 2152 ue-ip-range 193.55.0.0 193.55.255.255 +gtp local 172.16.32.58 2152 ue-ip-range 193.56.0.0 193.56.255.255 +gtp local 172.16.32.59 2152 ue-ip-range 193.57.0.0 193.57.255.255 +gtp local 172.16.32.60 2152 ue-ip-range 193.58.0.0 193.58.255.255 +gtp local 172.16.32.61 2152 ue-ip-range 193.59.0.0 193.59.255.255 +gtp local 172.16.32.62 2152 ue-ip-range 193.60.0.0 193.60.255.255 +gtp local 172.16.32.63 2152 ue-ip-range 193.61.0.0 193.61.255.255 +gtp local 172.16.32.64 2152 ue-ip-range 193.62.0.0 193.62.255.255 +gtp local 172.16.32.65 2152 ue-ip-range 193.63.0.0 193.63.255.255 +gtp local 172.16.32.66 2152 ue-ip-range 193.64.0.0 193.64.255.255 +gtp local 172.16.32.67 2152 ue-ip-range 193.65.0.0 193.65.255.255 +gtp local 172.16.32.68 2152 ue-ip-range 193.66.0.0 193.66.255.255 +gtp local 172.16.32.69 2152 ue-ip-range 193.67.0.0 193.67.255.255 +gtp local 172.16.32.70 2152 ue-ip-range 193.68.0.0 193.68.255.255 +gtp local 172.16.32.71 2152 ue-ip-range 193.69.0.0 193.69.255.255 +gtp local 172.16.32.72 2152 ue-ip-range 193.70.0.0 193.70.255.255 +gtp local 172.16.32.73 2152 ue-ip-range 193.71.0.0 193.71.255.255 +gtp local 172.16.32.74 2152 ue-ip-range 193.72.0.0 193.72.255.255 +gtp local 172.16.32.75 2152 ue-ip-range 193.73.0.0 193.73.255.255 +gtp local 172.16.32.76 2152 ue-ip-range 193.74.0.0 193.74.255.255 +gtp local 172.16.32.77 2152 ue-ip-range 193.75.0.0 193.75.255.255 +gtp local 172.16.32.78 2152 ue-ip-range 193.76.0.0 193.76.255.255 +gtp local 172.16.32.79 2152 ue-ip-range 193.77.0.0 193.77.255.255 +gtp local 172.16.32.80 2152 ue-ip-range 193.78.0.0 193.78.255.255 +gtp local 172.16.32.81 2152 ue-ip-range 193.79.0.0 193.79.255.255 +gtp local 172.16.32.82 2152 ue-ip-range 193.80.0.0 193.80.255.255 +gtp local 172.16.32.83 2152 ue-ip-range 193.81.0.0 193.81.255.255 +gtp local 172.16.32.84 2152 ue-ip-range 193.82.0.0 193.82.255.255 +gtp local 172.16.32.85 2152 ue-ip-range 193.83.0.0 193.83.255.255 +gtp local 172.16.32.86 2152 ue-ip-range 193.84.0.0 193.84.255.255 +gtp local 172.16.32.87 2152 ue-ip-range 193.85.0.0 193.85.255.255 +gtp local 172.16.32.88 2152 ue-ip-range 193.86.0.0 193.86.255.255 +gtp local 172.16.32.89 2152 ue-ip-range 193.87.0.0 193.87.255.255 +gtp local 172.16.32.90 2152 ue-ip-range 193.88.0.0 193.88.255.255 +gtp local 172.16.32.91 2152 ue-ip-range 193.89.0.0 193.89.255.255 +gtp local 172.16.32.92 2152 ue-ip-range 193.90.0.0 193.90.255.255 +gtp local 172.16.32.93 2152 ue-ip-range 193.91.0.0 193.91.255.255 +gtp local 172.16.32.94 2152 ue-ip-range 193.92.0.0 193.92.255.255 +gtp local 172.16.32.95 2152 ue-ip-range 193.93.0.0 193.93.255.255 +gtp local 172.16.32.96 2152 ue-ip-range 193.94.0.0 193.94.255.255 +gtp local 172.16.32.97 2152 ue-ip-range 193.95.0.0 193.95.255.255 +gtp local 172.16.32.98 2152 ue-ip-range 193.96.0.0 193.96.255.255 +gtp local 172.16.32.99 2152 ue-ip-range 193.97.0.0 193.97.255.255 +gtp local 172.16.32.100 2152 ue-ip-range 193.98.0.0 193.98.255.255 +gtp local 172.16.32.101 2152 ue-ip-range 193.99.0.0 193.99.255.255 + +gtp core 172.16.32.200 + +# now associate with UPF and start N sessions. +pfcp-peer 172.16.31.2 + tx assoc-setup-req + sleep 1 + date + + n 100000 session create tunend + wait responses + # All sessions established + date + +# give some time to gather counters before the tunnel is removed +sleep 999999 diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/0.osmo-upf-load-gen.cfg b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/0.osmo-upf-load-gen.cfg new file mode 100644 index 0000000..6c3f75c --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/0.osmo-upf-load-gen.cfg @@ -0,0 +1,18 @@ +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 + +line vty + no login + bind 127.0.0.1 +ctrl + bind 127.0.0.1 + +local-addr 0.0.0.0 8805 +listen diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/1.gtp_flood.vty b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/1.gtp_flood.vty new file mode 100644 index 0000000..ce86b7d --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/1.gtp_flood.vty @@ -0,0 +1,133 @@ +# Establish N PFCP sessions for tunend, and emit massive GTP traffic to the UPF +# to each established tunnel. +# +# osmo-upf-load-gen UPF "internet host" +# |GTP-ep -------GTP-----> GTP-ep|UE-IP-addr -------IP------> arbitrary-IP| +# |172.16.32.2 172.16.32.1|192.168.10.23 123.234.42.23| +# |172.16.32.3 +# ^ ^ ^ +# ^ | | | +# | | configure by configure by +# configure by from UPF 'ue ip' 'payload target ip', +# 'gtp local' ("F-TEID=choose") 'payload target port' + +# Configure one or more local GTP endpoints to emit GTP packets from. +# Established sessions will use these round-robin. +no gtp local bind +gtp local 172.16.32.102 2152 ue-ip-range 193.100.0.0 193.100.255.255 +gtp local 172.16.32.103 2152 ue-ip-range 193.101.0.0 193.101.255.255 +gtp local 172.16.32.104 2152 ue-ip-range 193.102.0.0 193.102.255.255 +gtp local 172.16.32.105 2152 ue-ip-range 193.103.0.0 193.103.255.255 +gtp local 172.16.32.106 2152 ue-ip-range 193.104.0.0 193.104.255.255 +gtp local 172.16.32.107 2152 ue-ip-range 193.105.0.0 193.105.255.255 +gtp local 172.16.32.108 2152 ue-ip-range 193.106.0.0 193.106.255.255 +gtp local 172.16.32.109 2152 ue-ip-range 193.107.0.0 193.107.255.255 +gtp local 172.16.32.110 2152 ue-ip-range 193.108.0.0 193.108.255.255 +gtp local 172.16.32.111 2152 ue-ip-range 193.109.0.0 193.109.255.255 +gtp local 172.16.32.112 2152 ue-ip-range 193.110.0.0 193.110.255.255 +gtp local 172.16.32.113 2152 ue-ip-range 193.111.0.0 193.111.255.255 +gtp local 172.16.32.114 2152 ue-ip-range 193.112.0.0 193.112.255.255 +gtp local 172.16.32.115 2152 ue-ip-range 193.113.0.0 193.113.255.255 +gtp local 172.16.32.116 2152 ue-ip-range 193.114.0.0 193.114.255.255 +gtp local 172.16.32.117 2152 ue-ip-range 193.115.0.0 193.115.255.255 +gtp local 172.16.32.118 2152 ue-ip-range 193.116.0.0 193.116.255.255 +gtp local 172.16.32.119 2152 ue-ip-range 193.117.0.0 193.117.255.255 +gtp local 172.16.32.120 2152 ue-ip-range 193.118.0.0 193.118.255.255 +gtp local 172.16.32.121 2152 ue-ip-range 193.119.0.0 193.119.255.255 +gtp local 172.16.32.122 2152 ue-ip-range 193.120.0.0 193.120.255.255 +gtp local 172.16.32.123 2152 ue-ip-range 193.121.0.0 193.121.255.255 +gtp local 172.16.32.124 2152 ue-ip-range 193.122.0.0 193.122.255.255 +gtp local 172.16.32.125 2152 ue-ip-range 193.123.0.0 193.123.255.255 +gtp local 172.16.32.126 2152 ue-ip-range 193.124.0.0 193.124.255.255 +gtp local 172.16.32.127 2152 ue-ip-range 193.125.0.0 193.125.255.255 +gtp local 172.16.32.128 2152 ue-ip-range 193.126.0.0 193.126.255.255 +gtp local 172.16.32.129 2152 ue-ip-range 193.127.0.0 193.127.255.255 +gtp local 172.16.32.130 2152 ue-ip-range 193.128.0.0 193.128.255.255 +gtp local 172.16.32.131 2152 ue-ip-range 193.129.0.0 193.129.255.255 +gtp local 172.16.32.132 2152 ue-ip-range 193.130.0.0 193.130.255.255 +gtp local 172.16.32.133 2152 ue-ip-range 193.131.0.0 193.131.255.255 +gtp local 172.16.32.134 2152 ue-ip-range 193.132.0.0 193.132.255.255 +gtp local 172.16.32.135 2152 ue-ip-range 193.133.0.0 193.133.255.255 +gtp local 172.16.32.136 2152 ue-ip-range 193.134.0.0 193.134.255.255 +gtp local 172.16.32.137 2152 ue-ip-range 193.135.0.0 193.135.255.255 +gtp local 172.16.32.138 2152 ue-ip-range 193.136.0.0 193.136.255.255 +gtp local 172.16.32.139 2152 ue-ip-range 193.137.0.0 193.137.255.255 +gtp local 172.16.32.140 2152 ue-ip-range 193.138.0.0 193.138.255.255 +gtp local 172.16.32.141 2152 ue-ip-range 193.139.0.0 193.139.255.255 +gtp local 172.16.32.142 2152 ue-ip-range 193.140.0.0 193.140.255.255 +gtp local 172.16.32.143 2152 ue-ip-range 193.141.0.0 193.141.255.255 +gtp local 172.16.32.144 2152 ue-ip-range 193.142.0.0 193.142.255.255 +gtp local 172.16.32.145 2152 ue-ip-range 193.143.0.0 193.143.255.255 +gtp local 172.16.32.146 2152 ue-ip-range 193.144.0.0 193.144.255.255 +gtp local 172.16.32.147 2152 ue-ip-range 193.145.0.0 193.145.255.255 +gtp local 172.16.32.148 2152 ue-ip-range 193.146.0.0 193.146.255.255 +gtp local 172.16.32.149 2152 ue-ip-range 193.147.0.0 193.147.255.255 +gtp local 172.16.32.150 2152 ue-ip-range 193.148.0.0 193.148.255.255 +gtp local 172.16.32.151 2152 ue-ip-range 193.149.0.0 193.149.255.255 +gtp local 172.16.32.152 2152 ue-ip-range 193.150.0.0 193.150.255.255 +gtp local 172.16.32.153 2152 ue-ip-range 193.151.0.0 193.151.255.255 +gtp local 172.16.32.154 2152 ue-ip-range 193.152.0.0 193.152.255.255 +gtp local 172.16.32.155 2152 ue-ip-range 193.153.0.0 193.153.255.255 +gtp local 172.16.32.156 2152 ue-ip-range 193.154.0.0 193.154.255.255 +gtp local 172.16.32.157 2152 ue-ip-range 193.155.0.0 193.155.255.255 +gtp local 172.16.32.158 2152 ue-ip-range 193.156.0.0 193.156.255.255 +gtp local 172.16.32.159 2152 ue-ip-range 193.157.0.0 193.157.255.255 +gtp local 172.16.32.160 2152 ue-ip-range 193.158.0.0 193.158.255.255 +gtp local 172.16.32.161 2152 ue-ip-range 193.159.0.0 193.159.255.255 +gtp local 172.16.32.162 2152 ue-ip-range 193.160.0.0 193.160.255.255 +gtp local 172.16.32.163 2152 ue-ip-range 193.161.0.0 193.161.255.255 +gtp local 172.16.32.164 2152 ue-ip-range 193.162.0.0 193.162.255.255 +gtp local 172.16.32.165 2152 ue-ip-range 193.163.0.0 193.163.255.255 +gtp local 172.16.32.166 2152 ue-ip-range 193.164.0.0 193.164.255.255 +gtp local 172.16.32.167 2152 ue-ip-range 193.165.0.0 193.165.255.255 +gtp local 172.16.32.168 2152 ue-ip-range 193.166.0.0 193.166.255.255 +gtp local 172.16.32.169 2152 ue-ip-range 193.167.0.0 193.167.255.255 +gtp local 172.16.32.170 2152 ue-ip-range 193.168.0.0 193.168.255.255 +gtp local 172.16.32.171 2152 ue-ip-range 193.169.0.0 193.169.255.255 +gtp local 172.16.32.172 2152 ue-ip-range 193.170.0.0 193.170.255.255 +gtp local 172.16.32.173 2152 ue-ip-range 193.171.0.0 193.171.255.255 +gtp local 172.16.32.174 2152 ue-ip-range 193.172.0.0 193.172.255.255 +gtp local 172.16.32.175 2152 ue-ip-range 193.173.0.0 193.173.255.255 +gtp local 172.16.32.176 2152 ue-ip-range 193.174.0.0 193.174.255.255 +gtp local 172.16.32.177 2152 ue-ip-range 193.175.0.0 193.175.255.255 +gtp local 172.16.32.178 2152 ue-ip-range 193.176.0.0 193.176.255.255 +gtp local 172.16.32.179 2152 ue-ip-range 193.177.0.0 193.177.255.255 +gtp local 172.16.32.180 2152 ue-ip-range 193.178.0.0 193.178.255.255 +gtp local 172.16.32.181 2152 ue-ip-range 193.179.0.0 193.179.255.255 +gtp local 172.16.32.182 2152 ue-ip-range 193.180.0.0 193.180.255.255 +gtp local 172.16.32.183 2152 ue-ip-range 193.181.0.0 193.181.255.255 +gtp local 172.16.32.184 2152 ue-ip-range 193.182.0.0 193.182.255.255 +gtp local 172.16.32.185 2152 ue-ip-range 193.183.0.0 193.183.255.255 +gtp local 172.16.32.186 2152 ue-ip-range 193.184.0.0 193.184.255.255 +gtp local 172.16.32.187 2152 ue-ip-range 193.185.0.0 193.185.255.255 +gtp local 172.16.32.188 2152 ue-ip-range 193.186.0.0 193.186.255.255 +gtp local 172.16.32.189 2152 ue-ip-range 193.187.0.0 193.187.255.255 +gtp local 172.16.32.190 2152 ue-ip-range 193.188.0.0 193.188.255.255 +gtp local 172.16.32.191 2152 ue-ip-range 193.189.0.0 193.189.255.255 +gtp local 172.16.32.192 2152 ue-ip-range 193.190.0.0 193.190.255.255 +gtp local 172.16.32.193 2152 ue-ip-range 193.191.0.0 193.191.255.255 +gtp local 172.16.32.194 2152 ue-ip-range 193.192.0.0 193.192.255.255 +gtp local 172.16.32.195 2152 ue-ip-range 193.193.0.0 193.193.255.255 +gtp local 172.16.32.196 2152 ue-ip-range 193.194.0.0 193.194.255.255 +gtp local 172.16.32.197 2152 ue-ip-range 193.195.0.0 193.195.255.255 +gtp local 172.16.32.198 2152 ue-ip-range 193.196.0.0 193.196.255.255 +gtp local 172.16.32.199 2152 ue-ip-range 193.197.0.0 193.197.255.255 +gtp local 172.16.32.200 2152 ue-ip-range 193.198.0.0 193.198.255.255 +gtp local 172.16.32.201 2152 ue-ip-range 193.199.0.0 193.199.255.255 + + +gtp core 172.16.32.201 + +# now associate with UPF and start N sessions. +pfcp-peer 172.16.31.2 + tx assoc-setup-req + sleep 1 + date + + n 100000 session create tunend + wait responses + # All sessions established + date + +# give some time to gather counters before the tunnel is removed +sleep 999999 diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/1.osmo-upf-load-gen.cfg b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/1.osmo-upf-load-gen.cfg new file mode 100644 index 0000000..290d69f --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/1.osmo-upf-load-gen.cfg @@ -0,0 +1,18 @@ +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 + +line vty + no login + bind 127.0.0.2 +ctrl + bind 127.0.0.2 + +local-addr 0.0.0.0 8806 +listen diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/configure.sh b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/configure.sh new file mode 100755 index 0000000..5270225 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/configure.sh @@ -0,0 +1,17 @@ +#!/bin/bash -xe + +case $(hostname) in +gtplab0) + IFACE_UPF="enp2s0f0np0" + ;; +c240-3) + IFACE_UPF="ens2f0np0" + ;; +*) + echo "UNEXPECTED HOSTNAME: $(hostname)" + exit 1 + ;; +esac + +sudo ip addr add 172.16.31.1/24 dev $IFACE_UPF || true +sudo ip link set up dev $IFACE_UPF || true diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/gen_gtpu_concurrent_ue_addr_range.py b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/gen_gtpu_concurrent_ue_addr_range.py new file mode 100755 index 0000000..926381f --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/gen_gtpu_concurrent_ue_addr_range.py @@ -0,0 +1,52 @@ +#!/usr/bin/python3 +import argparse + +def inc_addr(addr_str, inc): + li = addr_str.split(".") + num_0 = (int(li[0]) << (3*8)) + num_1 = (int(li[1]) << (2*8)) + num_2 = (int(li[2]) << (1*8)) + num_3 = int(li[3]) + num = num_0 | num_1 | num_2 | num_3 + num += inc + li[0] = str((num >> (3*8)) & 0xff) + li[1] = str((num >> (2*8)) & 0xff) + li[2] = str((num >> (1*8)) & 0xff) + li[3] = str(num & 0xff) + return ".".join(li) + +parser = argparse.ArgumentParser() + +parser.add_argument('--num-streams', + type=int, + default=200000, + help="The number of streams (UE sessions).") +parser.add_argument('--num-addrs', + type=int, + default=100, + help="The number of src IP addresses.") +parser.add_argument('--gtp-local-port', + type=int, + default=2152, + help="The GTPU local port, 2152 by default") +parser.add_argument('--gtp-local-addr', + type=str, + default='172.16.32.2', + help='The first GTPU local IP address in the concurrent list') +parser.add_argument('--ue-addr', + type=str, + default='193.0.0.0', + help='The first UE IP address in the concurrent list') + +args = parser.parse_args() + +streams_per_tun = (args.num_streams // args.num_addrs) +total_ue_addr_end = inc_addr(args.ue_addr, args.num_streams - 1) +print("# num-streams: %d, num-addrs: %d, UE sessions per GTPU address: %d" %(args.num_streams, args.num_addrs, streams_per_tun)) +print("# start UE addr: %s, end UE addr: %s" %(args.ue_addr, total_ue_addr_end)) + +for addr_idx in range(args.num_addrs): + gtp_local_addr = inc_addr(args.gtp_local_addr, addr_idx) + ue_addr_start = '193.%d.0.0' % addr_idx + ue_addr_end = inc_addr(ue_addr_start, streams_per_tun - 1) + print("gtp local %s\t%d ue-ip-range %s\t%s" % (gtp_local_addr, args.gtp_local_port, ue_addr_start, ue_addr_end)) diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/run.sh b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/run.sh new file mode 100755 index 0000000..0314edb --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/cpf/run.sh @@ -0,0 +1,7 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +RUN_IDX=${IDX:-0} + +osmo-upf-load-gen -c "${SCRIPT_DIR}/${RUN_IDX}.osmo-upf-load-gen.cfg" "${SCRIPT_DIR}/${RUN_IDX}.gtp_flood.vty" diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/topology.dot b/testsuites/gtplab-sysmo2025/tunend-2trex/topology.dot new file mode 100644 index 0000000..7a10319 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/topology.dot @@ -0,0 +1,40 @@ +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.{100-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 [label="UPF\ntunend",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_tool -> gtplab0_172_31 -> switch_vlan1 -> gtplab1_172_31 -> upf [label="PFCP",dir=both,style=dashed,color=black]; + + trex -> gtplab2_172_32 -> switch_vlan2 -> gtplab1_172_32 -> upf [label="GTPU UL (RAN)",style=bold, color=red]; + upf -> gtplab1_172_31 -> switch_vlan1 -> gtplab2_172_31 -> trex [label="IP UL (CN)",style=bold, color=purple]; + + trex -> gtplab2_172_31 -> switch_vlan1 -> gtplab1_172_31 -> upf [label="IP DL (CN)",style=bold,color=blue]; + upf -> gtplab1_172_32 -> switch_vlan2 -> gtplab2_172_32 -> trex [label="GTPU DL (RAN)",style=bold,color=darkgreen]; + +} diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/trex/configure.sh b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/configure.sh new file mode 100755 index 0000000..dcc1fbb --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/configure.sh @@ -0,0 +1,27 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +HOSTNAME="$(hostname)" + +case $HOSTNAME in +gtplab2) + TREX_BIN="/opt/trex/t-rex-64" + ;; +c240-*) + # Crashes at startup with "t-rex-64" + TREX_BIN="/opt/trex/t-rex-64-o" + ;; +epyc1) + # Crashes at startup with "t-rex-64" + TREX_BIN="/opt/trex/t-rex-64-o" + ;; +*) + echo "UNEXPECTED HOSTNAME: $(hostname)" + exit 1 + ;; +esac + +sudo sysctl -w vm.nr_hugepages=4096 + +cd /opt/trex +sudo $TREX_BIN -i --astf --software --tso-disable --no-scapy-server --cfg "${SCRIPT_DIR}/trex_cfg_$HOSTNAME.yaml" --no-ofed-check -v 3 diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/trex/gtpu_topo.py b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/gtpu_topo.py new file mode 100644 index 0000000..870ee4e --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/gtpu_topo.py @@ -0,0 +1,52 @@ +from trex.astf.api import * +from trex.astf.tunnels_topo import TunnelsTopo +import argparse + +def calc_src_addr(addr_str, inc): + li = addr_str.split(".") + num_0 = (int(li[0]) << (3*8)) + num_1 = (int(li[1]) << (2*8)) + num_2 = (int(li[2]) << (1*8)) + num_3 = int(li[3]) + num = num_0 | num_1 | num_2 | num_3 + num += inc + li[0] = str((num >> (3*8)) & 0xff) + li[1] = str((num >> (2*8)) & 0xff) + li[2] = str((num >> (1*8)) & 0xff) + li[3] = str(num & 0xff) + return ".".join(li) + + +def add_tun(topo, num_streams, num_addrs, addr_offset, start_teid, tun_idx): + streams_per_tun = num_streams // num_addrs + src_gtpu_ip = calc_src_addr('172.16.32.2', addr_offset + tun_idx) + start_teid += tun_idx + teid_jump = 1*num_addrs + src_start = '193.%d.0.0' % (addr_offset + tun_idx) + src_end = calc_src_addr(src_start, streams_per_tun) + topo.add_tunnel_ctx( + src_start = src_start, + src_end = src_end, + initial_teid = start_teid, + teid_jump = teid_jump, + sport = 2152, + version = 4, + tunnel_type = 1, + src_ip = src_gtpu_ip, + dst_ip = '172.16.32.1', + activate = True + ) + + +def get_topo(**kwargs): + print("get_topo params: %r" % (kwargs)) + num_streams = kwargs.get('num-streams', 1) + num_addrs = kwargs.get('num-addrs', 1) + addr_offset = kwargs.get('addr-offset', 0) + # NOTE Assume previous segments have same amount of streams as this one: + start_teid = kwargs.get('start-teid', 0x00000001 + ((num_streams // num_addrs) * addr_offset)) + topo = TunnelsTopo() + + for tun_idx in range(num_addrs): + add_tun(topo, num_streams, num_addrs, addr_offset, start_teid, tun_idx) + return topo diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/trex/run.sh b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/run.sh new file mode 100755 index 0000000..09836b8 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/run.sh @@ -0,0 +1,29 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +# see https://trex-tgn.cisco.com/trex/doc/trex_astf.html#_gtpu_traffic_tutorials + +ADDR_OFFSET=${ADDR_OFFSET:-0} +NUM_STREAMS=100000 +NUM_ADDRS=100 + +set +x +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},addr-offset=${ADDR_OFFSET};" +echo "start -f ${SCRIPT_DIR}/udp_simple.py -m 50000 -d 600 -t num-streams=${NUM_STREAMS},num-addrs=${NUM_ADDRS},addr-offset=${ADDR_OFFSET},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 +# Needs to be executed from /opt/trex ... +cd /opt/trex/ +/opt/trex/trex-console + +# Troubleshooting: +# > portattr +# > service +# > ping -p 0 -d 172.16.32.1 -n 3 +# > ping -p 1 -d 172.16.31.2 -n 3 +# > service --off +# > tunnels_topo show diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_c240-1.yaml b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_c240-1.yaml new file mode 100644 index 0000000..87be35c --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_c240-1.yaml @@ -0,0 +1,24 @@ +### Config file generated by dpdk_setup_ports.py ### + +- version: 2 + interfaces: ['5e:00.0', '5e:00.1'] + c: 18 + rx_desc: 4096 + tx_desc: 4096 + port_info: + - ip: 172.16.32.2 + default_gw: 172.16.32.1 + - ip: 172.16.31.200 + default_gw: 172.16.31.2 + + platform: + master_thread_id: 0 + latency_thread_id: 1 + dual_if: + - socket: 0 + threads: [2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19] + + memory: + mbuf_2048: 128000 + global: 256000 + diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_c240-2.yaml b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_c240-2.yaml new file mode 100644 index 0000000..638bde3 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_c240-2.yaml @@ -0,0 +1,24 @@ +### Config file generated by dpdk_setup_ports.py ### + +- version: 2 + interfaces: ['5e:00.0', '5e:00.1'] + c: 18 + rx_desc: 4096 + tx_desc: 4096 + port_info: + - ip: 172.16.32.254 + default_gw: 172.16.32.1 + - ip: 172.16.31.201 + default_gw: 172.16.31.2 + + platform: + master_thread_id: 0 + latency_thread_id: 1 + dual_if: + - socket: 0 + threads: [2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19] + + memory: + mbuf_2048: 128000 + global: 256000 + diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_epyc1.yaml b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_epyc1.yaml new file mode 100644 index 0000000..4f38c55 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_epyc1.yaml @@ -0,0 +1,24 @@ +### Config file generated by dpdk_setup_ports.py ### + +- version: 2 + interfaces: ['81:00.0', '81:00.1'] + c: 22 + rx_desc: 4096 + tx_desc: 4096 + port_info: + - ip: 172.16.32.2 + default_gw: 172.16.32.1 + - ip: 172.16.31.200 + default_gw: 172.16.31.2 + + platform: + master_thread_id: 0 + latency_thread_id: 1 + dual_if: + - socket: 0 + threads: [2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23] + + memory: + mbuf_2048: 128000 + global: 256000 + diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_gtplab2.yaml b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_gtplab2.yaml new file mode 100644 index 0000000..4a4e02b --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/trex_cfg_gtplab2.yaml @@ -0,0 +1,24 @@ +### Config file generated by dpdk_setup_ports.py ### + +- version: 2 + interfaces: ['02:00.0', '02:00.1'] + c: 10 + rx_desc: 4096 + tx_desc: 4096 + port_info: + - ip: 172.16.32.2 + default_gw: 172.16.32.1 + - ip: 172.16.31.200 + default_gw: 172.16.31.2 + + platform: + master_thread_id: 0 + latency_thread_id: 1 + dual_if: + - socket: 0 + threads: [2,3,4,5,6,7,8,9,10,11] + + memory: + mbuf_2048: 128000 + global: 256000 + diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/trex/udp_simple.py b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/udp_simple.py new file mode 100644 index 0000000..ac8fb82 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/trex/udp_simple.py @@ -0,0 +1,113 @@ +from trex.astf.api import * +import argparse + +ul_pkt = (1400*'x') +dl_pkt = (1400*'y') + +class Prof1(): + def __init__(self): + pass + + def calc_src_addr(self, addr_str, inc): + li = addr_str.split(".") + num_0 = (int(li[0]) << (3*8)) + num_1 = (int(li[1]) << (2*8)) + num_2 = (int(li[2]) << (1*8)) + num_3 = int(li[3]) + num = num_0 | num_1 | num_2 | num_3 + num += inc + li[0] = str((num >> (3*8)) & 0xff) + li[1] = str((num >> (2*8)) & 0xff) + li[2] = str((num >> (1*8)) & 0xff) + li[3] = str(num & 0xff) + return ".".join(li) + + def create_ip_gen(self, prog_c, prog_s, addr_idx): + # ip generator + start_ms_addr = "193.%d.0.0" % (self.addr_offset + addr_idx) + end_ms_addr = self.calc_src_addr(start_ms_addr, (self.num_streams // self.num_addrs) - 1) + start_srv_addr = "48.%d.0.1" % (self.addr_offset) + end_srv_addr = self.calc_src_addr(start_srv_addr, self.num_addrs - 1) + ip_gen_c = ASTFIPGenDist(ip_range=[start_ms_addr, end_ms_addr], distribution="seq") + ip_gen_s = ASTFIPGenDist(ip_range=[start_srv_addr, end_srv_addr], distribution="seq") + ip_gen = ASTFIPGen(glob=ASTFIPGenGlobal(ip_offset="1.0.0.0"), + dist_client=ip_gen_c, + dist_server=ip_gen_s) + return ip_gen + + def create_template(self, prog_c, prog_s, addr_idx): + # ip generator + ip_gen = self.create_ip_gen(prog_c, prog_s, addr_idx) + # template + srv_port = 80 + addr_idx + temp_c = ASTFTCPClientTemplate(program=prog_c, ip_gen=ip_gen, port=srv_port) + temp_s = ASTFTCPServerTemplate(program=prog_s, assoc=ASTFAssociation(rules=ASTFAssociationRule(port=srv_port))) + template = ASTFTemplate(client_template=temp_c, server_template=temp_s, tg_name='latency') + return template + + def get_profile(self, tunables, **kwargs): + parser = argparse.ArgumentParser(description='Argparser for {}'.format(os.path.basename(__file__)), + formatter_class=argparse.ArgumentDefaultsHelpFormatter) + parser.add_argument('--num-streams', + type=int, + default=1, + help="The number of streams.") + parser.add_argument('--num-addrs', + type=int, + default=1, + help="The number of src IP addresses.") + parser.add_argument('--addr-offset', + type=int, + default=0, + help="Start index assigning --num-addrs addresses.") + parser.add_argument('--num-pkts-ul', + type=int, + default=1, + 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', + choices={'ul', 'dl', 'uldl'}, + help='') + args = parser.parse_args(tunables) + self.num_streams = args.num_streams + self.num_addrs = args.num_addrs + self.addr_offset = args.addr_offset + 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_ul): + prog_c.send_msg(ul_pkt) + if do_dl: + prog_c.set_keepalive_msg(10000) + 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_ul) + if do_dl: + for _ in range(self.num_pkts_dl): + 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) + + templates = [] + for addr_idx in range(self.num_addrs): + templates.append(self.create_template(prog_c, prog_s, addr_idx = addr_idx)) + + return ASTFProfile(default_ip_gen=default_ip_gen, templates=templates) + +def register(): + return Prof1() + diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/configure.sh b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/configure.sh new file mode 100755 index 0000000..f76a9cb --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/configure.sh @@ -0,0 +1,99 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +NUM_ENB=200 + +NUM_SEGMENTS=2 +NUM_ENB_SEGMENT=$((NUM_ENB / NUM_SEGMENTS)) + +# Interface towards UPF: +ADDR_GW_CN="172.16.31.200" +ADDR_GW_CN2="172.16.31.201" + +case $(hostname) in +epyc1) + IFACE_RAN="enp129s0f0np0" + IFACE_CN="enp129s0f1np1" + # TRex peer is c240-1 Mellanox NIC: + MAC_RAN_PEER="88:e9:a4:3b:f0:48" + MAC_CN_PEER="88:e9:a4:3b:f0:49" + # TRex peer is c240-2 Mellanox NIC: + MAC_RAN_PEER2="88:e9:a4:3b:21:38" + MAC_CN_PEER2="88:e9:a4:3b:21:39" + ;; +*) + echo "UNEXPECTED HOSTNAME: $(hostname)" + exit 1 + ;; +esac + +setup_arp_enb() { + local enb_offset="$1" + local iface_ran="$2" + local mac_ran_peer="$3" + local enb_start="$((2 + enb_offset))" + local enb_end="$((enb_start + NUM_ENB_SEGMENT - 1))" + # TRex doesn't answer ARPs, so we need to set up the peers: + for i in $(seq "$enb_start" "$enb_end"); do + local ip_addr + ip_addr="$(printf "172.16.32.%u" "$i")" + # Delete needed to potentially drop incomplete entries created when trying to Tx traffic: + sudo ip neigh del "$ip_addr" lladdr "$mac_ran_peer" nud permanent dev "$iface_ran" || true + sudo ip neigh add "$ip_addr" lladdr "$mac_ran_peer" nud permanent dev "$iface_ran" || true + done +} + +setup_arp_cn() { + local cn_ip_addr="$1" + local iface_cn="$2" + local mac_cn_peer="$3" + sudo ip neigh del "$cn_ip_addr" lladdr "$mac_cn_peer" nud permanent dev "$iface_cn" || true + sudo ip neigh add "$cn_ip_addr" lladdr "$mac_cn_peer" nud permanent dev "$iface_cn" || true +} + +# Disable ethernet flow control: +sudo ethtool -A $IFACE_RAN autoneg off rx off tx off +sudo ethtool -A $IFACE_CN autoneg off rx off tx off +# Disable GRO / LRO: +sudo ethtool -K $IFACE_RAN gro off lro off +sudo ethtool -K $IFACE_CN gro off lro off +# Increase NIC buffers: +sudo ethtool -G $IFACE_RAN rx 8192 tx 8192 +sudo ethtool -G $IFACE_CN rx 8192 tx 8192 + +# Enable IP forwarding: +sudo sysctl -w net.ipv4.ip_forward=1 + +# Increase UDP buffer memory: +sudo sysctl -w net.ipv4.udp_mem="763563 900000000 1000000000" +sudo sysctl -w net.core.optmem_max=16000000 +sudo sysctl -w net.core.rmem_max=2000000000 +sudo sysctl -w net.core.rmem_default=2000000000 +sudo sysctl -w net.core.wmem_max=2000000000 +sudo sysctl -w net.core.wmem_default=2000000000 +sudo sysctl -w net.core.netdev_max_backlog=2000 +sudo sysctl -w net.core.netdev_budget=600 + +# Set up UPF address: +sudo ip addr add 172.16.32.1/24 dev $IFACE_RAN || true +sudo ip link set up dev $IFACE_RAN || true +sudo ip addr add 172.16.31.2/24 dev $IFACE_CN || true +sudo ip link set up dev $IFACE_CN || true + +# TRex doesn't answer ARPs, so we need to set up the peers: +setup_arp_enb 0 "$IFACE_RAN" "$MAC_RAN_PEER" +setup_arp_enb "$NUM_ENB_SEGMENT" "$IFACE_RAN" "$MAC_RAN_PEER2" + +setup_arp_cn "$ADDR_GW_CN" "$IFACE_CN" "$MAC_CN_PEER" +setup_arp_cn "$ADDR_GW_CN2" "$IFACE_CN" "$MAC_CN_PEER2" + +# Add route towards HTTP server on the CN side, aka "the Internet" +sudo ip route del 48.0.0.0/16 via $ADDR_GW_CN dev $IFACE_CN || true +sudo ip route add 48.0.0.0/16 via $ADDR_GW_CN dev $IFACE_CN || true +sudo ip route del 48.$NUM_ENB_SEGMENT.0.0/16 via $ADDR_GW_CN2 dev $IFACE_CN || true +sudo ip route add 48.$NUM_ENB_SEGMENT.0.0/16 via $ADDR_GW_CN2 dev $IFACE_CN || true + +# Apply host specific iface names: +sed -i "s/TEMPLATE_IFACE_RAN/$IFACE_RAN/g" "${SCRIPT_DIR}/eupf.yaml" +sed -i "s/TEMPLATE_IFACE_CN/$IFACE_CN/g" "${SCRIPT_DIR}/eupf.yaml" diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/eupf.yaml new file mode 100644 index 0000000..3f7326b --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/eupf.yaml @@ -0,0 +1,15 @@ +interface_name: [TEMPLATE_IFACE_RAN, TEMPLATE_IFACE_CN] +xdp_attach_mode: native +api_address: :8080 +pfcp_address: 172.16.31.2:8805 +pfcp_node_id: 172.16.31.2 +metrics_address: :9090 +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: 4000000 +logging_level: 2 \ No newline at end of file diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/run.sh b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/run.sh new file mode 100755 index 0000000..26a1931 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/eupf/run.sh @@ -0,0 +1,5 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +sudo GIN_MODE=release eupf --config "$SCRIPT_DIR/eupf.yaml" diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/configure.sh b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/configure.sh new file mode 100755 index 0000000..204e8d3 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/configure.sh @@ -0,0 +1,99 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +NUM_ENB=200 + +NUM_SEGMENTS=2 +NUM_ENB_SEGMENT=$((NUM_ENB / NUM_SEGMENTS)) + +# Interface towards UPF: +IFACE_APN="apn-flood" +ADDR_GW_CN="172.16.31.200" +ADDR_GW_CN2="172.16.31.201" +case $(hostname) in +epyc1) + IFACE_RAN="enp129s0f0np0" + IFACE_CN="enp129s0f1np1" + # TRex peer is c240-1 Mellanox NIC: + MAC_RAN_PEER="88:e9:a4:3b:f0:48" + MAC_CN_PEER="88:e9:a4:3b:f0:49" + # TRex peer is c240-2 Mellanox NIC: + MAC_RAN_PEER2="88:e9:a4:3b:21:38" + MAC_CN_PEER2="88:e9:a4:3b:21:39" + ;; +*) + echo "UNEXPECTED HOSTNAME: $(hostname)" + exit 1 + ;; +esac + +setup_arp_enb() { + local enb_offset="$1" + local iface_ran="$2" + local mac_ran_peer="$3" + local enb_start="$((2 + enb_offset))" + local enb_end="$((enb_start + NUM_ENB_SEGMENT - 1))" + # TRex doesn't answer ARPs, so we need to set up the peers: + for i in $(seq "$enb_start" "$enb_end"); do + local ip_addr + ip_addr="$(printf "172.16.32.%u" "$i")" + # Delete needed to potentially drop incomplete entries created when trying to Tx traffic: + sudo ip neigh del "$ip_addr" lladdr "$mac_ran_peer" nud permanent dev "$iface_ran" || true + sudo ip neigh add "$ip_addr" lladdr "$mac_ran_peer" nud permanent dev "$iface_ran" || true + done +} + +setup_arp_cn() { + local cn_ip_addr="$1" + local iface_cn="$2" + local mac_cn_peer="$3" + sudo ip neigh del "$cn_ip_addr" lladdr "$mac_cn_peer" nud permanent dev "$iface_cn" || true + sudo ip neigh add "$cn_ip_addr" lladdr "$mac_cn_peer" nud permanent dev "$iface_cn" || true +} + +# Disable ethernet flow control: +sudo ethtool -A $IFACE_RAN autoneg off rx off tx off +sudo ethtool -A $IFACE_CN autoneg off rx off tx off +# Disable GRO / LRO: +sudo ethtool -K $IFACE_RAN gro off lro off +sudo ethtool -K $IFACE_CN gro off lro off +# Increase NIC buffers: +sudo ethtool -G $IFACE_RAN rx 8192 tx 8192 +sudo ethtool -G $IFACE_CN rx 8192 tx 8192 + +# Enable IP forwarding: +sudo sysctl -w net.ipv4.ip_forward=1 + +# Increase UDP buffer memory: +sudo sysctl -w net.ipv4.udp_mem="763563 900000000 1000000000" +sudo sysctl -w net.core.optmem_max=16000000 +sudo sysctl -w net.core.rmem_max=2000000000 +sudo sysctl -w net.core.rmem_default=2000000000 +sudo sysctl -w net.core.wmem_max=2000000000 +sudo sysctl -w net.core.wmem_default=2000000000 +sudo sysctl -w net.core.netdev_max_backlog=2000 +sudo sysctl -w net.core.netdev_budget=600 + +# Set up UPF address: +sudo ip addr add 172.16.32.1/24 dev $IFACE_RAN || true +sudo ip link set up dev $IFACE_RAN || true +sudo ip addr add 172.16.31.2/24 dev $IFACE_CN || true +sudo ip link set up dev $IFACE_CN || true + +# TRex doesn't answer ARPs, so we need to set up the peers: +setup_arp_enb 0 "$IFACE_RAN" "$MAC_RAN_PEER" +setup_arp_enb "$NUM_ENB_SEGMENT" "$IFACE_RAN" "$MAC_RAN_PEER2" + +setup_arp_cn "$ADDR_GW_CN" "$IFACE_CN" "$MAC_CN_PEER" +setup_arp_cn "$ADDR_GW_CN2" "$IFACE_CN" "$MAC_CN_PEER2" + +# Add route towards HTTP server on the CN side, aka "the Internet" +sudo ip route del 48.0.0.0/16 via $ADDR_GW_CN dev $IFACE_CN || true +sudo ip route add 48.0.0.0/16 via $ADDR_GW_CN dev $IFACE_CN || true +sudo ip route del 48.$NUM_ENB_SEGMENT.0.0/16 via $ADDR_GW_CN2 dev $IFACE_CN || true +sudo ip route add 48.$NUM_ENB_SEGMENT.0.0/16 via $ADDR_GW_CN2 dev $IFACE_CN || true + +# Set up UE IP routes: +# FIXME: This one below need to be done *after* osmo-upf creates the iface.... +sudo ip route add 193.0.0.0/8 dev $IFACE_APN diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/osmo-upf.cfg b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/osmo-upf.cfg new file mode 100644 index 0000000..3ba93db --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/osmo-upf.cfg @@ -0,0 +1,29 @@ +log stderr + logging filter all 1 + 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 notice + logging level set-all info + logging level session debug + logging level nft debug + logging level gtp debug + logging level set-all error + +line vty + bind 127.0.0.1 +ctrl + bind 127.0.0.1 + +timer pfcp x24 5000 +timer nft x32 100 +timer nft x33 100 +pfcp + local-addr 172.16.31.2 +tunend + dev create apn-flood 172.16.32.1 +netinst + add netinst-flood 172.16.32.1 diff --git a/testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/run.sh b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/run.sh new file mode 100755 index 0000000..6a9f679 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend-2trex/upf/osmo-upf/run.sh @@ -0,0 +1,9 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +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: +# ip route add 193.0.0.0/8 dev apn-flood -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40339?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: I6dcc3a27ef61857c05ab8d5cb67cceab5bb3dffa Gerrit-Change-Number: 40339 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in upf-benchmark[master]: testsuites: Add tunend-2trex test env
by pespin 21 May '25

21 May '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40339?usp=email ) Change subject: testsuites: Add tunend-2trex test env ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40339?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I6dcc3a27ef61857c05ab8d5cb67cceab5bb3dffa Gerrit-Change-Number: 40339 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 May 2025 15:01:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in upf-benchmark[master]: testsuites: tunend: eupf: Run with GIN_MODE=release
by pespin 21 May '25

21 May '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40340?usp=email ) Change subject: testsuites: tunend: eupf: Run with GIN_MODE=release ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40340?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I50deef5730367812b5357fa49d5d9b3177660426 Gerrit-Change-Number: 40340 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 May 2025 15:01:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in upf-benchmark[master]: testsuites: tunend: upf: Support upf running in epyc1
by pespin 21 May '25

21 May '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40338?usp=email ) Change subject: testsuites: tunend: upf: Support upf running in epyc1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40338?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I18ab093167476f9075877207a49da95bd9fb9bd2 Gerrit-Change-Number: 40338 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 May 2025 15:01:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in upf-benchmark[master]: testsuites: tunmap: upf: Support upf running in epyc1
by pespin 21 May '25

21 May '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40337?usp=email ) Change subject: testsuites: tunmap: upf: Support upf running in epyc1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I8c211147cc2c29ac87acd909041219bf668e8f8a Gerrit-Change-Number: 40337 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 May 2025 15:01:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log