osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40683?usp=email )
Change subject: smlc: fix running against latest ......................................................................
smlc: fix running against latest
osmo-smlc from latest doesn't support statsd yet. Use a separate config that doesn't have the statsd block and don't try to initialize it for latest.
Change-Id: If7b1d46777703f0511ee15520571d0313bdfa5ed Fixes: 5268d5 ("smlc: Add suport to obtain statsd output") --- M smlc/SMLC_Tests.ttcn A smlc/osmo-smlc.latest.cfg M smlc/testenv.cfg 3 files changed, 39 insertions(+), 1 deletion(-)
Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified
diff --git a/smlc/SMLC_Tests.ttcn b/smlc/SMLC_Tests.ttcn index be69c7d..671f483 100644 --- a/smlc/SMLC_Tests.ttcn +++ b/smlc/SMLC_Tests.ttcn @@ -193,7 +193,10 @@ f_bssap_le_adapter_start(g_bssap_le[bssap_le_idx]); }
- f_init_statsd("SMLC_Test", vc_STATSD, mp_test_ip, mp_statsd_port, g_statd_timeout); + /* Remove nightly condition after osmo-smlc >= 0.4.x is released */ + if (Misc_Helpers.f_osmo_repo_is("nightly")) { + f_init_statsd("SMLC_Test", vc_STATSD, mp_test_ip, mp_statsd_port, g_statd_timeout); + } }
function f_init_vty(charstring id := "foo") runs on test_CT { diff --git a/smlc/osmo-smlc.latest.cfg b/smlc/osmo-smlc.latest.cfg new file mode 100644 index 0000000..32b3084 --- /dev/null +++ b/smlc/osmo-smlc.latest.cfg @@ -0,0 +1,32 @@ +log gsmtap 127.0.0.203 + logging level set-all debug + logging filter all 1 +log stderr + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print extended-timestamp 1 + logging print file basename last + logging level set-all debug +! +line vty + no login + bind 0.0.0.0 +! +cs7 instance 0 + point-code 0.23.6 + asp asp-clnt-Lb-0 2905 2905 m3ua + local-ip 127.0.0.20 + remote-ip 127.0.0.200 + role asp + sctp-role client + as as-clnt-Lb m3ua + asp asp-clnt-Lb-0 + routing-key 6 0.23.6 + +cells + lac-ci 23 42 lat 23.23 lon 42.42 + cgi 001 02 3 4 lat 5.678 lon 6.789 + cgi 001 02 1 17 lat 7.890123 lon 8.90123 diff --git a/smlc/testenv.cfg b/smlc/testenv.cfg index 1268300..401dbb5 100644 --- a/smlc/testenv.cfg +++ b/smlc/testenv.cfg @@ -15,3 +15,6 @@ package=osmo-smlc copy=osmo-smlc.cfg vty_port=4271 +# Remove *_latest lines and related cfg after osmo-smlc >= 0.4.x is released +copy_latest=osmo-smlc.latest.cfg +program_latest=osmo-smlc -c osmo-smlc.latest.cfg
-
osmith