Merge lp:~pwlars/lava-test/hwprofile into lp:lava-test/0.0

[Paul Larson]

[James Westby (james-w)]

On Fri, 06 Aug 2010 18:25:59 -0000, Paul Larson <email address hidden> wrote:
> Paul Larson has proposed merging lp:~pwlars/abrek/hwprofile into lp:abrek.
>
> Requested reviews:
> Linaro Infrastructure (arm-infrastructure)
>
> --
> https://code.launchpad.net/~pwlars/abrek/hwprofile/+merge/31980
> Your team Linaro Infrastructure is requested to review the proposed merge of lp:~pwlars/abrek/hwprofile into lp:abrek.
> === modified file 'abrek/utils.py'
> --- abrek/utils.py 2010-06-29 16:27:42 +0000
> +++ abrek/utils.py 2010-08-06 18:25:58 +0000
> @@ -3,6 +3,8 @@
> import urllib2
> import urlparse
>
> +_fake_files = None
> +
> def geturl(url, path=""):
> urlpath = urlparse.urlsplit(url).path
> filename = os.path.basename(urlpath)
> @@ -19,7 +21,24 @@
> raise RuntimeError("Could not retrieve %s" % url)
> return filename
>
> -def write_file(data,path):
> +def write_file(data, path):
> with open(path, "w") as fd:
> fd.write(data)
>
> +def read_file(path):
> + global _fake_files
> + if _fake_files is not None:
> + if path in _fake_files:
> + return _fake_files[path]
> + with open(path) as fd:
> + data = fd.read()
> + return data

Do you want to error if there are fake files but the path isn't in them?
That would increase test isolation, but if you intend to read a mix of
files then it obviously won't work.

Otherwise this looks fine.

Thanks,

James

[Paul Larson (pwlars)]

> Do you want to error if there are fake files but the path isn't in them?
> That would increase test isolation, but if you intend to read a mix of
> files then it obviously won't work.
No, because I could have places where I may want or need to fake one file, but the others are fine to read from the real path.

[James Westby (james-w)]

On Fri, 06 Aug 2010 20:56:11 -0000, Paul Larson <email address hidden> wrote:
> > Do you want to error if there are fake files but the path isn't in them?
> > That would increase test isolation, but if you intend to read a mix of
> > files then it obviously won't work.
> No, because I could have places where I may want or need to fake one file, but the others are fine to read from the real path.

Ok.

You maybe want to consider a whitelist, but I'm fine with what you have
now.

Thanks,

James

