factory_test_tools: merge new properties from R11 factory hardware_Components

gft_hwcomp.py

 #!/usr/bin/python
 #
 # Copyright (c) 2011 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 os
 import pprint
 import re
 import sys
@@ skipping 27 matching lines @@
     'hash_ro_firmware',
     'part_id_audio_codec',
     'part_id_cpu',
     'part_id_display_panel',
     'part_id_dram',
     'part_id_embedded_controller',
     'part_id_ethernet',
     'part_id_flash_chip',
     'part_id_ec_flash_chip',
     'part_id_hwqual',
+    'part_id_keyboard',
     'part_id_storage',
     'part_id_tpm',
     'part_id_wireless',
     'vendor_id_touchpad',
     'version_rw_firmware',
+    'version_3g_firmware',
     ]
   _pci_cids = [
     'part_id_chipset',
     'part_id_usb_hosts',
     'part_id_vga',
     ]
   _usb_cids = [
     'part_id_bluetooth',
     'part_id_webcam',
     'part_id_3g',
@@ skipping 219 matching lines @@
   def get_part_id_hwqual(self):
     part_id = gft_common.SystemOutput('crossystem hwid').strip()
     return (part_id if part_id else self._not_present)
 
   def get_part_id_storage(self):
     cmd = ('cd $(find /sys/devices -name sda)/../..; '
            'cat vendor model | tr "\n" " " | sed "s/ \\+/ /g"')
     part_id = gft_common.SystemOutput(cmd).strip()
     return part_id
 
+  def get_part_id_keyboard(self):
+    # VPD value "initial_locale"="en-US" should be listed.

[Louis, 2011/04/11 02:43:12]

Could you change the example as following to match your code:

  "keyboard_layout"="xkb:gb:extd:eng"

Thanks

+    image_file = self.load_main_firmware()
+    part_id = gft_common.SystemOutput(
+        'vpd -i RO_VPD -l -f %s | grep keyboard_layout | cut -f4 -d\\"' %

[Louis, 2011/04/11 02:43:12]

shall we escape -f %s like

  -f \\"%s\\"

Ignore this comment if image_file doesn't contain dangerous chars.

+        image_file).strip()
+    return part_id or self._not_present
+
   def get_part_id_tpm(self):
     """ Returns Manufacturer_info : Chip_Version """
     cmd = 'tpm_version'
     tpm_output = gft_common.SystemOutput(cmd)
     tpm_lines = tpm_output.splitlines()
     tpm_dict = {}
     for tpm_line in tpm_lines:
       [key, colon, value] = tpm_line.partition(':')
       tpm_dict[key.strip()] = value.strip()
     part_id = ''
@@ skipping 83 matching lines @@
       data = flashrom.get_section(base_img, layout, name)
       block = vblock.unpack_verification_block(data)
       ver = block['VbFirmwarePreambleHeader']['firmware_version']
       versions[index] = ver
     # we embed error reports in return value.
     assert len(versions) == 2
     if versions[0] != versions[1]:
       return 'A=%d, B=%d' % (versions[0], versions[1])
     return '%d' % versions[0]
 
+  def get_version_3g_firmware(self):
+    version = 'Unknown'
+    # TODO(hungte) use mm.py directly to prevent the need of shell scripting
+    modem_status = gft_common.SystemOutput('modem status').splitlines()
+    if not modem_status:
+      return self._not_present
+
+    # status format:
+    # Manufacturer: $VENDOR
+    # Modem: $MODEM
+    # Version: $VERSION_MAY_BE_MULTILINE
+    def ParseInfo(name):
+      data = [line for line in modem_status if line.find('%s: ' % name) >= 0]
+      assert len(data) < 2
+      return data[0].split(': ', 1)[1].strip()
+
+    version = ParseInfo('Version')
+    vendor = ParseInfo('Manufacturer')
+    modem = ParseInfo('Modem')
+
+    if vendor == 'Samsung' and modem == 'GT-Y3300X':
+      # The real version is in "Version:" +2 lines
+      version = ''
+      for i, line in enumerate(modem_status):
+        if 'Version: ' in line:
+          version = modem_status[i + 2].strip()
+          break
+    return version or 'Unknown'
+
   def _read_gbb_component(self, name):
     image_file = self.load_main_firmware()
     if not image_file:
       ErrorDie('cannot load main firmware')
     filename = gft_common.GetTemporaryFileName('gbb%s' % name)
     if os.system('gbb_utility -g --%s=%s %s >/dev/null 2>&1' %
                  (name, filename, image_file)) != 0:
       ErrorDie('cannot get %s from GBB' % name)
     value = gft_common.ReadBinaryFile(filename)
     os.remove(filename)
@@ skipping 190 matching lines @@
 
   for arg in args:
     (matched, failures) = components.match_current_system(arg)
     print 'Probed (%s):' % arg
     print components.pformat(matched)
     print 'Failures (%s):' % arg
     print components.pformat(failures)
 
 if __name__ == '__main__':
   _main(sys.argv[0], sys.argv[1:])