pespin submitted this change.

View Change

smlc: Adapt testsuite to new OsmoCNI 202512 release

Change-Id: I61aaf5ae7b4975e68f573b1f432b74fab86d5355
---
M smlc/SMLC_Tests.ttcn
D smlc/osmo-smlc.latest.cfg
M smlc/testenv.cfg
3 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/smlc/SMLC_Tests.ttcn b/smlc/SMLC_Tests.ttcn
index 393d69f..1d317bb 100644
--- a/smlc/SMLC_Tests.ttcn
+++ b/smlc/SMLC_Tests.ttcn
@@ -193,10 +193,8 @@
 		f_bssap_le_adapter_start(g_bssap_le[bssap_le_idx]);
 	}
 
-	/* 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);
-	}
+	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 {
@@ -589,12 +587,7 @@
 	execute( TC_smlc_location_request_bsslap_abort() );
 	execute( TC_smlc_location_request_abort() );
 
-	/* This "nightly" if can be removed once libosmo-sigtran (osmo-stp) > 2.1.0 is released.
-	 * Currently released osmo-stp 2.1.0 ends up in in broken AS-ACTIVE+ASP-DOWN state when
-	 * restarting the ASP after exiting the related asp node through VTY: */
-	if (Misc_Helpers.f_osmo_repo_is("nightly")) {
-		execute( TC_stat_bsc_sctp_disconnected() );
-	}
+	execute( TC_stat_bsc_sctp_disconnected() );
 }
 
 }
diff --git a/smlc/osmo-smlc.latest.cfg b/smlc/osmo-smlc.latest.cfg
deleted file mode 100644
index e642549..0000000
--- a/smlc/osmo-smlc.latest.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-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 timestamp 1
- logging print extended-timestamp 1
- logging print file basename last
- logging print category 1
- logging print category-hex 0
- logging print level 1
- 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 401dbb5..1268300 100644
--- a/smlc/testenv.cfg
+++ b/smlc/testenv.cfg
@@ -15,6 +15,3 @@
 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

To view, visit change 41573. To unsubscribe, or for help writing mail filters, visit settings.