=== added file 'abrek/hwprofile.py'
--- abrek/hwprofile.py	1970-01-01 00:00:00 +0000
+++ abrek/hwprofile.py	2010-08-06 18:25:58 +0000
@@ -0,0 +1,184 @@
+import commands
+import os
+import re
+from utils import read_file
+
+INTEL_KEYMAP = {
+    'vendor_id': 'cpu_vendor_name',
+    'cpu family': 'cpu_family',
+    'model': 'cpu_model',
+    'model name': 'cpu_model_name',
+    'stepping': 'cpu_stepping',
+    'cpu MHz': 'cpu_mhz',
+    'flags': 'cpu_features',
+}
+
+INTEL_VALMAP = {
+    'cpu family': int,
+    'model': int,
+    'stepping': int,
+    'cpu MHz': float,
+    'flags': lambda value: list(sorted(value.split())),
+}
+
+ARM_KEYMAP = {
+    'Processor': 'cpu_model_name',
+    'Features': 'cpu_features',
+    'CPU implementer': 'cpu_implementer',
+    'CPU architecture': 'cpu_architecture',
+    'CPU variant': 'cpu_variant',
+    'CPU part': 'cpu_part',
+    'CPU revision': 'cpu_revision',
+}
+
+ARM_VALMAP = {
+    'CPU implementer': lambda value: int(value, 16),
+    'CPU architecture': int,
+    'CPU variant': lambda value: int(value, 16),
+    'CPU part': lambda value: int(value, 16),
+    'CPU revision': int,
+    'Features': lambda value: list(sorted(value.split()))
+}
+
+
+def _translate_cpuinfo(keymap, valmap, key, value):
+    """
+    Translate a key and value using keymap and valmap passed in
+    """
+    newkey = keymap.get(key, key)
+    newval = valmap.get(key, lambda x: x)(value)
+    return newkey, newval
+
+def get_cpu_devs():
+    """
+    Return a list of CPU devices
+    """
+    pattern = re.compile('^(?P<key>.+?)\s*:\s*(?P<value>.*)$')
+    cpunum = 0
+    devices = []
+    cpudevs = []
+    cpudevs.append({})
+    machine = os.uname()[-1]
+    if machine in ('i686', 'x86_64'):
+        keymap, valmap = INTEL_KEYMAP, INTEL_VALMAP
+    elif machine.startswith('arm'):
+        keymap, valmap = ARM_KEYMAP, ARM_VALMAP
+
+    cpuinfo = read_file("/proc/cpuinfo")
+    for line in cpuinfo.splitlines():
+        match = pattern.match(line)
+        if match:
+            key, value = match.groups()
+            key, value = _translate_cpuinfo(keymap, valmap,
+                         key, value)
+            if cpudevs[cpunum].get(key):
+                cpunum += 1
+                cpudevs.append({})
+            cpudevs[cpunum][key] = value
+    for c in range(len(cpudevs)):
+        device = {}
+        device['device_type'] = 'device.cpu'
+        device['attributes'] = 'Processor #{0}'.format(c)
+        device['desc'] = cpudevs[c]
+        devices.append(device)
+    return devices
+
+
+def get_board_devs():
+    """
+    Return a list of board devices
+    """
+    devices = []
+    desc = {}
+    device = {}
+    machine = os.uname()[-1]
+    if machine in ('i686', 'x86_64'):
+        name = read_file('/sys/class/dmi/id/board_name') or None
+        vendor = read_file('/sys/class/dmi/id/board_vendor') or None
+        version = read_file('/sys/class/dmi/id/board_version') or None
+        if name:
+            device['attributes'] = name.strip()
+        if vendor:
+            desc['vendor'] = vendor.strip()
+        if version:
+            desc['version'] = version.strip()
+    elif machine.startswith('arm'):
+        cpuinfo = read_file("/proc/cpuinfo")
+        if cpuinfo is None:
+            return devices
+        pattern = re.compile("^Hardware\s*:\s*(?P<hardware>.+)$", re.M)
+        match = pattern.search(cpuinfo)
+        if match is None:
+            return devices
+        desc['hardware'] = match.group('hardware')
+    else:
+        return devices
+    device['desc'] = desc
+    device['device_type'] = 'device.board'
+    devices.append(device)
+    return devices
+
+def get_mem_devs():
+    """ Return a list of memory devices
+
+    This returns up to two items, one for physical RAM and another for swap
+    """
+    pattern = re.compile('^(?P<key>.+?)\s*:\s*(?P<value>.+) kB$', re.M)
+
+    devices = []
+    meminfo = read_file("/proc/meminfo")
+    for match in pattern.finditer(meminfo):
+        key, value = match.groups()
+        if key not in ('MemTotal', 'SwapTotal'):
+            continue
+        capacity = int(value) << 10 #Kernel reports in 2^10 units
+        if capacity == 0:
+            continue
+        if key == 'MemTotal':
+            kind = 'RAM'
+        else:
+            kind = 'swap'
+        name = "{capacity}MiB of {kind}".format(
+               capacity=capacity >> 20, kind=kind)
+        device = {}
+        device['attributes'] = name
+        device['desc'] = {'capacity': capacity, 'kind': kind}
+        device['device_type'] = "device.mem"
+        devices.append(device)
+    return devices
+
+def get_usb_devs():
+    """
+    Return a list of usb devices
+    """
+    pattern = re.compile(
+              "^Bus \d{3} Device \d{3}: ID (?P<vendor_id>[0-9a-f]{4}):"
+              "(?P<product_id>[0-9a-f]{4}) (?P<name>.*)$")
+    devices = []
+    for line in commands.getoutput('lsusb').splitlines():
+        match = pattern.match(line)
+        if match:
+            vendor_id, product_id, name = match.groups()
+            desc = {}
+            device = {}
+            desc['vendor_id'] = int(vendor_id, 16)
+            desc['product_id'] = int(product_id, 16)
+            device['desc'] = desc
+            device['attributes'] = name
+            device['device_type'] = 'device.usb'
+            devices.append(device)
+    return devices
+
+def get_hw_context():
+    """
+    Return a dict with all of the hardware profile information gathered
+    """
+    hw_context = {}
+    devices = []
+    devices.extend(get_cpu_devs())
+    devices.extend(get_board_devs())
+    devices.extend(get_mem_devs())
+    devices.extend(get_usb_devs())
+    hw_context['devices'] = devices
+    return hw_context
+

=== modified file 'abrek/utils.py'
--- abrek/utils.py	2010-06-29 16:27:42 +0000
+++ abrek/utils.py	2010-08-06 18:25:58 +0000
@@ -3,6 +3,8 @@
 import urllib2
 import urlparse
 
