Move Servo related modules to server/cros/servo.
Creating a subdirectory to hold all the modules so as to make the
boundary between Servo and Autotest a little more pronounced.
BUG=None
TEST=None
Change-Id: I976413dc50f66b6589b57a13a8dae7668634ced4
Reviewed-on: https://gerrit.chromium.org/gerrit/45158
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
diff --git a/server/cros/faftsequence.py b/server/cros/faftsequence.py
index a124ca6..7fea193 100644
--- a/server/cros/faftsequence.py
+++ b/server/cros/faftsequence.py
@@ -11,13 +11,13 @@
from autotest_lib.client.bin import utils
from autotest_lib.client.common_lib import error
+from autotest_lib.server import hosts
from autotest_lib.server.cros import vboot_constants as vboot
-from autotest_lib.server.cros import chrome_ec
from autotest_lib.server.cros.faft_checkers import FAFTCheckers
from autotest_lib.server.cros.faft_client_attribute import FAFTClientAttribute
from autotest_lib.server.cros.faft_delay_constants import FAFTDelayConstants
+from autotest_lib.server.cros.servo import chrome_ec
from autotest_lib.server.cros.servo_test import ServoTest
-from autotest_lib.server import hosts
class FAFTSequence(ServoTest):
"""
diff --git a/server/cros/servo/__init__.py b/server/cros/servo/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/server/cros/servo/__init__.py
diff --git a/server/cros/chrome_ec.py b/server/cros/servo/chrome_ec.py
similarity index 100%
rename from server/cros/chrome_ec.py
rename to server/cros/servo/chrome_ec.py
diff --git a/server/cros/programmer.py b/server/cros/servo/programmer.py
similarity index 100%
rename from server/cros/programmer.py
rename to server/cros/servo/programmer.py
diff --git a/server/cros/servo.py b/server/cros/servo/servo.py
similarity index 99%
rename from server/cros/servo.py
rename to server/cros/servo/servo.py
index e47a8c0..c73cfbb 100644
--- a/server/cros/servo.py
+++ b/server/cros/servo/servo.py
@@ -11,7 +11,7 @@
from autotest_lib.client.common_lib import error
from autotest_lib.server import utils
-from autotest_lib.server.cros import programmer
+from autotest_lib.server.cros.servo import programmer
class Servo(object):
"""Manages control of a Servo board.
diff --git a/server/hosts/site_host.py b/server/hosts/site_host.py
index 297f45d..0a0928a 100644
--- a/server/hosts/site_host.py
+++ b/server/hosts/site_host.py
@@ -21,9 +21,9 @@
from autotest_lib.server import autoserv_parser
from autotest_lib.server import autotest
from autotest_lib.server import site_host_attributes
-from autotest_lib.server.cros import servo
from autotest_lib.server.cros.dynamic_suite import constants as ds_constants
from autotest_lib.server.cros.dynamic_suite import tools
+from autotest_lib.server.cros.servo import servo
from autotest_lib.server.hosts import remote
from autotest_lib.site_utils.rpm_control_system import rpm_client
diff --git a/server/site_tests/factory_InstallServo/factory_InstallServo.py b/server/site_tests/factory_InstallServo/factory_InstallServo.py
index d17edc1..4d8ae80 100644
--- a/server/site_tests/factory_InstallServo/factory_InstallServo.py
+++ b/server/site_tests/factory_InstallServo/factory_InstallServo.py
@@ -21,8 +21,8 @@
from autotest_lib.client.bin import utils as client_utils
from autotest_lib.client.common_lib import error
from autotest_lib.server import utils
-from autotest_lib.server.cros import servo
from autotest_lib.server.cros.factory_install_test import FactoryInstallTest
+from autotest_lib.server.cros.servo import servo
from autotest_lib.server.hosts import ssh_host
diff --git a/server/site_tests/fwupdate/control b/server/site_tests/fwupdate/control
index 2f51f33..db51c67 100644
--- a/server/site_tests/fwupdate/control
+++ b/server/site_tests/fwupdate/control
@@ -5,7 +5,7 @@
import os
from autotest_lib.server import utils
-from autotest_lib.server.cros import servo
+from autotest_lib.server.cros.servo import servo
AUTHOR = 'Chrome OS Team'
NAME = 'fwupdate'
diff --git a/server/site_tests/platform_ExternalUSBBootStress/platform_ExternalUSBBootStress.py b/server/site_tests/platform_ExternalUSBBootStress/platform_ExternalUSBBootStress.py
index 6848b85..7501199 100644
--- a/server/site_tests/platform_ExternalUSBBootStress/platform_ExternalUSBBootStress.py
+++ b/server/site_tests/platform_ExternalUSBBootStress/platform_ExternalUSBBootStress.py
@@ -5,7 +5,8 @@
import json, logging, re, time
from autotest_lib.server import autotest, test
-from autotest_lib.server.cros import servo, stress
+from autotest_lib.server.cros import stress
+from autotest_lib.server.cros.servo import servo
from autotest_lib.client.common_lib import error
_WAIT_DELAY = 5
