x/vmtp
Code Issues Proposed changes

Retry UDP testcases for a 2nd time if needed

Browse Source 
Change-Id: Iccf4276f417ff568205df2d822b246043e3537f6
This commit is contained in:
Yichen Wang 2018-12-29 00:45:28 -08:00
parent 16e2b078a9
commit ccc96c540a
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
vmtp/iperf_tool.py
View File

@ -35,7 +35,7 @@ def get_bdw_kbps(bdw, bdw_unit):
class IperfTool(PerfTool): class IperfTool(PerfTool):
def __init__(self, instance): def __init__(self, instance):
PerfTool.__init__(self, 'iperf-2.0.9', instance) PerfTool.__init__(self, 'iperf-2.0.12', instance)
def get_server_launch_cmd(self): def get_server_launch_cmd(self):
'''Return the command to launch the server side.''' '''Return the command to launch the server side.'''
@ -63,24 +63,32 @@ class IperfTool(PerfTool):
# (need to find the right iperf options to make it work as there are # (need to find the right iperf options to make it work as there are
# issues for the server to send back results to the client in reverse # issues for the server to send back results to the client in reverse
# direction # direction
if proto == 'UDP': if proto == 'TCP':
bidir = False
loop_count = 1
else:
# For accuracy purpose, TCP throughput will be measured multiple times # For accuracy purpose, TCP throughput will be measured multiple times
bidir = bidirectional
loop_count = self.instance.config.tcp_tp_loop_count loop_count = self.instance.config.tcp_tp_loop_count
for pkt_size in pkt_size_list: self.instance.display('Measuring TCP Throughput...')
self.instance.display('Measuring %s Throughput (packet size=%d)...', for _ in range(loop_count):
proto, pkt_size) # for bidirectional the function returns a list of 2 results
for _ in xrange(loop_count):
res = self.run_client_dir(target_ip, mss, res = self.run_client_dir(target_ip, mss,
bandwidth_kbps=bandwidth, bandwidth_kbps=bandwidth,
bidirectional=bidir, bidirectional=bidirectional,
protocol=proto, protocol=proto,
length=pkt_size) length=pkt_size_list[0])
# for bidirectional the function returns a list of 2 results
res_list.extend(res) res_list.extend(res)
else:
for pkt_size in pkt_size_list:
self.instance.display('Measuring UDP Throughput (packet size=%d)...', pkt_size)
# Trying a second time if needed, due to iperf bugs...
for _ in range(2):
res = self.run_client_dir(target_ip, mss,
bandwidth_kbps=bandwidth,
bidirectional=False,
protocol=proto,
length=pkt_size)
if 'error' not in res:
break
res_list.extend(res)
return res_list return res_list
def run_client_dir(self, target_ip, def run_client_dir(self, target_ip,