From 12055479de31853055ec8fe92ca752dfe0ab633f Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sat, 17 Mar 2018 20:10:08 +0100
Subject: [PATCH] bsc: fix shutdown

Change-Id: I23932927bd6bb9b5e447acbeafc2748a77513a0d
---
 bsc/BSC_Tests.ttcn                | 16 ++++++++++++++++
 library/Osmocom_CTRL_Adapter.ttcn |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 07f2ac7bb..a2111fdef 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -110,6 +110,12 @@ modulepar {
 }
 
 private function f_shutdown_helper() runs on test_CT {
+	for (var integer i := 0; i < NUM_BTS; i := i+1) {
+		if (isbound(bts[i]) and isbound(bts[i].rsl)) {
+			f_ipa_rsl_stop(bts[i].rsl);
+		}
+	}
+	f_ipa_ctrl_stop();
 	all port.stop;
 	setverdict(pass);
 }
@@ -195,6 +201,16 @@ runs on test_CT {
 	}
 }
 
+function f_ipa_rsl_stop(inout IPA_Client clnt) runs on test_CT {
+	if (not isbound(clnt) or not isbound(clnt.vc_IPA)) {
+		return;
+	}
+	clnt.vc_IPA.stop;
+	if (isbound(clnt.vc_RSL)) {
+		clnt.vc_RSL.stop;
+	}
+}
+
 /* Wait for the OML connection to be brought up by the external osmo-bts-omldummy */
 function f_wait_oml(integer bts_nr, charstring status, float secs_max) runs on test_CT {
 	timer T := secs_max;
diff --git a/library/Osmocom_CTRL_Adapter.ttcn b/library/Osmocom_CTRL_Adapter.ttcn
index 4cfe739bf..9baa6a2c3 100644
--- a/library/Osmocom_CTRL_Adapter.ttcn
+++ b/library/Osmocom_CTRL_Adapter.ttcn
@@ -42,7 +42,9 @@ runs on CTRL_Adapter_CT {
 	}
 }
 
-
+function f_ipa_ctrl_stop() runs on CTRL_Adapter_CT {
+	vc_CTRL_IPA.stop;
+}
 
 
 /* BSC specific CTRL helper functions */