[autotest] Move dynamic suite code into its own module
No big rewrite, just moving files around
BUG=chromium-os:30266
TEST=unit
TEST=successful run_suite.py run
TEST=suite_enumerator.py, suite_preprocessor.py, and suite_scheduler.py
Change-Id: I2fbcae0332104ce3adcb10a1e90ce94cb209aca8
Reviewed-on: https://gerrit.chromium.org/gerrit/30267
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Ready: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/site_utils/admin/clean_staged_images.py b/site_utils/admin/clean_staged_images.py
index cb20798..0725107 100755
--- a/site_utils/admin/clean_staged_images.py
+++ b/site_utils/admin/clean_staged_images.py
@@ -30,7 +30,7 @@
from autotest_lib.frontend.afe import rpc_client_lib
from autotest_lib.cli.rpc import AFE_RPC_PATH
from autotest_lib.client.common_lib import global_config, logging_config
-from autotest_lib.server.cros.dynamic_suite import VERSION_PREFIX
+from autotest_lib.server.cros.dynamic_suite.dynamic_suite import VERSION_PREFIX
# This filename must be kept in sync with devserver's downloader.py
_TIMESTAMP_FILENAME = 'staged.timestamp'
diff --git a/site_utils/run_suite.py b/site_utils/run_suite.py
index aae7b8e..94bdc60 100755
--- a/site_utils/run_suite.py
+++ b/site_utils/run_suite.py
@@ -18,8 +18,9 @@
import common
import logging
from autotest_lib.client.common_lib import global_config
-from autotest_lib.server.cros import dynamic_suite, frontend_wrappers
-from autotest_lib.server.cros import job_status
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+from autotest_lib.server.cros.dynamic_suite import frontend_wrappers
+from autotest_lib.server.cros.dynamic_suite import job_status
CONFIG = global_config.global_config
diff --git a/site_utils/suite_enumerator.py b/site_utils/suite_enumerator.py
index 7b07a08..923dfe6 100755
--- a/site_utils/suite_enumerator.py
+++ b/site_utils/suite_enumerator.py
@@ -21,7 +21,8 @@
import optparse, os, sys, time
import common
-from autotest_lib.server.cros import control_file_getter, dynamic_suite
+from autotest_lib.server.cros.dynamic_suite import control_file_getter
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
def parse_options():
usage = "usage: %prog [options] suite_name"
diff --git a/site_utils/suite_preprocessor.py b/site_utils/suite_preprocessor.py
index a6768ea..d975a0f 100755
--- a/site_utils/suite_preprocessor.py
+++ b/site_utils/suite_preprocessor.py
@@ -25,7 +25,8 @@
import optparse, os, sys
import common
from autotest_lib.client.common_lib import control_data
-from autotest_lib.server.cros import control_file_getter, dynamic_suite
+from autotest_lib.server.cros.dynamic_suite import control_file_getter
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
def parse_options():
parser = optparse.OptionParser()
diff --git a/site_utils/suite_scheduler/board_enumerator.py b/site_utils/suite_scheduler/board_enumerator.py
index 57ddc95..c4eb2fd 100644
--- a/site_utils/suite_scheduler/board_enumerator.py
+++ b/site_utils/suite_scheduler/board_enumerator.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.server.cros import frontend_wrappers
+from autotest_lib.server.cros.dynamic_suite import frontend_wrappers
from autotest_lib.server import frontend
from constants import Labels
diff --git a/site_utils/suite_scheduler/deduping_scheduler.py b/site_utils/suite_scheduler/deduping_scheduler.py
index 4545c7c..550c5dc 100644
--- a/site_utils/suite_scheduler/deduping_scheduler.py
+++ b/site_utils/suite_scheduler/deduping_scheduler.py
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import logging
-from autotest_lib.server.cros import frontend_wrappers
+from autotest_lib.server.cros.dynamic_suite import frontend_wrappers
from autotest_lib.server import frontend
diff --git a/site_utils/suite_scheduler/suite_scheduler.py b/site_utils/suite_scheduler/suite_scheduler.py
index d5a4631..8d43b7e 100755
--- a/site_utils/suite_scheduler/suite_scheduler.py
+++ b/site_utils/suite_scheduler/suite_scheduler.py
@@ -41,7 +41,7 @@
import manifest_versions
from autotest_lib.client.common_lib import global_config
from autotest_lib.client.common_lib import logging_config, logging_manager
-from autotest_lib.server.cros import frontend_wrappers
+from autotest_lib.server.cros.dynamic_suite import frontend_wrappers
CONFIG_SECTION = 'SCHEDULER'