+_fake_files = None
+
 def geturl(url, path=""):
     urlpath = urlparse.urlsplit(url).path
     filename = os.path.basename(urlpath)
@@ -19,7 +21,24 @@
         raise RuntimeError("Could not retrieve %s" % url)
     return filename
 
-def write_file(data,path):
+def write_file(data, path):
     with open(path, "w") as fd:
         fd.write(data)
 
+def read_file(path):
+    global _fake_files
+    if _fake_files is not None:
+        if path in _fake_files:
+            return _fake_files[path]
+    with open(path) as fd:
+        data = fd.read()
+    return data
+
+def fake_file(path, data):
+    """
+    Set up a fake file to be read with read_file() in testing
+    """
+    global _fake_files
+    if _fake_files is None:
+        _fake_files = {}
+    _fake_files[path] = data

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2010-08-04 17:29:48 +0000
+++ tests/__init__.py	2010-08-06 18:25:58 +0000
@@ -6,7 +6,8 @@
                     'tests.test_abrektestinstaller',
                     'tests.test_abrektestrunner',
                     'tests.test_abrektestparser',
-                    'tests.test_swprofile']
+                    'tests.test_swprofile',
+                    'tests.test_hwprofile']
     loader = unittest.TestLoader()
     suite = loader.loadTestsFromNames(module_names)
     return suite

=== added file 'tests/test_hwprofile.py'
--- tests/test_hwprofile.py	1970-01-01 00:00:00 +0000
+++ tests/test_hwprofile.py	2010-08-06 18:25:58 +0000
@@ -0,0 +1,78 @@
+import unittest
+
+import abrek.hwprofile
+from abrek.utils import fake_file
+
+class AptCache:
+    def __init__(self, packages=[]):
+        self.packages = packages
+
+ARM_CPUINFO_FILE = """Processor       : ARMv7 Processor rev 3 (v7l)
+BogoMIPS        : 483.16
+Features        : swp half thumb fastmult vfp edsp neon vfpv3*
+CPU implementer : 0x41
+CPU architecture: 7
+CPU variant     : 0x1
+CPU part        : 0xc08
+CPU revision    : 3
+
+Hardware        : OMAP3 Beagle Board
+Revision        : 0020
+Serial          : 0000000000000000"""
+
+FAKE_BOARDNAME_FILE = "XXXXXXX"
+
+FAKE_MEMINFO_FILE = """MemTotal:         238220 kB
+MemFree:           45992 kB
+Buffers:            4564 kB
+Cached:            73220 kB
+SwapCached:        15536 kB
+Active:            48460 kB
+Inactive:         122624 kB
+Active(anon):      18788 kB
+Inactive(anon):    75888 kB
+Active(file):      29672 kB
+Inactive(file):    46736 kB
+Unevictable:           0 kB
+Mlocked:               0 kB
+SwapTotal:        524284 kB
+SwapFree:         458436 kB
+Dirty:                 0 kB
+Writeback:             0 kB
+AnonPages:         81076 kB
+Mapped:             9556 kB
+Shmem:              1376 kB
+Slab:              11072 kB
+SReclaimable:       4408 kB
+SUnreclaim:         6664 kB
+KernelStack:        1656 kB
+PageTables:         2748 kB
+NFS_Unstable:          0 kB
+Bounce:                0 kB
+WritebackTmp:          0 kB
+CommitLimit:      643392 kB
+Committed_AS:     398812 kB
+VmallocTotal:     647168 kB
+VmallocUsed:        1936 kB
+VmallocChunk:     643316 kB"""
+
+class HwprofileTests(unittest.TestCase):
+    def test_get_cpu_devs(self):
+        fake_file('/proc/cpuinfo', ARM_CPUINFO_FILE)
+        devs = abrek.hwprofile.get_cpu_devs()
+        processor = "ARMv7 Processor rev 3 (v7l)"
+        self.assertEqual(processor, devs[0]['desc']['Processor'])
+
+    def test_get_board_devs(self):
+        fake_file('/sys/class/dmi/id/board_name', FAKE_BOARDNAME_FILE)
+        devs = abrek.hwprofile.get_board_devs()
+        self.assertEqual(FAKE_BOARDNAME_FILE, devs[0]['attributes'])
+
+    def test_get_mem_devs(self):
+        fake_file('/proc/meminfo', FAKE_MEMINFO_FILE)
+        devs = abrek.hwprofile.get_mem_devs()
+        self.assertEqual(243937280, devs[0]['desc']['capacity'])
+
+    def test_get_usb_devs(self):
+        devs = abrek.hwprofile.get_usb_devs()
+        self.assertEqual('device.usb', devs[0]['device_type'])