From 7ca887221625bbef414f976eabc94ce30c3a94f8 Mon Sep 17 00:00:00 2001
From: hardy <remi.hardy@openairinterface.org>
Date: Thu, 29 Apr 2021 21:59:47 +0200
Subject: [PATCH] fix test status fail/pass + test update + cleaning

---
 ci-scripts/ran.py                             | 21 +++++++------------
 ci-scripts/xml_files/gnb_phytest_usrp_run.xml |  4 ++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 8e378afbe9..f5f53c20b7 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -940,18 +940,6 @@ class RANManagement():
 					logging.debug(dlsch_ulsch_stats[key])
 				htmleNBFailureMsg += statMsg
 
-			#real time statistics (old but working version)
-			#if len(real_time_stats)!=0: #check if dictionary is not empty
-			#	statMsg=''
-			#	for k in real_time_stats:
-			#		tmp=re.match(r'^(?P<metric>.*):\s+(?P<avg>\d+\.\d+) us;\s+\d+;\s+(?P<max>\d+\.\d+) us;',real_time_stats[k])
-			#		if tmp is not None:
-			#			metric=tmp.group('metric')
-			#			avg=tmp.group('avg')
-			#			max=tmp.group('max')
-			#			statMsg += metric + ' : avg = ' + avg + 'us ; max = ' + max +'us\n' 
-			#	htmleNBFailureMsg += statMsg
-
 			#real time statistics
 			datalog_rt_stats['Data']={}
 			if len(real_time_stats)!=0: #check if dictionary is not empty
@@ -962,8 +950,13 @@ class RANManagement():
 						avg=float(tmp.group('avg'))
 						max=float(tmp.group('max'))
 						datalog_rt_stats['Data'][metric]=["{:.0f}".format(avg),"{:.0f}".format(max),"{:.2f}".format(avg/datalog_rt_stats['Ref'][metric])]
-						#store the data as a class attribute to build a dedicated HTML table afterward
-						self.datalog_rt_stats=datalog_rt_stats
+				#once all metrics are collected, store the data as a class attribute to build a dedicated HTML table afterward
+				self.datalog_rt_stats=datalog_rt_stats
+				#check if there is a fail => will render the test as failed
+				for k in datalog_rt_stats['Data']:
+					if float(datalog_rt_stats['Data'][k][2])> datalog_rt_stats['Threshold'][k]: #condition for fail : avg/ref is greater than the fixed threshold
+						#setting prematureExit is ok although not the best option
+						self.prematureExit=True
 			else:
 				statMsg = 'No real time stats found in the log file\n'
 				logging.debug('No real time stats found in the log file')
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
index 00610d430e..9e798afdc4 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
@@ -24,7 +24,7 @@
         <htmlTabRef>gNB-PHY-Test</htmlTabRef>
         <htmlTabName>Run-gNB-PHY-Test</htmlTabName>
         <htmlTabIcon>tasks</htmlTabIcon>	
-	<repeatCount>2</repeatCount>
+	<repeatCount>3</repeatCount>
 	<TestCaseRequestedList>
 090101 000001 090109
 	</TestCaseRequestedList>
@@ -40,7 +40,7 @@
 	<testCase id="000001">
 		<class>IdleSleep</class>
 		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>180</idle_sleep_time_in_sec>
+		<idle_sleep_time_in_sec>300</idle_sleep_time_in_sec>
 	</testCase>