- gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: ttcn3-stp-test: enable M3UA-over-TCP testing for master
by fixeria 03 Mar '24

03 Mar '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36151?usp=email ) Change subject: ttcn3-stp-test: enable M3UA-over-TCP testing for master ...................................................................... ttcn3-stp-test: enable M3UA-over-TCP testing for master Change-Id: I210b7d62845075dcfe147f2f77603625cc1e64f9 Depends: osmo-ttcn3-hacks.git I5d0b05aa434c057ad379125ac293f5fc9a240b6f Related: osmo-ttcn3-hacks.git I1e2a887aa22f317783b3207494fd707d7b426439 Related: SYS#5424 --- M ttcn3-stp-test/jenkins.sh A ttcn3-stp-test/osmo-stp-tcp.confmerge 2 files changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/51/36151/1 diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 006bb3b..14cca36 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -16,6 +16,13 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ +# XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 +if image_suffix_is_master; then + osmo-config-merge "$VOL_BASE_DIR/stp/osmo-stp.cfg" \ + osmo-stp-tcp.confmerge \ + > "$VOL_BASE_DIR/stp/osmo-stp.cfg" +fi + network_create network_replace_subnet_in_configs diff --git a/ttcn3-stp-test/osmo-stp-tcp.confmerge b/ttcn3-stp-test/osmo-stp-tcp.confmerge new file mode 100644 index 0000000..8772c35 --- /dev/null +++ b/ttcn3-stp-test/osmo-stp-tcp.confmerge @@ -0,0 +1,28 @@ +cs7 instance 0 + asp asp-sender-tcp 9999 2905 m3ua tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 + role sg + transport-role server + asp asp-client0-tcp 10002 2906 m3ua tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 + 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 172.18.19.200 + local-ip fd02:db8:19::200 + accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36151?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I210b7d62845075dcfe147f2f77603625cc1e64f9 Gerrit-Change-Number: 36151 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: check-in expected-results.xml from Jenkins
by fixeria 03 Mar '24

03 Mar '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36147?usp=email ) Change subject: stp: check-in expected-results.xml from Jenkins ...................................................................... stp: check-in expected-results.xml from Jenkins Change-Id: Id4081af9e9d5b0a95dc2fe7d137778747dc27bd0 --- A stp/expected-results.xml 1 file changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/36147/1 diff --git a/stp/expected-results.xml b/stp/expected-results.xml new file mode 100644 index 0000000..0f6073b --- /dev/null +++ b/stp/expected-results.xml @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<testsuite name='STP_Tests' tests='46' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> + <testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_asp_act' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_asp_act_override' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_asp_act_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_asp_act_broadcast' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_tmt_override' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_tmt_loadshare' time='MASKED'/> + <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_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'/> + <testcase classname='STP_Tests_M3UA' name='TC_rkm_unreg_never_registered' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_rkm_unreg_invalid' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_rkm_unreg_registered' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_rkm_unreg_active' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_connect_asp_up' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_act' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_sg_to_asp' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_to_sg' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_sg_to_asp_norctx' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_to_sg_norctx' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_quirk_no_notify_asp_act' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_no_daud_in_asp' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_quirk_daud_in_asp' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_no_snm_inactive' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_quirk_snm_inactive' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_ssnm_aspac_dava_aspia_duna' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dava_duna' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dava_duna_multipc' time='MASKED'/> + <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_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'/> + <testcase classname='STP_Tests_IPA' name='TC_tmt_override' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_override' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' time='MASKED'/> + <testcase classname='STP_Tests' name='TC_m3ua_to_ipa' time='MASKED'/> + <testcase classname='STP_Tests' name='TC_ipa_to_m3ua' time='MASKED'/> + <testcase classname='STP_Tests' name='TC_ipa_to_m3ua_ni' time='MASKED'/> + <testcase classname='STP_Tests' name='TC_ipa_to_m3ua_patch_sccp' time='MASKED'/> +</testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36147?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id4081af9e9d5b0a95dc2fe7d137778747dc27bd0 Gerrit-Change-Number: 36147 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: prepare for testing M3UA-over-TCP
by fixeria 03 Mar '24

