API: Moving autotest_lib to autotest

This patch brings API changes to test writers. Move autotest_api to a shorter and cleaner autotest. So all references to autotest_lib.[lib] Become autotest.[lib] The conversion was made mostly automated by script. Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
yumingfei · Apr 18, 2012 · 7e83868 · 7e83868
1 parent 4ece855
commit 7e83868
Show file tree

Hide file tree

Showing 614 changed files with 1,317 additions and 1,317 deletions.
diff --git a/CODING_STYLE b/CODING_STYLE
@@ -87,7 +87,7 @@ import sys, time, urllib, urlparse
 try:
     import autotest.common   
 except ImportError:
-    import common   # Magic autotest_lib module and sys.path setup code.
+    import common   # Magic autotest module and sys.path setup code.
 import MySQLdb  # After common so that we check our site-packages first.
 from common_lib import error
 

diff --git a/cli/acl.py b/cli/acl.py
@@ -18,7 +18,7 @@
 """
 
 import os, sys
-from autotest_lib.cli import topic_common, action_common
+from autotest.cli import topic_common, action_common
 
 
 class acl(topic_common.atest):

diff --git a/cli/acl_unittest.py b/cli/acl_unittest.py
@@ -10,7 +10,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import topic_common, action_common, acl, cli_mock
+from autotest.cli import topic_common, action_common, acl, cli_mock
 
 
 class acl_list_unittest(cli_mock.cli_unittest):

diff --git a/cli/action_common.py b/cli/action_common.py
@@ -41,7 +41,7 @@
 """
 
 import re, socket, types
-from autotest_lib.cli import topic_common
+from autotest.cli import topic_common
 
 
 #

diff --git a/cli/action_common_unittest.py b/cli/action_common_unittest.py
@@ -10,8 +10,8 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock, topic_common, action_common, rpc
-from autotest_lib.frontend.afe.json_rpc import proxy
+from autotest.cli import cli_mock, topic_common, action_common, rpc
+from autotest.frontend.afe.json_rpc import proxy
 
 #
 # List action

diff --git a/cli/atest.py b/cli/atest.py
@@ -22,7 +22,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import topic_common
+from autotest.cli import topic_common
 
 
 def main():
@@ -65,7 +65,7 @@ def main():
     elif not os.path.exists(os.path.join(cli_dir, '%s.py' % topic)):
         syntax_obj.invalid_syntax('Invalid topic %s' % topic)
     topic_module = common.setup_modules.import_module(topic,
-                                                      'autotest_lib.cli')
+                                                      'autotest.cli')
 
     # If we have a syntax error now, it should
     # refer to the topic class.

diff --git a/cli/atest_unittest.py b/cli/atest_unittest.py
@@ -10,7 +10,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock
+from autotest.cli import cli_mock
 
 
 class main_unittest(cli_mock.cli_unittest):

diff --git a/cli/atomicgroup.py b/cli/atomicgroup.py
@@ -14,7 +14,7 @@
 """
 
 import os, sys
-from autotest_lib.cli import topic_common, action_common
+from autotest.cli import topic_common, action_common
 
 class atomicgroup(topic_common.atest):
     """

diff --git a/cli/atomicgroup_unittest.py b/cli/atomicgroup_unittest.py
@@ -8,7 +8,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock, topic_common, atomicgroup
+from autotest.cli import cli_mock, topic_common, atomicgroup
 
 
 class atomicgroup_unittest(cli_mock.cli_unittest):

diff --git a/cli/autotest-rpc-change-protection-level b/cli/autotest-rpc-change-protection-level
@@ -7,7 +7,7 @@ try:
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import rpc, host
+from autotest.cli import rpc, host
 
 usage = 'usage: %prog [options] new_protection_level machine1 machine2 ...'
 parser = optparse.OptionParser(usage=usage)

diff --git a/cli/autotest-rpc-client b/cli/autotest-rpc-client
@@ -5,7 +5,7 @@ try:
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import atest
+from autotest.cli import atest
 
 
 sys.exit(atest.main())
diff --git a/cli/autotest-rpc-compose-query b/cli/autotest-rpc-compose-query
@@ -8,8 +8,8 @@ try:
     import autotest.common
 except ImportError:
     import common
-from autotest_lib.client.common_lib import kernel_versions
-from autotest_lib.tko import display, frontend, db, query_lib
+from autotest.client.common_lib import kernel_versions
+from autotest.tko import display, frontend, db, query_lib
 
 # First do all the options parsing
 parser = optparse.OptionParser()

diff --git a/cli/autotest-rpc-migrate-host b/cli/autotest-rpc-migrate-host
@@ -5,7 +5,7 @@ try:
     import autotest.common
 except ImportError:
     import common
