diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 57a8688a950d8263d0dd7b1195c3a605fef1c990..7202e7c881631f597b1ceec1c84cc629022b0ef0 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -2226,36 +2226,21 @@ class OaiCiTest():
SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
cmd = 'rm iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
SSH.command(cmd,'\$',5)
-
- #cmd = 'echo $USER; nohup iperf3 -s -i 1 2>&1 > iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
- #SSH.command(cmd,'\$',5)
-
- HOST=EPC.IPAddress
- COMMAND='echo $USER; nohup iperf3 -s -i 1 2>&1 > iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
- logging.debug(COMMAND)
- subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+ cmd = 'echo $USER; nohup iperf -s -i 1 -u 2>&1 > iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log'
+ SSH.command(cmd,'\$',5)
#client side UE
SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
cmd = 'rm iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
SSH.command(cmd,'\$',5)
-
-
-# SSH.command('iperf3 -c ' + EPC.IPAddress + ' ' + self.iperf_args + ' 2>&1 > iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log', '\$', int(iperf_time)*5.0)
-
- HOST=Module_UE.HostIPAddress
- COMMAND='iperf3 -c ' + EPC.IPAddress + ' ' + self.iperf_args + ' 2>&1 > iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
- logging.debug(COMMAND)
- subprocess.Popen(["ssh", "%s" % HOST, COMMAND],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-
-
+ SSH.command('/opt/iperf-2.0.10/iperf -c 192.172.0.1 ' + self.iperf_args + ' 2>&1 > iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log', '\$', int(iperf_time)*5.0)
#copy the 2 resulting files locally
SSH.copyin(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword, 'iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log', '.')
SSH.copyin(EPC.IPAddress, EPC.UserName, EPC.Password, 'iperf_server_' + self.testCase_id + '_' + self.ue_id + '.log', '.')
#send for analysis
filename='iperf_client_' + self.testCase_id + '_' + self.ue_id + '.log'
- self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,filename,1)
+ self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, self.iperf_args,filename,1)
else :
logging.debug("Incorrect or missing IPERF direction in XML")
diff --git a/ci-scripts/xml_files/benetel_nsa_base.xml b/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
similarity index 71%
rename from ci-scripts/xml_files/benetel_nsa_base.xml
rename to ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
index 0aed28dffa8e92de6377fdf51bdeac58215f9529..93c0c5a00a209659092d47b39787086b48dc30da 100644
--- a/ci-scripts/xml_files/benetel_nsa_base.xml
+++ b/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
@@ -21,49 +21,42 @@
-->
<testCaseList>
- <htmlTabRef>TEST-FR1-TM1</htmlTabRef>
- <htmlTabName>FR1</htmlTabName>
+ <htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
+ <htmlTabName>NSA Ping DL UL with QUECTEL</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon>
+ <repeatCount>3</repeatCount>
<TestCaseRequestedList>
- 010000
030000
040000
- 010001
+ 000002
+ 010000
000001
050000
050001
000001
- 060000
- 060001
- 000001
070000
+ 000001
070001
+ 000001
010002
000001
080001
080000
- 010003
+
</TestCaseRequestedList>
<TestCaseExclusionList></TestCaseExclusionList>
<testCase id="010000">
<class>Initialize_UE</class>
- <desc>Initialize UE</desc>
- </testCase>
-
- <testCase id="010003">
- <class>Terminate_UE</class>
- <desc>Terminate UE</desc>
+ <desc>Initialize Quectel</desc>
+ <id>idefix</id>
</testCase>
- <testCase id="010001">
- <class>Attach_UE</class>
- <desc>Attach UE</desc>
- </testCase>
<testCase id="010002">
<class>Detach_UE</class>
<desc>Detach UE</desc>
+ <id>idefix</id>
</testCase>
@@ -74,13 +67,13 @@
<eNB_instance>0</eNB_instance>
<eNB_serverId>0</eNB_serverId>
<air_interface>lte</air_interface>
- </testCase>
+ </testCase>
<testCase id="040000">
<class>Initialize_eNB</class>
<desc>Initialize gNB</desc>
- <Initialize_eNB_args>-O ci-scripts/conf_files/benetel-5g.conf</Initialize_eNB_args>
+ <Initialize_eNB_args>-O ci-scripts/conf_files/benetel-5g.conf -q</Initialize_eNB_args>
<eNB_instance>1</eNB_instance>
<eNB_serverId>1</eNB_serverId>
<air_interface>nr</air_interface>
@@ -89,12 +82,20 @@
<testCase id="000001">
<class>IdleSleep</class>
<desc>Sleep</desc>
- <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
+ <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
</testCase>
+ <testCase id="000002">
+ <class>IdleSleep</class>
+ <desc>Sleep</desc>
+ <idle_sleep_time_in_sec>30</idle_sleep_time_in_sec>
+ </testCase>
+
+
<testCase id="050000">
<class>Ping</class>
<desc>Ping: 20pings in 20sec</desc>
+ <id>idefix</id>
<ping_args>-c 20</ping_args>
<ping_packetloss_threshold>50</ping_packetloss_threshold>
</testCase>
@@ -102,46 +103,32 @@
<testCase id="050001">
<class>Ping</class>
<desc>Ping: 100pings in 20sec</desc>
+ <id>idefix</id>
<ping_args>-c 100 -i 0.2</ping_args>
<ping_packetloss_threshold>50</ping_packetloss_threshold>
</testCase>
-
- <testCase id="060000">
- <class>Iperf</class>
- <desc>iperf (DL/2.5Mbps/UDP)(60 sec)(single-ue profile)</desc>
- <iperf_args>-u -b 2.5M -t 60 -i 1</iperf_args>
- <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
- <iperf_profile>single-ue</iperf_profile>
- </testCase>
-
- <testCase id="060001">
- <class>Iperf</class>
- <desc>iperf (UL/1.5Mbps/UDP)(60 sec)(single-ue profile)</desc>
- <iperf_args>-u -b 1.5M -t 60 -i 1 -R</iperf_args>
- <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
- <iperf_profile>single-ue</iperf_profile>
- </testCase>
-
-
<testCase id="070000">
<class>Iperf</class>
- <desc>iperf (DL/20Mbps/UDP)(20 sec)(single-ue profile)</desc>
- <iperf_args>-u -b 20M -t 20 -i 1</iperf_args>
+ <desc>iperf (DL/20Mbps/UDP)(20 min)(single-ue profile)</desc>
+ <iperf_args>-u -b 20M -t 1200 -i 1</iperf_args>
+ <direction>DL</direction>
+ <id>idefix</id>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
<testCase id="070001">
<class>Iperf</class>
- <desc>iperf (UL/3Mbps/UDP)(20 sec)(single-ue profile)</desc>
- <iperf_args>-u -b 3M -t 20 -i 1 -R</iperf_args>
+ <desc>iperf (UL/3Mbps/UDP)(20 min)(single-ue profile)</desc>
+ <iperf_args>-u -b 2M -t 1200 -i 1</iperf_args>
+ <direction>UL</direction>
+ <id>idefix</id>
<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
<iperf_profile>single-ue</iperf_profile>
</testCase>
-
<testCase id="080000">
<class>Terminate_eNB</class>
<desc>Terminate eNB</desc>