[autotest] Rename server/hosts/repair to repair_utils.
To avoid naming confusion between the `repair` method and the module
named `repair`, rename the latter to `repair_utils`.
BUG=None
TEST=None
Change-Id: I63ddb544b24ebb7002a4719359dd536145ef7452
Reviewed-on: https://chromium-review.googlesource.com/1207552
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Congbin Guo <guocb@chromium.org>
diff --git a/server/hosts/cros_repair.py b/server/hosts/cros_repair.py
index d8eec05..64bafae 100644
--- a/server/hosts/cros_repair.py
+++ b/server/hosts/cros_repair.py
@@ -18,7 +18,7 @@
from autotest_lib.server.cros import autoupdater
from autotest_lib.server.cros.dynamic_suite import tools
from autotest_lib.server.hosts import cros_firmware
-from autotest_lib.server.hosts import repair
+from autotest_lib.server.hosts import repair_utils
# _DEV_MODE_ALLOW_POOLS - The set of pools that are allowed to be
# in dev mode (usually, those should be unmanaged devices)
@@ -486,7 +486,7 @@
return 'Reset the DUT via servo'
-class CrosRebootRepair(repair.RebootRepair):
+class CrosRebootRepair(repair_utils.RebootRepair):
"""Repair a CrOS target by clearing dev mode and rebooting it."""
def repair(self, host):
@@ -607,18 +607,18 @@
FirmwareStatusVerifier = cros_firmware.FirmwareStatusVerifier
FirmwareVersionVerifier = cros_firmware.FirmwareVersionVerifier
verify_dag = (
- (repair.SshVerifier, 'ssh', ()),
- (DevModeVerifier, 'devmode', ('ssh',)),
- (HWIDVerifier, 'hwid', ('ssh',)),
- (ACPowerVerifier, 'power', ('ssh',)),
- (EXT4fsErrorVerifier, 'ext4', ('ssh',)),
- (WritableVerifier, 'writable', ('ssh',)),
- (TPMStatusVerifier, 'tpm', ('ssh',)),
- (UpdateSuccessVerifier, 'good_au', ('ssh',)),
- (FirmwareStatusVerifier, 'fwstatus', ('ssh',)),
- (FirmwareVersionVerifier, 'rwfw', ('ssh',)),
- (PythonVerifier, 'python', ('ssh',)),
- (repair.LegacyHostVerifier, 'cros', ('ssh',)),
+ (repair_utils.SshVerifier, 'ssh', ()),
+ (DevModeVerifier, 'devmode', ('ssh',)),
+ (HWIDVerifier, 'hwid', ('ssh',)),
+ (ACPowerVerifier, 'power', ('ssh',)),
+ (EXT4fsErrorVerifier, 'ext4', ('ssh',)),
+ (WritableVerifier, 'writable', ('ssh',)),
+ (TPMStatusVerifier, 'tpm', ('ssh',)),
+ (UpdateSuccessVerifier, 'good_au', ('ssh',)),
+ (FirmwareStatusVerifier, 'fwstatus', ('ssh',)),
+ (FirmwareVersionVerifier, 'rwfw', ('ssh',)),
+ (PythonVerifier, 'python', ('ssh',)),
+ (repair_utils.LegacyHostVerifier, 'cros', ('ssh',)),
)
return verify_dag
@@ -629,7 +629,7 @@
repair_actions = (
# RPM cycling must precede Servo reset: if the DUT has a dead
# battery, we need to reattach AC power before we reset via servo.
- (repair.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
+ (repair_utils.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
(ServoSysRqRepair, 'sysrq', (), ('ssh',)),
(ServoResetRepair, 'servoreset', (), ('ssh',)),
@@ -685,11 +685,11 @@
"""Return the verification DAG for a `MoblabHost`."""
FirmwareVersionVerifier = cros_firmware.FirmwareVersionVerifier
verify_dag = (
- (repair.SshVerifier, 'ssh', ()),
- (ACPowerVerifier, 'power', ('ssh',)),
- (FirmwareVersionVerifier, 'rwfw', ('ssh',)),
- (PythonVerifier, 'python', ('ssh',)),
- (repair.LegacyHostVerifier, 'cros', ('ssh',)),
+ (repair_utils.SshVerifier, 'ssh', ()),
+ (ACPowerVerifier, 'power', ('ssh',)),
+ (FirmwareVersionVerifier, 'rwfw', ('ssh',)),
+ (PythonVerifier, 'python', ('ssh',)),
+ (repair_utils.LegacyHostVerifier, 'cros', ('ssh',)),
)
return verify_dag
@@ -697,7 +697,7 @@
def _moblab_repair_actions():
"""Return the repair actions for a `MoblabHost`."""
repair_actions = (
- (repair.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
+ (repair_utils.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
(AutoUpdateRepair, 'au', ('ssh',), _CROS_AU_TRIGGERS),
)
return repair_actions
diff --git a/server/hosts/cros_repair_unittest.py b/server/hosts/cros_repair_unittest.py
index 32022ad..a538bbd 100755
--- a/server/hosts/cros_repair_unittest.py
+++ b/server/hosts/cros_repair_unittest.py
@@ -13,11 +13,11 @@
from autotest_lib.client.common_lib.cros import retry
from autotest_lib.server.hosts import cros_firmware
from autotest_lib.server.hosts import cros_repair
-from autotest_lib.server.hosts import repair
+from autotest_lib.server.hosts import repair_utils
CROS_VERIFY_DAG = (
- (repair.SshVerifier, 'ssh', ()),
+ (repair_utils.SshVerifier, 'ssh', ()),
(cros_repair.DevModeVerifier, 'devmode', ('ssh',)),
(cros_repair.HWIDVerifier, 'hwid', ('ssh',)),
(cros_repair.ACPowerVerifier, 'power', ('ssh',)),
@@ -28,11 +28,11 @@
(cros_firmware.FirmwareStatusVerifier, 'fwstatus', ('ssh',)),
(cros_firmware.FirmwareVersionVerifier, 'rwfw', ('ssh',)),
(cros_repair.PythonVerifier, 'python', ('ssh',)),
- (repair.LegacyHostVerifier, 'cros', ('ssh',)),
+ (repair_utils.LegacyHostVerifier, 'cros', ('ssh',)),
)
CROS_REPAIR_ACTIONS = (
- (repair.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
+ (repair_utils.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
(cros_repair.ServoSysRqRepair, 'sysrq', (), ('ssh',)),
(cros_repair.ServoResetRepair, 'servoreset', (), ('ssh',)),
(cros_firmware.FirmwareRepair,
@@ -55,21 +55,21 @@
)
MOBLAB_VERIFY_DAG = (
- (repair.SshVerifier, 'ssh', ()),
+ (repair_utils.SshVerifier, 'ssh', ()),
(cros_repair.ACPowerVerifier, 'power', ('ssh',)),
(cros_firmware.FirmwareVersionVerifier, 'rwfw', ('ssh',)),
(cros_repair.PythonVerifier, 'python', ('ssh',)),
- (repair.LegacyHostVerifier, 'cros', ('ssh',)),
+ (repair_utils.LegacyHostVerifier, 'cros', ('ssh',)),
)
MOBLAB_REPAIR_ACTIONS = (
- (repair.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
+ (repair_utils.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
(cros_repair.AutoUpdateRepair,
'au', ('ssh',), ('power', 'rwfw', 'python', 'cros',)),
)
JETSTREAM_VERIFY_DAG = (
- (repair.SshVerifier, 'ssh', ()),
+ (repair_utils.SshVerifier, 'ssh', ()),
(cros_repair.DevModeVerifier, 'devmode', ('ssh',)),
(cros_repair.HWIDVerifier, 'hwid', ('ssh',)),
(cros_repair.ACPowerVerifier, 'power', ('ssh',)),
@@ -80,7 +80,7 @@
(cros_firmware.FirmwareStatusVerifier, 'fwstatus', ('ssh',)),
(cros_firmware.FirmwareVersionVerifier, 'rwfw', ('ssh',)),
(cros_repair.PythonVerifier, 'python', ('ssh',)),
- (repair.LegacyHostVerifier, 'cros', ('ssh',)),
+ (repair_utils.LegacyHostVerifier, 'cros', ('ssh',)),
(cros_repair.JetstreamTpmVerifier, 'jetstream_tpm', ('ssh',)),
(cros_repair.JetstreamAttestationVerifier, 'jetstream_attestation',
('ssh',)),
@@ -88,7 +88,7 @@
)
JETSTREAM_REPAIR_ACTIONS = (
- (repair.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
+ (repair_utils.RPMCycleRepair, 'rpm', (), ('ssh', 'power',)),
(cros_repair.ServoSysRqRepair, 'sysrq', (), ('ssh',)),
(cros_repair.ServoResetRepair, 'servoreset', (), ('ssh',)),
(cros_firmware.FirmwareRepair,
@@ -228,6 +228,7 @@
class CrosRepairUnittests(unittest.TestCase):
+ # pylint: disable=missing-docstring
maxDiff = None
diff --git a/server/hosts/repair.py b/server/hosts/repair_utils.py
similarity index 100%
rename from server/hosts/repair.py
rename to server/hosts/repair_utils.py
diff --git a/server/hosts/servo_repair.py b/server/hosts/servo_repair.py
index 0fb2f97..8fd5ba2 100644
--- a/server/hosts/servo_repair.py
+++ b/server/hosts/servo_repair.py
@@ -8,7 +8,7 @@
import common
from autotest_lib.client.common_lib import hosts
from autotest_lib.server.cros.dynamic_suite import frontend_wrappers
-from autotest_lib.server.hosts import repair
+from autotest_lib.server.hosts import repair_utils
class _UpdateVerifier(hosts.Verifier):
@@ -295,7 +295,7 @@
return 'Start servod with the proper config settings.'
-class _ServoRebootRepair(repair.RebootRepair):
+class _ServoRebootRepair(repair_utils.RebootRepair):
"""
Reboot repair action that also waits for an update.
@@ -352,7 +352,7 @@
"""
config = ['brd_config', 'ser_config']
verify_dag = [
- (repair.SshVerifier, 'servo_ssh', []),
+ (repair_utils.SshVerifier, 'servo_ssh', []),
(_UpdateVerifier, 'update', ['servo_ssh']),
(_BoardConfigVerifier, 'brd_config', ['servo_ssh']),
(_SerialConfigVerifier, 'ser_config', ['servo_ssh']),
@@ -372,7 +372,7 @@
servod_deps = ['job', 'servod', 'pwr_button']
repair_actions = [
- (repair.RPMCycleRepair, 'rpm', [], ['servo_ssh']),
+ (repair_utils.RPMCycleRepair, 'rpm', [], ['servo_ssh']),
(_RestartServod, 'restart', ['servo_ssh'], config + servod_deps),
(_ServoRebootRepair, 'servo_reboot', ['servo_ssh'], servod_deps),
(_DutRebootRepair, 'dut_reboot', ['servod'], ['lid_open']),