03 Mar '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36149?usp=email ) Change subject: stp: prepare for testing M3UA-over-TCP ...................................................................... stp: prepare for testing M3UA-over-TCP * rename various fields and templates to be transport neutral * extend mp_m3ua_configs[]: add one client and one server ASPs * f_M3UA_connect(): split onto f_M3UA_connect_{tcp,sctp}() * f[_no]_quirk(): properly handle ASPs using TCP transport * add osmo-stp-tcp.confmerge [*] We cannot add new M3UA-over-TCP ASPs to osmo-stp.cfg because that would break the job testing latest osmo-stp version. Instead, add a confmerge file to be applied by jenkins.sh (for nightly only). Change-Id: I5d0b05aa434c057ad379125ac293f5fc9a240b6f Related: docker-playground.git I210b7d62845075dcfe147f2f77603625cc1e64f9 Related: SYS#5424 --- M stp/STP_Tests_M3UA.ttcn A stp/osmo-stp-tcp.confmerge 2 files changed, 175 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/36149/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 8b3db48..3100ab6 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -2,6 +2,7 @@ /* Osmocom STP test suite in in TTCN-3 * (C) 2019 Harald Welte <laforge(a)gnumonks.org> + * (C) 2024 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 @@ -15,6 +16,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; @@ -34,8 +36,8 @@ import from STP_Tests_Common all; -private const integer NR_M3UA := 3; /* number of M3UA clients in ATS */ -private const integer NR_M3UA_SRV := 3; /* number of M3UA servres in ATS */ +private const integer NR_M3UA := 4; /* number of M3UA clients in ATS */ +private const integer NR_M3UA_SRV := 4; /* number of M3UA servres in ATS */ modulepar { /* STP-side IP addresses */ @@ -45,43 +47,65 @@ M3uaConfigs mp_m3ua_configs := { /* as-sender: One ASP within AS */ { - remote_sctp_port := 2905, - local_sctp_port := 9999, + use_tcp := false, + remote_port := 2905, + local_port := 9999, point_code := 23, routing_ctx := 1023 }, /* as-receiver: Two ASP within AS */ { - remote_sctp_port := 2905, - local_sctp_port := 10000, + use_tcp := false, + remote_port := 2905, + local_port := 10000, point_code := 42, routing_ctx := 1042 }, { - remote_sctp_port := 2905, - local_sctp_port := 10001, + use_tcp := false, + remote_port := 2905, + local_port := 10001, point_code := 42, routing_ctx := 1042 }, + /* as-sender-tcp: One ASP within AS */ + { + use_tcp := true, + remote_port := 2905, + local_port := 9999, + point_code := 123, + routing_ctx := 1123 + }, /* as-client: One ASP within AS */ { - remote_sctp_port := 2906, - local_sctp_port := 10002, + use_tcp := false, + remote_port := 2906, + local_port := 10002, point_code := 55, routing_ctx := 1055 }, /* as-client60-norctx */ { - remote_sctp_port := 2907, - local_sctp_port := 11060, + use_tcp := false, + remote_port := 2907, + local_port := 11060, point_code := 60, routing_ctx := - }, /* as-client61-norctx */ { - remote_sctp_port := 2907, - local_sctp_port := 11061, + use_tcp := false, + remote_port := 2907, + local_port := 11061, point_code := 61, routing_ctx := - + }, + /* as-client-tcp: One ASP within AS */ + { + use_tcp := true, + remote_port := 2906, + local_port := 10002, + point_code := 155, + routing_ctx := 1155 } }; integer mp_recovery_timeout_msec := 2000; @@ -89,10 +113,12 @@ } type record M3uaConfig { - /* STP-side SCTP port for M3UA */ - integer remote_sctp_port, + /* use TCP (true) or SCTP (false) */ + boolean use_tcp, + /* STP-side SCTP (or TCP) port for M3UA */ + integer remote_port, /* local M3UA base port on TTCN3 side */ - integer local_sctp_port, + integer local_port, /* point code routed via this M3U */ integer point_code, /* associated routing context */ @@ -135,7 +161,7 @@ sctpPeerAddrChange := ? } } -private template PortEvent tr_SctpConnOpened := { +private template PortEvent tr_ConnOpened := { connOpened := ? } @@ -153,9 +179,13 @@ } } -friend function f_M3UA_send(integer idx, template (present) PDU_M3UA msg, template integer stream := 0) +friend function f_M3UA_send(integer idx, template (present) PDU_M3UA msg, integer stream := 0) runs on RAW_M3UA_CT { - M3UA[idx].send(t_M3UA_Send(g_m3ua_conn_id[idx], msg, stream)); + if (mp_m3ua_configs[idx].use_tcp) { + M3UA[idx].send(t_M3UA_Send(g_m3ua_conn_id[idx], msg, omit)); + } else { + M3UA[idx].send(t_M3UA_Send(g_m3ua_conn_id[idx], msg, stream)); + } } friend function f_M3UA_exp(integer idx, template (present) PDU_M3UA msg) runs on RAW_M3UA_CT { @@ -208,7 +238,7 @@ assocId := omit }; -friend function f_M3UA_connect(integer i) runs on RAW_M3UA_CT { +friend function f_M3UA_connect_sctp(integer i) runs on RAW_M3UA_CT { var Result res; var Option opt_add_local_addrs; var OptionList opt_list := {}; @@ -229,15 +259,15 @@ if (lengthof(mp_stp_m3ua_ip) > 1) { for (var integer j := 1; j < lengthof(mp_stp_m3ua_ip); j := j + 1) { - var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j], m3cfg.remote_sctp_port)); + var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j], m3cfg.remote_port)); opt_add_remote_addrs[j - 1] := sk; } } else { opt_add_remote_addrs := omit; } - res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], m3cfg.remote_sctp_port, - mp_local_m3ua_ip[0], m3cfg.local_sctp_port, 0, + res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], m3cfg.remote_port, + mp_local_m3ua_ip[0], m3cfg.local_port, 0, {sctp:=valueof(ts_SCTP(3, 0, opt_add_remote_addrs))}, opt_list); if (not ispresent(res.connId)) { @@ -247,10 +277,47 @@ g_m3ua_conn_id[i] := res.connId; } +friend function f_M3UA_connect_tcp(integer i) runs on RAW_M3UA_CT { + var M3uaConfig m3cfg := mp_m3ua_configs[i]; + var Result res; + + /* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */ + if (not Misc_Helpers.f_osmo_repo_is("nightly")) { + log("Not connect()ing m3cfg := ", m3cfg, " (not supported by IUT)"); + g_m3ua_conn_id[i] := -1; + return; + } + + if (lengthof(mp_local_m3ua_ip) == 0 or lengthof(mp_stp_m3ua_ip) == 0) { + setverdict(fail, "Empty local or remote address trying to connect TCP socket: ", + mp_local_m3ua_ip, " / ", mp_stp_m3ua_ip); + mtc.stop; + } + + res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], m3cfg.remote_port, + mp_local_m3ua_ip[0], m3cfg.local_port, 0, + {tcp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect M3UA socket, check your configuration"); + mtc.stop; + } + g_m3ua_conn_id[i] := res.connId; + M3UA_CodecPort.f_set_tcp_segmentation(M3UA[i], res.connId); +} + friend function f_M3UA_close(integer i) runs on RAW_M3UA_CT { var Result res; - res := M3UA_CodecPort_CtrlFunct.f_IPL4_close(M3UA[i], g_m3ua_conn_id[i], {sctp:=valueof(ts_SCTP)}); - g_m3ua_conn_id[i] := 0; + if (g_m3ua_conn_id[i] < 0) { + log("Not close()ing m3cfg := ", mp_m3ua_configs[i], " (not connected)"); + /* not connected */ + return; + } + if (mp_m3ua_configs[i].use_tcp) { + res := M3UA_CodecPort_CtrlFunct.f_IPL4_close(M3UA[i], g_m3ua_conn_id[i], {tcp:={}}); + } else { + res := M3UA_CodecPort_CtrlFunct.f_IPL4_close(M3UA[i], g_m3ua_conn_id[i], {sctp:=valueof(ts_SCTP)}); + } + g_m3ua_conn_id[i] := -1; } friend function f_M3UA_listen(integer i) runs on RAW_M3UA_CT { @@ -271,12 +338,20 @@ opt_list := {opt_add_local_addrs}; } - res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], m3cfg.local_sctp_port, - {sctp:=valueof(ts_SCTP)}, opt_list); + if (mp_m3ua_configs[i].use_tcp) { + res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], m3cfg.local_port, + {tcp:={}}); + } else { + res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], m3cfg.local_port, + {sctp:=valueof(ts_SCTP)}, opt_list); + } if (not ispresent(res.connId)) { setverdict(fail, "Could not bind M3UA socket, check your configuration"); mtc.stop; } + if (mp_m3ua_configs[i].use_tcp) { + M3UA_CodecPort.f_set_tcp_segmentation(M3UA[i], res.connId); + } } friend function f_init_m3ua(boolean ignore_ssnm := true) runs on RAW_M3UA_CT { @@ -291,7 +366,11 @@ for (i := 0; i < NR_M3UA; i:=i+1) { map(self:M3UA[i], system:M3UA_CODEC_PT); - f_M3UA_connect(i); + if (mp_m3ua_configs[i].use_tcp) { + f_M3UA_connect_tcp(i); + } else { + f_M3UA_connect_sctp(i); + } } } @@ -310,15 +389,15 @@ friend function f_init_m3ua_srv() runs on RAW_M3UA_CT { var integer i; - var PortEvent sctp_evt; + var PortEvent port_evt; for (i := NR_M3UA; i < NR_M3UA+NR_M3UA_SRV; i:=i+1) { map(self:M3UA[i], system:M3UA_CODEC_PT); /* bind+ listen */ f_M3UA_listen(i); /* wait for accept() */ - M3UA[i].receive(tr_SctpConnOpened) -> value sctp_evt { - g_m3ua_conn_id[i] := sctp_evt.connOpened.connId; + M3UA[i].receive(tr_ConnOpened) -> value port_evt { + g_m3ua_conn_id[i] := port_evt.connOpened.connId; } } } @@ -526,7 +605,7 @@ /* verify traffic is routed from sender to new receiver */ const integer iter_per_asp := 5; - var integer num_rx[NR_M3UA] := { 0, 0, 0 }; + var integer num_rx[NR_M3UA] := { 0, 0, 0, 0 }; for (i := 0; i < 2*iter_per_asp; i := i+1) { var octetstring data := f_rnd_octstring_rnd_len(100); var template (value) M3UA_Protocol_Data tx_pd; @@ -1002,12 +1081,30 @@ f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0)); } +private function f_asp_cfg_str(charstring asp_name, in M3uaConfig cfg) +return charstring { + var charstring str; + + str := "asp " & asp_name; + str := str & " " & int2str(cfg.local_port); + str := str & " " & int2str(cfg.remote_port); + str := str & " m3ua"; + + if (cfg.use_tcp) { + str := str & " tcp"; + } + + return str; +} + private function f_quirk(charstring quirk) runs on RAW_M3UA_CT { - f_vty_config2(VTY, {"cs7 instance 0", "asp asp-client0 10002 2906 m3ua"}, "quirk " & quirk); + var charstring asp_cfg_str := f_asp_cfg_str("asp-client0", f_m3ua_srv_config(0)); + f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, "quirk " & quirk); } private function f_no_quirk(charstring quirk) runs on RAW_M3UA_CT { - f_vty_config2(VTY, {"cs7 instance 0", "asp asp-client0 10002 2906 m3ua"}, "no quirk " & quirk); + var charstring asp_cfg_str := f_asp_cfg_str("asp-client0", f_m3ua_srv_config(0)); + f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, "no quirk " & quirk); } /* quirk 'no_notify': Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ diff --git a/stp/osmo-stp-tcp.confmerge b/stp/osmo-stp-tcp.confmerge new file mode 100644 index 0000000..b40867a --- /dev/null +++ b/stp/osmo-stp-tcp.confmerge @@ -0,0 +1,22 @@ +cs7 instance 0 + asp asp-sender-tcp 9999 2905 m3ua tcp + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + transport-role server + asp asp-client0-tcp 10002 2906 m3ua tcp + local-ip 127.0.0.1 + remote-ip 127.0.0.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 + accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36149?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5d0b05aa434c057ad379125ac293f5fc9a240b6f Gerrit-Change-Number: 36149 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: add testcases for M3UA-over-TCP
by fixeria 03 Mar '24

