[autotest] Remove the concept of 'protection level' from repair.
In original Autotest, hosts have a 'protection level' that is
passed to repair jobs in order to limit the specific kinds of repair
that can be done. For the CrOS lab, this concept is largely not
useful; we want a uniform repair procedure determined by the kind of
DUT being repaired, not by a database configuration.
This removes the concept of 'protection level' from the repair flow;
repair steps are now determined only by the class of Host that
handles the operation. The protection level remains in the
database, but the only meaningful value is 'Do not verify'. That
setting on a host will prevent it from running any verify, cleanup,
or repair tasks. This is done for the sake of non-DUT hosts that
exist in the CrOS lab AFE database.
BUG=None
TEST=unit tests, and run repair in a local instance
Change-Id: I1d512eb2b1fe604b70fec00b3a290f5f6b9d9beb
Reviewed-on: https://chromium-review.googlesource.com/312979
Commit-Ready: Richard Barnette <[email protected]>
Tested-by: Richard Barnette <[email protected]>
Reviewed-by: Dan Shi <[email protected]>
diff --git a/server/server_job.py b/server/server_job.py
index 45ff890..5dc20ba 100644
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -385,7 +385,7 @@
return namespace
- def cleanup(self, labels=''):
+ def cleanup(self, labels):
"""Cleanup machines.
@param labels: Comma separated job labels, will be used to
@@ -401,7 +401,7 @@
self._execute_code(CLEANUP_CONTROL_FILE, namespace, protect=False)
- def verify(self, labels=''):
+ def verify(self, labels):
"""Verify machines are all ssh-able.
@param labels: Comma separated job labels, will be used to
@@ -417,7 +417,7 @@
self._execute_code(VERIFY_CONTROL_FILE, namespace, protect=False)
- def reset(self, labels=''):
+ def reset(self, labels):
"""Reset machines by first cleanup then verify each machine.
@param labels: Comma separated job labels, will be used to
@@ -433,10 +433,9 @@
self._execute_code(RESET_CONTROL_FILE, namespace, protect=False)
- def repair(self, host_protection, labels=''):
+ def repair(self, labels):
"""Repair machines.
- @param host_protection: level of host protection.
@param labels: Comma separated job labels, will be used to
determine special task actions.
"""
@@ -446,8 +445,7 @@
os.chdir(self.resultdir)
namespace = self._make_namespace()
- namespace.update({'protection_level' : host_protection,
- 'job_labels': labels, 'args': ''})
+ namespace.update({'job_labels': labels, 'args': ''})
self._execute_code(REPAIR_CONTROL_FILE, namespace, protect=False)
