From 92e286ecae87d00b54b91317a1723f072c348d84 Mon Sep 17 00:00:00 2001
From: hardy <remi.hardy@openairinterface.org>
Date: Thu, 14 Oct 2021 21:01:18 +0200
Subject: [PATCH] aligning NSA and SA tests

---
 ci-scripts/ci_ueinfra.yaml                   |  1 +
 ci-scripts/cls_oaicitest.py                  |  7 ++++---
 ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml |  5 +++--
 ci-scripts/xml_files/fr1_sa_quectel.xml      | 16 ++++++++++++----
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ci-scripts/ci_ueinfra.yaml b/ci-scripts/ci_ueinfra.yaml
index 0957a1e465..51acb75968 100644
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -16,6 +16,7 @@ idefix:
   HostUsername : oaicicd
   HostPassword : oaicicd
   HostSourceCodePath : none
+  MTU : 1500
 nrmodule2_quectel:
   ID: nrmodule2_quectel
   State : enabled
diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 8bda1fa202..76d72f0d12 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -403,9 +403,10 @@ class OaiCiTest():
 					#execute additional commands from yaml file after UE attach
 					SSH = sshconnection.SSHConnection()
 					SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
-					for startcommand in Module_UE.StartCommands:
-						cmd = 'echo ' + Module_UE.HostPassword + ' | ' + startcommand 
-					SSH.command(cmd,'\$',5)	
+					if hasattr(Module_UE,StartCommands):
+						for startcommand in Module_UE.StartCommands:
+							cmd = 'echo ' + Module_UE.HostPassword + ' | ' + startcommand 
+							SSH.command(cmd,'\$',5)	
 					SSH.close()
 					#check that the MTU is as expected / requested
 					Module_UE.CheckModuleMTU()
diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
index 03dea36607..7a7985ebb5 100644
--- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
+++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
@@ -32,6 +32,7 @@
  010000
  000001
  050000
+ 050001
  000002
  070000
  070001
@@ -99,7 +100,7 @@
 		<desc>Ping: 20pings in 20sec</desc>
 		<id>nrmodule2_quectel</id>
 		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
 
 	<testCase id="050001">
@@ -107,7 +108,7 @@
 		<desc>Ping: 100pings in 20sec</desc>
 		<id>nrmodule2_quectel</id>
 		<ping_args>-c 100 -i 0.2</ping_args>
-		<ping_packetloss_threshold>50</ping_packetloss_threshold>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
 
 	<testCase id="070000">
diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml
index 469ae8fb1b..a7a6023dd8 100644
--- a/ci-scripts/xml_files/fr1_sa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel.xml
@@ -88,10 +88,18 @@
 		<ping_packetloss_threshold>5</ping_packetloss_threshold>
 	</testCase>
 
+	<testCase id="050001">
+		<class>Ping</class>
+		<desc>Ping: 100pings in 20sec</desc>
+		<id>nrmodule2_quectel</id>
+		<ping_args>-c 100 -i 0.2</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/5Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 5M -t 60</iperf_args>
+		<desc>iperf (DL/20Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 20M -t 60</iperf_args>
 		<direction>DL</direction>
 		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -100,8 +108,8 @@
 
 	<testCase id="070001">
 		<class>Iperf</class>
-		<desc>iperf (UL/1Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 1M -t 60</iperf_args>
+		<desc>iperf (UL/1Mbps/UDP)(20 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 1M -t 20</iperf_args>
 		<direction>UL</direction>
 		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>