03 Mar '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36150?usp=email ) Change subject: stp: add testcases for M3UA-over-TCP ...................................................................... stp: add testcases for M3UA-over-TCP Change-Id: I1e2a887aa22f317783b3207494fd707d7b426439 Related: docker-playground.git I210b7d62845075dcfe147f2f77603625cc1e64f9 Related: SYS#5424 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/36150/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 3100ab6..4c2d526 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -1203,6 +1203,64 @@ f_clear_m3ua(); } +private function f_TC_m3ua_tcp(integer idx_a, integer idx_b) runs on RAW_M3UA_CT { + var M3uaConfig cfg_a := mp_m3ua_configs[idx_a]; + var M3uaConfig cfg_b := mp_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 < NR_M3UA) { + 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 < NR_M3UA) { + f_M3UA_asp_up_act(idx_b, rctx := rctx_b); + } else { + f_M3UA_CLNT_asp_up_act(idx_b, rctx := rctx_b); + } + + /* 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_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 */ @@ -1218,6 +1276,11 @@ execute( TC_tmt_broadcast() ); execute( TC_act_rctx_data_no_rctx() ); + 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() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36150?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1e2a887aa22f317783b3207494fd707d7b426439 Gerrit-Change-Number: 36150 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: add and use f_m3ua_{cli,srv}_config() helpers
by fixeria 03 Mar '24

