From 5e57b66cfcc7fb1a789976550ffea00b38d2133c Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 20 Jan 2022 13:41:01 +0100
Subject: [PATCH 1/3] CI: Run T tracer in SA test

---
 ci-scripts/xml_files/fr1_sa_quectel.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml
index 8b0fc3b541..746bd669cc 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel.xml
@@ -59,7 +59,7 @@
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>

From b06b21d1ed6d5126d852797fc62cc37e04824034 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 24 Jan 2022 22:43:26 +0100
Subject: [PATCH 2/3] Perform log analysis from textlog only if T_stdout 0

---
 ci-scripts/ran.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index da20998297..ad360d2179 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -671,10 +671,14 @@ class RANManagement():
 				mySSH.command('echo ' + localEpcPassword + ' | sudo -S chmod 666 /tmp/' + self.epcPcapFile, '\$', 5)
 				mySSH.copyin(localEpcIpAddr, localEpcUserName, localEpcPassword, '/tmp/' + self.epcPcapFile, '.')
 				mySSH.copyout(lIpAddr, lUserName, lPassWord, self.epcPcapFile, lSourcePath + '/cmake_targets/.')
+			mySSH.command('killall --signal SIGKILL record', '\$', 5)
 			mySSH.close()
+		# if T tracer was run with option 0 (no logs), analyze logs
+		# from textlog, otherwise do normal analysis (e.g., option 2)
+		result = re.search('T_stdout 0', str(self.Initialize_eNB_args))
+		if (result is not None):
 			logging.debug('\u001B[1m Replaying RAW record file\u001B[0m')
 			mySSH.open(lIpAddr, lUserName, lPassWord)
-			mySSH.command('killall --signal SIGKILL record', '\$', 5)
 			mySSH.command('cd ' + lSourcePath + '/common/utils/T/tracer/', '\$', 5)
 			enbLogFile = self.eNBLogFiles[int(self.eNB_instance)]
 			raw_record_file = enbLogFile.replace('.log', '_record.raw')

From 997f8f9f4836594d950d85c918115f7a6f1298ea Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Tue, 25 Jan 2022 12:14:01 +0100
Subject: [PATCH 3/3] SA stage2 test numbers to not overwrite logs in ZIP

---
 .../xml_files/fr1_sa_quectel_stages.xml       | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
index edc4440612..318574f2b8 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
@@ -26,28 +26,28 @@
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
- 040000
+ 041000
  000002
- 010000
+ 011000
  000001
- 050000
+ 051000
  000001
- 070000
+ 071000
  000001
- 070001
+ 071001
  000001
- 070002
+ 071002
  000001
- 070003
+ 071003
  000001
- 070004
+ 071004
  000001
- 010002
- 080000
+ 011002
+ 081000
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-	<testCase id="010000">
+	<testCase id="011000">
 		<class>Initialize_UE</class>
 		<desc>Initialize Quectel</desc>
 		<id>nrmodule2_quectel</id>
@@ -55,14 +55,14 @@
 	</testCase>
 
 
-	<testCase id="010002">
+	<testCase id="011002">
 		<class>Terminate_UE</class>
 		<desc>Terminate Quectel</desc>
 		<id>nrmodule2_quectel</id>
 	</testCase>
 
 
-	<testCase id="040000">
+	<testCase id="041000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
 		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
@@ -88,7 +88,7 @@
 	</testCase>
 
 
-	<testCase id="050000">
+	<testCase id="051000">
 		<class>Ping</class>
 		<desc>Ping: 20pings in 20sec</desc>
 		<id>nrmodule2_quectel</id>
@@ -98,7 +98,7 @@
 	</testCase>
 
 
-	<testCase id="070000">
+	<testCase id="071000">
 		<class>Iperf</class>
 		<desc>iperf (DL/10Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 10M -t 30</iperf_args>
@@ -108,7 +108,7 @@
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
-	<testCase id="070001">
+	<testCase id="071001">
 		<class>Iperf</class>
 		<desc>iperf (DL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 20M -t 30</iperf_args>
@@ -118,7 +118,7 @@
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
-	<testCase id="070002">
+	<testCase id="071002">
 		<class>Iperf</class>
 		<desc>iperf (DL/40Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 40M -t 30</iperf_args>
@@ -128,7 +128,7 @@
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
-	<testCase id="070003">
+	<testCase id="071003">
 		<class>Iperf</class>
 		<desc>iperf (DL/60Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 60M -t 30</iperf_args>
@@ -138,7 +138,7 @@
 		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
-	<testCase id="070004">
+	<testCase id="071004">
 		<class>Iperf</class>
 		<desc>iperf (DL/90Mbps/UDP)(30 sec)(single-ue profile)</desc>
 		<iperf_args>-u -b 90M -t 30</iperf_args>
@@ -151,7 +151,7 @@
 
 
 
-	<testCase id="080000">
+	<testCase id="081000">
 		<class>Terminate_eNB</class>
 		<desc>Terminate gNB</desc>
 		<eNB_instance>0</eNB_instance>