-from autotest_lib.server import frontend
+from autotest.server import frontend
 
 try:
     old = frontend.AFE(web_server='http://' + sys.argv[1])

diff --git a/cli/autotest-rpc-query-keyvals b/cli/autotest-rpc-query-keyvals
@@ -5,7 +5,7 @@ try:
     import autotest.common
 except ImportError:
     import common
-from autotest_lib.cli import rpc
+from autotest.cli import rpc
 
 
 def parse_options():

diff --git a/cli/autotest-rpc-query-results b/cli/autotest-rpc-query-results
@@ -8,8 +8,8 @@ try:
     import autotest.common
 except ImportError:
     import common
-from autotest_lib.cli import rpc
-from autotest_lib.database import database_connection
+from autotest.cli import rpc
+from autotest.database import database_connection
 
 
 # First do all the options parsing

diff --git a/cli/cli_mock.py b/cli/cli_mock.py
@@ -9,11 +9,11 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import atest, topic_common, rpc
-from autotest_lib.frontend.afe import rpc_client_lib
-from autotest_lib.frontend.afe.json_rpc import proxy
-from autotest_lib.client.common_lib.test_utils import mock
-from autotest_lib.client.common_lib import autotemp
+from autotest.cli import atest, topic_common, rpc
+from autotest.frontend.afe import rpc_client_lib
+from autotest.frontend.afe.json_rpc import proxy
+from autotest.client.common_lib.test_utils import mock
+from autotest.client.common_lib import autotemp
 
 CLI_USING_PDB = False
 CLI_UT_DEBUG = False

diff --git a/cli/common.py b/cli/common.py
@@ -11,4 +11,4 @@
     import setup_modules
     sys.path.pop(0)
 
-setup_modules.setup(base_path=autotest_dir, root_module_name="autotest_lib")
+setup_modules.setup(base_path=autotest_dir, root_module_name="autotest")
diff --git a/cli/contrib/common.py b/cli/contrib/common.py
@@ -11,4 +11,4 @@
     import setup_modules
     sys.path.pop(0)
 
