[autotest][cfm] Move usb related classes into their own /usb directory
BUG=chromium:784396
TEST=local setup
Change-Id: Iaa05f4b1d8b25ee4f5b52a87deadbec50c123f90
Reviewed-on: https://chromium-review.googlesource.com/788386
Trybot-Ready: Denis Tosic <dtosic@chromium.org>
Reviewed-by: Kristoffer Erlandsson <kerl@google.com>
Tested-by: Denis Tosic <dtosic@chromium.org>
diff --git a/client/common_lib/cros/cfm/usb/__init__.py b/client/common_lib/cros/cfm/usb/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/client/common_lib/cros/cfm/usb/__init__.py
diff --git a/client/common_lib/cros/cfm/cfm_usb_devices.py b/client/common_lib/cros/cfm/usb/cfm_usb_devices.py
similarity index 96%
rename from client/common_lib/cros/cfm/cfm_usb_devices.py
rename to client/common_lib/cros/cfm/usb/cfm_usb_devices.py
index 605f89c..f506025 100644
--- a/client/common_lib/cros/cfm/cfm_usb_devices.py
+++ b/client/common_lib/cros/cfm/usb/cfm_usb_devices.py
@@ -15,7 +15,7 @@
not be the case (list of interfaces might be different for example).
"""
-from autotest_lib.client.common_lib.cros.cfm import usb_device_spec
+from autotest_lib.client.common_lib.cros.cfm.usb import usb_device_spec
# Cameras
HUDDLY_GO = usb_device_spec.UsbDeviceSpec(
diff --git a/client/common_lib/cros/cfm/cfm_usb_devices_unittest.py b/client/common_lib/cros/cfm/usb/cfm_usb_devices_unittest.py
similarity index 81%
rename from client/common_lib/cros/cfm/cfm_usb_devices_unittest.py
rename to client/common_lib/cros/cfm/usb/cfm_usb_devices_unittest.py
index be9ac34..a157109 100644
--- a/client/common_lib/cros/cfm/cfm_usb_devices_unittest.py
+++ b/client/common_lib/cros/cfm/usb/cfm_usb_devices_unittest.py
@@ -1,6 +1,6 @@
import unittest
-from autotest_lib.client.common_lib.cros.cfm import cfm_usb_devices
+from autotest_lib.client.common_lib.cros.cfm.usb import cfm_usb_devices
# pylint: disable=missing-docstring
diff --git a/client/common_lib/cros/cfm/usb_device.py b/client/common_lib/cros/cfm/usb/usb_device.py
similarity index 100%
rename from client/common_lib/cros/cfm/usb_device.py
rename to client/common_lib/cros/cfm/usb/usb_device.py
diff --git a/client/common_lib/cros/cfm/usb_device_collector.py b/client/common_lib/cros/cfm/usb/usb_device_collector.py
similarity index 96%
rename from client/common_lib/cros/cfm/usb_device_collector.py
rename to client/common_lib/cros/cfm/usb/usb_device_collector.py
index c5ffd97..b00efef 100644
--- a/client/common_lib/cros/cfm/usb_device_collector.py
+++ b/client/common_lib/cros/cfm/usb/usb_device_collector.py
@@ -1,8 +1,8 @@
import cStringIO
from autotest_lib.client.common_lib.cros import textfsm
-from autotest_lib.client.common_lib.cros.cfm import cfm_usb_devices
-from autotest_lib.client.common_lib.cros.cfm import usb_device
+from autotest_lib.client.common_lib.cros.cfm.usb import cfm_usb_devices
+from autotest_lib.client.common_lib.cros.cfm.usb import usb_device
class UsbDataCollector(object):
diff --git a/client/common_lib/cros/cfm/usb_device_collector_unittest.py b/client/common_lib/cros/cfm/usb/usb_device_collector_unittest.py
similarity index 92%
rename from client/common_lib/cros/cfm/usb_device_collector_unittest.py
rename to client/common_lib/cros/cfm/usb/usb_device_collector_unittest.py
index 2002b72..33ead5d 100644
--- a/client/common_lib/cros/cfm/usb_device_collector_unittest.py
+++ b/client/common_lib/cros/cfm/usb/usb_device_collector_unittest.py
@@ -1,8 +1,8 @@
import unittest
-from autotest_lib.client.common_lib.cros.cfm import usb_device_collector
-from autotest_lib.client.common_lib.cros.cfm import usb_device
+from autotest_lib.client.common_lib.cros.cfm.usb import usb_device_collector
+from autotest_lib.client.common_lib.cros.cfm.usb import usb_device
class MockUsbDataCollector(object):
diff --git a/client/common_lib/cros/cfm/usb_device_spec.py b/client/common_lib/cros/cfm/usb/usb_device_spec.py
similarity index 100%
rename from client/common_lib/cros/cfm/usb_device_spec.py
rename to client/common_lib/cros/cfm/usb/usb_device_spec.py
diff --git a/client/common_lib/cros/cfm/usb_device_spec_unittest.py b/client/common_lib/cros/cfm/usb/usb_device_spec_unittest.py
similarity index 91%
rename from client/common_lib/cros/cfm/usb_device_spec_unittest.py
rename to client/common_lib/cros/cfm/usb/usb_device_spec_unittest.py
index 25fddee..2dfe79a 100644
--- a/client/common_lib/cros/cfm/usb_device_spec_unittest.py
+++ b/client/common_lib/cros/cfm/usb/usb_device_spec_unittest.py
@@ -1,6 +1,6 @@
import unittest
-from autotest_lib.client.common_lib.cros.cfm import usb_device_spec
+from autotest_lib.client.common_lib.cros.cfm.usb import usb_device_spec
# pylint: disable=missing-docstring
diff --git a/client/common_lib/cros/cfm/usb_device_unittest.py b/client/common_lib/cros/cfm/usb/usb_device_unittest.py
similarity index 90%
rename from client/common_lib/cros/cfm/usb_device_unittest.py
rename to client/common_lib/cros/cfm/usb/usb_device_unittest.py
index b5555bf..2186c2e 100644
--- a/client/common_lib/cros/cfm/usb_device_unittest.py
+++ b/client/common_lib/cros/cfm/usb/usb_device_unittest.py
@@ -1,6 +1,6 @@
import unittest
-from autotest_lib.client.common_lib.cros.cfm import usb_device
+from autotest_lib.client.common_lib.cros.cfm.usb import usb_device
# pylint: disable=missing-docstring
diff --git a/server/site_tests/enterprise_CFM_DualSpeaker/enterprise_CFM_DualSpeaker.py b/server/site_tests/enterprise_CFM_DualSpeaker/enterprise_CFM_DualSpeaker.py
index 1469d7e..7ff769f 100644
--- a/server/site_tests/enterprise_CFM_DualSpeaker/enterprise_CFM_DualSpeaker.py
+++ b/server/site_tests/enterprise_CFM_DualSpeaker/enterprise_CFM_DualSpeaker.py
@@ -8,9 +8,9 @@
import time
from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib.cros.cfm import usb_device_collector
from autotest_lib.client.common_lib.cros import power_cycle_usb_util
-from autotest_lib.client.common_lib.cros.cfm import cfm_usb_devices
+from autotest_lib.client.common_lib.cros.cfm.usb import cfm_usb_devices
+from autotest_lib.client.common_lib.cros.cfm.usb import usb_device_collector
from autotest_lib.server.cros.cfm import cfm_base_test
# CFMs have a base volume level threshold. Setting the level below 2
diff --git a/server/site_tests/enterprise_CFM_MimoSanity/enterprise_CFM_MimoSanity.py b/server/site_tests/enterprise_CFM_MimoSanity/enterprise_CFM_MimoSanity.py
index 39b9769..256784d 100644
--- a/server/site_tests/enterprise_CFM_MimoSanity/enterprise_CFM_MimoSanity.py
+++ b/server/site_tests/enterprise_CFM_MimoSanity/enterprise_CFM_MimoSanity.py
@@ -9,8 +9,8 @@
from autotest_lib.client.common_lib import error
from autotest_lib.server.cros.cfm import cfm_base_test
from autotest_lib.client.common_lib.cros import power_cycle_usb_util
-from autotest_lib.client.common_lib.cros.cfm import cfm_usb_devices
-from autotest_lib.client.common_lib.cros.cfm import usb_device_collector
+from autotest_lib.client.common_lib.cros.cfm.usb import cfm_usb_devices
+from autotest_lib.client.common_lib.cros.cfm.usb import usb_device_collector
LONG_TIMEOUT = 20