May 2025 - gerrit-log - lists.osmocom.org

[L] Change in osmo-ttcn3-hacks[master]: stp: Split M3UA TCP tests into its own testenv config

by pespin

pespin has uploaded this change for review. ( 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 A stp/osmo-stp-m3ua-tcp.confmerge M stp/osmo-stp-m3ua.confmerge A stp/testenv_m3ua-tcp.cfg 7 files changed, 258 insertions(+), 127 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/40324/1 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/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: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8123887755aa3253830b43407b4cc6b21142233c Gerrit-Change-Number: 40324 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: qemu: add modules.alias

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40316?usp=email ) Change subject: testenv: qemu: add modules.alias ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40316?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I475176734b994e7abda63badda0983ab6534b682 Gerrit-Change-Number: 40316 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 May 2025 14:53:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: qemu: initrd build fail: stop immediately

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40315?usp=email ) Change subject: testenv: qemu: initrd build fail: stop immediately ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40315?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6de4d1c31385af52ee0fd55378adb10a9e2c2154 Gerrit-Change-Number: 40315 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 May 2025 14:42:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: fix not aborting on build_initrd error

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40314?usp=email ) Change subject: testenv: fix not aborting on build_initrd error ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40314?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2870b7e7ba28b2afc72e86b7a3bc389103564c80 Gerrit-Change-Number: 40314 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 May 2025 14:41:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: qemu: fix adding kernel modules

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40313?usp=email ) Change subject: testenv: qemu: fix adding kernel modules ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40313?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic32318da169ee8ebf867937782be5cf8a15f9f2f Gerrit-Change-Number: 40313 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 May 2025 14:40:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: podman: add missing tree command

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40312?usp=email ) Change subject: testenv: podman: add missing tree command ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40312?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I75fcd210db9e5c9364cb98ee09ebf754790aa55f Gerrit-Change-Number: 40312 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 May 2025 14:40:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: podman: add erlang-dev

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40311?usp=email ) Change subject: testenv: podman: add erlang-dev ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40311?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4ca9d1823037889315f50de629e5581964cda079 Gerrit-Change-Number: 40311 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 May 2025 14:39:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[M] Change in pysim[master]: [1/6] personalization: refactor: drop ClassVarMeta use

