commit c92e6f971402b72aef718b075b6c936756e53221
author Andy Cheng <andycheng@chromium.org> Tue Nov 20 16:55:53 2012 +0800
committer Gerrit <chrome-bot@google.com> Wed Nov 28 22:06:53 2012 -0800
tree 9dea9803a322d3aaa3b53182d02e5f825837f34e
parent 3609fbd22b91ccbe40aaa34e0e23dbe1c3963bdd

Refactor gooftool.py for Probe, VerifyHWID, etc.

Refactored the following commands and added unit tests:

- WriteHwid
- Probe
- VerifyWpSwitch

BUG=None
TEST=Manual on DUT

Change-Id: I0602e515573ac2734f8280fc19b6573775883f38
Reviewed-on: https://gerrit.chromium.org/gerrit/38807
Commit-Ready: Andy Cheng <andycheng@chromium.org>
Reviewed-by: Andy Cheng <andycheng@chromium.org>
Tested-by: Andy Cheng <andycheng@chromium.org>

py/gooftool/gooftool.py

diff --git a/py/gooftool/gooftool.py b/py/gooftool/gooftool.py
index de6f7c1..a2461ad 100755
--- a/py/gooftool/gooftool.py
+++ b/py/gooftool/gooftool.py
@@ -53,14 +53,11 @@
 
 @Command('write_hwid',
          CmdArg('hwid', metavar='HWID', help='HWID string'))
-def WriteHwid(options):
+def WriteHWID(options):
   """Write specified HWID value into the system BB."""
 
   logging.info('writing hwid string %r', options.hwid)
-  main_fw = crosfw.LoadMainFirmware()
-  Shell('gbb_utility --set --hwid="%s" "%s"' %
-        (options.hwid, main_fw.GetFileName()))
-  main_fw.Write(sections=['GBB'])
+  Gooftool().WriteHWID(options.hwid)
   _event_log.Log('write_hwid', hwid=options.hwid)
   print 'Wrote HWID: %r' % options.hwid
 
@@ -273,13 +270,10 @@
                 help='Include VPD data in volatiles.'))
 def RunProbe(options):
   """Print yaml-formatted breakdown of probed device properties."""
-
-  probe_results = Probe(target_comp_classes=options.comps,
-                        probe_volatile=not options.no_vol,
-                        probe_initial_config=not options.no_ic,
-                        probe_vpd=options.include_vpd)
-  print probe_results.Encode()
-
+  print Gooftool().Probe(target_comp_classes=options.comps,
+                         probe_volatile=not options.no_vol,
+                         probe_initial_config=not options.no_ic,
+                         probe_vpd=options.include_vpd).Encode()
 
 @Command('verify_components',
          _hwdb_path_cmd_arg,
@@ -494,11 +488,10 @@
 
 
 @Command('verify_switch_wp')
-def VerifyWpSwitch(options):  # pylint: disable=W0613
+def VerifyWPSwitch(options):  # pylint: disable=W0613
   """Verify hardware write protection switch is enabled."""
 
-  if Shell('crossystem wpsw_cur').stdout.strip() != '1':
-    raise Error, 'write protection switch is disabled'
+  Gooftool().VerifyWPSwitch()
 
 
 @Command('verify_switch_dev')
@@ -571,14 +564,14 @@
 
 
 @Command('clear_gbb_flags')
-def ClearGbbFlags(options):  # pylint: disable=W0613
+def ClearGBBFlags(options):  # pylint: disable=W0613
   """Zero out the GBB flags, in preparation for transition to release state.
 
   No GBB flags are set in release/shipping state, but they are useful
   for factory/development.  See "gbb_utility --flags" for details.
   """
 
-  Gooftool().ClearGbbFlags()
+  Gooftool().ClearGBBFlags()
   _event_log.Log('clear_gbb_flags')
 
 
@@ -607,7 +600,7 @@
   """
 
   if not options.no_write_protect:
-    VerifyWpSwitch({})
+    VerifyWPSwitch({})
   VerifyDevSwitch({})
   VerifyHwid(options)
   VerifySystemTime({})
@@ -729,7 +722,7 @@
 
   Verify(options)
   SetFirmwareBitmapLocale({})
-  ClearGbbFlags({})
+  ClearGBBFlags({})
   if options.no_write_protect:
     logging.warn('WARNING: Firmware Write Protection is SKIPPED.')
     _event_log.Log('wp', fw='both', status='skipped')