Merge ~bladernr/plainbox-provider-checkbox:1672726-improve-get-make-model into plainbox-provider-checkbox:master

[Jeff Lane ]

bin/get_make_and_model: Now also outputs info on the baseboard make and model to make indentifying systems like SuperMicro easier.

[Pierre Equoy (pieq)]

I've tested this on my laptop.

Without the patch applied:

Manufacturer: Dell Inc.
Version: 01
Model: Latitude E5550 (Latitude E5550)

With the patch applied:

Mainboard:
  Manufacturer: Dell Inc.
  Version: A00
  Model: 013BI2
System:
  Manufacturer: Dell Inc.
  Version: 01
  Model: Latitude E5550 (Latitude E5550)

Looks good to me, but I'm wondering if the output of this script is not used in other parts that might be impacted by this change. I was for instance thinking of the C3 website, but when I check the page of the aforementioned laptop (https://certification.canonical.com/hardware/201409-15490/), it seems that the make/model data is not exactly the same anyway, so it probably gets this data from somewhere else.

I had a quick look and it seems this script has been introduced by Rod Smith and it's not called anywhere else other than in the miscellanea/get_make_and_model job, so it should be fine!

Added an inline comment too.

review: Approve

diff --git a/bin/get_make_and_model b/bin/get_make_and_model
index bb5efd9..496a949 100755
--- a/bin/get_make_and_model
+++ b/bin/get_make_and_model
@@ -4,31 +4,39 @@ import os.path
 import shlex
 from subprocess import check_output
 
+def print_header(value):
+    print("{}:".format(value))
+
 def print_data(key, value):
-    print("{}: {}".format(key, value))
+    print("  {}: {}".format(key, value))
+
+def run_cmd(option):
+    cmd = "lshw -C " + option
+    out = check_output(shlex.split(cmd),
+                       universal_newlines = True)
+    return out.split('\n')
 
 def main():
     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])
+    lshw_classes = {'system': 'System', 
+                    'bus': 'Mainboard'}
+
+    for lshw_class in lshw_classes:
+        output = run_cmd(lshw_class)
+        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"
+
+        print_header(lshw_classes[lshw_class])
+        for key in data:
+            print_data(key, data[key])
 
 if __name__ == "__main__":
     raise SystemExit(main())