osmith has uploaded this change for review.

View Change

hnbgw: remove osmo-hnbgw <= 1.6.0 code path

osmo-hnbgw 1.7.0 has been released, so we can remove this code path.

Change-Id: Ie55b752c19aa597afdc47b6e57e8ff0b42313e00
---
M hnbgw/HNBGW_Tests.ttcn
1 file changed, 2 insertions(+), 11 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/39550/1

diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 589c699..33800f3 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -381,19 +381,10 @@
 	/* Temporarily access Statsd during test startup: */
 	connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC);
 
-	/* osmo-hnbgw <= 1.6.0 doesn't support the stats "pfcp_associated".
-	 * Assume we have to wait for IUT to send PFCP Assoc Setup Req,
-	 * but avoid failing if we don't receive any. */
-	var boolean validate_pfcp_assoc := Misc_Helpers.f_osmo_repo_is("nightly");
-	var boolean pfcp_associated := false;
-	if (validate_pfcp_assoc) {
-		pfcp_associated := f_statsd_pfcp_associated();
-	}
-
-	if (not pfcp_associated) {
+	if (not f_statsd_pfcp_associated()) {
 		connect(self:PFCP, vc_PFCP:CLIENT);
 		connect(self:PFCP_PROC, vc_PFCP:CLIENT_PROC);
-		f_pfcp_wait_assoc_setup_req(fail_timeout := validate_pfcp_assoc);
+		f_pfcp_wait_assoc_setup_req(fail_timeout := true);
 		disconnect(self:PFCP, vc_PFCP:CLIENT);
 		disconnect(self:PFCP_PROC, vc_PFCP:CLIENT_PROC);
 	}

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