CI: better iperf syntax

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

ci-scripts/main.py

@@ -1807,8 +1807,13 @@ class SSHConnection():
 			iClientPasswd = self.eNBPassword
 		# Starting the iperf server
 		self.open(iServerIPAddr, iServerUser, iServerPasswd)
+		# args SHALL be "-c client -u any"
+		# -c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1
+		# -B 10.0.1.1 -u -s -i 1 -fm
+		server_options = re.sub('-u.*$', '-u -s -i 1 -fm', str(self.iperf_args))
+		server_options = server_options.replace('-c','-B')
 		self.command('rm -f /tmp/tmp_iperf_server_' + self.testCase_id + '.log', '\$', 5)
-		self.command('echo $USER; nohup iperf -u -s -i 1 > /tmp/tmp_iperf_server_' + self.testCase_id + '.log 2>&1 &', iServerUser, 5)
+		self.command('echo $USER; nohup iperf ' + server_options + ' > /tmp/tmp_iperf_server_' + self.testCase_id + '.log 2>&1 &', iServerUser, 5)
 		time.sleep(0.5)
 		self.close()
 

ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml

@@ -25,7 +25,7 @@
 	<htmlTabName>Test-05MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<TestCaseRequestedList>
- 030101 000001 090101 000002 040501 040502 000001 040601 040641 000001 090109 030201
+ 030101 000001 090101 000002 040501 040502 000001 040601 040641 040642 000001 090109 030201
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
@@ -86,29 +86,29 @@
         <testCase id="040601">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.2 -fm -u -b 1M -t 30 -i 1</iperf_args>
+		<iperf_args>-c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         </testCase>
 
         <testCase id="040602">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - DL/1.2Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.2 -fm -u -b 1.2M -t 30 -i 1</iperf_args>
+		<iperf_args>-c 10.0.1.2 -u -b 1.2M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         </testCase>
 
 	<testCase id="040641">
 		<class>Iperf</class>
 		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.1 -fm -u -b 1M -t 30 -i 1 -R</iperf_args>
+		<iperf_args>-c 10.0.1.1 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
 	</testCase>
 
 	<testCase id="040642">
 		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/1.2Mbps/UDP)(30 sec)</desc>
-		<iperf_args>-c 10.0.1.1 -fm -u -b 1.2M -t 30 -i 1</iperf_args>
+		<desc>iperf (5MHz - UL/8Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.1 -u -b 8M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
 	</testCase>