-setup_modules.setup(base_path=autotest_dir, root_module_name="autotest_lib")
+setup_modules.setup(base_path=autotest_dir, root_module_name="autotest")
diff --git a/cli/contrib/why_isnt_my_job_running.py b/cli/contrib/why_isnt_my_job_running.py
@@ -5,8 +5,8 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import rpc, host
-from autotest_lib.client.common_lib import host_queue_entry_states
+from autotest.cli import rpc, host
+from autotest.client.common_lib import host_queue_entry_states
 
 parser = optparse.OptionParser(
     usage='Usage: %prog [options] <job id> [<hostname>]\n\n'

diff --git a/cli/host.py b/cli/host.py
@@ -22,8 +22,8 @@
 """
 
 import os, sys, socket
-from autotest_lib.cli import topic_common, action_common
-from autotest_lib.client.common_lib import host_protections
+from autotest.cli import topic_common, action_common
+from autotest.client.common_lib import host_protections
 
 
 class host(topic_common.atest):

diff --git a/cli/host_unittest.py b/cli/host_unittest.py
@@ -10,7 +10,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock, host
+from autotest.cli import cli_mock, host
 
 
 class host_ut(cli_mock.cli_unittest):

diff --git a/cli/job.py b/cli/job.py
@@ -17,7 +17,7 @@
 """
 
 import getpass, os, pwd, re, socket, sys
-from autotest_lib.cli import topic_common, action_common
+from autotest.cli import topic_common, action_common
 
 
 class job(topic_common.atest):

diff --git a/cli/job_unittest.py b/cli/job_unittest.py
@@ -11,8 +11,8 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock, topic_common, job
-from autotest_lib.client.common_lib.test_utils import mock
+from autotest.cli import cli_mock, topic_common, job
+from autotest.client.common_lib.test_utils import mock
 
 
 class job_unittest(cli_mock.cli_unittest):

diff --git a/cli/label.py b/cli/label.py
@@ -17,7 +17,7 @@
 """
 
 import os, sys
-from autotest_lib.cli import topic_common, action_common
+from autotest.cli import topic_common, action_common
 
 
 class label(topic_common.atest):

diff --git a/cli/label_unittest.py b/cli/label_unittest.py
@@ -10,7 +10,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock, topic_common
+from autotest.cli import cli_mock, topic_common
 
 
 class label_list_unittest(cli_mock.cli_unittest):

diff --git a/cli/rpc.py b/cli/rpc.py
@@ -3,9 +3,9 @@
 #
 
 import os
-from autotest_lib.frontend.afe import rpc_client_lib
-from autotest_lib.frontend.afe.json_rpc import proxy
-from autotest_lib.client.common_lib import global_config, utils
+from autotest.frontend.afe import rpc_client_lib
+from autotest.frontend.afe.json_rpc import proxy
+from autotest.client.common_lib import global_config, utils
 
 GLOBAL_CONFIG = global_config.global_config
 DEFAULT_SERVER = 'autotest'

diff --git a/cli/rpc_unittest.py b/cli/rpc_unittest.py
@@ -9,10 +9,10 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import rpc
-from autotest_lib.client.common_lib import global_config
-from autotest_lib.frontend.afe import rpc_client_lib
-from autotest_lib.frontend.afe.json_rpc import proxy
+from autotest.cli import rpc
+from autotest.client.common_lib import global_config
+from autotest.frontend.afe import rpc_client_lib
+from autotest.frontend.afe.json_rpc import proxy
 
 GLOBAL_CONFIG = global_config.global_config
 

diff --git a/cli/setup.py b/cli/setup.py
@@ -6,7 +6,7 @@
 except ImportError:
     import common
 
-from autotest_lib.client.common_lib import version
+from autotest.client.common_lib import version
 
 # Mostly needed when called one level up
 cli_dir = os.path.dirname(sys.modules[__name__].__file__) or '.'

diff --git a/cli/site_readme.py b/cli/site_readme.py
@@ -11,7 +11,7 @@
 
 import inspect, new, sys
 
-from autotest_lib.cli import topic_common, label
+from autotest.cli import topic_common, label
 
 
 class site_label(label.label):

diff --git a/cli/test.py b/cli/test.py
@@ -17,7 +17,7 @@
 
 import os, sys
 
-from autotest_lib.cli import topic_common, action_common
+from autotest.cli import topic_common, action_common
 
 
 class test(topic_common.atest):

diff --git a/cli/test_unittest.py b/cli/test_unittest.py
@@ -10,7 +10,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock, topic_common, test
+from autotest.cli import cli_mock, topic_common, test
 
 
 class test_list_unittest(cli_mock.cli_unittest):

diff --git a/cli/threads_unittest.py b/cli/threads_unittest.py
@@ -12,7 +12,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock, threads
+from autotest.cli import cli_mock, threads
 
 
 class thread_unittest(cli_mock.cli_unittest):

diff --git a/cli/topic_common.py b/cli/topic_common.py
@@ -57,9 +57,9 @@ class __init__() before adding its own parser arguments.
 
 import getpass, optparse, os, pwd, re, socket, sys, textwrap, traceback
 import socket, string, urllib2
-from autotest_lib.cli import rpc
-from autotest_lib.frontend.afe.json_rpc import proxy
-from autotest_lib.client.common_lib.test_utils import mock
+from autotest.cli import rpc
+from autotest.frontend.afe.json_rpc import proxy
+from autotest.client.common_lib.test_utils import mock
 
 
 # Maps the AFE keys to printable names.

diff --git a/cli/topic_common_unittest.py b/cli/topic_common_unittest.py
@@ -10,8 +10,8 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock, topic_common, rpc
-from autotest_lib.frontend.afe.json_rpc import proxy
+from autotest.cli import cli_mock, topic_common, rpc
+from autotest.frontend.afe.json_rpc import proxy
 
 
 class topic_common_misc_tests(unittest.TestCase):

diff --git a/cli/user.py b/cli/user.py
@@ -15,7 +15,7 @@
 """
 
 import os, sys
-from autotest_lib.cli import topic_common, action_common
+from autotest.cli import topic_common, action_common
 
 
 class user(topic_common.atest):

diff --git a/cli/user_unittest.py b/cli/user_unittest.py
@@ -10,7 +10,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.cli import cli_mock, user
+from autotest.cli import cli_mock, user
 
 
 class user_list_unittest(cli_mock.cli_unittest):

diff --git a/client/autotest b/client/autotest
@@ -7,7 +7,7 @@ try:
 except ImportError:
     import common
 
-from autotest_lib.client import autotest_local
+from autotest.client import autotest_local
 
 if __name__ == '__main__':
     app = autotest_local.AutotestLocalApp()

diff --git a/client/autotest-local b/client/autotest-local
@@ -7,7 +7,7 @@ try:
 except ImportError:
     import common
 
-from autotest_lib.client import autotest_local
+from autotest.client import autotest_local
 
 if __name__ == '__main__':
     app = autotest_local.AutotestLocalApp()

diff --git a/client/autotest_client b/client/autotest_client
@@ -6,7 +6,7 @@ except ImportError:
 
 import sys, os, time, subprocess
 
-from autotest_lib.client.common_lib import utils
+from autotest.client.common_lib import utils
 
 # We want to set the output (stdout&stderr) of the autotest binary onto our
 # stdout channel. We went to get the status stream of autotest back on our
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ @@
     """
     import re, socket, types
-    from autotest_lib.cli import topic_common
+    from autotest.cli import topic_common
     #
@@ Expand Down @@