From: Kristian Hunt Date: Tue, 7 Jul 2015 07:59:56 +0000 (+0200) Subject: Fix iperf3 target ipaddr and no options X-Git-Tag: brahmaputra.1.0~218 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F971%2F2;p=yardstick.git Fix iperf3 target ipaddr and no options 1. Fixes runner failing because of key error in context 'target_ipaddr'. 2. Fixes type error when no options are specified in the task file (for example as in the current iperf3 sample task file). JIRA:- Change-Id: I21a1dea4571c14dbb1f9862dcf70b078837ebf07 Signed-off-by: Kristian Hunt --- diff --git a/yardstick/benchmark/scenarios/networking/iperf3.py b/yardstick/benchmark/scenarios/networking/iperf3.py index 88423725e..3c4cd1fbf 100644 --- a/yardstick/benchmark/scenarios/networking/iperf3.py +++ b/yardstick/benchmark/scenarios/networking/iperf3.py @@ -53,7 +53,7 @@ For more info see http://software.es.net/iperf self.context = context self.user = context.get('user', 'ubuntu') self.host_ipaddr = context['host'] - self.target_ipaddr = context['target_ipaddr'] + self.target_ipaddr = context['target'] self.key_filename = self.context.get('key_filename', '~/.ssh/id_rsa') self.setup_done = False @@ -92,6 +92,10 @@ For more info see http://software.es.net/iperf cmd = "iperf3 -c %s --json" % (self.target_ipaddr) + # If there are no options specified + if not options: + options = "" + if "udp" in options: cmd += " --udp" else: