diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-10-12 00:45:26 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-10-12 00:45:26 +0000 |
commit | 5721849f3f08c2c1c89354341115c834e510b3d6 (patch) | |
tree | 19a1fdb5c4067c0e7113533e84f2f500e95888a8 /yardstick/benchmark/scenarios/networking | |
parent | eab7e0f4b1ffb895a93107ab28b26ceb3b084e99 (diff) | |
parent | 10f85b332c4b1f55e651aeb9c45b328e1ebdc2af (diff) |
Merge "Use "protocol" parameters in iperf3 yaml and task file"
Diffstat (limited to 'yardstick/benchmark/scenarios/networking')
-rw-r--r-- | yardstick/benchmark/scenarios/networking/iperf3.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/yardstick/benchmark/scenarios/networking/iperf3.py b/yardstick/benchmark/scenarios/networking/iperf3.py index a3d273750..98c45990e 100644 --- a/yardstick/benchmark/scenarios/networking/iperf3.py +++ b/yardstick/benchmark/scenarios/networking/iperf3.py @@ -111,18 +111,22 @@ For more info see http://software.es.net/iperf # If there are no options specified if not options: - options = "" + options = {} use_UDP = False - if "udp" in options: - cmd += " --udp" - use_UDP = True - if "bandwidth" in options: - cmd += " --bandwidth %s" % options["bandwidth"] - else: - # tcp obviously + try: + protocol = options.get("protocol") + bandwidth = options.get('bandwidth') + use_UDP = protocol == 'udp' + if protocol: + cmd += " --" + protocol + if use_UDP and bandwidth: + cmd += " --bandwidth " + bandwidth + # if nodelay in the option, protocal maybe null or 'tcp' if "nodelay" in options: cmd += " --nodelay" + except AttributeError: + LOG.warning("Can't parser the options in your config file!!!") # these options are mutually exclusive in iperf3 if time: |