From ed2b77529bee4bb4146762347f836f1af093009b Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Wed, 28 Aug 2019 10:17:54 +0200
Subject: [PATCH] CI: better handling of test failures   -- Properly stopping
 FlexRan Ctl in case of failure

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
 ci-scripts/main.py                                          | 5 +++++
 .../xml_files/x2ho_enb_usrp210_band13_full_terminate.xml    | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 2a6e2a6255..3c79e6387a 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -3374,6 +3374,11 @@ class SSHConnection():
 			self.ShowTestID()
 			self.eNB_instance = '0'
 			self.TerminateeNB()
+		if self.flexranCtrlInstalled and self.flexranCtrlStarted:
+			self.testCase_id = 'AUTO-KILL-flexran-ctl'
+			self.desc = 'Automatic Termination of FlexRan CTL'
+			self.ShowTestID()
+			self.TerminateFlexranCtrl()
 		self.prematureExit = True
 
 	def IdleSleep(self):
diff --git a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_full_terminate.xml b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_full_terminate.xml
index 91280462b7..f8aaafd9a0 100644
--- a/ci-scripts/xml_files/x2ho_enb_usrp210_band13_full_terminate.xml
+++ b/ci-scripts/xml_files/x2ho_enb_usrp210_band13_full_terminate.xml
@@ -26,6 +26,7 @@
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<TestCaseRequestedList>
  030201 030202
+ 050202
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
@@ -43,4 +44,9 @@
 		<eNB_serverId>1</eNB_serverId>
 	</testCase>
 
+	<testCase id="050202">
+		<class>Terminate_FlexranCtrl</class>
+		<desc>Stopping Flexran Controller</desc>
+	</testCase>
+
 </testCaseList>