Adding 3G wireless modem firmware check in HWID test

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 firmware_hash
 import glob
 import logging
 import os
 import pprint
 import re
@@ skipping 26 matching lines @@
         '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 322 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 version_3g_firmware(self):

[Jay Kim, 2011/03/29 05:28:50]

It should be get_version_3g_firmware. Will update this change.

+        vendor_cmd = ('modem status | grep Manufacturer: | '
+                      'sed s/.\*"Manufacturer: "//')
+        vendor = utils.system_output(vendor_cmd)
+        modem_cmd = ('modem status | grep Modem: | '
+                     'sed s/.\*"Modem: "//')
+        modem = utils.system_output(modem_cmd)
+        if vendor == 'Samsung' and modem == 'GT-Y3300X':
+            cmd = ("modem status | grep Version: -A 2 | tail -1 | "
+                   "awk '{print $1}'")
+            version = utils.system_output(cmd)
+        elif vendor == 'Qualcomm Incorporated':
+            cmd = ("modem status | awk '/Version: / {print $2}'")
+            version = utils.system_output(cmd)
+        else:
+            version = 'Unknown'
+        return version
 
     def probe_key_recovery(self, part_id):
         current_key = self._gbb.get_recoverykey()
         target_key = utils.read_file(part_id)
         return current_key.startswith(target_key)
 
 
     def probe_key_root(self, part_id):
         current_key = self._gbb.get_rootkey()
         target_key = utils.read_file(part_id)
@@ skipping 156 matching lines @@
                     # hardware_Components may run without factory environment
                     factory.log('Failed setting shared data, ignored: %s' %
                                 repr(e))
                 return
 
         if only_cardreader_failed:
             all_failures = ('You may forget to insert an SD card.\n' +
                             all_failures)
 
         raise error.TestFail(all_failures)