Merge lp:~brendan-donegan/checkbox/bug1184661 into lp:checkbox

[Brendan Donegan]

dmidecode doesn't exist on ARM platforms so memory_compare was failing to get the size of the installed RAM on these platforms. lshw was identified as a suitable replacement so this branch includes a parser for that tools JSON formatted output (lshw -json) and uses it in the memory_compare script to get the installed memory size if dmidecode is unable to.

[Brendan Donegan (brendan-donegan)]

Putting this on hold since I want to confer over whether to just scrap the DMI parser altogether and use the lshw one on both x86 and ARM - my own local tests show they return the same figure.

[Brendan Donegan (brendan-donegan)]

> Putting this on hold since I want to confer over whether to just scrap the DMI
> parser altogether and use the lshw one on both x86 and ARM - my own local
> tests show they return the same figure.

Well, I don't mean to scrap the DMI parser altogether - just its use in the memory_compare script.

[Brendan Donegan (brendan-donegan)]

I tested this on the Calxeda node and it seems to work well

[Jeff Lane  (bladernr)]

I also tested on saucy 64bit, raring 64bit and lucid 32bit and it works fine on all three, produces exactly the same physical memory numbers that dmidecode did.

[Brendan Donegan (brendan-donegan)]

I removed the Dmi code and changed all references to dmi to lshw instead. Now we have a script that works across all platforms!

[Jeff Lane  (bladernr)]

Yep, tested and looked at, and it's cool. Onward with the decimation of DMI!!

review: Approve

=== added file 'checkbox-old/checkbox/parsers/lshwjson.py'
--- checkbox-old/checkbox/parsers/lshwjson.py	1970-01-01 00:00:00 +0000
+++ checkbox-old/checkbox/parsers/lshwjson.py	2013-07-03 16:16:26 +0000
@@ -0,0 +1,23 @@
+import sys
+import json
+
+class LshwJsonParser:
+
+    def __init__(self, stream_or_string):
+        self.stream_or_string = stream_or_string
+
+    def _parse_lshw(self, lshw, result):
+        if 'children' in lshw.keys():
+            for child in lshw['children']:
+                self._parse_lshw(child, result)
+            del lshw['children']
+
+        result.addHardware(lshw)
+
+    def run(self, result):
+        try:
+            lshw = json.loads(self.stream_or_string)
+        except:
+            print('not valid json')
+
+        self._parse_lshw(lshw, result)

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-07-01 13:44:11 +0000
+++ checkbox-old/debian/changelog	2013-07-03 16:16:26 +0000
@@ -3,6 +3,9 @@
   [ Brendan Donegan ]
   * plugins/launchpad_report.py - Don't include attachments which have a status
     of 'unsupported' (LP: #1196531)
+  * checkbox/parsers/lshwjson.py, scripts/memory_compare - Create a parser for
+    lshw and use this in the memory_compare script instead of dmidecode
+    (LP: #1184661)
 
  -- Brendan Donegan <[e-mail]>  Fri, 28 Jun 2013 15:02:58 +0100
 

=== modified file 'checkbox-old/scripts/memory_compare'
--- checkbox-old/scripts/memory_compare	2013-05-29 07:50:30 +0000
+++ checkbox-old/scripts/memory_compare	2013-07-03 16:16:26 +0000
@@ -3,29 +3,26 @@
 import os
 import sys
 
-from checkbox.parsers.dmidecode import DmidecodeParser
+from checkbox.parsers.lshwjson import LshwJsonParser
 from checkbox.parsers.meminfo import MeminfoParser
+from subprocess import check_output, PIPE
 
 THRESHOLD = 10
 
-class DmiResult:
+class LshwJsonResult:
 
     total_size = 0
 
-    def addDmiDevice(self, device):
-        form = getattr(device, "form", None)
-
-        if form and "IMM" in form:
-            try:
-                self.total_size += int(getattr(device, "size", 0))
-            except ValueError:
-                pass
+    def addHardware(self, hardware):
+        if hardware['id'] == 'memory':
+            self.total_size += int(hardware['size'])
 
 def get_installed_memory_size():
-    dmi = DmidecodeParser(os.popen('dmidecode'))
-    result = DmiResult()
-
-    dmi.run(result)
+    lshw = LshwJsonParser(check_output(['lshw','-json'],
+                          universal_newlines=True,
+                          stderr=PIPE))
+    result = LshwJsonResult()
+    lshw.run(result)
 
     return result.total_size
 
@@ -57,21 +54,21 @@
     except ZeroDivisionError:
         print("Results:")
         print("\t/proc/meminfo reports:\t%s kB" % visible_memory, file=sys.stderr)
-        print("\tdmi reports:\t%s kB" % installed_memory, file=sys.stderr)
-        print("\nFAIL: Either dmi or /proc/meminfo returned a memory size of 0 kB", file=sys.stderr)
+        print("\tlshw reports:\t%s kB" % installed_memory, file=sys.stderr)
+        print("\nFAIL: Either lshw or /proc/meminfo returned a memory size of 0 kB", file=sys.stderr)
         return 1
     
     if percentage <= THRESHOLD:
         print("Results:")
         print("\t/proc/meminfo reports:\t%s kB" % visible_memory)
-        print("\tdmi reports:\t%s kB" % installed_memory)
-        print("\nPASS: Meminfo reports %d bytes less than DMI, a difference of %.2f%%. This is less than the %d%% variance allowed." % (difference, percentage, THRESHOLD))
+        print("\tlshw reports:\t%s kB" % installed_memory)
+        print("\nPASS: Meminfo reports %d bytes less than lshw, a difference of %.2f%%. This is less than the %d%% variance allowed." % (difference, percentage, THRESHOLD))
         return 0
     else:
         print("Results")
         print("\t/proc/meminfo reports:\t%s kB" % visible_memory, file=sys.stderr)
-        print("\tdmi reports:\t%s kB" % installed_memory, file=sys.stderr)
-        print("\nFAIL: Meminfo reports %d bytes less than DMI, a difference of %.2f%%. Only a variance of %d%% in reported memory is allowed." % (difference, percentage, THRESHOLD), file=sys.stderr)
+        print("\tlshw reports:\t%s kB" % installed_memory, file=sys.stderr)
+        print("\nFAIL: Meminfo reports %d bytes less than lshw, a difference of %.2f%%. Only a variance of %d%% in reported memory is allowed." % (difference, percentage, THRESHOLD), file=sys.stderr)
         return 1
 
 if __name__ == "__main__":