Merge lp:~rodsmith/hwcert-tools/multi-iperf3 into lp:~leftyfb/hwcert-tools/cert-precheck

[Rod Smith]

Mike,

I've looked over your pre-certification script, and have these changes for you. The issue is that your script didn't parse multiple iperf targets in /etc/xdg/canonical-certification.conf, or check for iperf3 servers. My patch does that. A few notes:

* It mostly-replicates the iperf2 code to test iperf3. I'd rather do a loop, but that started to get hairy in various ways, so I left it with mostly-replicated code instead.
* I use an iperf3 call to check for the presence of the server rather than nc because I discovered that the iperf3 server terminates after several unsuccessful connection attempts by nc, so the test could end up causing problems if nc were used. This has the drawback that the script will pause for a bit if an IP address is invalid, but otherwise it seems to work fine.
* My change is a little verbose in what it reports, but trimming it more might make it less useful.

[Mike Rushton (leftyfb)]

review: Approve

[Mike Rushton (leftyfb)]

Looks good. Thanks.

=== modified file 'cert-precheck'
--- cert-precheck	2016-01-19 20:16:41 +0000
+++ cert-precheck	2016-01-22 21:22:08 +0000
@@ -162,13 +162,35 @@
 		fail
 	fi
 fi
-iperfserver=$(grep ^TEST_TARGET_IPERF /etc/xdg/canonical-certification.conf|awk '{print $3}')
-nc -z $iperfserver 5001
-if [ $? = 0 ]; then
-	echo " Iperf server found on port 5001 on $iperfserver"
-elif [ $? = 1 ]; then
-	echo " No Iperf server configured at $iperfserver"
-	fail
+local iperf2found=0
+local iperf3found=0
+for iperfserver in $(grep ^TEST_TARGET_IPERF /etc/xdg/canonical-certification.conf | cut -d = -f 2 | sed s/,/\\n/g)
+        do
+                echo " Testing $iperfserver"
+                local iperffound=0
+                nc -z $iperfserver 5001
+                if [ $? = 0 ]; then
+                        echo "  Iperf server found on port 5001 on $iperfserver"
+                        iperf2found=1
+                        iperffound=1
+                fi
+                iperf3 -c $iperfserver -n 1 &> /dev/null
+                if [ $? = 0 ]; then
+                        echo "  Iperf3 server found on port 5201 on $iperfserver"
+                        iperf3found=1
+                        iperffound=1
+                fi
+                if [ $iperffound = 0 ]; then
+                        echo "  No Iperf (2) or iperf3 server found on $iperfserver"
+                fi
+done
+if [[ $iperf2found == 0 ]]; then
+        echo " No iperf (2) server found"
+        fail
+fi
+if [[ $iperf3found == 0 ]]; then
+        echo " No iperf3 server found"
+        fail
 fi
 }