autotest: move constants to common_lib
This file gets imported from lots of server-side tests and
infrastructure so it shouldn't be hiding in client/cros. This
moves the file and fixes all imports.
BUG=chromium:485834
TEST=run many tests, make sure there are no problems importing
constants
Change-Id: I5c2b2a0bef6ebc998e62f40162a6ec9cc4436480
Reviewed-on: https://chromium-review.googlesource.com/291302
Trybot-Ready: Eric Caruso <ejcaruso@chromium.org>
Commit-Queue: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Chris Sosa <sosa@google.com>
diff --git a/server/control_segments/provision b/server/control_segments/provision
index 6fd2273..348b8ce 100644
--- a/server/control_segments/provision
+++ b/server/control_segments/provision
@@ -3,7 +3,7 @@
# found in the LICENSE file.
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server.cros import provision
diff --git a/server/crashcollect.py b/server/crashcollect.py
index 3294eec..d50e588 100644
--- a/server/crashcollect.py
+++ b/server/crashcollect.py
@@ -2,7 +2,7 @@
from autotest_lib.client.common_lib import global_config
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import utils
diff --git a/server/cros/bluetooth/bluetooth_device.py b/server/cros/bluetooth/bluetooth_device.py
index 033b9d2..0058aa4 100644
--- a/server/cros/bluetooth/bluetooth_device.py
+++ b/server/cros/bluetooth/bluetooth_device.py
@@ -4,7 +4,7 @@
import json
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import autotest
diff --git a/server/cros/bluetooth/bluetooth_tester.py b/server/cros/bluetooth/bluetooth_tester.py
index e3e2b50..0ebe929 100644
--- a/server/cros/bluetooth/bluetooth_tester.py
+++ b/server/cros/bluetooth/bluetooth_tester.py
@@ -5,7 +5,7 @@
import base64
import json
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import autotest
from autotest_lib.server import hosts
from autotest_lib.server.cros import dnsname_mangler
diff --git a/server/cros/interactive_client.py b/server/cros/interactive_client.py
index 03e324d..0865621 100644
--- a/server/cros/interactive_client.py
+++ b/server/cros/interactive_client.py
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import autotest
diff --git a/server/cros/multimedia/remote_facade_factory.py b/server/cros/multimedia/remote_facade_factory.py
index a3e28cc..e69fdc3 100644
--- a/server/cros/multimedia/remote_facade_factory.py
+++ b/server/cros/multimedia/remote_facade_factory.py
@@ -10,7 +10,7 @@
import sys
from autotest_lib.client.common_lib.cros import retry
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import autotest
from autotest_lib.server.cros.multimedia import audio_facade_adapter
from autotest_lib.server.cros.multimedia import display_facade_adapter
diff --git a/server/cros/network/apmanager_service_provider.py b/server/cros/network/apmanager_service_provider.py
index be6cbd8..db53628 100644
--- a/server/cros/network/apmanager_service_provider.py
+++ b/server/cros/network/apmanager_service_provider.py
@@ -3,7 +3,7 @@
# found in the LICENSE file.
from autotest_lib.client.common_lib.cros.network import apmanager_constants
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import autotest
from autotest_lib.server.cros.network import hostap_config
diff --git a/server/cros/network/wifi_cell_test_base.py b/server/cros/network/wifi_cell_test_base.py
index 036a8bd..7bc2059 100644
--- a/server/cros/network/wifi_cell_test_base.py
+++ b/server/cros/network/wifi_cell_test_base.py
@@ -8,7 +8,7 @@
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib import utils
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import frontend
from autotest_lib.server import site_utils
from autotest_lib.server import test
diff --git a/server/cros/network/wifi_client.py b/server/cros/network/wifi_client.py
index 2f9a332..f335b63 100644
--- a/server/cros/network/wifi_client.py
+++ b/server/cros/network/wifi_client.py
@@ -15,7 +15,7 @@
from autotest_lib.client.common_lib.cros.network import interface
from autotest_lib.client.common_lib.cros.network import iw_runner
from autotest_lib.client.common_lib.cros.network import ping_runner
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import autotest
from autotest_lib.server import frontend
from autotest_lib.server import site_linux_system
diff --git a/server/hosts/cros_host.py b/server/hosts/cros_host.py
index f1f2674..31d004e 100644
--- a/server/hosts/cros_host.py
+++ b/server/hosts/cros_host.py
@@ -20,11 +20,11 @@
from autotest_lib.client.common_lib import global_config
from autotest_lib.client.common_lib import lsbrelease_utils
from autotest_lib.client.common_lib.cros import autoupdater
+from autotest_lib.client.common_lib.cros import constants as client_constants
from autotest_lib.client.common_lib.cros import dev_server
from autotest_lib.client.common_lib.cros import retry
from autotest_lib.client.common_lib.cros.graphite import autotest_es
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
-from autotest_lib.client.cros import constants as client_constants
from autotest_lib.client.cros import cros_ui
from autotest_lib.client.cros.audio import cras_utils
from autotest_lib.client.cros.input_playback import input_playback
diff --git a/server/hosts/servo_host.py b/server/hosts/servo_host.py
index bec28ef..5052ca9 100644
--- a/server/hosts/servo_host.py
+++ b/server/hosts/servo_host.py
@@ -20,11 +20,11 @@
from autotest_lib.client.common_lib import global_config
from autotest_lib.client.common_lib import lsbrelease_utils
from autotest_lib.client.common_lib.cros import autoupdater
+from autotest_lib.client.common_lib.cros import constants as client_constants
from autotest_lib.client.common_lib.cros import dev_server
from autotest_lib.client.common_lib.cros import retry
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
from autotest_lib.client.common_lib.cros.network import ping_runner
-from autotest_lib.client.cros import constants as client_constants
from autotest_lib.server import site_utils as server_site_utils
from autotest_lib.server.cros.servo import servo
from autotest_lib.server.cros.dynamic_suite import frontend_wrappers
diff --git a/server/site_crashcollect.py b/server/site_crashcollect.py
index 02ab900..b7c903a 100644
--- a/server/site_crashcollect.py
+++ b/server/site_crashcollect.py
@@ -8,7 +8,7 @@
from autotest_lib.client.common_lib import utils as client_utils
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib.cros import dev_server
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server.cros.dynamic_suite.constants import JOB_BUILD_KEY
from autotest_lib.server import utils
diff --git a/server/site_tests/autoupdate_EndToEndTest/control b/server/site_tests/autoupdate_EndToEndTest/control
index e5d6cad..a58159a 100644
--- a/server/site_tests/autoupdate_EndToEndTest/control
+++ b/server/site_tests/autoupdate_EndToEndTest/control
@@ -4,7 +4,7 @@
import logging
from autotest_lib.client.common_lib import error, utils
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import host_attributes
AUTHOR = "Chromium OS"
diff --git a/server/site_tests/platform_KernelErrorPaths/platform_KernelErrorPaths.py b/server/site_tests/platform_KernelErrorPaths/platform_KernelErrorPaths.py
index e3ba790..ee059f5 100644
--- a/server/site_tests/platform_KernelErrorPaths/platform_KernelErrorPaths.py
+++ b/server/site_tests/platform_KernelErrorPaths/platform_KernelErrorPaths.py
@@ -5,7 +5,7 @@
import logging, os, time
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.cros.crash_test import CrashTest as CrashTestDefs
from autotest_lib.server import test
diff --git a/server/site_tests/provision_AutoUpdate/control b/server/site_tests/provision_AutoUpdate/control
index f6ab4cf..3bb13ef 100644
--- a/server/site_tests/provision_AutoUpdate/control
+++ b/server/site_tests/provision_AutoUpdate/control
@@ -18,7 +18,7 @@
from autotest_lib.client.common_lib import error, utils
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
# Uncomment the below line, and change it to the correct value if you are
diff --git a/server/site_tests/provision_AutoUpdate/control.double b/server/site_tests/provision_AutoUpdate/control.double
index 382b407..cbcbe3c 100644
--- a/server/site_tests/provision_AutoUpdate/control.double
+++ b/server/site_tests/provision_AutoUpdate/control.double
@@ -39,7 +39,7 @@
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.server import utils as server_utils