by laforge

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/pysim/+/39741?usp=email ) Change subject: [1/6] personalization: refactor: drop ClassVarMeta use ...................................................................... Patch Set 10: Code-Review-1 (1 comment) File pySim/esim/saip/personalization.py: https://gerrit.osmocom.org/c/pysim/+/39741/comment/9bbf8092_deda38af?usp=em… : PS9, Line 37: class ConfigurableParameter: > I do not understand what ABC is for; this is an educated "i do not understand" as in, i have yet to […] There's no point about discussion whether abstract base classes and the python library are useful or not. They are a standard language feature. OTher code you reference may simply predate it, or the authors had different opinions. We've been using ABC quite a bit in pySim, and it does solve real problems. Maybe I don't understand the problem. Can you then please make it very clear what exactly did not work and how it did not work? Do you have your code where you try to use ABC but it fails? Basically I see this sequence of events: * you try to do something not being familiar with ABC * you rewrite the code to avoid ABC and see it as an improvement * multiple others, including me as the original author disagree What ideally should have happened is a concise example of what exactly you were trying to achieve, and how, and how it failed, so that people with more ABC knowledge can see if it has a solution. I just don't think we should merge code refactoring that multiple people consider a step backwards unless the very exact technical reason is crystal clear. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39741?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I60ea8fd11fb438ec90ddb08b17b658cbb789c051 Gerrit-Change-Number: 39741 Gerrit-PatchSet: 10 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 May 2025 14:25:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 month, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: STP_Tests_IPA: Support configuring less than 8 AS(P)s

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40322?usp=email ) Change subject: stp: STP_Tests_IPA: Support configuring less than 8 AS(P)s ...................................................................... stp: STP_Tests_IPA: Support configuring less than 8 AS(P)s This is a preparation patch towards splitting testsuite into smaller configurations. Change-Id: I820d295cd22fe824abf0f60bf6f1f0f3fd069d85 --- M stp/STP_Tests_IPA.ttcn 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/40322/1 diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index b7da439..3e484cb 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -34,7 +34,7 @@ import from STP_Tests_Common all; -private const integer NR_IPA := 8; +private const integer MAX_NR_IPA := 8; type record of charstring AspNameArray; @@ -57,10 +57,10 @@ type component IPA_CT extends Test_CT { /* for IPA we use the IPA_Emulation and not directly IPA_CodecPort to avoid * having to re-invent IPA CCM handling here */ - port MTP3asp_PT IPA[NR_IPA]; - port IPA_SP_PT IPA_CTRL[NR_IPA]; - var IPA_Emulation_CT vc_IPA[NR_IPA]; - var IPA_CCM_Parameters g_ccm_pars[NR_IPA]; + port MTP3asp_PT IPA[MAX_NR_IPA]; + port IPA_SP_PT IPA_CTRL[MAX_NR_IPA]; + var IPA_Emulation_CT vc_IPA[MAX_NR_IPA]; + var IPA_CCM_Parameters g_ccm_pars[MAX_NR_IPA]; } friend function f_IPA_send(integer idx, octetstring data) runs on IPA_CT { @@ -102,7 +102,7 @@ f_init_common(); - for (i := 0; i < NR_IPA; i:=i+1) { + for (i := 0; i < lengthof(mp_ipa_as_names); i:=i+1) { vc_IPA[i] := IPA_Emulation_CT.create("IPA" & int2str(i)); map(vc_IPA[i]:IPA_PORT, system:IPA_CODEC_PT); connect(self:IPA[i], vc_IPA[i]:MTP3_SP_PORT); @@ -116,7 +116,7 @@ var integer port_offset := 0; if (use_unknown_asp_port) { /* Add 100 to the port since we know that port is not configured in any - ASP only up to NR_IPA are configured. */ + ASP only up to MAX_NR_IPA are configured. */ port_offset := 100; } vc_IPA[idx].start(IPA_Emulation.main_client(mp_stp_ipa_ip, mp_stp_ipa_port, mp_local_ipa_ip, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40322?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I820d295cd22fe824abf0f60bf6f1f0f3fd069d85 Gerrit-Change-Number: 40322 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: stp: Initial split into several testenv config

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40323?usp=email ) Change subject: stp: Initial split into several testenv config ...................................................................... stp: Initial split into several testenv config As a first step, split the generic config into 3 configs, one per module. The idea is to have a different config for a given set of related tests running on a specific network topology/setup. This helps in simplifying the test conditions, which allows easily adding new topologies to test, validate specific scenarios or debug existing ones. For instance, to test Combined linkset loadsharing, we'll need to set up some sort of scenario where we have at least 2 AS with each at least 1 ASP. Change-Id: I4ec8e1bbc8e71d8bd421dfbd5356bf1937ce2bb4 --- A stp/STP_Tests_IPA.cfg M stp/STP_Tests_IPA.ttcn A stp/STP_Tests_IPA_M3UA.cfg M stp/STP_Tests_IPA_M3UA.ttcn A stp/STP_Tests_M3UA.cfg M stp/STP_Tests_M3UA.ttcn A stp/osmo-stp-ipa-m3ua.confmerge A stp/osmo-stp-ipa.confmerge A stp/osmo-stp-m3ua.confmerge M stp/osmo-stp.cfg D stp/testenv.cfg A stp/testenv_ipa-m3ua.cfg A stp/testenv_ipa.cfg A stp/testenv_m3ua.cfg 14 files changed, 442 insertions(+), 277 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/40323/1 diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg new file mode 100644 index 0000000..d1ab417 --- /dev/null +++ b/stp/STP_Tests_IPA.cfg @@ -0,0 +1,28 @@ +[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] +STP_Tests_IPA.mp_ipa_as_names := { + "ipa-as-loadshare-sender", + "ipa-as-loadshare-sender", + "ipa-as-loadshare-receiver", + "ipa-as-loadshare-receiver", + "ipa-as-dynamic-asp", + "ipa-as-override-sender", + "ipa-as-override-receiver", + "ipa-as-override-receiver" +}; + +[MAIN_CONTROLLER] + +[EXECUTE] +STP_Tests_IPA.control diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 3e484cb..5fb8423 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -43,15 +43,7 @@ charstring mp_local_ipa_ip := "127.0.0.1"; integer mp_stp_ipa_port := 5000; integer mp_local_ipa_port := 20000; - AspNameArray mp_ipa_as_names := {"ipa-as-loadshare-sender", - "ipa-as-loadshare-sender", - "ipa-as-loadshare-receiver", - "ipa-as-loadshare-receiver", - "ipa-as-dynamic-asp", - "ipa-as-override-sender", - "ipa-as-override-receiver", - "ipa-as-override-receiver" - }; + AspNameArray mp_ipa_as_names := {}; } type component IPA_CT extends Test_CT { diff --git a/stp/STP_Tests_IPA_M3UA.cfg b/stp/STP_Tests_IPA_M3UA.cfg new file mode 100644 index 0000000..be16ccf --- /dev/null +++ b/stp/STP_Tests_IPA_M3UA.cfg @@ -0,0 +1,38 @@ +[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] +STP_Tests_IPA.mp_ipa_as_names := { + "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", + use_tcp := false, + remote_port := 2905, + local_port := 9999, + point_code := 23, + 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] + +[EXECUTE] +STP_Tests_IPA_M3UA.control diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn index 08ca5aa..4fcd506 100644 --- a/stp/STP_Tests_IPA_M3UA.ttcn +++ b/stp/STP_Tests_IPA_M3UA.ttcn @@ -65,12 +65,15 @@ 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 OCT4 pc_receiver := int2oct(5, 4); - f_connect_ipa(4); - f_M3UA_asp_up_act(0, omit, rctx_sender); + f_connect_ipa(ipa_idx); + f_M3UA_asp_up_act(m3ua_idx, omit, rctx_sender); /* send a well-formed, encoded SCCP message via M3UA */ var octetstring data := f_rnd_octstring_rnd_len(100); @@ -80,10 +83,10 @@ 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(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1); + f_M3UA_send(m3ua_idx, ts_M3UA_DATA(rctx_sender, tx_pd), 1); /* expect to receive it via IPA */ - f_IPA_exp(4, sccp_enc); + f_IPA_exp(ipa_idx, sccp_enc); f_clear_m3ua(); } @@ -97,12 +100,15 @@ f_init_m3ua(); 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(4); - f_M3UA_asp_up_act(0, omit, rctx_receiver); + f_connect_ipa(ipa_idx); + f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ var octetstring data := f_rnd_octstring_rnd_len(100); @@ -110,12 +116,12 @@ 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(4, sccp_enc); + f_IPA_send(ipa_idx, 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(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); + f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_clear_m3ua(); } @@ -130,12 +136,15 @@ f_init_m3ua(); 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(4); - f_M3UA_asp_up_act(0, omit, rctx_receiver); + f_connect_ipa(ipa_idx); + f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ var octetstring data := f_rnd_octstring_rnd_len(100); @@ -144,13 +153,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(4, sccp_enc); + f_IPA_send(ipa_idx, 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(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); + f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator international"); f_clear_m3ua(); } @@ -165,19 +174,22 @@ f_init_m3ua(); 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(4); - f_M3UA_asp_up_act(0, omit, rctx_receiver); + f_connect_ipa(ipa_idx); + f_M3UA_asp_up_act(m3ua_idx, 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(4, enc_PDU_SCCP(sccp)); + f_IPA_send(ipa_idx, enc_PDU_SCCP(sccp)); /* patch point codes into addresses */ called := valueof(ts_SccpAddr_PC_GT(oct2int(pc_receiver), '83'O, "mtp3_itu", '1234'H)); @@ -188,7 +200,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(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); + f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_clear_m3ua(); } diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg new file mode 100644 index 0000000..d5894a1 --- /dev/null +++ b/stp/STP_Tests_M3UA.cfg @@ -0,0 +1,95 @@ +[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-receiver: Two ASP within AS */ + { + asp_name := "asp-receiver0", + use_tcp := false, + remote_port := 2905, + local_port := 10000, + point_code := 42, + routing_ctx := 1042 + }, { + asp_name := "asp-receiver1", + use_tcp := false, + remote_port := 2905, + local_port := 10001, + 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", + use_tcp := false, + remote_port := 2906, + local_port := 10002, + point_code := 55, + routing_ctx := 1055 + }, + /* as-client60-norctx */ + { + asp_name := "asp-client60-norctx0", + use_tcp := false, + remote_port := 2907, + local_port := 11060, + point_code := 60, + routing_ctx := - + }, + /* as-client61-norctx */ + { + asp_name := "asp-client61-norctx0", + use_tcp := false, + remote_port := 2907, + 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; +/* number of M3UA servers in ATS */ +STP_Tests_M3UA.mp_m3ua_num_servers := 4; + +[MAIN_CONTROLLER] + +[EXECUTE] +STP_Tests_M3UA.control diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index eddd0b1..a78dec5 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -45,82 +45,11 @@ /* local IP addresses */ HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" }; /* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */ - M3uaConfigs 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-receiver: Two ASP within AS */ - { - asp_name := "asp-receiver0", - use_tcp := false, - remote_port := 2905, - local_port := 10000, - point_code := 42, - routing_ctx := 1042 - }, { - asp_name := "asp-receiver1", - use_tcp := false, - remote_port := 2905, - local_port := 10001, - 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", - use_tcp := false, - remote_port := 2906, - local_port := 10002, - point_code := 55, - routing_ctx := 1055 - }, - /* as-client60-norctx */ - { - asp_name := "asp-client60-norctx0", - use_tcp := false, - remote_port := 2907, - local_port := 11060, - point_code := 60, - routing_ctx := - - }, - /* as-client61-norctx */ - { - asp_name := "asp-client61-norctx0", - use_tcp := false, - remote_port := 2907, - 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 - } - }; + M3uaConfigs mp_m3ua_configs := {}; /* number of M3UA clients in ATS */ - integer mp_m3ua_num_clients := 4; + integer mp_m3ua_num_clients := 0; /* number of M3UA servers in ATS */ - integer mp_m3ua_num_servers := 4; + integer mp_m3ua_num_servers := 0; integer mp_recovery_timeout_msec := 2000; charstring mp_sccp_service_type := "mtp3_itu"; } diff --git a/stp/osmo-stp-ipa-m3ua.confmerge b/stp/osmo-stp-ipa-m3ua.confmerge new file mode 100644 index 0000000..ce3123b --- /dev/null +++ b/stp/osmo-stp-ipa-m3ua.confmerge @@ -0,0 +1,36 @@ +cs7 instance 0 + ! + !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 + as as-sender m3ua + asp asp-sender + routing-key 1023 23 + ! + ! IPA DYNAMIC AS: + ! + as ipa-as-dynamic-asp ipa + routing-key 0 5 + point-code override dpc 23 + ! + ! ROUTING TABLE: + ! + route-table system + update route 23 16777215 linkset as-sender + route-table system + update route 5 16777215 linkset ipa-as-dynamic-asp + ! + !SERVERS: + ! + listen m3ua 2905 + local-ip 127.0.0.1 + local-ip ::1 + accept-asp-connections dynamic-permitted + listen ipa 5000 + accept-asp-connections dynamic-permitted diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge new file mode 100644 index 0000000..712e2a9 --- /dev/null +++ b/stp/osmo-stp-ipa.confmerge @@ -0,0 +1,72 @@ +cs7 instance 0 + ! + ! IPA AS/ASP: + ! + asp ipa-asp-loadshare-sender0 20000 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + asp ipa-asp-loadshare-sender1 20001 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + as ipa-as-loadshare-sender ipa + routing-key 0 6 + point-code override dpc 31 + asp ipa-asp-loadshare-sender0 + asp ipa-asp-loadshare-sender1 + asp ipa-asp-loadshare-receiver0 20002 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + asp ipa-asp-loadshare-receiver1 20003 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as ipa-as-loadshare-receiver ipa + traffic-mode loadshare + routing-key 0 7 + point-code override dpc 32 + asp ipa-asp-loadshare-receiver0 + asp ipa-asp-loadshare-receiver1 + ! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3. + ! OVERRIDE: + asp ipa-asp-override-sender 20005 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + as ipa-as-override-sender ipa + routing-key 0 6 + point-code override dpc 33 + asp ipa-asp-override-sender + asp ipa-asp-override-receiver0 20006 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + asp ipa-asp-override-receiver1 20007 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as ipa-as-override-receiver ipa + traffic-mode override + routing-key 0 8 + point-code override dpc 34 + asp ipa-asp-override-receiver0 + asp ipa-asp-override-receiver1 + ! DYNAMIC AS: + as ipa-as-dynamic-asp ipa + routing-key 0 5 + point-code override dpc 23 + ! + ! ROUTING TABLE: + ! + route-table system + update route 31 16777215 linkset ipa-as-loadshare-receiver + update route 33 16777215 linkset ipa-as-override-receiver + update route 5 16777215 linkset ipa-as-dynamic-asp + ! + !SERVERS: + ! + listen ipa 5000 + accept-asp-connections dynamic-permitted diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge new file mode 100644 index 0000000..2140553 --- /dev/null +++ b/stp/osmo-stp-m3ua.confmerge @@ -0,0 +1,108 @@ +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-receiver0 10000 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-receiver1 10001 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 + asp asp-client60-norctx0 11060 2907 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + asp asp-client61-norctx0 11061 2907 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-receiver m3ua + asp asp-receiver0 + asp asp-receiver1 + routing-key 1042 42 + as as-client m3ua + routing-key 1055 55 + asp asp-client0 + as as-client60-norctx m3ua + routing-key 0 60 + asp asp-client60-norctx0 + as as-client61-norctx m3ua + routing-key 0 61 + asp asp-client61-norctx0 + ! + ! 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 + update route 60 16777215 linkset as-client60-norctx + update route 61 16777215 linkset as-client61-norctx + ! + !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.cfg b/stp/osmo-stp.cfg index 355bf20..241382d 100644 --- a/stp/osmo-stp.cfg +++ b/stp/osmo-stp.cfg @@ -24,171 +24,3 @@ ! cs7 instance 0 point-code format 24 - 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 - route-table system - update route 123 16777215 linkset as-sender-tcp - update route 155 16777215 linkset as-client-tcp - listen m3ua 2905 tcp - local-ip 127.0.0.1 - local-ip ::1 - accept-asp-connections dynamic-permitted -! -!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-receiver0 10000 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-receiver1 10001 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 - asp asp-client60-norctx0 11060 2907 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - asp asp-client61-norctx0 11061 2907 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-receiver m3ua - asp asp-receiver0 - asp asp-receiver1 - routing-key 1042 42 - as as-client m3ua - routing-key 1055 55 - asp asp-client0 - as as-client60-norctx m3ua - routing-key 0 60 - asp asp-client60-norctx0 - as as-client61-norctx m3ua - routing-key 0 61 - asp asp-client61-norctx0 -! -! IPA AS/ASP: -! - asp ipa-asp-loadshare-sender0 20000 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - asp ipa-asp-loadshare-sender1 20001 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - as ipa-as-loadshare-sender ipa - routing-key 0 6 - point-code override dpc 31 - asp ipa-asp-loadshare-sender0 - asp ipa-asp-loadshare-sender1 - asp ipa-asp-loadshare-receiver0 20002 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - asp ipa-asp-loadshare-receiver1 20003 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - as ipa-as-loadshare-receiver ipa - traffic-mode loadshare - routing-key 0 7 - point-code override dpc 32 - asp ipa-asp-loadshare-receiver0 - asp ipa-asp-loadshare-receiver1 -! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3. -! OVERRIDE: - asp ipa-asp-override-sender 20005 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - as ipa-as-override-sender ipa - routing-key 0 6 - point-code override dpc 33 - asp ipa-asp-override-sender - asp ipa-asp-override-receiver0 20006 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - asp ipa-asp-override-receiver1 20007 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - as ipa-as-override-receiver ipa - traffic-mode override - routing-key 0 8 - point-code override dpc 34 - asp ipa-asp-override-receiver0 - asp ipa-asp-override-receiver1 -! DYNAMIC AS: - as ipa-as-dynamic-asp ipa - routing-key 0 5 - point-code override dpc 23 -! -! ROUTING TABLE: -! - route-table system - update route 23 16777215 linkset as-sender - update route 42 16777215 linkset as-receiver - update route 55 16777215 linkset as-client - update route 60 16777215 linkset as-client60-norctx - update route 61 16777215 linkset as-client61-norctx - update route 31 16777215 linkset ipa-as-loadshare-receiver - update route 33 16777215 linkset ipa-as-override-receiver - update route 5 16777215 linkset ipa-as-dynamic-asp -! -!SERVERS: -! - listen m3ua 2905 - local-ip 127.0.0.1 - local-ip ::1 - accept-asp-connections dynamic-permitted - listen ipa 5000 - accept-asp-connections dynamic-permitted diff --git a/stp/testenv.cfg b/stp/testenv.cfg deleted file mode 100644 index a0f14e1..0000000 --- a/stp/testenv.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[testsuite] -program=STP_Tests -config=STP_Tests.cfg - -[stp] -program=osmo-stp -make=libosmo-sigtran -package=osmo-stp -copy=osmo-stp.cfg -vty_port=4239 diff --git a/stp/testenv_ipa-m3ua.cfg b/stp/testenv_ipa-m3ua.cfg new file mode 100644 index 0000000..144e6a9 --- /dev/null +++ b/stp/testenv_ipa-m3ua.cfg @@ -0,0 +1,11 @@ +[testsuite] +program=STP_Tests +config=STP_Tests_IPA_M3UA.cfg + +[stp] +prepare=osmo-config-merge osmo-stp.cfg osmo-stp-ipa-m3ua.confmerge > osmo-stp-ipa-m3ua.cfg +program=osmo-stp -c osmo-stp-ipa-m3ua.cfg +make=libosmo-sigtran +package=osmo-stp libosmocore-utils +copy=osmo-stp.cfg osmo-stp-ipa-m3ua.confmerge +vty_port=4239 diff --git a/stp/testenv_ipa.cfg b/stp/testenv_ipa.cfg new file mode 100644 index 0000000..91320e1 --- /dev/null +++ b/stp/testenv_ipa.cfg @@ -0,0 +1,11 @@ +[testsuite] +program=STP_Tests +config=STP_Tests_IPA.cfg + +[stp] +prepare=osmo-config-merge osmo-stp.cfg osmo-stp-ipa.confmerge > osmo-stp-ipa.cfg +program=osmo-stp -c osmo-stp-ipa.cfg +make=libosmo-sigtran +package=osmo-stp libosmocore-utils +copy=osmo-stp.cfg osmo-stp-ipa.confmerge +vty_port=4239 diff --git a/stp/testenv_m3ua.cfg b/stp/testenv_m3ua.cfg new file mode 100644 index 0000000..d645d4d --- /dev/null +++ b/stp/testenv_m3ua.cfg @@ -0,0 +1,11 @@ +[testsuite] +program=STP_Tests +config=STP_Tests_M3UA.cfg + +[stp] +prepare=osmo-config-merge osmo-stp.cfg osmo-stp-m3ua.confmerge > osmo-stp-m3ua.cfg +program=osmo-stp -c osmo-stp-m3ua.cfg +make=libosmo-sigtran +package=osmo-stp libosmocore-utils +copy=osmo-stp.cfg osmo-stp-m3ua.confmerge +vty_port=4239 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40323?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4ec8e1bbc8e71d8bd421dfbd5356bf1937ce2bb4 Gerrit-Change-Number: 40323 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025