Merge lp:~bladernr/checkbox/1352376-fix-get_make_and_model-device-tree into lp:checkbox

[Jeff Lane ]

basically a rewrite of get_make_and_model to use lshw instead of directly accessing /sys/class/dmi/id/*. This is to add functionality on device-tree enabled systems (armhf and arm64) as they do not currently provide dmi data/interfaces.

Rather than write platform or interface specific bits for multiple methods to get the same data, lshw is fairly universal (universal enough to catch 99% of our use cases) and provides the same data in a uniform way, regardless of the interface used.

[Daniel Manrique (roadmr)]

One tiny request, could you update the job definition (miscellanea/get_make_and_model) and change the estimated_duration? On my system it takes close to 2.5 seconds so our current timing data is inaccurate. If it takes longer on e.g. armhf, that would be a good value to use.

review: Needs Fixing

[lp:~bladernr/checkbox/1352376-fix-get_make_and_model-device-tree]

3161. By Jeff Lane  on 2014-08-04

updated estimated time for miscellanea/get_make_and_model to 30 seconds based on tests locally

[Jeff Lane  (bladernr)]

Ok, updated the time item.

I set it to 30 seconds. it was actually a good deal faster on the ARM systems (that have less data to parse, I suppose) but on my development machine here, it consistently took about 30 seconds on all 10 attempts... so 30 sounds like a safe, conservative estimate.

review: Needs Resubmitting

[Daniel Manrique (roadmr)]

Awesome, thanks and apologies for the nitpick.

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/get_make_and_model'
--- providers/plainbox-provider-checkbox/bin/get_make_and_model	2014-07-17 18:15:59 +0000
+++ providers/plainbox-provider-checkbox/bin/get_make_and_model	2014-08-04 20:53:23 +0000
@@ -1,17 +1,34 @@
 #!/usr/bin/env python3
 
 import os.path
+import shlex
+from subprocess import check_output
 
-def print_file_contents(heading, filename):
-    with open(filename) as f:
-        text = f.read().strip()
-        print("{}: {}".format(heading, text))
-        f.close()
+def print_data(key, value):
+    print("{}: {}".format(key, value))
 
 def main():
-    print_file_contents('Manufacturer', '/sys/class/dmi/id/sys_vendor')
-    print_file_contents('Model', '/sys/class/dmi/id/product_name')
-    print_file_contents('Version', '/sys/class/dmi/id/product_version')
+    keys = {'Manufacturer': 'vendor',
+            'Model': 'product',
+            'Version': 'version'}
+
+    cmd = "lshw -C system"
+
+    out = check_output(shlex.split(cmd), 
+                          universal_newlines = True)
+    output = out.split('\n')
+    
+    data = {}
+    for key in keys:
+        for line in output:
+            if keys[key] in line:
+                data[key] = line.split(':')[1].strip()
+                break
+            else:
+                data[key] = "NOT FOUND"
+
+    for key in data:
+        print_data(key, data[key])
 
 if __name__ == "__main__":
     raise SystemExit(main())

=== modified file 'providers/plainbox-provider-checkbox/jobs/miscellanea.txt.in'
--- providers/plainbox-provider-checkbox/jobs/miscellanea.txt.in	2014-07-16 18:28:38 +0000
+++ providers/plainbox-provider-checkbox/jobs/miscellanea.txt.in	2014-08-04 20:53:23 +0000
@@ -175,7 +175,7 @@
 _summary: Gets the version of MAAS used to deploy the SUT
 
 plugin: shell
-estimated_duration: 0.1
+estimated_duration: 30.0
 id: miscellanea/get_make_and_model
 user: root
 command: get_make_and_model