From a7678b337b3194e57c0a9fca41f104d50602d102 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Thu, 11 Apr 2019 17:06:13 +0200 Subject: [PATCH] CI: better iperf syntax Signed-off-by: Raphael Defosseux --- ci-scripts/main.py | 7 ++++++- .../enb_ue_usrp210_band7_test_05mhz_tm1.xml | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 8c7d0c9cde..a83e57c565 100644 --- a/ci-scripts/main.py +++ b/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() diff --git a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml index 22f54f5170..2d949ac324 100644 --- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml +++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml @@ -25,7 +25,7 @@ Test-05MHz-TM1 tasks - 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 @@ -86,29 +86,29 @@ Iperf iperf (5MHz - DL/1Mbps/UDP)(30 sec) - -c 10.0.1.2 -fm -u -b 1M -t 30 -i 1 + -c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1 50 Iperf iperf (5MHz - DL/1.2Mbps/UDP)(30 sec) - -c 10.0.1.2 -fm -u -b 1.2M -t 30 -i 1 + -c 10.0.1.2 -u -b 1.2M -t 30 -i 1 -fm -B 10.0.1.1 50 Iperf iperf (5MHz - UL/1Mbps/UDP)(30 sec) - -c 10.0.1.1 -fm -u -b 1M -t 30 -i 1 -R + -c 10.0.1.1 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.2 -R 50 balanced Iperf - iperf (5MHz - UL/1.2Mbps/UDP)(30 sec) - -c 10.0.1.1 -fm -u -b 1.2M -t 30 -i 1 + iperf (5MHz - UL/8Mbps/UDP)(30 sec) + -c 10.0.1.1 -u -b 8M -t 30 -i 1 -fm -B 10.0.1.2 -R 50 balanced