Not check versions of BIOS. Checking hash is enough.

client/site_tests/hardware_Components/hardware_Components.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import glob, hashlib, logging, os, pprint, re
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.common_lib import flashrom_util
 from autotest_lib.client.common_lib import site_vblock
 
 
 class hardware_Components(test.test):
     version = 1
     _cids = [
         'hash_ro_firmware',
         'part_id_audio_codec',
-        'part_id_bios',
         'part_id_cpu',
         'part_id_display_panel',
         'part_id_embedded_controller',
         'part_id_ethernet',
         'part_id_flash_chip',
         'part_id_hwqual',
         'part_id_storage',
         'part_id_wireless',
+        'vendor_id_bios',
         'vendor_id_touchpad',
         'ver_rw_firmware',
     ]
     _pci_cids = [
         'part_id_chipset',
         'part_id_usb_hosts',
         'part_id_vga',
     ]
     _usb_cids = [
         'part_id_bluetooth',
@@ skipping 19 matching lines @@
 
         app_cids = self._approved[comp_key]
 
         if '*' in app_cids:
             return
 
         if not comp_id in app_cids:
             self._failures[comp_key] = [ comp_id ]
 
 
+    def check_approved_part_id_existence(self, cid, type):
+        """
+        Check if there are matching devices on the system.
+        Parameter type should be one of 'pci', 'usb', or 'others'.
+        """
+        if cid in self._ignored:
+            return
+
+        if not self._approved.has_key(cid):
+            raise error.TestFail('%s missing from database' % cid)
+
+        approved_devices = self._approved[cid]
+        if '*' in approved_devices:
+            self._system[cid] = [ '*' ]
+            return
+
+        for device in approved_devices:
+            present = False
+            if type in ['pci', 'usb']:
+                try:
+                    cmd = '/usr/sbin/ls' + type + ' -d %s'
+                    output = utils.system_output(cmd % device)
+                    # If it shows something, means found.
+                    if output:
+                        present = True
+                except:
+                    pass
+            elif type == 'others':
+                present = getattr(self, 'check_existence_' + cid)(device)
+
+            if present:
+                self._system[cid] = [ device ]
+                return
+
+        self._failures[cid] = [ 'No match' ]
+
+
+    def check_existence_part_id_chrontel(self, part_id):
+        if part_id == self._not_present:
+            return True
+
+        if part_id == 'ch7036':
+            grep_cmd = 'grep i2c_dev /proc/modules'
+            i2c_loaded = (utils.system(grep_cmd, ignore_status=True) == 0)
+            if not i2c_loaded:
+                utils.system('modprobe i2c_dev')
+
+            probe_cmd = 'ch7036_monitor -p'
+            present = (utils.system(probe_cmd, ignore_status=True) == 0)
+
+            if not i2c_loaded:
+                utils.system('modprobe -r i2c_dev')
+            return present
+
+        return False
+
+
     def get_part_id_audio_codec(self):
         cmd = 'grep -R Codec: /proc/asound/* | head -n 1 | sed s/.\*Codec://'
         part_id = utils.system_output(cmd).strip()
         return part_id
 
 
-    def get_part_id_bios(self):
-        cmd = ('dmidecode | grep -A 2 "BIOS Information" | tail -2 '
-               '| sed "s/.*: //" | tr "\n" " "')
-        part_id = utils.system_output(cmd).strip()
-
-        cmd = ('dmidecode | grep "\(BIOS\|Firmware\) Revision" | sed "s/\t//" '
-               '| sed "s/Revision/Rev/"')
-        rev_num = ', '.join(utils.system_output(cmd).split('\n'))
-
-        if rev_num:
-            part_id = part_id + ' (' + rev_num + ')'
-
-        return part_id
-
-
     def get_part_id_cpu(self):
         cmd = 'grep -m 1 \'model name\' /proc/cpuinfo | sed s/.\*://'
         part_id = utils.system_output(cmd).strip()
         return part_id
 
 
     def get_part_id_display_panel(self):
         cmd = ('get-edid | parse-edid | grep ModelName | '
                'sed \'s/^.*ModelName "\(.*\)"$/\\1/\'')
         part_id = utils.system_output(cmd).strip()
@@ skipping 63 matching lines @@
     def get_part_id_wireless(self):
         """
           Returns a colon delimited string where the first section
           is the vendor id and the second section is the device id.
         """
         part_id = utils.read_one_line('/sys/class/net/wlan0/device/device')
         vendor_id = utils.read_one_line('/sys/class/net/wlan0/device/vendor')
         return "%s:%s" % (vendor_id.replace('0x',''), part_id.replace('0x',''))
 
 
-    def check_approved_part_id_existence(self, cid, type):
-        """
-        Check if there are matching devices on the system.
-        Parameter type should be one of 'pci', 'usb', or 'others'.
-        """
-        if cid in self._ignored:
-            return
-
-        if not self._approved.has_key(cid):
-            raise error.TestFail('%s missing from database' % cid)
-
-        approved_devices = self._approved[cid]
-        if '*' in approved_devices:
-            self._system[cid] = [ '*' ]
-            return
-
-        for device in approved_devices:
-            present = False
-            if type in ['pci', 'usb']:
-                try:
-                    cmd = '/usr/sbin/ls' + type + ' -d %s'
-                    output = utils.system_output(cmd % device)
-                    # If it shows something, means found.
-                    if output:
-                        present = True
-                except:
-                    pass
-            elif type == 'others':
-                present = getattr(self, 'check_existence_' + cid)(device)
-
-            if present:
-                self._system[cid] = [ device ]
-                return
-
-        self._failures[cid] = [ 'No match' ]
-
-
-    def check_existence_part_id_chrontel(self, part_id):
-        if part_id == self._not_present:
-            return True
-
-        if part_id == 'ch7036':
-            grep_cmd = 'grep i2c_dev /proc/modules'
-            i2c_loaded = (utils.system(grep_cmd, ignore_status=True) == 0)
-            if not i2c_loaded:
-                utils.system('modprobe i2c_dev')
-
-            probe_cmd = 'ch7036_monitor -p'
-            present = (utils.system(probe_cmd, ignore_status=True) == 0)
-
-            if not i2c_loaded:
-                utils.system('modprobe -r i2c_dev')
-            return present
-
-        return False
+    def get_vendor_id_bios(self):
+        cmd = ('dmidecode | grep -A 1 "BIOS Information" | grep Vendor: '
+               '| sed "s/.*Vendor: //"')
+        part_id = utils.system_output(cmd, ignore_status=True).strip()
+        return part_id
 
 
     def get_vendor_id_touchpad(self):
         cmd = 'grep -i Touchpad /proc/bus/input/devices | sed s/.\*=//'
         part_id = utils.system_output(cmd).strip('"')
         return part_id
 
 
     def get_vendor_id_webcam(self):
         cmd = 'cat /sys/class/video4linux/video0/name'
@@ skipping 101 matching lines @@
             if self._failures:
                 all_failures += 'Approved DB: %s' % db
                 all_failures += self.pformat(self._failures)
             else:
                 # If one of DBs is matched, record the hwqual_id and exit.
                 self.write_test_keyval(
                     {'hwqual_id': self._approved['part_id_hwqual'][0]})
                 return
 
         raise error.TestFail(all_failures)