[autotest] Rename site_host.SiteHost to cros_host.CrosHost
Rename site_host.SiteHost to cros_host.CrosHost.
cros_host.CrosHost is the new chromeos specific host class.
The concept 'SiteHost' is deprecated as we are dealing with
multiple types of hosts (e.g. ServoHost).
The concept of a single'SiteHost' doesn't meet our needs any more.
All references are updated.
SerialHost is now subclassing RemoteHost and mixes in CrosHost
in hosts.factory.create_host().
BUG=chromium:273833
TEST=Trybot build passes; Repair/Verify pass;
Dummy suite passes;
Server side test platform_InstallTestImage
which is affected by this CL passes.
DEPLOY=scheduler
Change-Id: I5e59194996c67c6b5d7fdcaf40d594ea08de1af5
Reviewed-on: https://chromium-review.googlesource.com/167182
Tested-by: Fang Deng <fdeng@chromium.org>
Reviewed-by: Simran Basi <sbasi@chromium.org>
Commit-Queue: Fang Deng <fdeng@chromium.org>
diff --git a/server/cros/factory_install_test.py b/server/cros/factory_install_test.py
index 3d319fa..52db3e4 100644
--- a/server/cros/factory_install_test.py
+++ b/server/cros/factory_install_test.py
@@ -100,7 +100,7 @@
@abstractmethod
def get_dut_client(self):
"""
- Returns a client (subclass of SiteHost) to control the DUT.
+ Returns a client (subclass of CrosHost) to control the DUT.
"""
pass
diff --git a/server/hosts/__init__.py b/server/hosts/__init__.py
index 2d90332..392b110 100644
--- a/server/hosts/__init__.py
+++ b/server/hosts/__init__.py
@@ -11,15 +11,12 @@
# host abstract classes
from base_classes import Host
from remote import RemoteHost
-try:
- from site_host import SiteHost
-except ImportError, e:
- pass
# host implementation classes
from ssh_host import SSHHost
from guest import Guest
from kvm_guest import KVMGuest
+from cros_host import CrosHost
# extra logger classes
from serial import SerialHost
diff --git a/server/hosts/base_classes.py b/server/hosts/base_classes.py
index 5316865..0759d5f 100644
--- a/server/hosts/base_classes.py
+++ b/server/hosts/base_classes.py
@@ -78,9 +78,3 @@
if self.job:
self.job.hosts.discard(self)
-
-
- @staticmethod
- def check_for_rpm_support(hostname):
- """Stub method. RPM support is implemented in site_host."""
- return False
\ No newline at end of file
diff --git a/server/hosts/site_host.py b/server/hosts/cros_host.py
similarity index 99%
rename from server/hosts/site_host.py
rename to server/hosts/cros_host.py
index 3c09b1f..469e673 100644
--- a/server/hosts/site_host.py
+++ b/server/hosts/cros_host.py
@@ -87,7 +87,7 @@
return add_func
-class SiteHost(abstract_ssh.AbstractSSHHost):
+class CrosHost(abstract_ssh.AbstractSSHHost):
"""Chromium OS specific subclass of Host."""
_parser = autoserv_parser.autoserv_parser
@@ -193,7 +193,7 @@
Recommended usage:
~~~~~~~~
args_dict = utils.args_to_dict(args)
- servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+ servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
host = hosts.create_host(machine, servo_args=servo_args)
~~~~~~~~
@@ -221,7 +221,7 @@
cases apply, `self.servo` will be `None`.
"""
- super(SiteHost, self)._initialize(hostname=hostname,
+ super(CrosHost, self)._initialize(hostname=hostname,
*args, **dargs)
# self.env is a dictionary of environment variable settings
# to be exported for commands run on the host.
@@ -885,7 +885,7 @@
def close(self):
self.rpc_disconnect_all()
- super(SiteHost, self).close()
+ super(CrosHost, self).close()
def _cleanup_poweron(self):
@@ -921,7 +921,7 @@
logging.warn('Unable to restart ui, rebooting device.')
# Since restarting the UI fails fall back to normal Autotest
# cleanup routines, i.e. reboot the machine.
- super(SiteHost, self).cleanup()
+ super(CrosHost, self).cleanup()
# Check if the rpm outlet was manipulated.
if self.has_power():
self._cleanup_poweron()
@@ -941,7 +941,7 @@
# Enable fastsync to avoid running extra sync commands before reboot.
if 'fastsync' not in dargs:
dargs['fastsync'] = True
- super(SiteHost, self).reboot(**dargs)
+ super(CrosHost, self).reboot(**dargs)
def verify_software(self):
@@ -955,7 +955,7 @@
4. update_engine answers a simple status request over DBus.
"""
- super(SiteHost, self).verify_software()
+ super(CrosHost, self).verify_software()
self.check_diskspace(
'/mnt/stateful_partition',
global_config.global_config.get_config_value(
@@ -1436,7 +1436,7 @@
for RPM powered DUT's in the lab. If it does follow the format,
it returns a regular expression MatchObject instead.
"""
- return re.match(SiteHost._RPM_HOSTNAME_REGEX, hostname)
+ return re.match(CrosHost._RPM_HOSTNAME_REGEX, hostname)
def has_power(self):
@@ -1445,7 +1445,7 @@
@return True if this host is in the CROS lab and follows the defined
naming format.
"""
- return SiteHost.check_for_rpm_support(self.hostname)
+ return CrosHost.check_for_rpm_support(self.hostname)
def _set_power(self, state, power_method):
diff --git a/server/hosts/factory.py b/server/hosts/factory.py
index 6c81618..af25cd1 100644
--- a/server/hosts/factory.py
+++ b/server/hosts/factory.py
@@ -3,7 +3,7 @@
from autotest_lib.client.common_lib import error, global_config
from autotest_lib.server import autotest, utils as server_utils
-from autotest_lib.server.hosts import site_factory, site_host, ssh_host, serial
+from autotest_lib.server.hosts import site_factory, cros_host, ssh_host, serial
from autotest_lib.server.hosts import logfile_monitor
@@ -45,7 +45,7 @@
# TODO(fdeng): this method should should dynamically discover
# and allocate host types, crbug.com/273843
- classes = [site_host.SiteHost]
+ classes = [cros_host.CrosHost]
# by default assume we're using SSH support
if SSH_ENGINE == 'paramiko':
from autotest_lib.server.hosts import paramiko_host
diff --git a/server/hosts/remote.py b/server/hosts/remote.py
index d1b4b46..e2ddba5 100644
--- a/server/hosts/remote.py
+++ b/server/hosts/remote.py
@@ -1,5 +1,4 @@
-"""This class defines the Remote host class, mixing in the SiteHost class
-if it is available."""
+"""This class defines the Remote host class."""
import os, logging, urllib
from autotest_lib.client.common_lib import error
diff --git a/server/hosts/serial.py b/server/hosts/serial.py
index e89bff9..007e0ca 100644
--- a/server/hosts/serial.py
+++ b/server/hosts/serial.py
@@ -2,6 +2,7 @@
from autotest_lib.client.common_lib import global_config, utils, error
from autotest_lib.server import utils as server_utils
+from autotest_lib.server.hosts import cros_host
from autotest_lib.server.hosts import remote
@@ -9,13 +10,8 @@
'rpm_frontend_uri', type=str, default='')
-SiteHost = utils.import_site_class(
- __file__, "autotest_lib.server.hosts.site_host", "SiteHost",
- remote.RemoteHost)
-
-
-class SerialHost(SiteHost):
- DEFAULT_REBOOT_TIMEOUT = SiteHost.DEFAULT_REBOOT_TIMEOUT
+class SerialHost(remote.RemoteHost):
+ DEFAULT_REBOOT_TIMEOUT = remote.RemoteHost.DEFAULT_REBOOT_TIMEOUT
HARD_RESET_CMD = 'hardreset'
@@ -70,7 +66,8 @@
logging.warning("Timed out while trying to attach to conmux")
return_value = False
- return return_value or SiteHost.check_for_rpm_support(hostname)
+ return (return_value or
+ cros_host.CrosHost.check_for_rpm_support(hostname))
def start_loggers(self):
diff --git a/server/site_tests/audiovideo_AudioRoutingUSB/control b/server/site_tests/audiovideo_AudioRoutingUSB/control
index 2c28070..02c8eb8 100644
--- a/server/site_tests/audiovideo_AudioRoutingUSB/control
+++ b/server/site_tests/audiovideo_AudioRoutingUSB/control
@@ -25,7 +25,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/autoupdate_EndToEndTest/control b/server/site_tests/autoupdate_EndToEndTest/control
index 0c012e9..de8df79 100644
--- a/server/site_tests/autoupdate_EndToEndTest/control
+++ b/server/site_tests/autoupdate_EndToEndTest/control
@@ -64,7 +64,7 @@
use_servo = args_dict.get('servo_host', False)
servo_args = None
if use_servo:
- servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+ servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
# Create test configuration based on command-line arguments (higher precedence,
# for run_remote_tests.sh invocation) and local variables (lower precedence,
diff --git a/server/site_tests/firmware_CgptState/control b/server/site_tests/firmware_CgptState/control
index 9f6940e..d81eb9d 100644
--- a/server/site_tests/firmware_CgptState/control
+++ b/server/site_tests/firmware_CgptState/control
@@ -25,7 +25,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_cgptstate(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CgptStress/control b/server/site_tests/firmware_CgptStress/control
index 0d2ae9d..c50bd86 100644
--- a/server/site_tests/firmware_CgptStress/control
+++ b/server/site_tests/firmware_CgptStress/control
@@ -21,7 +21,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_cgptstress(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CgptStress/control.dev b/server/site_tests/firmware_CgptStress/control.dev
index 4bd1561..abf0c81 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -21,7 +21,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_cgptstress(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control b/server/site_tests/firmware_ConsecutiveBoot/control
index 8223822..9742118 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_consecutive_boot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev b/server/site_tests/firmware_ConsecutiveBoot/control.dev
index 6d1ad4b..0e77386 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_consecutive_boot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control b/server/site_tests/firmware_CorruptBothFwBodyAB/control
index 766ceb6..4167768 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -27,7 +27,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptbothfwbodyab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
index c9b1d4c..8bc1f4d 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -27,7 +27,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptbothfwbodyab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control b/server/site_tests/firmware_CorruptBothFwSigAB/control
index 8764383..722fe55 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptbothfwsigab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
index 3e6669a..112efbd 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptbothfwsigab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control b/server/site_tests/firmware_CorruptBothKernelAB/control
index 816def7..b750e31 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -25,7 +25,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptbothkernelab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control.dev b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
index 324f398..df5ea5b 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
@@ -25,7 +25,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptbothkernelab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control b/server/site_tests/firmware_CorruptFwBodyA/control
index 339f6fa..255365f 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control
+++ b/server/site_tests/firmware_CorruptFwBodyA/control
@@ -25,7 +25,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptfwbodya(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control.dev b/server/site_tests/firmware_CorruptFwBodyA/control.dev
index e91ebb3..958de1e 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.dev
@@ -25,7 +25,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptfwbodya(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control b/server/site_tests/firmware_CorruptFwBodyB/control
index 70bacbd..a8d6dbe 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control
+++ b/server/site_tests/firmware_CorruptFwBodyB/control
@@ -25,7 +25,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptfwbodyb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control.dev b/server/site_tests/firmware_CorruptFwBodyB/control.dev
index f95b043..95792e4 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.dev
@@ -25,7 +25,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptfwbodyb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptFwSigA/control b/server/site_tests/firmware_CorruptFwSigA/control
index 3f3c075..0f4a335 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control
+++ b/server/site_tests/firmware_CorruptFwSigA/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptfwsiga(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptFwSigA/control.dev b/server/site_tests/firmware_CorruptFwSigA/control.dev
index 2cb43eb..3f04641 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigA/control.dev
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptfwsiga(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptFwSigB/control b/server/site_tests/firmware_CorruptFwSigB/control
index 8a7efe8..591410f 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control
+++ b/server/site_tests/firmware_CorruptFwSigB/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptfwsigb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptFwSigB/control.dev b/server/site_tests/firmware_CorruptFwSigB/control.dev
index afdae53..fa98972 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigB/control.dev
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptfwsigb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptKernelA/control b/server/site_tests/firmware_CorruptKernelA/control
index be2bdaa..9f8423c 100644
--- a/server/site_tests/firmware_CorruptKernelA/control
+++ b/server/site_tests/firmware_CorruptKernelA/control
@@ -20,7 +20,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptkernela(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptKernelA/control.dev b/server/site_tests/firmware_CorruptKernelA/control.dev
index 26b1dfc..943ecbe 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.dev
+++ b/server/site_tests/firmware_CorruptKernelA/control.dev
@@ -20,7 +20,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptkernela(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptKernelB/control b/server/site_tests/firmware_CorruptKernelB/control
index 4feae44..ca47d79 100644
--- a/server/site_tests/firmware_CorruptKernelB/control
+++ b/server/site_tests/firmware_CorruptKernelB/control
@@ -21,7 +21,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptkernelb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_CorruptKernelB/control.dev b/server/site_tests/firmware_CorruptKernelB/control.dev
index a6d6082..68872e8 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.dev
+++ b/server/site_tests/firmware_CorruptKernelB/control.dev
@@ -21,7 +21,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_corruptkernelb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_DevBootUSB/control b/server/site_tests/firmware_DevBootUSB/control
index 29ebdba..675e6c7 100644
--- a/server/site_tests/firmware_DevBootUSB/control
+++ b/server/site_tests/firmware_DevBootUSB/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_devbootusb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_DevFwNormalBoot/control b/server/site_tests/firmware_DevFwNormalBoot/control
index c4aadcd..39b19f4 100644
--- a/server/site_tests/firmware_DevFwNormalBoot/control
+++ b/server/site_tests/firmware_DevFwNormalBoot/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_devfwnormalboot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_DevMode/control b/server/site_tests/firmware_DevMode/control
index 643fe37..70ce842 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_devmode(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_DevMode/control.ec_wp b/server/site_tests/firmware_DevMode/control.ec_wp
index 79d46ed..bf99ce9 100644
--- a/server/site_tests/firmware_DevMode/control.ec_wp
+++ b/server/site_tests/firmware_DevMode/control.ec_wp
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_devmode(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_DevModeStress/control b/server/site_tests/firmware_DevModeStress/control
index c663ae0..42554d5 100644
--- a/server/site_tests/firmware_DevModeStress/control
+++ b/server/site_tests/firmware_DevModeStress/control
@@ -20,7 +20,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_devmodestress(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_DevScreenTimeout/control b/server/site_tests/firmware_DevScreenTimeout/control
index 4be49c2..b30bb88 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -27,7 +27,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_devscreentimeout(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_DevTriggerRecovery/control b/server/site_tests/firmware_DevTriggerRecovery/control
index b68b822..c9eab3e 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/control
+++ b/server/site_tests/firmware_DevTriggerRecovery/control
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_devtriggerrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECAdc/control b/server/site_tests/firmware_ECAdc/control
index c8a61d4..478b2c1 100644
--- a/server/site_tests/firmware_ECAdc/control
+++ b/server/site_tests/firmware_ECAdc/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecadc(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECBattery/control b/server/site_tests/firmware_ECBattery/control
index 3377cab..188ec98 100644
--- a/server/site_tests/firmware_ECBattery/control
+++ b/server/site_tests/firmware_ECBattery/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecbattery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECBootTime/control b/server/site_tests/firmware_ECBootTime/control
index 355a64d..625611c 100644
--- a/server/site_tests/firmware_ECBootTime/control
+++ b/server/site_tests/firmware_ECBootTime/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecboottime(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECCharging/control b/server/site_tests/firmware_ECCharging/control
index 97fb4ea..e3234f3 100644
--- a/server/site_tests/firmware_ECCharging/control
+++ b/server/site_tests/firmware_ECCharging/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_eccharging(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECHash/control b/server/site_tests/firmware_ECHash/control
index 3f946d0..b082378 100644
--- a/server/site_tests/firmware_ECHash/control
+++ b/server/site_tests/firmware_ECHash/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_echash(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECKeyboard/control b/server/site_tests/firmware_ECKeyboard/control
index 39af9c5..56aba4c 100644
--- a/server/site_tests/firmware_ECKeyboard/control
+++ b/server/site_tests/firmware_ECKeyboard/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_eckeyboard(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECLidSwitch/control b/server/site_tests/firmware_ECLidSwitch/control
index 373ca1a..da1f538 100644
--- a/server/site_tests/firmware_ECLidSwitch/control
+++ b/server/site_tests/firmware_ECLidSwitch/control
@@ -24,7 +24,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_eclidswitch(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECPeci/control b/server/site_tests/firmware_ECPeci/control
index 6b64583..c210b50 100644
--- a/server/site_tests/firmware_ECPeci/control
+++ b/server/site_tests/firmware_ECPeci/control
@@ -20,7 +20,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecpeci(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECPowerButton/control b/server/site_tests/firmware_ECPowerButton/control
index 8e34228..ae96c97 100644
--- a/server/site_tests/firmware_ECPowerButton/control
+++ b/server/site_tests/firmware_ECPowerButton/control
@@ -25,7 +25,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecpowerbutton(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECPowerG3/control b/server/site_tests/firmware_ECPowerG3/control
index 12ce84e..d1f68d1 100644
--- a/server/site_tests/firmware_ECPowerG3/control
+++ b/server/site_tests/firmware_ECPowerG3/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecpowerg3(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECSharedMem/control b/server/site_tests/firmware_ECSharedMem/control
index 2db9b4c..4ad9c68 100644
--- a/server/site_tests/firmware_ECSharedMem/control
+++ b/server/site_tests/firmware_ECSharedMem/control
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecsharedmem(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECThermal/control b/server/site_tests/firmware_ECThermal/control
index 4cfe780..ada24d9 100644
--- a/server/site_tests/firmware_ECThermal/control
+++ b/server/site_tests/firmware_ECThermal/control
@@ -20,7 +20,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecthermal(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECUsbPorts/control b/server/site_tests/firmware_ECUsbPorts/control
index a03a9f8..0d6d57d 100644
--- a/server/site_tests/firmware_ECUsbPorts/control
+++ b/server/site_tests/firmware_ECUsbPorts/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecusbports(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECWakeSource/control b/server/site_tests/firmware_ECWakeSource/control
index c27f48a..8ca7cef 100644
--- a/server/site_tests/firmware_ECWakeSource/control
+++ b/server/site_tests/firmware_ECWakeSource/control
@@ -20,7 +20,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecwakesource(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECWatchdog/control b/server/site_tests/firmware_ECWatchdog/control
index 0fc8de8..3a381ca 100644
--- a/server/site_tests/firmware_ECWatchdog/control
+++ b/server/site_tests/firmware_ECWatchdog/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecwatchdog(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECWriteProtect/control b/server/site_tests/firmware_ECWriteProtect/control
index 7cb3a46..cc931ee 100644
--- a/server/site_tests/firmware_ECWriteProtect/control
+++ b/server/site_tests/firmware_ECWriteProtect/control
@@ -31,7 +31,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecwriteprotect(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ECWriteProtect/control.dev b/server/site_tests/firmware_ECWriteProtect/control.dev
index fb53054..9d66f8c 100644
--- a/server/site_tests/firmware_ECWriteProtect/control.dev
+++ b/server/site_tests/firmware_ECWriteProtect/control.dev
@@ -31,7 +31,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ecwriteprotect(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_FAFTSetup/control b/server/site_tests/firmware_FAFTSetup/control
index e82304e..97dfd87 100644
--- a/server/site_tests/firmware_FAFTSetup/control
+++ b/server/site_tests/firmware_FAFTSetup/control
@@ -30,7 +30,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_faftsetup(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index a6c4ab3..52dad94 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_fwscreencloselid(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_FwScreenPressPower/control b/server/site_tests/firmware_FwScreenPressPower/control
index c0f8044..50b8b18 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_fwscreenpresspower(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_InvalidUSB/control b/server/site_tests/firmware_InvalidUSB/control
index 8d87ff0..6bd6100 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_invalidusb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_LegacyRecovery/control b/server/site_tests/firmware_LegacyRecovery/control
index c96ea98..3cf80d1 100644
--- a/server/site_tests/firmware_LegacyRecovery/control
+++ b/server/site_tests/firmware_LegacyRecovery/control
@@ -21,7 +21,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_legacyrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RONormalBoot/control b/server/site_tests/firmware_RONormalBoot/control
index 577bf5a..f0e551b 100644
--- a/server/site_tests/firmware_RONormalBoot/control
+++ b/server/site_tests/firmware_RONormalBoot/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ronormalboot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RONormalBoot/control.dev b/server/site_tests/firmware_RONormalBoot/control.dev
index 0ae34a8..c660c52 100644
--- a/server/site_tests/firmware_RONormalBoot/control.dev
+++ b/server/site_tests/firmware_RONormalBoot/control.dev
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ronormalboot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RONormalBoot/control.ec_wp b/server/site_tests/firmware_RONormalBoot/control.ec_wp
index 3531d7e..fe7e95e 100644
--- a/server/site_tests/firmware_RONormalBoot/control.ec_wp
+++ b/server/site_tests/firmware_RONormalBoot/control.ec_wp
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_ronormalboot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RecoveryButton/control b/server/site_tests/firmware_RecoveryButton/control
index 530ec1c..dba9e32 100644
--- a/server/site_tests/firmware_RecoveryButton/control
+++ b/server/site_tests/firmware_RecoveryButton/control
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_recoverybutton(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RecoveryButton/control.dev b/server/site_tests/firmware_RecoveryButton/control.dev
index 4300ef1..aa2c3d1 100644
--- a/server/site_tests/firmware_RecoveryButton/control.dev
+++ b/server/site_tests/firmware_RecoveryButton/control.dev
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_recoverybutton(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RecoveryButton/control.ec_wp b/server/site_tests/firmware_RecoveryButton/control.ec_wp
index 2c7e873..abf1f92 100644
--- a/server/site_tests/firmware_RecoveryButton/control.ec_wp
+++ b/server/site_tests/firmware_RecoveryButton/control.ec_wp
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_recoverybutton(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RollbackFirmware/control b/server/site_tests/firmware_RollbackFirmware/control
index 811d232..cfcec81 100644
--- a/server/site_tests/firmware_RollbackFirmware/control
+++ b/server/site_tests/firmware_RollbackFirmware/control
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_rollbackfirmware(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RollbackFirmware/control.dev b/server/site_tests/firmware_RollbackFirmware/control.dev
index 50157ee..f4b137c 100644
--- a/server/site_tests/firmware_RollbackFirmware/control.dev
+++ b/server/site_tests/firmware_RollbackFirmware/control.dev
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_rollbackfirmware(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RollbackKernel/control b/server/site_tests/firmware_RollbackKernel/control
index eee6abe..f01b2c6 100644
--- a/server/site_tests/firmware_RollbackKernel/control
+++ b/server/site_tests/firmware_RollbackKernel/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_rollbackkernel(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_RollbackKernel/control.dev b/server/site_tests/firmware_RollbackKernel/control.dev
index fe1adb6..6ba315c 100644
--- a/server/site_tests/firmware_RollbackKernel/control.dev
+++ b/server/site_tests/firmware_RollbackKernel/control.dev
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_rollbackkernel(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_SelfSignedBoot/control b/server/site_tests/firmware_SelfSignedBoot/control
index d17cddd..e6a567e 100644
--- a/server/site_tests/firmware_SelfSignedBoot/control
+++ b/server/site_tests/firmware_SelfSignedBoot/control
@@ -34,7 +34,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_devbootsignedonly(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_ShellBall/control b/server/site_tests/firmware_ShellBall/control
index 9192bac..192e2ef 100644
--- a/server/site_tests/firmware_ShellBall/control
+++ b/server/site_tests/firmware_ShellBall/control
@@ -27,7 +27,7 @@
opts = dict([[k, v] for (k, _, v) in [x.partition('=') for x in args]])
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_shellball(machine):
# Verify bios path arg.
diff --git a/server/site_tests/firmware_SoftwareSync/control b/server/site_tests/firmware_SoftwareSync/control
index bb7b9c1..cfeefda 100644
--- a/server/site_tests/firmware_SoftwareSync/control
+++ b/server/site_tests/firmware_SoftwareSync/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_softwaresync(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_SoftwareSync/control.dev b/server/site_tests/firmware_SoftwareSync/control.dev
index 69fddab..ae2bd34 100644
--- a/server/site_tests/firmware_SoftwareSync/control.dev
+++ b/server/site_tests/firmware_SoftwareSync/control.dev
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_softwaresync(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_SoftwareSync/control.ec_wp b/server/site_tests/firmware_SoftwareSync/control.ec_wp
index 3821cef..2a9769a 100644
--- a/server/site_tests/firmware_SoftwareSync/control.ec_wp
+++ b/server/site_tests/firmware_SoftwareSync/control.ec_wp
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_softwaresync(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_TryFwB/control b/server/site_tests/firmware_TryFwB/control
index 9b63dda..21af027 100644
--- a/server/site_tests/firmware_TryFwB/control
+++ b/server/site_tests/firmware_TryFwB/control
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_tryfwb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_TryFwB/control.dev b/server/site_tests/firmware_TryFwB/control.dev
index 92d6be1..0d0200e 100644
--- a/server/site_tests/firmware_TryFwB/control.dev
+++ b/server/site_tests/firmware_TryFwB/control.dev
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_tryfwb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_TryFwB/control.ec_wp b/server/site_tests/firmware_TryFwB/control.ec_wp
index e91f7e5..1f7bd2d 100644
--- a/server/site_tests/firmware_TryFwB/control.ec_wp
+++ b/server/site_tests/firmware_TryFwB/control.ec_wp
@@ -19,7 +19,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_tryfwb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UpdateECBin/control b/server/site_tests/firmware_UpdateECBin/control
index 2a97216..393d948 100644
--- a/server/site_tests/firmware_UpdateECBin/control
+++ b/server/site_tests/firmware_UpdateECBin/control
@@ -50,7 +50,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_updateec(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UpdateECBin/control.dev b/server/site_tests/firmware_UpdateECBin/control.dev
index 76bc3bc..8429edc 100644
--- a/server/site_tests/firmware_UpdateECBin/control.dev
+++ b/server/site_tests/firmware_UpdateECBin/control.dev
@@ -50,7 +50,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_updateec(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
index a17f7b3..2d25c70 100644
--- a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
@@ -36,7 +36,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_updatefirmwaredatakeyversion(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UpdateFirmwareVersion/control b/server/site_tests/firmware_UpdateFirmwareVersion/control
index 1d3d369..817a06d 100644
--- a/server/site_tests/firmware_UpdateFirmwareVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareVersion/control
@@ -38,7 +38,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_updatefirmwareversion(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
index 62ce7f8..5ff8436 100644
--- a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
@@ -32,7 +32,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_updatekerneldatakeyversion(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
index 702d2b4..29fb2eb 100644
--- a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
@@ -28,7 +28,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_updatekernelsubkeyversion(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UpdateKernelVersion/control b/server/site_tests/firmware_UpdateKernelVersion/control
index fc33b65..1158eb6 100644
--- a/server/site_tests/firmware_UpdateKernelVersion/control
+++ b/server/site_tests/firmware_UpdateKernelVersion/control
@@ -30,7 +30,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_updatekernelversion(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UserRequestRecovery/control b/server/site_tests/firmware_UserRequestRecovery/control
index 14854bb..46e9765 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control
+++ b/server/site_tests/firmware_UserRequestRecovery/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_userrequestrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.dev b/server/site_tests/firmware_UserRequestRecovery/control.dev
index f7545c0..49aca5a 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.dev
+++ b/server/site_tests/firmware_UserRequestRecovery/control.dev
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_userrequestrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.ec_wp b/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
index 905b6af..f3347bd 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
+++ b/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_userrequestrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/fwupdate/control b/server/site_tests/fwupdate/control
index db51c67..af2a9e5 100644
--- a/server/site_tests/fwupdate/control
+++ b/server/site_tests/fwupdate/control
@@ -21,7 +21,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
# In case this is run by dynamic suite, board and url come from local
# variables
diff --git a/server/site_tests/network_StressServoEthernetPlug/control b/server/site_tests/network_StressServoEthernetPlug/control
index 7e1f195..701a63d 100644
--- a/server/site_tests/network_StressServoEthernetPlug/control
+++ b/server/site_tests/network_StressServoEthernetPlug/control
@@ -20,7 +20,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
num_iterations = int(args_dict.get('num_iterations', 10000))
def run(machine):
diff --git a/server/site_tests/platform_CloseOpenLid/control b/server/site_tests/platform_CloseOpenLid/control
index 01bb365..dc778ca 100644
--- a/server/site_tests/platform_CloseOpenLid/control
+++ b/server/site_tests/platform_CloseOpenLid/control
@@ -17,7 +17,7 @@
verified by pinging."""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/platform_ExternalUSBBootStress/control b/server/site_tests/platform_ExternalUSBBootStress/control
index 3fbf748..9af34e4 100644
--- a/server/site_tests/platform_ExternalUSBBootStress/control
+++ b/server/site_tests/platform_ExternalUSBBootStress/control
@@ -18,7 +18,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/platform_ExternalUSBStress/control b/server/site_tests/platform_ExternalUSBStress/control
index a1c5c6a..4bcd3ac 100644
--- a/server/site_tests/platform_ExternalUSBStress/control
+++ b/server/site_tests/platform_ExternalUSBStress/control
@@ -18,7 +18,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/platform_InstallRecoveryImage/control b/server/site_tests/platform_InstallRecoveryImage/control
index 8a629ca..4d467d8 100644
--- a/server/site_tests/platform_InstallRecoveryImage/control
+++ b/server/site_tests/platform_InstallRecoveryImage/control
@@ -24,7 +24,7 @@
args_dict = utils.args_to_dict(args)
image = args_dict.get('image', None)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
# Setup the client machine.
diff --git a/server/site_tests/platform_InstallTestImage/control b/server/site_tests/platform_InstallTestImage/control
index 031c561..4b31f04 100644
--- a/server/site_tests/platform_InstallTestImage/control
+++ b/server/site_tests/platform_InstallTestImage/control
@@ -29,7 +29,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
# Setup the client machine.
diff --git a/server/site_tests/platform_LidStress/control b/server/site_tests/platform_LidStress/control
index 6af1651..c1a85af 100644
--- a/server/site_tests/platform_LidStress/control
+++ b/server/site_tests/platform_LidStress/control
@@ -26,7 +26,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/platform_LongPressPower/control b/server/site_tests/platform_LongPressPower/control
index 39adec3..3420c56 100644
--- a/server/site_tests/platform_LongPressPower/control
+++ b/server/site_tests/platform_LongPressPower/control
@@ -20,7 +20,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/platform_ServoPyAuto/control b/server/site_tests/platform_ServoPyAuto/control
index e41cc6d..844c7c2 100644
--- a/server/site_tests/platform_ServoPyAuto/control
+++ b/server/site_tests/platform_ServoPyAuto/control
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/platform_StressSuspend/control.stress_suspend_url b/server/site_tests/platform_StressSuspend/control.stress_suspend_url
index f8bbbcc..65bd15a 100644
--- a/server/site_tests/platform_StressSuspend/control.stress_suspend_url
+++ b/server/site_tests/platform_StressSuspend/control.stress_suspend_url
@@ -18,7 +18,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/power_BatteryStateOnResume/control b/server/site_tests/power_BatteryStateOnResume/control
index 84b7009..da016d5 100644
--- a/server/site_tests/power_BatteryStateOnResume/control
+++ b/server/site_tests/power_BatteryStateOnResume/control
@@ -33,7 +33,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_batstateonresume(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/power_ChargeStatus/control b/server/site_tests/power_ChargeStatus/control
index e4507c7..933a744 100644
--- a/server/site_tests/power_ChargeStatus/control
+++ b/server/site_tests/power_ChargeStatus/control
@@ -32,7 +32,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_chargestatus(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/power_DarkResumeShutdownServer/control b/server/site_tests/power_DarkResumeShutdownServer/control
index dad33e7..d74adfa 100644
--- a/server/site_tests/power_DarkResumeShutdownServer/control
+++ b/server/site_tests/power_DarkResumeShutdownServer/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/power_SuspendShutdown/control b/server/site_tests/power_SuspendShutdown/control
index 0e4df02..07f66ab 100644
--- a/server/site_tests/power_SuspendShutdown/control
+++ b/server/site_tests/power_SuspendShutdown/control
@@ -22,7 +22,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/power_USBHotplugInSuspend/control b/server/site_tests/power_USBHotplugInSuspend/control
index f37df2f..90838ab 100644
--- a/server/site_tests/power_USBHotplugInSuspend/control
+++ b/server/site_tests/power_USBHotplugInSuspend/control
@@ -23,7 +23,7 @@
"""
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run(machine):
host = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/provision_FirmwareUpdate/control b/server/site_tests/provision_FirmwareUpdate/control
index 3011d55..9101cbb 100644
--- a/server/site_tests/provision_FirmwareUpdate/control
+++ b/server/site_tests/provision_FirmwareUpdate/control
@@ -22,7 +22,7 @@
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
if not locals().get('value'):
diff --git a/server/site_tests/provision_FirmwareUpdate/provision_FirmwareUpdate.py b/server/site_tests/provision_FirmwareUpdate/provision_FirmwareUpdate.py
index 3c269ba..5a71734 100644
--- a/server/site_tests/provision_FirmwareUpdate/provision_FirmwareUpdate.py
+++ b/server/site_tests/provision_FirmwareUpdate/provision_FirmwareUpdate.py
@@ -39,7 +39,7 @@
def initialize(self, host, value):
"""Initialize the test.
- @param host: a SiteHost object of the machine to update.
+ @param host: a CrosHost object of the machine to update.
@param value: the provisioning value, which is the build version
to which we want to provision the machine,
e.g. 'link-firmware/R22-2695.1.144'.
diff --git a/server/site_tests/suites/control.faft_bios b/server/site_tests/suites/control.faft_bios
index df60c9b..653de83 100644
--- a/server/site_tests/suites/control.faft_bios
+++ b/server/site_tests/suites/control.faft_bios
@@ -52,7 +52,7 @@
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_server_test(machine):
client = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/suites/control.faft_lv1 b/server/site_tests/suites/control.faft_lv1
index 95bb1aa..e76ed87 100644
--- a/server/site_tests/suites/control.faft_lv1
+++ b/server/site_tests/suites/control.faft_lv1
@@ -38,7 +38,7 @@
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_server_test(machine):
client = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/suites/control.faft_lv2 b/server/site_tests/suites/control.faft_lv2
index 6190773..401e6cf 100644
--- a/server/site_tests/suites/control.faft_lv2
+++ b/server/site_tests/suites/control.faft_lv2
@@ -42,7 +42,7 @@
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_server_test(machine):
client = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/suites/control.faft_lv3 b/server/site_tests/suites/control.faft_lv3
index e334781..83dba2f 100644
--- a/server/site_tests/suites/control.faft_lv3
+++ b/server/site_tests/suites/control.faft_lv3
@@ -48,7 +48,7 @@
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_server_test(machine):
client = hosts.create_host(machine, servo_args=servo_args)
diff --git a/server/site_tests/suites/control.faft_lv4 b/server/site_tests/suites/control.faft_lv4
index 6999f96..06a90d3 100644
--- a/server/site_tests/suites/control.faft_lv4
+++ b/server/site_tests/suites/control.faft_lv4
@@ -41,7 +41,7 @@
args_dict = utils.args_to_dict(args)
-servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
def run_server_test(machine):
client = hosts.create_host(machine, servo_args=servo_args)