Merge lp:~pwlars/ubuntu-test-cases/krillin-02-06 into lp:ubuntu-test-cases/touch

[Paul Larson]

Add instrumentation data for krillin-02 and krillin-06

[Francis Ginther (fginther)]

Looks good, was able to match up with data in barometz.

review: Approve

=== modified file 'scripts/device_info.py'
--- scripts/device_info.py	2015-10-08 17:21:14 +0000
+++ scripts/device_info.py	2015-11-30 16:11:24 +0000
@@ -267,7 +267,11 @@
                               power_pin=RelayPin(1, 7),
                               volume_up_pin=RelayPin(2, 0),
                               volume_down_pin=RelayPin(2, 1)),
-    "krillin-02": TouchDevice("krillin", "JB010894"),
+    "krillin-02": TouchDevice("krillin", "JB010894",
+                              relay_url="http://bos01-a-04-shelf05-relay.power",
+                              power_pin=RelayPin(2, 5),
+                              volume_up_pin=RelayPin(2, 6),
+                              volume_down_pin=RelayPin(2, 7)),
     "krillin-03": TouchDevice("krillin", "JB015156",
                               relay_url="http://bos01-a-04-shelf03-relay.power",
                               power_pin=RelayPin(2, 0),
@@ -279,7 +283,11 @@
                               volume_up_pin=RelayPin(1, 5),
                               volume_down_pin=RelayPin(1, 6)),
     "krillin-05": TouchDevice("krillin", "JB015256"),
-    "krillin-06": TouchDevice("krillin", "JW010687"),
+    "krillin-06": TouchDevice("krillin", "JW010687",
+                              relay_url="http://bos01-a-04-shelf05-relay.power",
+                              power_pin=RelayPin(2, 2),
+                              volume_up_pin=RelayPin(2, 3),
+                              volume_down_pin=RelayPin(2, 4)),
     "krillin-07": TouchDevice("krillin", "JW011999",
                               relay_url="http://bos01-a-04-shelf03-relay.power",
                               power_pin=RelayPin(2, 4),