gooftool: Remove the sub-command `gooftool probe`.
This CL removes the general probing command `gooftool probe`.
To get the components' identities for HWID, use the command
`hwid probe`. To probe the system to get each component's detail
information, please run the command
`probe probe --include-generic --include-volatile`.
BUG=None
TEST=make test
Change-Id: I70b79f7a10053425cb41b54432524862f668d4db
Reviewed-on: https://chromium-review.googlesource.com/939228
Commit-Ready: Yong Hong <yhong@google.com>
Tested-by: Yong Hong <yhong@google.com>
Reviewed-by: Wei-Han Chen <stimim@chromium.org>
diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index 6b80089..c64bca0 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -40,7 +40,6 @@
from cros.factory.utils.argparse_utils import verbosity_cmd_arg
from cros.factory.utils.debug_utils import SetupLogging
from cros.factory.utils import file_utils
-from cros.factory.utils import json_utils
from cros.factory.utils.process_utils import Spawn
from cros.factory.utils import sys_utils
from cros.factory.utils import time_utils
@@ -133,9 +132,8 @@
help='allow only HWIDs with these status values')
_probe_results_cmd_arg = CmdArg(
- '--probe_results', metavar='RESULTS.yaml',
- help=('Output from "gooftool probe" (used instead of '
- 'probing this system).'))
+ '--probe_results', metavar='RESULTS.json',
+ help=('Output from "hwid probe" (used instead of probing this system).'))
_device_info_cmd_arg = CmdArg(
'--device_info', metavar='DEVICE_INFO.yaml', default=None,
@@ -222,19 +220,6 @@
'e.g. "gooftool verify --skip_list verify_tpm clear_gbb_flags".')
-@Command('probe',
- CmdArg('--comps', nargs='*',
- help='List of keys from the component_db registry.'),
- CmdArg('--no_vol', action='store_true',
- help='Do not probe volatile data.'))
-def RunProbe(options):
- """Print json-formatted breakdown of probed device properties."""
- logging.warning('This sub-command is going to be deprecated by `probe` '
- 'command-line tool, please see `probe --help` for detail.')
- probed_result = GetGooftool(options).Probe(options.comps, not options.no_vol)
- print json_utils.DumpStr(probed_result, pretty=True)
-
-
@Command(
'verify_ec_key',
_ec_pubkey_path_cmd_arg,