gooftool: Remove branding and add verify_vpd.
Branding (customization_id and rlz_brand_code) is now moved to mosys and
we should stop provisioning the values in factory.
BUG=chromium:731016
TEST=make test
Change-Id: I72a698539766c7feab42e7db5422bcb8c4a2b186
Reviewed-on: https://chromium-review.googlesource.com/584564
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index 1d40a5f..2fc9980 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -148,7 +148,7 @@
_cros_core_cmd_arg = CmdArg(
'--cros_core', action='store_true',
help='Finalize for ChromeOS Core devices (may add or remove few test '
- 'items. For example, branding verification or firmware bitmap '
+ 'items. For example, registration codes or firmware bitmap '
'locale settings).')
_enforced_release_channels_cmd_arg = CmdArg(
@@ -324,16 +324,13 @@
event_log.Log('switch_dev', type='virtual switch')
-@Command('verify_branding')
-def VerifyBranding(options):
- """Verify that branding fields are properly set.
+@Command('verify_vpd')
+def VerifyVPD(options):
+ """Verify that VPD values are properly set.
- customization_id, if set in the RO VPD, must be of the correct format.
-
- rlz_brand_code must be set either in the RO VPD or OEM partition, and must
- be of the correct format.
+ Check if mandatory fields are set, and deprecated fields don't exist.
"""
- return GetGooftool(options).VerifyBranding()
+ return GetGooftool(options).VerifyVPD()
@Command('verify_release_channel',
@@ -519,10 +516,7 @@
VerifyKeys(options)
VerifyRootFs(options)
VerifyTPM(options)
- if options.cros_core:
- logging.info('VerifyBranding is skipped for ChromeOS Core device.')
- else:
- VerifyBranding(options)
+ VerifyVPD(options)
VerifyReleaseChannel(options)