03 Mar '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36148?usp=email ) Change subject: stp: add and use f_m3ua_{cli,srv}_config() helpers ...................................................................... stp: add and use f_m3ua_{cli,srv}_config() helpers Using this API reduces the risk of using the wrong half of the mp_m3ua_configs[] array and improves the code readability a bit. Change-Id: I9788f52c20574f4f9d015d2de11b5e42bb03d15f Related: SYS#5424 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 96 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/36148/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 5af894a..8b3db48 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -104,6 +104,22 @@ return NR_M3UA+idx; } +private function f_m3ua_cli_config(integer idx) return M3uaConfig { + if (idx < 0 or idx >= NR_M3UA) { + setverdict(fail, "f_m3ua_cli_config(): unexpected idx"); + mtc.stop; + } + return mp_m3ua_configs[idx]; +} + +private function f_m3ua_srv_config(integer idx) return M3uaConfig { + if (idx < 0 or idx >= NR_M3UA_SRV) { + setverdict(fail, "f_m3ua_srv_config(): unexpected idx"); + mtc.stop; + } + return mp_m3ua_configs[M3UA_SRV(idx)]; +} + type component RAW_M3UA_CT extends Test_CT { port M3UA_CODEC_PT M3UA[NR_M3UA+NR_M3UA_SRV]; var integer g_m3ua_conn_id[NR_M3UA+NR_M3UA_SRV]; @@ -415,10 +431,10 @@ /* test whether the STP accepts M3UA DATA without Routing Context IE */ testcase TC_act_rctx_data_no_rctx() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].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 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(); /* bring up the sender specifying a routing context */ @@ -447,10 +463,10 @@ /* test "traffic-mode override" behavior */ testcase TC_tmt_override() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].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 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(); @@ -484,10 +500,10 @@ /* test "traffic-mode load-share" behavior */ testcase TC_tmt_loadshare() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].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 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 integer i; f_init_m3ua(); @@ -537,10 +553,10 @@ /* test "traffic-mode broadcast" behavior */ testcase TC_tmt_broadcast() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].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 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 integer i; f_init_m3ua(); @@ -599,8 +615,8 @@ /* Send RKM registration; expect OK as RCTX does match config */ testcase TC_rkm_reg_static_permitted() runs on RAW_M3UA_CT { - var OCT3 dpc := int2oct(mp_m3ua_configs[0].point_code, 3); // must match config - var OCT4 rctx := int2oct(mp_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(); @@ -629,7 +645,8 @@ /* 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(); - f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(mp_m3ua_configs[0].routing_ctx,4)))); + var octetstring rctx := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + 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(); } @@ -747,7 +764,8 @@ f_init_m3ua(); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); f_clear_m3ua(); } @@ -759,7 +777,8 @@ f_init_m3ua(); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), tmt := c_M3UA_TMT_loadshare, rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + 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_clear_m3ua(); } @@ -767,16 +786,16 @@ /* 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 { - var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); - var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(mp_m3ua_configs[M3UA_SRV(0)].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 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(); f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx_receiver); f_sleep(1.0); @@ -789,16 +808,16 @@ /* 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 { - var OCT4 rctx_sender := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); - var OCT4 pc_sender := int2oct(mp_m3ua_configs[M3UA_SRV(0)].point_code, 4); - var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(mp_m3ua_configs[0].point_code, 4); + 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(); f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx_sender); f_sleep(1.0); @@ -810,10 +829,10 @@ /* 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 { - var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); - var OCT4 pc_receiver := int2oct(mp_m3ua_configs[M3UA_SRV(1)].point_code, 4); - var OCT4 pc_receiver2 := int2oct(mp_m3ua_configs[M3UA_SRV(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(); @@ -837,10 +856,10 @@ /* 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 { - var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 pc_receiver := int2oct(mp_m3ua_configs[0].point_code, 4); - var OCT4 pc_sender := int2oct(mp_m3ua_configs[M3UA_SRV(1)].point_code, 4); - var OCT4 pc_sender2 := int2oct(mp_m3ua_configs[M3UA_SRV(2)].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); + 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); /* activate the sender side (ATS is client to STP in SG role) */ f_init_m3ua(); @@ -863,7 +882,8 @@ /* 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 { - var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var integer pc0 := f_m3ua_cli_config(1).point_code; f_init_m3ua(ignore_ssnm := false); /* activate the first ASP */ @@ -872,13 +892,13 @@ /* 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 */ - f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(mp_m3ua_configs[1].point_code, 0)}, rctx0)); + f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(pc0, 0)}, rctx0)); /* TODO: expect no DAVA on second ASP */ /* deactivate the second ASP */ f_M3UA_asp_inact(1); /* expect DUNA for PC of second ASP on first ASP */ - f_M3UA_exp(0, tr_M3UA_DUNA({ts_M3UA_PC(mp_m3ua_configs[1].point_code, 0)}, rctx0)); + f_M3UA_exp(0, tr_M3UA_DUNA({ts_M3UA_PC(pc0, 0)}, rctx0)); /* TODO: expect no DUNA on second ASP */ f_clear_m3ua(); @@ -886,8 +906,8 @@ /* 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 OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); @@ -898,7 +918,7 @@ /* activate SG-role ASP (ASP on STP) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0); /* transmit a DAVA to the remote ASP */ f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA({adv_pc}, rctxS0)); @@ -913,8 +933,8 @@ /* 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 OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).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) }; @@ -925,7 +945,7 @@ /* activate SG-role ASP (ASP on STP) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0); /* transmit a DAVA to the remote ASP */ f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA(adv_pcs, rctxS0)); @@ -940,8 +960,8 @@ /* 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 OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); @@ -952,7 +972,7 @@ /* activate SG-role ASP (ASP on STP) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), 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)); @@ -962,8 +982,8 @@ /* 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 OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); - var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); + var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); /* some random point code whose availability we advertise */ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); @@ -974,7 +994,7 @@ /* activate SG-role ASP (ASP on STP) */ f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0); /* transmit a SCON to the remote ASP */ f_M3UA_send(M3UA_SRV(0), ts_M3UA_SCON({adv_pc}, rctxS0)); @@ -996,7 +1016,7 @@ f_quirk("no_notify"); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4), + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4), ntfy_after_up := omit, ntfy_after_act := omit); f_no_quirk("no_notify"); f_clear_m3ua(); @@ -1008,11 +1028,12 @@ f_no_quirk("daud_in_asp"); f_init_m3ua_srv(); - var OCT4 rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + 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(M3UA_SRV(0), rctx := rctx); - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(mp_m3ua_configs[M3UA_SRV(0)].point_code) }; + 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)); setverdict(pass); @@ -1026,11 +1047,12 @@ f_quirk("daud_in_asp"); f_init_m3ua_srv(); - var OCT4 rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + 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(M3UA_SRV(0), rctx := rctx); - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(mp_m3ua_configs[M3UA_SRV(0)].point_code) }; + 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)); setverdict(pass); @@ -1051,7 +1073,7 @@ f_M3UA_CLNT_asp_up(M3UA_SRV(0)); f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ASPAC(*, *)); - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(mp_m3ua_configs[M3UA_SRV(0)].point_code) }; + 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)); setverdict(pass); @@ -1073,7 +1095,7 @@ f_M3UA_CLNT_asp_up(M3UA_SRV(0)); f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ASPAC(*, *)); - var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(mp_m3ua_configs[M3UA_SRV(0)].point_code) }; + 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_DAVA(aff_pcs)); setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36148?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9788f52c20574f4f9d015d2de11b5e42bb03d15f Gerrit-Change-Number: 36148 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: CBSP: Port over to use osmo_io via libosmo-netif
by fixeria 02 Mar '24

02 Mar '24

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36146?usp=email ) Change subject: CBSP: Port over to use osmo_io via libosmo-netif ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icce412e6ee69366c7b131c9bc1d51e8d44204917 Gerrit-Change-Number: 36146 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 02 Mar 2024 20:33:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: cbsp: Add osmo_cbsp_segmentation_cb for message segmentation
by fixeria 02 Mar '24

02 Mar '24

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36145?usp=email ) Change subject: cbsp: Add osmo_cbsp_segmentation_cb for message segmentation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36145?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5e922c54b3431d759b38e81e55076125c5a34008 Gerrit-Change-Number: 36145 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 02 Mar 2024 20:32:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: ctrl: Don't expose write_queue in ctrl_cmd_send() api
by fixeria 02 Mar '24

02 Mar '24

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36143?usp=email ) Change subject: ctrl: Don't expose write_queue in ctrl_cmd_send() api ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic81af56e7ea6921ba39168727ef64c308e9c6754 Gerrit-Change-Number: 36143 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 02 Mar 2024 20:30:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: CBSP: Port over to use osmo_io via libosmo-netif
by laforge 02 Mar '24

02 Mar '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36146?usp=email ) Change subject: CBSP: Port over to use osmo_io via libosmo-netif ...................................................................... CBSP: Port over to use osmo_io via libosmo-netif Change-Id: Icce412e6ee69366c7b131c9bc1d51e8d44204917 Depends: libosmocore.git Change-Id I5e922c54b3431d759b38e81e55076125c5a34008 Related: OS#5755 --- M TODO-RELEASE M src/osmo-bsc/cbsp_link.c 2 files changed, 21 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/36146/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 7a7ec22..91e8dae 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmocore > 1.9.0 working (compiling) OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL +libosmocore > 1.9.0 we use the new osmo_cbsp_segmentation_cb diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c index 849b802..98f25d3 100644 --- a/src/osmo-bsc/cbsp_link.c +++ b/src/osmo-bsc/cbsp_link.c @@ -54,7 +54,6 @@ static int cbsp_srv_closed_cb(struct osmo_stream_srv *conn) { struct bsc_cbc_link *cbc = osmo_stream_srv_get_data(conn); - //struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); LOGP(DCBS, LOGL_NOTICE, "CBSP Server lost connection from %s\n", cbc->server.sock_name); talloc_free(cbc->server.sock_name); @@ -63,29 +62,11 @@ return 0; } -static int cbsp_srv_cb(struct osmo_stream_srv *conn) +static int cbsp_srv_read_cb(struct osmo_stream_srv *conn, struct msgb *msg) { struct bsc_cbc_link *cbc = osmo_stream_srv_get_data(conn); - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); struct osmo_cbsp_decoded *decoded; - struct msgb *msg; - int rc; - /* READ */ - rc = osmo_cbsp_recv_buffered(cbc, ofd->fd, &msg, &cbc->server.msg); - if (rc <= 0) { - if (rc == -EAGAIN || rc == -EINTR) { - /* more data needs to be read */ - return 0; - } else if (rc == -EPIPE || rc == -ECONNRESET) { - /* lost connection */ - } else if (rc == 0) { - /* connection closed */ - } - osmo_stream_srv_destroy(conn); - cbc->server.srv = NULL; - return -EBADF; - } OSMO_ASSERT(msg); decoded = osmo_cbsp_decode(conn, msg); if (decoded) { @@ -117,12 +98,15 @@ return -1; } - srv = osmo_stream_srv_create(cbc, link, fd, cbsp_srv_cb, cbsp_srv_closed_cb, cbc); + srv = osmo_stream_srv_create2(cbc, link, fd, cbc); if (!srv) { LOGP(DCBS, LOGL_ERROR, "Unable to create stream server for %s\n", osmo_sock_get_name2(fd)); return -1; } + osmo_stream_srv_set_read_cb(srv, cbsp_srv_read_cb); + osmo_stream_srv_set_closed_cb(srv, cbsp_srv_closed_cb); + osmo_stream_srv_set_segmentation_cb(srv, osmo_cbsp_segmentation_cb); cbc->server.srv = srv; if (cbc->server.sock_name) @@ -141,11 +125,10 @@ static int cbsp_client_connect_cb(struct osmo_stream_cli *cli) { struct bsc_cbc_link *cbc = osmo_stream_cli_get_data(cli); - struct osmo_fd *ofd = osmo_stream_cli_get_ofd(cli); if (cbc->client.sock_name) talloc_free(cbc->client.sock_name); - cbc->client.sock_name = osmo_sock_get_name(cbc, ofd->fd); + cbc->client.sock_name = osmo_sock_get_name(cbc, osmo_stream_cli_get_fd(cli)); LOGP(DCBS, LOGL_NOTICE, "CBSP Client connected to CBC: %s\n", cbc->client.sock_name); @@ -165,28 +148,11 @@ return 0; } -static int cbsp_client_read_cb(struct osmo_stream_cli *cli) +static int cbsp_client_read_cb(struct osmo_stream_cli *cli, struct msgb *msg) { struct bsc_cbc_link *cbc = osmo_stream_cli_get_data(cli); - struct osmo_fd *ofd = osmo_stream_cli_get_ofd(cli); struct osmo_cbsp_decoded *decoded; - struct msgb *msg = NULL; - int rc; - /* READ */ - rc = osmo_cbsp_recv_buffered(cbc, ofd->fd, &msg, &cbc->client.msg); - if (rc <= 0) { - if (rc == -EAGAIN || rc == -EINTR) { - /* more data needs to be read */ - return 0; - } else if (rc == -EPIPE || rc == -ECONNRESET) { - /* lost connection */ - } else if (rc == 0) { - /* connection closed */ - } - osmo_stream_cli_reconnect(cli); - return -EBADF; - } OSMO_ASSERT(msg); decoded = osmo_cbsp_decode(cli, msg); if (decoded) { @@ -244,7 +210,8 @@ osmo_stream_cli_set_data(cbc->client.cli, cbc); osmo_stream_cli_set_connect_cb(cbc->client.cli, cbsp_client_connect_cb); osmo_stream_cli_set_disconnect_cb(cbc->client.cli, cbsp_client_disconnect_cb); - osmo_stream_cli_set_read_cb(cbc->client.cli, cbsp_client_read_cb); + osmo_stream_cli_set_read_cb2(cbc->client.cli, cbsp_client_read_cb); + osmo_stream_cli_set_segmentation_cb(cbc->client.cli, osmo_cbsp_segmentation_cb); } /* CBC side */ osmo_stream_cli_set_addr(cbc->client.cli, cbc->client.remote_addr.ip); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icce412e6ee69366c7b131c9bc1d51e8d44204917 Gerrit-Change-Number: 36146 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: cbsp: Add osmo_cbsp_segmentation_cb for message segmentation
by laforge 02 Mar '24

02 Mar '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/36145?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: cbsp: Add osmo_cbsp_segmentation_cb for message segmentation ...................................................................... cbsp: Add osmo_cbsp_segmentation_cb for message segmentation This call-back can for example be used as segmentation call-back for libosmo-netif stream_cli/stream_srv or directly for osmo_io. Related: OS#5755 Change-Id: I5e922c54b3431d759b38e81e55076125c5a34008 --- M include/osmocom/gsm/cbsp.h M src/gsm/cbsp.c M src/gsm/libosmogsm.map 3 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/36145/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36145?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5e922c54b3431d759b38e81e55076125c5a34008 Gerrit-Change-Number: 36145 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

2026

2025

2024

2023

2022

gerrit-log