laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37629?usp=email )
Change subject: stp: remove <= 1.8.x code paths ......................................................................
stp: remove <= 1.8.x code paths
Change-Id: I31a1516215237984c029c02dfa30aa223c3d06a3 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 9 insertions(+), 25 deletions(-)
Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 9c45a32..2cac7cc 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -272,13 +272,6 @@ 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); @@ -317,12 +310,6 @@ var OptionList opt_list := {}; var M3uaConfig m3cfg := mp_m3ua_configs[i];
- /* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */ - if (not Misc_Helpers.f_osmo_repo_is("nightly") and m3cfg.use_tcp) { - log("Not listen()ing m3cfg := ", m3cfg, " (not supported by IUT)"); - return; - } - if (lengthof(mp_local_m3ua_ip) == 0 ) { setverdict(fail, "Empty local address trying to bind SCTP socket: ", mp_local_m3ua_ip); @@ -362,12 +349,6 @@ }
for (i := 0; i < NR_M3UA; i:=i+1) { - /* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */ - if (not Misc_Helpers.f_osmo_repo_is("nightly") and mp_m3ua_configs[i].use_tcp) { - log("Not connect()ing m3cfg := ", mp_m3ua_configs[i], " (not supported by IUT)"); - g_m3ua_conn_id[i] := -1; - continue; - } map(self:M3UA[i], system:M3UA_CODEC_PT); if (mp_m3ua_configs[i].use_tcp) { f_M3UA_connect_tcp(i); @@ -395,12 +376,6 @@ var PortEvent port_evt;
for (i := NR_M3UA; i < NR_M3UA+NR_M3UA_SRV; i:=i+1) { - /* XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 */ - if (not Misc_Helpers.f_osmo_repo_is("nightly") and mp_m3ua_configs[i].use_tcp) { - log("Not listen()ing m3cfg := ", mp_m3ua_configs[i], " (not supported by IUT)"); - g_m3ua_conn_id[i] := -1; - continue; - } map(self:M3UA[i], system:M3UA_CODEC_PT); /* bind+ listen */ f_M3UA_listen(i);
-
laforge