Merge lp:~bladernr/checkbox/1229435-network-script-output-improvement into lp:checkbox

[Jeff Lane ]

This adds a little more information to the output on failure: adds the throughput info to the warning message that gets logged. Also added an example to help into on running the iperf test.

[Daniel Manrique (roadmr)]

Looks good, and a similar change is already in checkbox-legacy.

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/network'
--- providers/plainbox-provider-checkbox/bin/network	2014-08-22 12:12:02 +0000
+++ providers/plainbox-provider-checkbox/bin/network	2014-09-04 15:29:54 +0000
@@ -78,7 +78,7 @@
                           (self.iface.link_speed, self.iface.max_speed))
             logging.error("Check your device configuration and try again")
             return 1
-
+        
         cmd = "timeout 180 iperf -c {} -n {}".format(self.target, self.mbytes)
 
         logging.debug(cmd)
@@ -138,6 +138,10 @@
                   int(self.iface.max_speed)))
             if percent < self.fail_threshold:
                 logging.warn("Poor network performance detected")
+                logging.warn("  Transfer speed: {} {}b/s".format(
+                             throughput, units))
+                logging.warn("  {:03.2f}% of theoretical max {}Mb/s\n".format(
+                             percent, int(self.iface.max_speed)))
                 return 30
 
             logging.debug("Passed benchmark")
@@ -621,6 +625,11 @@
 --target 192.168.0.1 --username USERID --password PASSW0RD
 --filesize-2
 
+For running iperf test:
+network test -i eth0 -t iperf --target 192.168.0.1
+NOTE: The iperf test requires an iperf server running on the same network
+segment that the test machine is running on.
+
 Configuration
 =============